Merge remote-tracking branch 'origin/master'

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

src/mixin/commonApi.js

@@ -51,8 +51,7 @@ export default {
             if(!inr)
                 return
             let data =await Api.post("display/"+inr)
-            Utils.copyValueFromVO(this.model,data.data)
-            console.log(data)
+            Utils.copyValueFromVO(this.model,JSON.parse(data.data))
         }
     }
 } 
\ No newline at end of file

src/mixin/commonProcess.js

@@ -35,7 +35,7 @@ export default {
           for (let j = 0; j < this.checkRules[key].length; j++) {
             const check = this.checkRules[key][j];
             rule.push({
-              validator: check
+              validator: check.bind(this)
             })
           }
         }

src/model/Ditopn/Check.js

@@ -12,7 +12,7 @@ export default {
     "liaall.limmod.ownref": [checkLiaallLimmodOwnrefN100,],
     "didgrp.rec.expplc": [checkDidgrpRecExpplcN900,],
     "didgrp.rec.fqtime": [checkDidgrpRecFqtimeN100,],
-    "didgrp.adv.pts.bankno": [checkDidgrpAdvPtsBanknoN100, ruleDidgrpAdvPtsBanknoN1252,],
+    "didgrp.adv.pts.bankno": [checkDidgrpAdvPtsBanknoN100,],
     "didgrp.rec.tratyp": [checkDidgrpRecTratypN100,],
     "liaall.limmod.ecifno": [checkLiaallLimmodEcifnoN100,],
     "ditp.benp.ptsget.sdamod.dadsnd": [checkDitpBenpPtsgetSdamodDadsndN100,],
@@ -99,12 +99,8 @@ export default {
     "ditp.rmbp.ptsget.sdamod.dadsnd": [checkDitpRmbpPtsgetSdamodDadsndN100,],
     "didgrp.ben.pts.extact": [checkDidgrpBenPtsExtactN1001,],
     "didgrp.blk.adlcnd": [checkDidgrpBlkAdlcndN100, checkDidgrpBlkAdlcndN100,],
-    "litameadv": [checkLitameadvN100,],
+    "litameadv": [checkLitameadvN100,ruleLitameadvN100,],
     "liaall.liaccv.relcshpct": [checkLiaallLiaccvRelcshpctN100,],
-
-    //Rule
-    "idgrp.rec.nomto":[ruleDidgrpRecNomtopN2000,],
-    "didgrp.rec.nomton":[ruleDidgrpRecNomtonN2000,],
 }
 /**
 *   source:liaall.@0019.script
@@ -135,19 +131,12 @@ function checkLiaallLimmodLimptsOthPtsExtkeyN960() {
 *   
 */
 function checkDidgrpAplPtsRefN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.apl.pts.ref").then(res =>{
-        //TODO
-    })
 }
 /**
 *   source:ditopn.@0121.script
 *   
 */
 function checkDidgrpAplPtsYouzbmN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.apl.pts.youzbm").then(res => {
-    })
 }
 /**
 *   source:ditopn.@0092.script
@@ -155,7 +144,7 @@ function checkDidgrpAplPtsYouzbmN100() {
 */
 function checkAmeadvrmkN100() {
     const that = this;
-    that.exeuteCheck("litameadv").then(res => {
+    that.exeuteCheck("ameadvrmk").then(res => {
     })
 }
 /**
@@ -397,10 +386,6 @@ function checkDidgrpRecApprulrmbN100() {
 *   
 */
 function checkDidgrpAplPtsDihdigN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.apl.pts.dihdig").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:ditopn.@0112.script
@@ -441,10 +426,6 @@ function checkDidgrpBlkDefdetN1001() {
 *   
 */
 function checkDidgrpRecElcflgN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.rec.elcflg").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:txmmod.@0009.script
@@ -555,40 +536,24 @@ function checkLiaallLimmodLimptsWrkPtsExtkeyN960() {
 *   
 */
 function checkDidgrpBenPtsDihdigN1004() {
-    const that = this;
-    that.exeuteCheck("didgrp.ben.pts.dihdig").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:ditopn.@0107.script
 *   
 */
 function checkDidgrpRecShpdatN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.rec.shpdat").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:ditopn.@0002.script
 *   
 */
 function checkDidgrpRecShpdatN999() {
-    const that = this;
-    that.exeuteCheck("didgrp.rec.shpdat").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:ditopn.@0005.script
 *   
 */
 function checkDidgrpCbsNom1CurN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.blk.lcrgod").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:ditopn.@0125.script
@@ -639,10 +604,6 @@ function checkDidgrpAdvPtsYouzbmN1003() {
 *   
 */
 function checkDidgrpAplPtsExtactN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.apl.pts.extact").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:ptsp.@0014.script
@@ -667,10 +628,6 @@ function checkDidgrpApcPtsYouzbmN1002() {
 *   
 */
 function checkDidgrpBenPtsYouzbmN1004() {
-    const that = this;
-    that.exeuteCheck("didgrp.ben.pts.youzbm").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:ditopn.@0027.script
@@ -779,10 +736,6 @@ function checkDidgrpAdvPtsDihdigN1003() {
 *   
 */
 function checkDidgrpRecExpdatN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.rec.expdat").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:ptsget.@0009.script
@@ -857,10 +810,6 @@ function checkDidgrpRecTenmaxdayN1050() {
 *   
 */
 function checkDidgrpCbsNom1AmtN100() {
-    const that = this;
-    that.exeuteCheck("didgrp.cbs.nom1.amt").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:txmmod.@0009.script
@@ -891,10 +840,6 @@ function checkDitpRmbpPtsgetSdamodDadsndN100() {
 *   
 */
 function checkDidgrpBenPtsExtactN1001() {
-    const that = this;
-    that.exeuteCheck("didgrp.ben.pts.extact").then(res => {
-        //TODO
-    })
 }
 /**
 *   source:txmmod.@0009.script
@@ -913,6 +858,10 @@ function checkDidgrpBlkAdlcndN100() {
 *   
 */
 function checkLitameadvN100() {
+    const that = this;
+    that.exeuteCheck("litameadv").then(res => {
+    })
+
 }
 /**
 *   source:liaccv.@0024.script
@@ -922,33 +871,8 @@ function checkLiaallLiaccvRelcshpctN100() {
 }
 
 
-//Rule
-/**
-*   source:ditopn.@0094.script
-*/
-function ruleDidgrpRecNomtopN2000() {
-    const that = this;
-    that.executeRule("didgrp.rec.nomtop").then(res =>{
-        //TODO
-    })
-}
-
-/**
-*   source:ditopn.@0094.script
-*/
-function ruleDidgrpRecNomtonN2000() {
+function ruleLitameadvN100() {
     const that = this;
-    that.executeRule("didgrp.rec.nomton").then(res =>{
-        //TODO
+    that.executeRule("litameadv").then(res => {
     })
 }
-
-/**
-*   source:ditopn.@0117.script
-*/
-function ruleDidgrpAdvPtsBanknoN1252() {
-    const that = this;
-    that.executeRule("didgrp.adv.pts.bankno").thes(res => {
-        //TODO
-    })
-}
\ No newline at end of file