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

src/model/Ditopn/Default.js

@@ -147,18 +147,20 @@ function defaultDitpBenpDet() {
 }
 function defaultLiaallLimmodLimptsLsh() {
 }
-function defaultDidgrpRecBdflg() {
+function defaultDidgrpRecBdflg(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.rec.bdflg").then(res => {
         that.model.didgrp.rec.bdflg = res.data.didgrp_rec_bdflg
+        callback()
     })
 }
 function defaultDitpLcrgodButtxmsel() {
 }
-function defaultDidgrpRecOpndat() {
+function defaultDidgrpRecOpndat(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.rec.opndat").then(res => {
         that.model.didgrp.rec.opndat = res.data.didgrp_rec_opndat
+        callback()
     })
 }
 function defaultLiaallLimmodWrkpDet() {
@@ -171,18 +173,20 @@ function defaultDitpButgetref() {
 }
 function defaultDidgrpBenPtsExtkey() {
 }
-function defaultDidgrpBlkLcrdoc() {
+function defaultDidgrpBlkLcrdoc(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.blk.lcrdoc").then(res => {
         that.model.didgrp.blk.lcrdoc = res.data.didgrp_blk_lcrdoc;
+        callback()
     })
 }
 function defaultDitpRmbpPtsgetSdamodDadsnd() {
 }
-function defaultLitameadv() {
+function defaultLitameadv(rule, value, callback) {
     const that = this;
     that.executeDefault("litameadv").then(res => {
         that.model.ameadvrmk = res.data.ameadvrmk;
+        callback()
     })
 }
 function defaultDidgrpBlkAdlcnd() {
@@ -221,6 +225,7 @@ function defaultDidgrpCbsNom1Cur(rule, value, callback)
     that.executeDefault("didgrp.rec.nam").then(res => {
         that.model.didgrp.cbs.max.cur = value;
         that.model.didgrp.rec.nam = res.data.didgrp_rec_nam;
+        callback()
     })
 }
 function defaultDidgrpCbsNom1Amt(rule, value, callback) {
@@ -235,6 +240,8 @@ function defaultDidgrpCbsNom1Amt(rule, value, callback) {
     that.executeDefault("didgrp.rec.nam").then(res => {
         that.model.didgrp.rec.nam = res.data.didgrp_rec_nam;
     })
+
+    callback()
 }
 function defaultSetmodZmqacc() {
 }
@@ -244,10 +251,11 @@ function defaultDidgrpRecMytype() {
 }
 function defaultSetmodXreflg() {
 }
-function defaultDidgrpRecAvbwth() {
+function defaultDidgrpRecAvbwth(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.rec.avbwth").then(res => {
         //TODO
+        callback()
     })
 }
 function defaultDidgrpRmbPtsRef() {
@@ -258,10 +266,11 @@ function defaultLiaallLiaccvRelcshpct() {
 }
 function defaultDidgrpRecExpplc() {
 }
-function defaultDidgrpAdvPtsBankno() {
+function defaultDidgrpAdvPtsBankno(rule, value, callback) {
     const that = this;
     that.executeRule("didgrp.adv.pts.bankno,didgrp.rec.avbwth").then(res => {
         //TODO
+        callback()
     })
 }
 function defaultDidgrpBenPtsRef() {
@@ -282,10 +291,11 @@ function defaultDidgrpAplPtsExtkey() {
 }
 function defaultDidgrpBlkDefdet() {
 }
-function defaultDidgrpBlkInsbnk() {
+function defaultDidgrpBlkInsbnk(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.blk.insbnk").then(res => {
         that.model.didgrp.blk.insbnk = res.data.didgrp_blk_insbnk;
+        callback()
     })
 }
 function defaultLiaallLiaccvTotcovamt() {
@@ -326,23 +336,26 @@ function defaultDitpAdlcndButtxmsel() {
 }
 function defaultLiaallLimmodLimptsGet1() {
 }
-function defaultBchname() {
+function defaultBchname(rule, value, callback) {
     const that = this;
     that.executeDefault("bchname").then(res => {
         that.model.bchname = res.data.bchname;
+        callback()
     })
 }
-function defaultDidgrpRecTenmaxday() {
+function defaultDidgrpRecTenmaxday(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.blk.defdet").then(res => {
         //TODO
         that.model.didgrp.blk.defdet = res.data.didgrp_blk_defdet;
+        callback()
     })
 }
-function defaultDitpRemark() {
+function defaultDitpRemark(rule, value, callback) {
     const that = this;
     that.executeDefault("ditp.remark").then(res => {
         that.model.ditp.remark = res.data.ditp_remark;
+        callback()
     })
 }
 function defaultLiaallLimmodLimptsOthPtsExtkey() {
@@ -383,10 +396,11 @@ function defaultDidgrpBebPtsBankno() {
 }
 function defaultDidgrpAplPtsAdrblk() {
 }
-function defaultDidgrpRecLcrtyp() {
+function defaultDidgrpRecLcrtyp(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.rec.lcrtyp").then(res => {
         //TODO
+        callback()
     })
 }
 function defaultLiaallLimmodLimptsWrkPtsExtkey() {
@@ -405,25 +419,29 @@ function defaultTrnmodTrndocAmdnam() {
 }
 function defaultLiaallLiaccvCshpct() {
 }
-function defaultDidgrpBlkPreper() {
+function defaultDidgrpBlkPreper(rule, value, callback) {
     const that = this;
     that.executeDefault("didgrp.blk.preper").then(res => {
         that.model.didgrp.blk.preper = res.data.didgrp_blk_preper;
+        callback()
     })
 }
 function defaultDidgrpCbsMaxAmt() {
 }
 
-function defaultDidgrpRecNomtop() {
-    caculateMaxAmt(this)
+function defaultDidgrpRecNomtop(rule, value, callback) {
+    caculateMaxAmt(this, callback)
 }
 
-function defaultDidgrpRecNomton() {
-    // caculateMaxAmt(this)
+function defaultDidgrpRecNomton(rule, value, callback) {
+    // caculateMaxAmt(this, callback)
 }
 
-function caculateMaxAmt (that) {
+function caculateMaxAmt (that, callback) {
     that.executeDefault("didgrp.cbs.max.amt").then(res => {
         that.model.didgrp.cbs.max.amt = res.data.didgrp_cbs_max_amt;
+        if (callback) {
+            callback()
+        }
     })
 }
\ No newline at end of file

src/model/Trnrel/Default.js

@@ -56,10 +56,11 @@ function defaultTrnInfdsp() {
 }
 function defaultRecpanIncben() {
 }
-function defaultUsrcon() {
+function defaultUsrcon(rule, value, callback) {
     const that = this;
     that.executeDefault("usrcon").then(res => {
         this.model.usrcon = res.data.usrcon;
+        callback()
     })
 }
 function defaultImgmodHisimg() {
@@ -76,20 +77,22 @@ function defaultImgmodNewhisimg() {
 }
 function defaultRecpanCpltxt() {
 }
-function defaultTrncorcoDflg() {
+function defaultTrncorcoDflg(rule, value, callback) {
     const that = this;
     that.executeDefault("trncorco.dflg").then(res => {
         that.model.trncorco.dflg = res.data.trncorco_dflg;
+        callback()
     })
 }
 function defaultOrddsp() {
 }
 function defaultRecpanUsrExtkey() {
 }
-function defaultAtptxt() {
+function defaultAtptxt(rule, value, callback) {
     const that = this;
     that.executeDefault("atptxt").then(res => {
         that.model.atptxt = res.data.atptxt;
+        callback()
     })
 }
 function defaultRecpanAckgrpRecSndref() {