Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/model/Ditopn/Default.js

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/model/Ditopn/Default.js

@@ -180,10 +180,7 @@ function defaultLitameadv() {
     })
 }
 function defaultDidgrpBlkAdlcnd() {
-    const that = this;
-    that.executeDefault("didgrp.blk.adlcnd").then(res => {
-        //TODO
-    })
+
 }
 function defaultDidgrpAplPtsRef() {
 }
@@ -258,6 +255,10 @@ function defaultLiaallLiaccvRelcshpct() {
 function defaultDidgrpRecExpplc() {
 }
 function defaultDidgrpAdvPtsBankno() {
+    const that = this;
+    that.executeRule("executeRule").thes(res => {
+        //TODO
+    })
 }
 function defaultDidgrpBenPtsRef() {
 }
@@ -274,10 +275,6 @@ function defaultLiaallLimmodLimptsPfcod2() {
 function defaultLiaallLimmodLimptsPfcod1() {
 }
 function defaultDidgrpAplPtsExtkey() {
-    const that = this;
-    that.executeDefault("didgrp.apl.pts.extkey").then(res => {
-        //TODO
-    })
 }
 function defaultDidgrpBlkDefdet() {
     const that = this;
@@ -310,16 +307,8 @@ function defaultDidgrpBlkLcrgod() {
 function defaultDidgrpRecAutdat() {
 }
 function defaultDidgrpRecIdcode() {
-    const that = this;
-    that.executeDefault("didgrp.rec.idcode").then(res => {
-        //TODO
-    })
 }
 function defaultDidgrpRecDkflg() {
-    const that = this;
-    that.executeDefault("didgrp.rec.dkflg").then(res => {
-        //TODO
-    })
 }
 function defaultDidgrpRmbPtsAdrblk() {
 }
@@ -418,8 +407,4 @@ function defaultDidgrpBlkPreper() {
     })
 }
 function defaultDidgrpCbsMaxAmt() {
-    const that = this;
-    that.executeDefault("didgrp.cbs.max.amt").then(res => {
-        //TODO
-    })
 }