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/mixin/commonProcess.js

@@ -354,10 +354,22 @@ export default {
      * @param {String} rulePath 路径
      */
     selectEty(val, rulePath) {
-      const props = rulePath.replaceAll(".", "_")
-      const obj = {}
-      obj[props] = val;
-      Utils.copyValueFromVO(this.model, obj);
+      // const props = rulePath.replaceAll(".", "_")
+      // const obj = {}
+      // obj[props] = val;
+      // Utils.copyValueFromVO(this.model, obj);
+      if (rulePath.indexOf("(") > 0) {//请求地址有"()"下标时，如setmod.setglg.setgll(2).setgrp.snd756.pts.extkey
+        let tempRulePath = rulePath
+        let rulePath = ""
+        const reg = /\((\d+)\)/
+        while (reg.test(tempRulePath)) {
+          const match = tempRulePath.match(reg)
+          rulePath += tempRulePath.substring(0, match.index) + "[" + (parseInt(match[1]) - 1) + "]"
+          tempRulePath = tempRulePath.substring(match.index + match[0].length)
+        }
+        rulePath += tempRulePath
+      }
+      _.set(this.model, rulePath, val)
       this.executeRule(rulePath, { "selectStatus": 1,'EventType': 1}).then((res) => {
         if (res.respCode == SUCCESS) {
           Utils.copyValueFromVO(this.model, res.data);

src/views/Business/Betset/Cnyp.vue

@@ -39,6 +39,11 @@ import Incp from "./Incp";
 import Basp from "./Basp"
 import Basp1 from "./Basp1"
 
+const tabNameToRulePathMapping = {
+  "basp": "bopmod.dbap.basp",
+  "basp1": "bopmod.dbdp.basp",
+}
+
 
 export default {
     inject: ["root"],
@@ -57,9 +62,30 @@ export default {
         };
     },
     methods: {
-        ...Event,
-        handleChange() { }
+    ...Event,
+    handleChange(names){
+      // console.log(names);//激活的(展开的)面板的name数组集合
+      if (this.isInDisplay) {
+        return
+      }
+      const arr = []
+      for (let i = 0; i < names.length; i++) {
+        const n = names[i];
+        const path = tabNameToRulePathMapping[n]//取出激活/展开面板name对应的rulePath
+        if (path) {
+          arr.push(path)
+        }
+      }
+      let rulePath = arr.join(",");//把arr数组加入逗号分割，变成字符串
+      if (!!rulePath) {//rulePath不为空串
+        this.executeRule(rulePath).then((res) => {
+          if (res.respCode == SUCCESS) {
+            this.updateModel(res.data);
+          }
+        });
+      }
     },
+  },
     created: function () { },
 };
 </script>

src/views/Business/Betset/index.vue

@@ -146,14 +146,26 @@ export default {
             activeNames: ["engp"],
         }
     },
-    methods:{
-        myTabClick(tab){
-            this.tabClick(tab)
-            /**
-            *  do it yourself
-            **/
-        }
+    methods: {
+    myTabClick(tab) {
+      this.tabClick(tab);
+      let name = tab.name;
+      let rulePath;
+      if (name === "basp") {
+        rulePath = "bopmod.dbap.basp";
+      }
+      if (name === "basp1") {
+        rulePath = "bopmod.dbdp.basp";
+      }
+      if (!!rulePath) {
+        this.executeRule(rulePath).then((res) => {
+          if (res.respCode == SUCCESS) {
+            this.updateModel(res.data);
+          }
+        });
+      }
     },
+  },
     created:async function(){
         console.log("进入betset交易");
         let rtnmsg = await this.init({})

src/views/Business/Gitcrq/Gitsetp1.vue

@@ -34,8 +34,8 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="8" v-if="model.gidgrp.rec.expdat != ''">
-        <el-form-item label="保函效期" label-width="50px" prop="gidgrp.rec.expdat">
+      <c-col :span="24" v-if="model.gidgrp.rec.expdat != ''">
+        <el-form-item label="保函效期" prop="gidgrp.rec.expdat">
           <c-date-picker type="date" v-model="model.gidgrp.rec.expdat" disabled style="width: 100%"
             placeholder="请选择保函效期"></c-date-picker>
         </el-form-item>

src/views/Business/Gitopn/Detpc.vue

@@ -36,7 +36,7 @@
             </el-form-item>
           </c-col>
           <c-col :span="24">
-            <c-col :span="20">
+            <c-col :span="17">
               <el-form-item
                 v-if="model.gitp.covgodsrvcmodflg == ''"
                 label="合同标的"
@@ -68,8 +68,9 @@
                 ></c-input>
               </el-form-item>
             </c-col>
-            <c-col :span="4">
+            <c-col :span="7">
               <c-checkbox
+                class="checkbox-left"
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.gitp.covgodsrvcmodflg"
                 style="margin: 0 0 0 10px"
@@ -77,6 +78,7 @@
                 >是否手工修改保函文本</c-checkbox
               >
               <c-checkbox
+                class="checkbox-left"
                 v-if="model.gitp.swiftflg == 'Y'"
                 v-model="model.gitp.covgodc.chkast"
                 style="margin: 0 0 0 10px"