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/Ditame/Default.js

@@ -4,7 +4,6 @@
 */
 import Api from "~/service/Api";
 export default {
-
     "didgrp.apl.pts.youzbm"                      :defaultDidgrpAplPtsYouzbm,
     "didgrp.rec.resflg"                      :defaultDidgrpRecResflg,
     "tel"                      :defaultTel,

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/Ditame/Amep.vue

@@ -136,6 +136,7 @@
             <c-input
               v-model="model.trnmod.swiadd.ameamt"
               style="width: 100%"
+              @change="ameamt"
             ></c-input>
           </el-form-item>
         </c-col>
@@ -385,6 +386,7 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Ditame/Event";
+import Utils from "~/utils";
 
 export default {
   inject: ["root"],
@@ -393,7 +395,18 @@ export default {
   data() {
     return {};
   },
-  methods: { ...Event },
+  methods: { ...Event ,
+  ameamt() {
+      console.log("进入前---------");
+      this.executeRule("trnmod.swiadd.ameamt").then((res) => {
+      console.log("进入后---------");
+        if ((res.respCode == 'AAAAAA')) {
+          Utils.copyValueFromVO(this.model, res.data);
+      console.log("if中---------");
+        }
+      });
+    },
+  },
   created: function () {},
 };
 </script>

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" },

src/views/Business/Infbfd/Infsea.vue

@@ -460,7 +460,7 @@ import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Infbfd/Event";
 //交易跳转逻辑
-import BusNavbar from "~/views/Business/Infbfd/BusNavbar";
+import BusNavbar from "~/views/Public/BusNavbar";
 
 export default {
     inject: ["root"],

src/views/Business/Infbpd/Infsea.vue

@@ -445,7 +445,7 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Infbpd/Event";
-import BusNavbar from "~/views/Business/Infbpd/BusNavbar";
+import BusNavbar from "~/views/Public/BusNavbar";
 
 export default {
   inject: ["root"],

src/views/Business/Infbrd/Infsea.vue

@@ -289,7 +289,7 @@
       </c-istream-table>
     </c-col>
 
-        <m-busbtn ref="childs" :ownref="ownref" @onChoose="onChoose"></m-busbtn>
+        <m-busbtn ref="childs"  :ownref="ownref" trnCode="litsel" :model="litselModel" ownrefPath="brdgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn>
 
   </div>
 </template>
@@ -298,7 +298,8 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Infbrd/Event";
-import BusNavbar from "~/views/Business/Infbrd/BusNavbar";
+import BusNavbar from "~/views/Public/BusNavbar";
+import LitselModel from "~/model/Litsel"
 
 export default {
   inject: ["root"],
@@ -307,6 +308,7 @@ export default {
   components: { "m-busbtn": BusNavbar },
   data() {
     return {
+      litselModel: new LitselModel().data,
       ownref: "",
       trnData: {
         columns: [
@@ -352,7 +354,8 @@ export default {
     };
   },
   methods: {
-    ...Event,async getButtons(ownref){
+    ...Event,
+    async getButtons(ownref){
         this.ownref = ownref
         this.$refs.childs.initdialog = true
         console.log("ownref:" +ownref);

src/views/Business/Infcpd/Infsea.vue

@@ -413,7 +413,7 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Infcpd/Event";
-import BusNavbar from "~/views/Business/Infcpd/BusNavbar";
+import BusNavbar from "~/views/Public/BusNavbar";
 export default {
   inject: ["root"],
   props: ["model", "codes"],

src/views/Business/Inflid/Infsea.vue

@@ -452,7 +452,7 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Inflid/Event";
-import BusNavbar from "~/views/Business/Inflid/BusNavbar";
+import BusNavbar from "~/views/Public/BusNavbar";
 
 export default {
   inject: ["root"],

src/views/Business/Infltd/Infsea.vue

@@ -298,7 +298,7 @@ import Utils from "~/utils/index";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Infltd/Event";
-import BusNavbar from "~/views/Business/Infltd/BusNavbar";
+import BusNavbar from "~/views/Public/BusNavbar";
 
 export default {
   inject: ["root"],

src/views/Business/Inftrd/Infsea.vue

@@ -253,7 +253,7 @@ import Api from "~/service/Api"
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
 import Event from "~/model/Inftrd/Event"
-import BusNavbar from "~/views/Business/Inftrd/BusNavbar"
+import BusNavbar from "~/views/Public/BusNavbar";
 
 export default {
     inject: ['root'],