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

src/mixin/commonApi.js

@@ -5,6 +5,9 @@ export default {
     data(){
         return {}
     },
+    mounted(){
+        this.restoreDisplay()
+    },
     methods:{
         init(params){
             params = params||{}
@@ -41,6 +44,14 @@ export default {
             params = params||{}
             let data = Utils.flatObject(this.model)
             return Api.post(this.declareParams.trnName+"/pending",{...data,params})
+        },
+        restoreDisplay()
+        {
+            let inr = this.$route.query.trn
+            if(!inr)
+                return
+            let data = Api.post("display/"+inr)
+            console.log(data)
         }
     }
 } 
\ No newline at end of file

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/Sptsel/index.vue

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