Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/model/Infbdd/Event.js

@@ -115,18 +115,30 @@ export default {
         
             },
             async handleSearch() {
+
+                this.stmData.data = [];
+                let opndatfrom = this.model.infcon.opndatfrom;
+                if(!opndatfrom || opndatfrom == ''){
+                    this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
+                    return;
+                }
+                let opndatto = this.model.infcon.opndatto;
+                if(!opndatto || opndatto == ''){
+                    this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
+                    return;
+                }
                     
-                    let rtnmsg = await this.executeRule("infbut.searow")
-                    if(rtnmsg.respCode == SUCCESS)
-                    {
-                        this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
-    
-                    }
-                    else
-                    {
-                    this.$notify.error({title: '错误',message: '服务请求失败！'});
-                    }
-                },
+                let rtnmsg = await this.executeRule("infbut.searow")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                    this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
+
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+        },
                 display(index, row) {
                     debugger;
                     Api.post("getTrnNameByInr", { inr:row['INR'] }).then((res) => {

src/model/Infdid/Event.js

@@ -177,7 +177,17 @@ export default {
 
     },
     async handleSearch() {
-
+        this.stmData.data = [];
+        let opndatfrom = this.model.infcon.opndatfrom;
+        if(!opndatfrom || opndatfrom == ''){
+            this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
+            return;
+        }
+        let opndatto = this.model.infcon.opndatto;
+        if(!opndatto || opndatto == ''){
+            this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
+            return;
+        }
         let rtnmsg = await this.executeRule("infbut.searow")
         if (rtnmsg.respCode == SUCCESS) {
             this.stmData.data = rtnmsg.data.infbut_dspstm.rows;

src/model/Sptsel/Event.js

@@ -79,11 +79,21 @@ export default {
         //let rtnmsg = await Api.post("getPendingData",{params:{'selsptinr':row[0]}})
         //if (rtnmsg.respCode == SUCCESS) {
         //var cacheFileName = rtnmsg.data.cacheFileName;
+        this.model.selsptinr = row['INR'];
+        let rtnmsg = await this.executeRule("tak")
+        if (rtnmsg.respCode == SUCCESS) {
+            //TODO 处理数据逻辑
+            let trnName = row.交易代码.toLowerCase();
+            // let viewurl = "/business/ditopn?selsptinr=" + row[0];
+            //let viewurl = "/business/"+trnName+"?selsptinr=" + row['INR'];
+            let viewurl = "/business/"+trnName;
+            this.$router.push(viewurl);
+        }
+        else {
+            this.$notify.error({ title: '错误', message: '服务请求失败！' });
+        }
      
-        let trnName = row.交易代码.toLowerCase();
-        // let viewurl = "/business/ditopn?selsptinr=" + row[0];
-        let viewurl = "/business/"+trnName+"?selsptinr=" + row['INR'];
-        this.$router.push(viewurl);
+       
         //}
     },
     async handleReset() {

src/model/Sptsel/index.js

@@ -60,6 +60,7 @@ export default class Sptsel {
 					relamt:"",			//  Relevant Amount Optional		.sptp.smh.relamt
 				},
 			},
+			selsptinr:"",
 			pageId: ""			// ctx的key
 		}
 	}

src/views/Business/Trnrel/InftrnpsDetail.vue

@@ -295,7 +295,7 @@
                                             <c-button
                                                 style="margin-left: 0"
                                                 size="small"
-                                                @click="show(scope.$index)"
+                                                @click="show(scope.$index,scope.row)"
                                             >
                                                 Show
                                             </c-button>
@@ -508,32 +508,21 @@ export default {
                 }
             });
         },
-        async show(idx){       
-            var params = {selDst:"recpan.smhstm",selIds:[idx+1]}
+        async show(idx,row){       
+            var params = {selDst:"recpan.smhstm",selIds:[idx+1],selBtnId:"A"}
             let rtnmsg = await Api.post(`trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
-            // let rtnmsg = await this.executeRule("trnrel.recpan.smhstm", params)
             if (rtnmsg.respCode == SUCCESS) {
                 this.title = "面函"
                 let viewurl = "/#/docpan/show";
                 let XMLdata;
-                if (row.pandsc.startsWith("elcs.")) {
+                if (row.Type == 'LET') {
                     window.sessionStorage.docXML = ''
-                    window.sessionStorage.docTXT = ''
-                    rtnmsg.data.trnmod_trndoc_doceot[index].doctxt.rows.forEach(element => {
-                        window.sessionStorage.docTXT += element + "\r\n"
-                    });
+                    window.sessionStorage.docXML = rtnmsg.data.docimm_xmldocblk;
                 }
                 else if (row.pandsc == "MT799") {
                     window.sessionStorage.docTXT = ''
                     XMLdata = rtnmsg.data.litbenl1blk
                 }
-                else{
-                    //参考后台Doceot.butshw order=1000
-                    let execution = 'P', structure = 'l'
-                    let attr = DocUtils.getDocAttribute(docnam,structure,execution)
-                    window.sessionStorage.docTXT = ''
-                    window.sessionStorage.docXML = rtnmsg.data[attr];
-                }
                 window.open(viewurl, 'newwindow', 'height=1200,width=800,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
             }
             else {