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

@@ -7323,12 +7323,12 @@ const CodeTable = {
         { label: "受益人", value: "BENE" },
     ],
     gartypc: [
-        { label: "APAY", value: "APAY Advance Payment" },
-        { label: "PAYM", value: "PAYM Payment" },
-        { label: "PERF", value: "PERF Performance" },
-        { label: "TEND", value: "TEND Tender or Bid" },
-        { label: "WARR", value: "WARR Warrantyimaintenance" },
-    ],
+      { label: "APAY Advance Payment", value: "APAY" },
+      { label: "PAYM Payment", value: "PAYM" },
+      { label: "PERF Performance", value: "PERF" },
+      { label: "TEND Tender or Bid", value: "TEND" },
+      { label: "WARR Warrantyimaintenance", value: "WARR" },
+  ],
     legfrm1: [
         { label: "备用信用证", value: "STBY" },
         { label: "合同保函统一规则URCG", value: "URG" },

src/mixin/commonApi.js

@@ -37,8 +37,8 @@ export default {
         },
         /*
         获取后台setValues、setCodeValues传来的动态码，并自动转为码表值。
-        key：为后端传来的CodeSet的字段path，如bddgrp.rec.docprbrol
-        tableName：src下的全局静态码表中的码表名称，如rolall
+        key：为后端传来的CodeSet的字段path，如'bddgrp.rec.docprbrol'
+        tableName：src下的全局静态码表中的码表名称，如'rolall'
         如后端传来的CodeSet下该字段值为"value+lable"，则不用传参数tableName
         如后端传来的CodeSet下该字段值仅有"value"，则需传参数tableName，去全局静态码表中找到相应码表，根据value值找到lable值
         */

src/views/Business/Bptopn/Wg.vue

@@ -15,7 +15,7 @@
             v-model="model.bopmod.szflg"
             style="width: 100%"
             placeholder="请选择申报类型"
-            :code="codes.szflg3"
+            :code="getValues('bopmod.szflg','szflg1')"
           >
           </c-select>
         </el-form-item>

src/views/Business/Gitopn/Ovwp1.vue

@@ -203,6 +203,7 @@
               style="width: 100%"
               placeholder="请选择支出目的"
               :code="getValues('gidgrp.rec.purpos')"
+              @change="purposChange"
             >
             </c-select>
           </el-form-item>
@@ -2035,8 +2036,21 @@ export default {
     onSeainf(data) {
       this.$emit("onSeainf", data);
     },
-    valueChange() {
-      if (this.onlySearch) return;
+    async purposChange(){
+      let rtnmsg = await this.executeRule("gidgrp.rec.purpos");
+      if (rtnmsg.respCode == SUCCESS) {
+        //TODO 处理数据逻辑
+        this.updateModel(rtnmsg.data);
+        if(this.model.gidgrp.rec.purpos == 'ISCO' || this.model.gidgrp.rec.purpos == 'ICCO'){
+          this.$nextTick(() => {
+            this.executeRule("gitp.ptypc").then((res) => {
+          //TODO 处理数据逻辑
+            if (res.respCode == SUCCESS) 
+            this.updateModel(res.data);
+            });
+          });
+        }
+      }
     },
     async atxexpBlur() {
       let rtnmsg = await this.executeRule("gidgrp.blk.atxexptxt");

src/views/Business/Gitopn/Ovwpc.vue

@@ -51,14 +51,16 @@
                   v-model="model.gidgrp.rec.gartypc"
                   style="width: 100%"
                   placeholder="请选择保函类型 "
+                  :code="getValues('gidgrp.rec.gartypc','gartypc')"
                 >
-                  <el-option
+                <!--  -->
+                  <!-- <el-option
                     v-for="item in codes.gartypc"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
                   >
-                  </el-option>
+                  </el-option> -->
                 </c-select>
               </el-form-item>
             </c-col>

src/views/Business/Gitopn/Ptypc.vue

@@ -173,8 +173,8 @@
                   @keyup.enter.native="
                     showGridPromptDialog(`gidgrp.iss.pts.extkey`)
                   "
-                  @blur="issBlur"
                 ></c-input>
+
                 <template slot="footer">
                   <c-button
                     style="margin: 0 10px 0 10px; padding: 0 12px"
@@ -208,7 +208,6 @@
               ></c-input>
             </el-form-item>
           </c-col>
-
           <c-col :span="24">
             <el-form-item
               label="最终收款行参考号"
@@ -344,12 +343,12 @@ export default {
   },
   methods: {
     ...Event,
-    async issBlur() {
-      let rtnmsg = await this.executeDefault("gidgrp.rec.sndto");
-      if (rtnmsg.respCode == SUCCESS) {
-        Utils.copyValueFromVO(this.model, rtnmsg.data);
-      }
-    },
+    // async issBlur() {
+    //   let rtnmsg = await this.executeDefault("gidgrp.rec.sndto");
+    //   if (rtnmsg.respCode == SUCCESS) {
+    //     Utils.copyValueFromVO(this.model, rtnmsg.data);
+    //   }
+    // },
   },
   created: function () {},
 };

src/views/Business/Infbcd/Infsea.vue

@@ -3,7 +3,7 @@
     <c-list-search @form-reset="handleReset" @form-search="handleSearch">
       <!-- 持续展示区 -->
       <template v-slot="searchSlot">
-        <el-form class="m-table-search-form" ref="paramsForm" :inline="true" label-position="right" label-width="110px"
+        <el-form class="m-table-search-form" ref="paramsForm" label-position="right" label-width="110px"
           size="small">
           <el-row>
               <c-col :span="8">