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

src/config/CodeTable/index.js

@@ -102,11 +102,6 @@ const CodeTable = {
 		{label:"系统外还款",value:"1" },
 		{label:"正常还款",value:"0" },
 	],
-	actiontype:[
-		{label:"修改",value:"C" },
-		{label:"新建",value:"A" },
-		{label:"删除",value:"D" },
-	],
 	acttyp:[
 		{label:"储蓄存款账户",value:"3" },
 		{label:"支票存款账户",value:"2" },
@@ -4925,8 +4920,8 @@ const CodeTable = {
 		{label:"Error",value:"E" },
 	],
 	shppar:[
-		{label:"不允许",value:"N" },
-		{label:"允许",value:"Y" },
+		{label:"不允许",value:"禁止" },
+		{label:"允许",value:"允许" },
 	],
 	shwfil:[
 		{label:"No",value:"" },
@@ -5730,8 +5725,8 @@ const CodeTable = {
 		// {label:"send as MT999",value:"SWT999" },
 	],
 	litameadv:[
-		{label:"无特殊规定",value:"1" },
-		{label:"有特殊规定，条件为:",value:"2" },
+		{label:"无特殊规定",value:"无特殊规定" },
+		{label:"有特殊规定，条件为:",value:"有特殊规定，条件为：" }
 	],
 	swttlx:[
 		{label:"需要加押的SWIFT报文（MT999）",value:"M"},

src/model/Ditopn/Check.js

@@ -2,6 +2,7 @@
 /**
 * Ditopn Check规则
 */
+import Utils from "~/utils";
 export default {
 
     "liaall.misamt": [checkLiaallMisamtN100,],
@@ -770,8 +771,11 @@ function checkDidgrpRecAvbbyN100(rule, value, callback) {
     const that = this;
     that.exeuteCheck("didgrp.rec.avbby").then(res => {
         //TODO
-        callback()
+        if (res.respCode == "AAAAAA"){
+            Utils.copyValueFromVO(that.model, res.data);
+        }
     })
+    callback()
 }
 /**
 *   source:ditp.@0077.script

src/model/Ditopn/Pattern.js

@@ -176,7 +176,7 @@ export default {
 
     "didgrp.beb.pts.bankno": [
         { type: "string", required: true, message: "必输项" },
-        { pattern: (/^[\u4E00-\u9FA5]{3,}|^[0-9A-Za-z]{6,}$/), message: "至少输入3个字或6位行号" },
+        { pattern: (/^[\u4E00-\u9FA5]{3,}|^[0-9A-Za-z]{6,}/), message: "至少输入3个字或6位行号" },
         { max: 20, message: "长度不能超过20" }
     ],
 

src/model/Trnrel/Event.js

@@ -194,7 +194,6 @@ export default {
         })
     },
     onRejrow() {
-        debugger;
         console.log(this.getSelectedData())
 
         this.model.trncorco.selinr['rows'] = this.getSelectedData();

src/views/Business/Ditopn/Addbcb.vue

@@ -34,7 +34,7 @@
         <el-col :span="24">
             <el-form-item label="" prop="ameadvrmk" style="width: 60%">
                 <c-input
-                    :disabled="model.litameadv != 2"
+                    :disabled="model.litameadv == '无特殊规定'"
                     type="textarea"
                     v-model="model.ameadvrmk"
                     :autosize="{ minRows: 4, maxRows: 6 }"

src/views/Business/Ditopn/Detp.vue

@@ -83,9 +83,9 @@
             </el-form-item>
 
             <el-form-item label="转运" prop="didgrp.rec.shptrs">
-                <c-select v-model="model.didgrp.rec.shptrs" style="width:95%" placeholder="请选择" :disabled="model.didgrp.rec.mytype == 'F'">
-                  <el-option label="不允许" value="1"></el-option>
-                  <el-option label="允许" value="2"></el-option>
+                <c-select v-model="model.didgrp.rec.shptrs" style="width:100%" placeholder="请选择" :disabled="model.didgrp.rec.mytype == 'F'">
+                  <el-option label="不允许" value="禁止"></el-option>
+                  <el-option label="允许" value="允许"></el-option>
                 </c-select>
             </el-form-item>
 

src/views/Business/Ditopn/Detp1.vue

@@ -73,7 +73,7 @@
         <el-col :span="12">
             <el-form-item label="开证行BIC" prop="didgrp.iss.pts.extkey">
                 <c-input
-                    disabled
+                @change="changeExtkey"
                     v-model="model.didgrp.iss.pts.extkey"
                     maxlength="16"
                     placeholder="请输入External Key of Address"

src/views/Business/Ditopn/Ovwp.vue

@@ -703,7 +703,6 @@ export default {
                 produce: "0",
                 uri: "/ditopn/getElcsRef",
             },
-            flag: true,
             jigomcFlag:false,
             trade: "",
         };
@@ -717,7 +716,6 @@ export default {
                         //失去焦点，避免多次触发
                         document.getElementById('extkey').blur();
                         Utils.copyValueFromVO(this.model, res.data);
-                        this.flag = false;
                     }
                 }
             );
@@ -770,13 +768,17 @@ export default {
                 (res) => {
                     if (res.respCode = "AAAAAA"){
                         Utils.copyValueFromVO(this.model, res.data);
-                        this.flag = false;
                     }
                 }
             );
         },
     },
     created: function () {},
+    computed:{
+    flag(){
+        return this.model.didgrp.apl.pts.extkey=="";
+    } ,
+    },
     watch: {
         declareParams() {},
     },

src/views/Business/Ditopn/Setpan.vue

@@ -252,7 +252,7 @@
                 </el-table-column>
                 <el-table-column label="Disp" width="auto">
                     <template #default="scope">
-                        <el-select v-model="scope.row.dsp">
+                        <el-select v-model="scope.row.dsp" @change="dispDefault">
                             <el-option
                                 v-for="item in codes.setfeldsp"
                                 :key="item.value"
@@ -392,6 +392,7 @@
 import Event from "~/model/Ditopn/Event";
 import SetpanDialog from "./SetpanDialog.vue";
 import Api from "~/service/Api"
+import Utils from "~/utils/index"
 
 export default {
     components: { SetpanDialog },
@@ -416,6 +417,7 @@ export default {
     },
     methods: {
         ...Event,
+        //第一个表格
         addRow() {
             let newRow = { ...dialog };
             this.model.setmod.setfog.setfol.push(newRow);
@@ -423,25 +425,33 @@ export default {
         removeRow() {
             this.model.setmod.setfog.setfol.pop();
         },
+        saveDialog() {
+            this.visiable = false;
+            this.model.setmod.setfog.setfol[this.index] = this.dialog;
+        },
+        // 第二个表格
         detail1(index, row) {
-            Api.post("ditopn/executeRule/det",this.model).then(res=>{
+            Api.post("ditopn/executeDefault/det",Utils.getRequestDataFn.call(this)).then(res=>{
                 this.dialogVisible = true;
             this.dialog = row;
             this.index = index;
             })
             
         },
+        dispDefault(){
+            Api.post("ditopn/executeDefault/mac",Utils.getRequestDataFn.call(this)).then(res=>{
+                 Utils.copyValueFromVO(this.model, res.data)
+            })
+            
+        },
+        // 第三个表格
         detail2(index, row) {
-             Api.post("ditopn/executeRule/det",this.model).then(res=>{
+             Api.post("ditopn/executeRule/det",Utils.getRequestDataFn.call(this)).then(res=>{
             this.dialogVisible2 = true;
             this.index = index;
             this.dialog2 = row
              })
         },
-        saveDialog() {
-            this.visiable = false;
-            this.model.setmod.setfog.setfol[this.index] = this.dialog;
-        },
     },
     created: function () {},
 };

src/views/Business/Ditopn/index.vue

@@ -247,8 +247,7 @@ export default {
         },
         avbby(){
             this.pattern["didgrp.rec.tenmaxday"][0].required = this.model.didgrp.rec.avbby == "D";
-        }       
-
+        },
     }
 }
 </script>