merge

src/components/IStreamTable.vue

@@ -56,7 +56,7 @@ export default {
     tableColumns() {
       const columnArr = []
       const lines = this.columns;
-      const etyReg = /\"(\w*\s?\w*)\"/
+      const etyReg = /\"(\w*(\s?|\/?)\w*)\"/
       const obj = {}
       for (let i = 0; i < lines.length; i++) {
           const line = lines[i];

src/mixin/commonDeclare.js

@@ -8,8 +8,8 @@ export default{
     computed:{
         declareParams(){
             return {
-                version:this.version,
-                trnName:this.trnName,
+                version: this.version,
+                trnName: this.root ? this.root.trnName : this.trnName,
             }
         }
     }

src/mixin/commonProcess.js

@@ -46,10 +46,17 @@ export default {
         }
         const triggerType = that.getTriggerType(key)
         if(that.checkRules[key]){
-          for (let j = 0; j < that.checkRules[key].length; j++) {
-            const check = that.checkRules[key][j];
+          if (Array.isArray(that.checkRules[key])) {
+            for (let j = 0; j < that.checkRules[key].length; j++) {
+              const check = that.checkRules[key][j];
+              rule.push({
+                validator: check.bind(that),
+                trigger: triggerType
+              })
+            }
+          } else {
             rule.push({
-              validator: check.bind(that),
+              validator: that.checkRules[key].bind(that),
               trigger: triggerType
             })
           }

src/model/Cptopn/index.js

@@ -142,6 +142,7 @@ export default class Cptopn{
 							payeecountcode:"",			//  收款人常驻国家/地区代码		.cptp.payeecountcode
 							uetr:"",			//  Uetr		.cptp.uetr
 						},
+						
 						setmod:{
 							docamttyplab:"",			//  settled amount description as label		.setmod.docamttyplab
 							retmsg:"",			//  Label showing Retry overflow condition		.setmod.retmsg
@@ -152,12 +153,19 @@ export default class Cptopn{
 							xreflg:"",			//  Recalculate Rates		.setmod.xreflg
 							setglg:{
 								labdspflg:"",			//  Label for Type of Settlement		.setmod.setglg.labdspflg
+								setgll:[]
 							},
 							zmqacclab:"",			//  主�'�号LABEL		.setmod.zmqacclab
 							zmqacc:"",			//  自�'�区主�'�号		.setmod.zmqacc
-							glemod:{
-								gleshwstm:"",			//  Booking stream to Display		.setmod.glemod.gleshwstm
+							setfog:{
+								setfol:[]
+							},
+							setfeg:{
+								setfel:[]
 							},
+							glemod:{
+								
+							}
 						},
 						mtabut:{
 							coninf:{

src/utils/index.js

@@ -216,7 +216,20 @@ export default class Utils {
                 Utils.copyValueFromVO(this.model, data)
                 callback()
             }
-
         })
     }
+
+    static reflectCheck(key){
+        return async function(rule, value, callback){
+            //调用具体的check
+            const res = await this.exeuteCheck(key)
+            if (res.respCode == SUCCESS){
+                if (Object.hasOwnProperty.call(res.fieldErrors, key)) {
+                    callback(res.fieldErrors[key])
+                } else {
+                    callback();
+                }
+            }
+        }
+    }
 }
\ No newline at end of file

src/views/Business/Cptopn/Setpan.vue

@@ -202,7 +202,7 @@
         <el-col :span="22" style="margin-bottom: 18px" :offset="1">
             <c-table
                 style="text-align: center"
-                :list="data"
+                :list="model.setmod.setfeg.setfel"
                 :paginationShow="false"
                 :border="true"
             >