Merge remote-tracking branch 'origin/master'

src/model/Ditopn/Default.js

@@ -238,7 +238,7 @@ function defaultDidgrpCbsNom1Cur()
 }
 function defaultDidgrpCbsNom1Amt(newVal, oldVal) {
     const that = this;
-    that.executeDefault("didgrp.cbs.max.amt", Utils.flatObject(this.model)).then(res => {
+    that.executeDefault("didgrp.cbs.max.amt").then(res => {
         that.model.didgrp.cbs.max.amt = res.data.didgrp_cbs_max_amt;
     })
 }

src/model/Ditopn/Event.js

@@ -15,19 +15,15 @@ export default {
             }
         })
     },
-    onAplpDet() {
-        this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
-            if (!valid)
-                return;
-            let rtnmsg = await Api.post("ditopn/aplp_det", Utils.flatObject(this.model))
+    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);
         }
         else {
             this.$notify.error({ title: '错误', message: '服务请求失败！' });
         }
-        })
     },
     onBenpDet() {
         this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {

src/views/Business/Ditopn/index.vue

@@ -170,7 +170,7 @@ export default {
         }
     },
     methods:{
-        tabClick(){
+        tabClick(vm){
             this.$refs.modelForm.validate(valid => {
                 if (valid){
                     console.log(1)
@@ -178,7 +178,19 @@ export default {
                     console.log(0)
                 }
             })
-            // this.executeDefault("didgrp.cbs.max.amt", Utils.flatObject(this.model))
+            const label = vm.label
+            if (label === "账务") {
+                this.executeRule("setmod.setpan").then(res => {
+                    const data = res.data;
+                    Utils.copyValueFromVO(this.model, data)
+                })
+            }
+            if (label === "面函") {
+                this.executeRule("trnmod.trndoc.docpan").then(res => {
+                    const data = res.data;
+                    Utils.copyValueFromVO(this.model, data)
+                })
+            }
         }
     },
     created:async function(){