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

src/model/Ditopn/Check.js

@@ -101,6 +101,7 @@ export default {
     "didgrp.blk.adlcnd": [checkDidgrpBlkAdlcndN100, checkDidgrpBlkAdlcndN100,],
     "litameadv": [checkLitameadvN100,ruleLitameadvN100,],
     "liaall.liaccv.relcshpct": [checkLiaallLiaccvRelcshpctN100,],
+    "didgrp.rec.bdflg":[resetDidgrpRecBdflg,],
 }
 /**
 *   source:liaall.@0019.script
@@ -528,6 +529,10 @@ function checkDidgrpAplPtsAdrblkN950(rule, value, callback) {
 */
 function checkDidgrpRecLcrtypN900(rule, value, callback) {
     callback()
+    //清空转让行相关字段
+    this.model.didgrp.cmb.pts.bankno = "";
+    this.model.didgrp.cmb.pts.jigomc = "";
+    this.model.didgrp.cmb.pts.dizhii = "";
 }
 /**
 *   source:ditp.@0089.script
@@ -591,6 +596,11 @@ function checkDidgrpRecFenctgN100(rule, value, callback) {
         //TODO
         callback()
     })
+    //清空议付行相关字段
+    this.model.didgrp.rec.avbwth = "";
+    this.model.didgrp.avb.pts.bankno = "";
+    this.model.didgrp.avb.pts.jigomc = "";
+    this.model.didgrp.avb.pts.dizhii = "";
 }
 /**
 *   source:limmod.@0099.script
@@ -1023,6 +1033,8 @@ function checkLitameadvN100(rule, value, callback) {
     that.exeuteCheck("litameadv").then(res => {
         callback()
     })
+    this.model.ameadvrmk = ""
+
 
 }
 /**
@@ -1040,3 +1052,11 @@ function ruleLitameadvN100(rule, value, callback) {
         callback()
     })
 }
+
+function resetDidgrpRecBdflg(rule, value, callback){
+    
+    callback()
+    this.model.didgrp.rmb.pts.bankno = "";
+    this.model.didgrp.rmb.pts.jigomc = "";
+    this.model.didgrp.rmb.pts.dizhii = "";
+}

src/model/Ditopn/Pattern.js

 export default {
-    //转让行
-
+    // 银行明细
+    //议付行
+    "didgrp.rec.fenctg": [
+        { type: "string", required: false, message: "必输项" },
+        { max: 16, message: "长度不能超过16" }
+    ],
     "ditp.recget.sdamod.dadsnd": [
         { type: "string", required: false, message: "必输项" },
         { max: 16, message: "长度不能超过16" }
@@ -589,11 +593,11 @@ export default {
         { max: 14, message: "长度不能超过14" }
     ],
     "mtabut.coninf.oitinf.oit.inftxt": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 60, message: "长度不能超过60" }
     ],
     "mtabut.coninf.oitset.oit.inftxt": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 60, message: "长度不能超过60" }
     ],
 

src/views/Business/Ditopn/Detp1.vue

@@ -184,7 +184,7 @@
 
             <el-form-item label="议付行地址" prop="didgrp.avb.pts.dizhii">
                 <c-input
-                    disabled
+                    :disabled="model.didgrp.rec.fenctg != 'Y'"
                     type="textarea"
                     v-model="model.didgrp.avb.pts.dizhii"
                     maxlength="35"
@@ -232,7 +232,7 @@
             </el-form-item>
             <el-form-item label="保兑行地址" prop="didgrp.rmb.pts.dizhii">
                 <c-input
-                    disabled
+                    :disabled="model.didgrp.rec.bdflg != 'Y'"
                     type="textarea"
                     v-model="model.didgrp.rmb.pts.dizhii"
                     maxlength="35"
@@ -279,7 +279,7 @@
             </el-form-item>
             <el-form-item label="转让行地址" prop="didgrp.cmb.pts.dizhii">
                 <c-input
-                    disabled
+                   :disabled="model.didgrp.rec.lcrtyp != 'IT'"
                     type="textarea"
                     v-model="model.didgrp.cmb.pts.dizhii"
                     maxlength="35"
@@ -345,7 +345,7 @@ export default {
         return {};
     },
     methods: { ...Event },
-    created: function () {},
+    created: function () {}
 };
 </script>
 <style>

src/views/Business/Ditopn/index.vue

@@ -243,13 +243,12 @@ export default {
     },
     watch:{
         flg(){
-            this.pattern["didgrp.avb.pts.bankno"][0].required = this.model.didgrp.rec.elcflg == "Y";
+             this.pattern["didgrp.rec.fenctg"][0].required = this.model.didgrp.rec.elcflg == "Y";
         },
         avbby(){
             this.pattern["didgrp.rec.tenmaxday"][0].required = this.model.didgrp.rec.avbby == "D";
         }       
 
-
     }
 }
 </script>