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/Bctdor/index.js

@@ -6,6 +6,9 @@ export default class Bctdor{
     constructor () {
         this.data = {
 						swtdat:"",
+						bctdrrl1blk: '',	// XMLPanel bctdrrl1的内置block
+						bctdrrl2blk: '',	// XMLPanel bctdrrl2的内置block
+						bctcoll1blk: '',	// XMLPanel bctcoll1的内置block
 						bcdgrp:{
 							rec:{
 								inr:"",

src/views/Business/Bctdor/Detp.vue

@@ -7,7 +7,6 @@
           <c-input
             disabled
             type="textarea"
-            disabled
             v-model="model.bcdgrp.blk.colins"
             maxlength="65"
             show-word-limit

src/views/Business/Bctset/Bctsus.vue

@@ -439,14 +439,20 @@ export default {
 
   methods: {
     ...Event,
+    async focflgChange() {
+      let rtnmsg = await this.executeDefault("bcdgrp.rec.focflg");
+      if (rtnmsg.respCode == SUCCESS) {
+        Utils.copyValueFromVO(this.model, rtnmsg.data);
+      }
+    },
     async crefinflgChange() {
-      let rtnmsg = await this.executeDefault("trtcre.crefinflg");
+      let rtnmsg = await this.executeRule("trtcre.crefinflg");
       if (rtnmsg.respCode == SUCCESS) {
         Utils.copyValueFromVO(this.model, rtnmsg.data);
       }
     },
     async dfflagChange() {
-      let rtnmsg = await this.executeDefault("dftcre.dfflag");
+      let rtnmsg = await this.executeRule("dftcre.dfflag");
       if (rtnmsg.respCode == SUCCESS) {
         Utils.copyValueFromVO(this.model, rtnmsg.data);
       }

src/views/Business/Bctset/Cnyp.vue

@@ -25,7 +25,7 @@
        <c-col :span="24">
         <el-form-item label="是否报送跨境人民币2111表" prop="cnybop.outflg">
             <c-select 
-            disabled
+            :disabled="model.setmod.doccur != 'CNY'"
             :code="codes.outflg"
             v-model="model.cnybop.outflg" style="width:100%" placeholder="请选择是否报送跨境人民币2111表">
               </c-select>

src/views/Business/Bctset/Trtcrep.vue

@@ -318,7 +318,7 @@
               v-model="model.trtcre.trtmod.finmod.intprd"
               style="width: 100%"
               placeholder="请选择计息周期"
-              :code="intprd"
+              :code="codes.intprd"
             >
             </c-select>
           </el-form-item>
@@ -333,7 +333,7 @@
             v-model="model.trtcre.trtmod.finmod.ratchgtyp"
             style="width: 95%"
             placeholder="请选择利率调整方式"
-            :code="ratchgtyp"
+            :code="codes.ratchgtyp"
           >
           </c-select>
         </el-form-item>
@@ -971,31 +971,7 @@ export default {
   mixins: [commonProcess],
   data() {
     return {
-      intprd: [
-        { label: "按年计息", value: "4" },
-        { label: "按6个月对月对日计息", value: "9" },
-        { label: "按固定月数计息", value: "5" },
-        { label: "利随本清", value: "6" },
-        { label: "按月计息", value: "1" },
-        { label: "按季计息", value: "2" },
-        { label: "按3个月对月对日计息", value: "8" },
-        { label: "按半年计息", value: "3" },
-        { label: "预扣息", value: "7" },
-        { label: "不计息", value: "B" },
-        { label: "按周计息", value: "A" },
-    ],
-    ratchgtyp: [
-        { label: "固定不变", value: "1" },
-        { label: "满一年一变", value: "2" },
-        { label: "按季调整（季末月份）", value: "4" },
-        { label: "外汇SIBOR浮动利率", value: "9" },
-        { label: "按年调整", value: "6" },
-        { label: "按月调整", value: "3" },
-        { label: "外汇LIBOR浮动利率", value: "7" },
-        { label: "按半年调整（6月、12月）", value: "5" },
-        { label: "实时随人行基准利率调整", value: "A" },
-        { label: "外汇HIBOR浮动利率", value: "8" },
-    ],
+     
     };
   },
   methods: {

src/views/Business/Bctset/index.vue

@@ -16,7 +16,7 @@
         size="small"
         :validate-on-rule-change="false"
       >
-        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
+        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
           <!--PD000005 -->
           <el-tab-pane label="Settle BC at Maturity" name="bctsus">
             <c-content>
@@ -24,13 +24,13 @@
             </c-content>
           </el-tab-pane>
 
-         <el-tab-pane label="Financing Details" name="trtcrep">
+         <el-tab-pane label="Financing Details" name="trtcrep" v-if="model.trtcre.crefinflg">
            <c-content>
             <m-trtcrep :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
 
-          <el-tab-pane label="同业代付" name="dftcrep">
+          <el-tab-pane label="同业代付" name="dftcrep" v-if="model.dftcre.dfflag">
             <c-content>
             <m-dftcrep :model="model" :codes="codes" />
             </c-content>
@@ -77,7 +77,7 @@
             <m-doctre :model="model" :codes="codes" />
           </el-tab-pane>
 
-           <el-tab-pane label="融资款项" name="rzkx">
+           <el-tab-pane label="融资款项" name="rzkx" v-if="model.trtcre.crefinflg">
             <m-rzkx :model="model" :codes="codes" />
           </el-tab-pane>
 
@@ -101,13 +101,21 @@
             <m-basp1 :model="model" :codes="codes" />
           </el-tab-pane>
 
-          <el-tab-pane label="定向收付" name="dxzfp">
+          <el-tab-pane label="定向收付" name="dxzfp" v-if="model.trtcre.crefinflg">
             <m-dxzfp :model="model" :codes="codes" />
           </el-tab-pane>
           <el-tab-pane label="跨境人名币申报" name="cnyp">
             <m-cnyp :model="model" :codes="codes" />
           </el-tab-pane>
 
+     <el-tab-pane
+          label="2111跨境支出信息"
+          name="outp"
+          v-if="model.cnybop.outflg == '1'"
+        >
+          <m-outp :model="model" :codes="codes" />
+        </el-tab-pane>
+        
           <el-tab-pane label="资本项目" name="cfactlp">
             <m-cfactlp :model="model" :codes="codes" />
           </el-tab-pane>
@@ -183,6 +191,7 @@ import Docpan from "./Docpan";
 import Doctre from "~/views/Public/Doctre";
 import Limitbody from "./Limitbody";
 import Glepan from "~/views/Public/Glepan";
+import Outp from "./Outp";
 
 export default {
   name: "Bctset",
@@ -210,7 +219,8 @@ export default {
     "m-dxzfp" : Dxzfp,
     "m-rzkx" :Rzkx,
     "m-trtcrep" :Trtcrep,
-    "m-cips2" :Cips2
+    "m-cips2" :Cips2,
+    "m-outp": Outp,
 
   },
   provide() {
@@ -232,7 +242,27 @@ export default {
     };
   },
   methods: {
-    
+    myTabClick(tab) {
+      this.tabClick(tab);
+      let name = tab.name;
+      let rulePath;
+      if ((name === "trtcrep")) {
+        rulePath = "trtcre.trtcrep";
+      }
+      if ((name === "dftcrep")) {
+        rulePath = "dftcre.dftcrep";
+      }
+      if(name === 'outp'){
+        rulePath = "cnybop.Outp"
+      }
+      if (!!rulePath) {
+        this.executeRule(rulePath).then((res) => {
+          if (res.respCode == SUCCESS) {
+            this.updateModel(res.data);
+          }
+        });
+      }
+    },
   },
   created: async function () {
     console.log("进入bctset交易");