Merge remote-tracking branch 'origin/master'

src/model/Ditopn/Default.js

@@ -3,7 +3,7 @@
 * Ditopn Default规则
 */
 import Api from "~/service/Api";
-import Utils from "~/utils/index"
+import Utils from "~/utils/indeAvatarx"
 export default {
 
     "didgrp.rec.resflg": defaultDidgrpRecResflg,
@@ -117,7 +117,9 @@ export default {
     "trnmod.trndoc.amdnam": defaultTrnmodTrndocAmdnam,
     "liaall.liaccv.cshpct": defaultLiaallLiaccvCshpct,
     "didgrp.blk.preper": defaultDidgrpBlkPreper,
-    "didgrp.cbs.max.amt": defaultDidgrpCbsMaxAmt
+    "didgrp.cbs.max.amt": defaultDidgrpCbsMaxAmt,
+    "didgrp.rec.nomtop": defaultDidgrpRecNomtop,
+    "didgrp.rec.nomton": defaultDidgrpRecNomton
 }
 function defaultDidgrpRecResflg() {
 }
@@ -224,9 +226,7 @@ function defaultDidgrpCbsNom1Cur(newVal, oldVal)
 function defaultDidgrpCbsNom1Amt(newVal, oldVal) {
     const that = this;
     // 信用证最大金额
-    that.executeDefault("didgrp.cbs.max.amt").then(res => {
-        that.model.didgrp.cbs.max.amt = res.data.didgrp_cbs_max_amt;
-    })
+    caculateMaxAmt(that)
     // 大写金额
     that.executeDefault("ditp.amt").then(res => {
         that.model.ditp.amt = res.data.ditp_amt;
@@ -412,3 +412,17 @@ function defaultDidgrpBlkPreper() {
 }
 function defaultDidgrpCbsMaxAmt() {
 }
+
+function defaultDidgrpRecNomtop() {
+    caculateMaxAmt(this)
+}
+
+function defaultDidgrpRecNomton() {
+    // caculateMaxAmt(this)
+}
+
+function caculateMaxAmt (that) {
+    that.executeDefault("didgrp.cbs.max.amt").then(res => {
+        that.model.didgrp.cbs.max.amt = res.data.didgrp_cbs_max_amt;
+    })
+}
\ No newline at end of file

src/views/Business/Ditopn/Ovwp.vue

@@ -406,12 +406,16 @@ export default {
                 const data = res.data;
                 this.model.didgrp.apl.namelc = data.didgrp_apl_namelc;
                 this.model.didgrp.apl.adrelc = data.didgrp_apl_adrelc;
+                this.model.didgrp.apl.pts.extkey = data.didgrp_apl_pts_extkey;
             })
         },
         benExtkeyEvent() {
             const data = Utils.flatObject(this.model)
             Api.post("ditopn/executeRule/didgrp.ben.pts.extkey",data).then(res => {
                 const data = res.data;
+                this.model.didgrp.ben.namelc = data.didgrp_ben_namelc;
+                this.model.didgrp.ben.adrelc = data.didgrp_ben_adrelc;
+                this.model.didgrp.ben.pts.extkey = data.didgrp_ben_pts_extkey;
             })
         }
     },