Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/model/Bdtcan/Default.js

@@ -33,5 +33,7 @@ export default {
     "mtabut.coninf.oitinf.oit.inftxt"                      :Utils.defaultFunction,
     "mtabut.coninf.oitinf.oit.inflev"                      :Utils.defaultFunction,
     "mtabut.coninf.conexedat"                      :Utils.defaultFunction,
+    "rebkpflg"                                  :Utils.defaultFunction,
+
 }
 //你可以添加自动default处理

src/model/Bdtcan/Pattern.js

@@ -91,7 +91,7 @@ export default {
         {max: 40,message:"长度不能超过40"}
     ],
     "strinf":[
-        {type: "string", required: true, message: "必输项"},
+        //{type: "string", required: true, message: "必输项"},
         {max: 50,message:"长度不能超过50"}
     ],
 

src/model/Ditdla/Pattern.js

@@ -573,20 +573,20 @@ export default {
         { max: 20, message: "长度不能超过20" }
     ],
     "didgrp.adv.pts.jigomc": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.iss.pts.jigomc": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.adv.pts.dizhii": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.iss.pts.dizhii": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.adv.pts.youzbm": [
         { type: "string", required: false, message: "必输项" },
@@ -612,24 +612,24 @@ export default {
         { max: 20, message: "长度不能超过20" }
     ],
     "didgrp.rmb.pts.jigomc": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.avb.pts.bankno": [
         { type: "string", required: false, message: "必输项" },
         { max: 20, message: "长度不能超过20" }
     ],
     "didgrp.avb.pts.jigomc": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.rmb.pts.dizhii": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.avb.pts.dizhii": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.apc.pts.bankno": [
         { type: "string", required: false, message: "必输项" },
@@ -637,20 +637,20 @@ export default {
     ],
 
     "didgrp.apc.pts.jigomc": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.cmb.pts.bankno": [
         { type: "string", required: false, message: "必输项" },
         { max: 20, message: "长度不能超过20" }
     ],
     "didgrp.apc.pts.dizhii": [
-        { type: "string", required: false, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: false, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.cmb.pts.jigomc": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.apc.pts.youzbm": [
         { type: "string", required: false, message: "必输项" },
@@ -661,8 +661,8 @@ export default {
         { max: 16, message: "长度不能超过16" }
     ],
     "didgrp.cmb.pts.dizhii": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        //{ type: "string", required: true, message: "必输项" },
+        //{ max: 35, message: "长度不能超过35" }
     ],
     "didgrp.blk.stamet": [
         { type: "string", required: false, message: "必输项" },

src/views/Business/Bdtcan/Canp.vue

@@ -308,13 +308,12 @@
             show-word-limit
             placeholder="请输入Narrative"
             :rows="10"
-             disabled
           ></c-input>
         </el-form-item>
       </c-col>
 
       <c-col :span="9" :offset="3">
-        <c-checkbox disabled v-model="model.sndmsg">Send Message</c-checkbox>
+        <c-checkbox  v-model="model.sndmsg">Send Message</c-checkbox>
       </c-col>
     </el-row>
     <c-col :span="12">

src/views/Business/Ditdav/Davp.vue

@@ -459,6 +459,7 @@ export default {
     mixins: [commonProcess],
     data(){
         return {
+            flag:true,
             docprbrol: [
         { label: "Advising Bank", value: "ADV" },
         { label: "Beneficiary", value: "BEN" },