Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

package.json

@@ -12,6 +12,7 @@
     "cluster": "^0.7.7",
     "element-ui": "^2.13.2",
     "es6-promise": "^4.2.8",
+    "lodash": "^4.17.21",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0",
     "vuex": "^3.4.0"

src/mixin/commonApi.js

@@ -45,12 +45,13 @@ export default {
             let data = Utils.flatObject(this.model)
             return Api.post(this.declareParams.trnName+"/pending",{...data,params})
         },
-        restoreDisplay()
+        async restoreDisplay()
         {
             let inr = this.$route.query.trn
             if(!inr)
                 return
-            let data = Api.post("display/"+inr)
+            let data =await Api.post("display/"+inr)
+            Utils.copyValueFromVO(this.model,data.data)
             console.log(data)
         }
     }

src/mixin/commonProcess.js

+import _ from "lodash"
 import commonDeclare from "./commonDeclare"
 import commonApi from "./commonApi"
 export default {
@@ -17,7 +18,7 @@ export default {
         return
       const that = this;
       Object.keys(that.defaultRules).forEach(key => {
-        that.$watch("model." + key, that.defaultRules[key])
+        that.$watch("model." + key, _.debounce(that.defaultRules[key], 1000))
       })
     },
     ruleCheck() {

src/model/Ditopn/Event.js

 import Api from "~/service/Api"
 import Utils from "~/utils/index"
 export default {
-    onDitpButgetref() {
-        this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
-            if (!valid)
-                return;
-            let rtnmsg = await Api.post("ditopn/ditp_butgetref", Utils.flatObject(this.model))
-            if (rtnmsg.respCode == "AAAAAA") {
-                //TODO 处理数据逻辑
+    async onDitpButgetref() {
+        let rtnmsg = await Api.post("ditopn/executeRule/ditp.butgetref", Utils.flatObject(this.model))
+        if (rtnmsg.respCode == "AAAAAA") {
+            //TODO 处理数据逻辑
+            const ownref = rtnmsg.data.didgrp_rec_ownref
 
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
-        })
+            const h = this.$createElement;
+            this.$msgbox({
+                title: '获取结果',
+                message: h('p', null, [
+                    h('div', { style: 'margin-left: 25%'}, `参考号：${ownref}`),
+                    h('div', { style: 'margin-left: 25%' }, '是否将结果填入表单？')
+                ]),
+                showCancelButton: true,
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+            }).then(action => {
+                this.model.didgrp.rec.ownref = ownref
+                this.$message({
+                    type: 'success',
+                    message: '填入成功！'
+                });
+            }).catch(action => {
+                this.$message({
+                    type: 'info',
+                    message: "已取消"
+                })
+            });
+        }
+        else {
+            this.$notify.error({ title: '错误', message: '服务请求失败！' });
+        }
     },
     async onAplpDet() {
         let rtnmsg = await Api.post("ditopn/executeRule/ditp.aplp.det", Utils.flatObject(this.model))
         if (rtnmsg.respCode == "AAAAAA") {
             //TODO 处理数据逻辑
-            console.log(rtnmsg.data);
+            // console.log(rtnmsg.data);
         }
         else {
             this.$notify.error({ title: '错误', message: '服务请求失败！' });

src/model/Sptsel/Default.js

@@ -40,34 +40,23 @@ function defaultDlmft() {
 function defaultButimg() {
 }
 async function defaultDflg() {
-    let rtnmsg = await Api.post("sptsel/default/dflg", Utils.flatObject(this.model))
-    if (rtnmsg.respCode == "AAAAAA") {
-        //TODO 处理数据逻辑
-        //this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
-    }
-    else {
-        this.$notify.error({ title: '错误', message: '服务请求失败！' });
-    }
+    const that = this;
+    that.executeDefault("dflg").then(res => {
+        that.model.dflg = res.data.dflg;
+    })
 }
 async function defaultYptinf() {
-    let rtnmsg = await Api.post("sptsel/default/yptinf", Utils.flatObject(this.model))
-    if (rtnmsg.respCode == "AAAAAA") {
+    const that = this;
+    that.executeDefault("yptinf").then(res => {
         //TODO 处理数据逻辑
-        //this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
-    }
-    else {
-        this.$notify.error({ title: '错误', message: '服务请求失败！' });
-    }
+    })
 }
 function defaultUsfmodUsrExtkey() {
 }
 async function defaultCheckbox() {
-    let rtnmsg = await Api.post("sptsel/default/sptstm", Utils.flatObject(this.model))
-    if (rtnmsg.respCode == "AAAAAA") {
+    const that = this;
+    that.executeDefault("sptstm").then(res => {
         //TODO 处理数据逻辑
-        this.model.stmData.data = rtnmsg.data.sptstm.rows;
-    }
-    else {
-        this.$notify.error({ title: '错误', message: '服务请求失败！' });
-    }
+        that.$refs.Menu.stmData.data = res.data.sptstm.rows;
+    })
 }

src/model/Trnrel/Default.js

@@ -56,7 +56,11 @@ function defaultTrnInfdsp() {
 }
 function defaultRecpanIncben() {
 }
-function defaultUsrcon() {
+async function defaultUsrcon() {
+    const that = this;
+    that.executeDefault("usrcon").then(res => {
+        this.model.usrcon = res.data.usrcon;
+    })
 }
 function defaultImgmodHisimg() {
 }
@@ -73,20 +77,20 @@ function defaultImgmodNewhisimg() {
 function defaultRecpanCpltxt() {
 }
 async function defaultTrncorcoDflg() {
-    let rtnmsg = await Api.post("trnrel/default/trncorco.dflg", Utils.flatObject(this.model))
-    if (rtnmsg.respCode == "AAAAAA") {
-        //TODO 处理数据逻辑
-        this.model = Utils.copyValueFromVO(this.model, rtnmsg.data);
-    }
-    else {
-        this.$notify.error({ title: '错误', message: '服务请求失败！' });
-    }
+    const that = this;
+    that.executeDefault("trncorco.dflg").then(res => {
+        that.model.trncorco.dflg = res.data.trncorco_dflg;
+    })
 }
 function defaultOrddsp() {
 }
 function defaultRecpanUsrExtkey() {
 }
-function defaultAtptxt() {
+async function defaultAtptxt() {
+    const that = this;
+    that.executeDefault("atptxt").then(res => {
+        that.model.atptxt = res.data.atptxt;
+    })
 }
 function defaultRecpanAckgrpRecSndref() {
 }

src/model/Trnrel/Event.js

@@ -5,28 +5,30 @@ export default {
         this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
             if (!valid)
                 return;
-            let rtnmsg = await Api.post("trnrel/executeRule/searow", Utils.flatObject(this.model))
-            if (rtnmsg.respCode == "AAAAAA") {
+            const that = this.$parent.$parent.$parent.$parent;
+            that.executeRule("searow").then(res => {
                 //TODO 处理数据逻辑
-                this.stmData.data = rtnmsg.data.trncorco_trnstm.rows;
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
+                that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
+            })
+            // let rtnmsg = await Api.post("trnrel/executeRule/searow", Utils.flatObject(this.model))
+            // if (rtnmsg.respCode == "AAAAAA") {
+            //     //TODO 处理数据逻辑
+            //     this.stmData.data = rtnmsg.data.trncorco_trnstm.rows;
+            // }
+            // else {
+            //     this.$notify.error({ title: '错误', message: '服务请求失败！' });
+            // }
         })
     },
     onSeajbh() {
         this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
             if (!valid)
                 return;
-            let rtnmsg = await Api.post("trnrel/seajbh", Utils.flatObject(this.model))
-            if (rtnmsg.respCode == "AAAAAA") {
+            const that = this.$parent.$parent.$parent.$parent;
+            that.executeRule("seajbh").then(res => {
                 //TODO 处理数据逻辑
-
-            }
-            else {
-                this.$notify.error({ title: '错误', message: '服务请求失败！' });
-            }
+                that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
+            })
         })
     },
     onSeactr() {

src/views/Business/Ditopn/Detp1.vue

@@ -3,8 +3,7 @@
         <!-- <el-row> -->
         <el-col :span="12">
             <el-form-item label="参考号">
-                <!-- <c-input v-model="model.didgrp.rec.tzref" maxlength="35" placeholder="请输入通知行编号"></c-input> -->
-                <c-input v-model="model.didgrp.adv.pts.extkey" maxlength="35" placeholder="请输入通知行编号"></c-input>
+                <c-input v-model="model.didgrp.rec.tzref" maxlength="35" placeholder="请输入通知行编号"></c-input>
             </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -98,7 +97,7 @@
             </el-form-item>
         </el-col>
         <!-- <el-row> -->
-        <el-col :span="8">
+        <el-col :span="12">
             <el-form-item label="指定的有关银行 ">
                 <c-select v-model="model.didgrp.rec.avbwth" style="width:100%" placeholder="请选择指定的有关银行  ">
                     <el-option v-for="item in codes.avbwth" :key="item.value" :label="item.label"
@@ -203,8 +202,6 @@ export default {
     },
     methods:{...Event},
     created:function(){
-        console.log(this.model)
-        console.log(this.model.didgrp.adv.pts.extkey)
     }
 }
 </script>

src/views/Business/Sptsel/index.vue

@@ -31,31 +31,27 @@ export default {
     },
     data(){
         return {
-           model:new Sptsel().data,           
-           checkRules: Check,
+            trnName:"sptsel",
+            model:new Sptsel().data,           
+            checkRules: Check,
             defaultRules: Default,
             pattern: Pattern,
-           rules:null,
-           codes:{
+            rules:null,
+            codes:{
                flt:CodeTable.flt,
                dflg:CodeTable.dflg
-           },
+            },
         }
     },
     methods:{...Event},
     mounted:async function(){
         console.log("进入sptsel交易");
-        let rtnmsg = await Api.post("sptsel/init",Utils.flatObject(this.model))
-        if(rtnmsg.respCode == "AAAAAA")
-        {
-           //TODO 处理数据逻辑
-            this.model = Utils.copyValueFromVO(this.model, rtnmsg.data)
-            this.$refs.Menu.stmData.columns = rtnmsg.data.sptstm.rows;
-        }
-        else
-        {
-            this.$notify.error({title: '错误',message: '服务请求失败！'});
-        }
+        const that = this;
+        that.init(that.model).then(res => {
+            //TODO 处理数据逻辑
+             that.model = Utils.copyValueFromVO(that.model, res.data)
+             that.$refs.Menu.stmData.columns = res.data.sptstm.rows;
+        })
     }
 }
 </script>

src/views/Business/Trnrel/index.vue

@@ -47,6 +47,7 @@ export default {
     },
     data(){
         return {
+            trnName:"trnrel",
             model: new Trnrel().data,
             checkRules: Check,
             defaultRules: Default,
@@ -65,19 +66,12 @@ export default {
     },
     mounted:async function(){
         console.log("进入trnrel交易");
-        
-
-        let rtnmsg = await Api.post("trnrel/init", Utils.flatObject(this.model))
-        if(rtnmsg.respCode == "AAAAAA")
-        {
+        const that = this;
+        that.init(that.model).then(res => {
             //TODO 处理数据逻辑
-            Utils.copyValueFromVO(this.model, rtnmsg.data);
-            this.$refs.inftrnps.stmData.columns=rtnmsg.data.trncorco_trnstm.rows
-        }
-        else
-        {
-            this.$notify.error({title: '错误',message: '服务请求失败！'});
-        }
+             that.model = Utils.copyValueFromVO(that.model, res.data)
+             that.$refs.inftrnps.stmData.columns=res.data.trncorco_trnstm.rows
+        })
     }
 }
 </script>