gitopn保函disabled灰显及“必输项”解决

src/model/Gitopn/Pattern.js

@@ -284,9 +284,9 @@ export default {
     ],
 
     "gidgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        {type: "string", required: false, message: "必输项"},
+        {max: 17,message:"整数位不能超过14位"},
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
 
     "gidgrp.apl.pts.ref":[
@@ -299,9 +299,9 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "gidgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        {type: "string", required: false, message: "必输项"},
+        {max: 17,message:"整数位不能超过14位"},
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
 
     "gidgrp.rec.oldref":[

src/views/Business/Gitopn/Opnp.vue

@@ -6,14 +6,9 @@
           v-model="model.gitp.swiftflg"
           style="width: 100%"
           placeholder="请选择是否SWIFT格式"
+          :code="codes.swiftflg"
+          @change="eventFunction('gitp.swiftflg')"
         >
-          <el-option
-            v-for="item in codes.swiftflg"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
         </c-select>
       </el-form-item>
     </c-col>
@@ -24,68 +19,35 @@
           v-model="model.gidgrp.rec.fingua"
           style="width: 100%"
           placeholder="请选择是否对外担保"
+          :code="codes.fingua"
+          @change="eventFunction('gidgrp.rec.fingua')"
         >
-          <el-option
-            v-for="item in codes.fingua"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
         </c-select>
       </el-form-item>
     </c-col>
 
-    <c-col :span="12" style="padding-right: 20px;" v-if="model.gidgrp.cbs.max.cur == 'CNY'">
-      <c-col :span="20">
+    <c-col :span="12" style="padding-right: 20px;">
+      <c-col :span="model.gidgrp.cbs.max.cur == 'CNY'? 20 : 24">
         <el-form-item label="对外担保类型" prop="gidgrp.rec.cfaguatyp">
           <c-select
             :disabled="
               model.gidgrp.rec.fingua == 'N' || model.gidgrp.rec.fingua == ''
             "
             v-model="model.gidgrp.rec.cfaguatyp"
-            style="width: 90%"
+            :style="model.gidgrp.cbs.max.cur == 'CNY'? 'width: 90%' :'width: 100%'"
             placeholder="请选择对外担保类型"
+            :code="codes.cfaguatyp"
+            @change="cfaguatypChange"
           >
-            <el-option
-              v-for="item in codes.cfaguatyp"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
           </c-select>
         </el-form-item>
       </c-col>
-      <c-col :span="4" class="centerLable">
+      <c-col :span="4" class="centerLable"  v-if="model.gidgrp.cbs.max.cur == 'CNY'">
         <c-checkbox disabled v-model="model.gidgrp.rec.cmtflg"
           >跨境人民币保函</c-checkbox
         >
       </c-col>
     </c-col>
-
-    <c-col :span="12" style="padding-right: 20px;" v-if="model.gidgrp.cbs.max.cur != 'CNY'">
-      <c-col :span="24">
-        <el-form-item label="对外担保类型" prop="gidgrp.rec.cfaguatyp">
-          <c-select
-            :disabled="
-              model.gidgrp.rec.fingua == 'N' || model.gidgrp.rec.fingua == ''
-            "
-            v-model="model.gidgrp.rec.cfaguatyp"
-            style="width: 100%"
-            placeholder="请选择对外担保类型"
-          >
-            <el-option
-              v-for="item in codes.cfaguatyp"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </c-select>
-        </el-form-item>
-      </c-col>
-    </c-col>
   </div>
 </template>
 <script>
@@ -102,7 +64,19 @@ export default {
     return {};
   },
   computed: {},
-  methods: { ...Event },
+  methods: { ...Event,
+    async cfaguatypChange(){
+      if(this.model.gidgrp.rec.fingua=="Y" && this.model.cfagit.cfaflg=="1"){
+          //选择对外担保时，且对外担保数据采集标签页数据采集标志为'新增'时，担保类型改变，td切换到对外担保-签约信息1标签页时会触发tabClick事件，影响签约信息1页面数据。
+          //UI合并页面后，需要手动加tabClick切换标签页事件
+        let rtnmsg = await this.executeRule("cfagit.recp.conp");
+        if (rtnmsg.respCode == SUCCESS) {
+          //TODO 处理数据逻辑
+          this.updateModel(rtnmsg.data);
+        }
+      }
+    },
+  },
   created: function () {},
 };
 </script>

src/views/Business/Gitopn/Ovwp1.vue

@@ -11,7 +11,7 @@
                 v-model="model.gidgrp.rec.ownref"
                 maxlength="16"
                 placeholder="请输入保函编号"
-                :disabled="model.gitp.swiftflg != 'N'"
+                disabled
               ></c-input>
               <template slot="footer">
                 <!-- <el-form-item label="" label-width="5px"> -->
@@ -63,7 +63,7 @@
           </el-form-item>
         </c-col>
         
-        <c-col :span="24" v-if="model.gitp.swiftflg != 'Y'">
+        <c-col :span="24">
           <c-col :span="12">
             <el-form-item label="保函币种和金额" prop="gidgrp.cbs.max.cur">
               <c-select
@@ -75,52 +75,24 @@
               </c-select>
             </el-form-item>
           </c-col>
-
-          <c-col :span="8">
+          <c-col :span="model.gitp.swiftflg != 'Y'? 8 : 12">
             <el-form-item label-width="5px" prop="gidgrp.cbs.max.amt">
-              <c-input
+              <c-input-currency
                 v-model="model.gidgrp.cbs.max.amt"
-                style="width: 80%"
+                :style="amtwidth"
                 placeholder="请输入保函金额"
-                @blur="defaultFunction('gidgrp.cbs.opn1.amt')"
                 @keyup.enter.native="$event.target.blur()"
-              ></c-input>
+              ></c-input-currency>
             </el-form-item>
           </c-col>
-          <c-col :span="4" class="centerLable">
+          <c-col :span="4" class="centerLable" v-if="model.gitp.swiftflg != 'Y'">
             <c-checkbox disabled v-model="model.gitp.dzbhflg"
               >电子保函标志</c-checkbox
             >
           </c-col>
         </c-col>
 
-        <c-col :span="24" v-if="model.gitp.swiftflg == 'Y'">
-          <c-col :span="12">
-            <el-form-item label="保函币种和金额" prop="gidgrp.cbs.max.cur">
-              <c-select
-                v-model="model.gidgrp.cbs.max.cur"
-                style="width: 100%"
-                placeholder="请选择保函币种"
-                :code="codes.gitopn_cur"
-              >
-              </c-select>
-            </el-form-item>
-          </c-col>
-
-          <c-col :span="12">
-            <el-form-item label-width="5px" prop="gidgrp.cbs.max.amt">
-              <c-input
-                v-model="model.gidgrp.cbs.max.amt"
-                style="width: 100%"
-                placeholder="请输入保函金额"
-                @blur="defaultFunction('gidgrp.cbs.opn1.amt')"
-                @keyup.enter.native="$event.target.blur()"
-              ></c-input>
-            </el-form-item>
-          </c-col>
-        </c-col>
-
-        <c-col :span="24" v-if="model.gitp.swiftflg == 'Y'">
+        <c-col :span="24">
           <c-col :span="12">
             <el-form-item label="保函余额" prop="gidgrp.cbs.opn1.cur">
               <c-input
@@ -131,47 +103,24 @@
               ></c-input>
             </el-form-item>
           </c-col>
-          <c-col :span="8">
+          <c-col :span="model.gitp.swiftflg == 'Y' ? 8 : 12">
             <el-form-item label-width="5px" prop="gidgrp.cbs.opn1.amt">
-              <c-input
+              <c-input-currency
                 disabled
                 v-model="model.gidgrp.cbs.opn1.amt"
-                style="width: 80%"
+                style="amtwidth"
                 placeholder="请输入"
-              ></c-input>
+              ></c-input-currency>
             </el-form-item>
           </c-col>
-          <c-col :span="4" class="centerLable">
+          <c-col :span="4" class="centerLable" v-if="model.gitp.swiftflg == 'Y'">
             <c-checkbox v-model="model.gitp.inc760">传入损失</c-checkbox>
           </c-col>
         </c-col>
 
-        <c-col :span="24" v-if="model.gitp.swiftflg != 'Y'">
-          <c-col :span="12">
-            <el-form-item label="保函余额" prop="gidgrp.cbs.opn1.cur">
-              <c-input
-                disabled
-                v-model="model.gidgrp.cbs.opn1.cur"
-                style="width: 100%"
-                placeholder="请输入保函余额"
-              ></c-input>
-            </el-form-item>
-          </c-col>
-          <c-col :span="12">
-            <el-form-item label-width="5px" prop="gidgrp.cbs.opn1.amt">
-              <c-input
-                disabled
-                v-model="model.gidgrp.cbs.opn1.amt"
-                style="width: 100%"
-                placeholder="请输入"
-              ></c-input>
-            </el-form-item>
-          </c-col>
-        </c-col>
-
+        <c-col :span="24" v-if="model.gitp.swiftflg == 'Y'">
           <c-col :span="24">
             <el-form-item
-            v-if="model.gitp.swiftflg == 'Y'"
               label="接收目的"
               prop="gidgrp.rec.purposin"
             >
@@ -185,8 +134,7 @@
               </c-select>
             </el-form-item>
           </c-col>
-
-        <c-col :span="24" v-if="model.gitp.swiftflg == 'Y'">
+          <c-col :span="24">
             <el-form-item label="支出目的" prop="gidgrp.rec.purpos">
               <c-select
                 v-model="model.gidgrp.rec.purpos"
@@ -198,6 +146,7 @@
               </c-select>
             </el-form-item>
           </c-col>
+        </c-col>
 
         <c-col :span="24">
           <el-form-item
@@ -355,7 +304,7 @@
             >
               <c-date-picker
                 type="date"
-                :disabled="model.gitp.swiftflg == ''"
+                :disabled="model.gidgrp.gartyp !='X'"
                 v-model="model.gidgrp.rec.vrfdat"
                 style="width: 100%"
                 placeholder="请选择核销日期"
@@ -374,8 +323,7 @@
               v-model="model.gidgrp.rec.gtxinr"
               style="width: 100%"
               placeholder="请选择保函文本格式"
-              :code="getValues('gidgrp.rec.gtxinr')"
-              :change="executeNotify(null, true)"
+              :code="getValues('gidgrp.rec.gtxinr','gtxinr')"
             >
             </c-select>
           </el-form-item>
@@ -445,7 +393,7 @@
               style="width: 100%"
               placeholder="请选择保函文本格式"
               :code="getValues('gidgrp.rec.atxinr')"
-              :change="executeNotify(null, true)"
+              @change="executeNotify(null, true)"
             >
             </c-select>
           </el-form-item>
@@ -683,6 +631,7 @@
               v-model="model.gidgrp.rec.inudat"
               style="width: 100%"
               placeholder="请选择保函生效日"
+              :disabled="model.gidgrp.rec.gartyp!='U'&&(model.gidgrp.gartyp!='F'||(model.gidgrp.ghd.segtyp!='01'&&model.gidgrp.ghd.segtyp!='02'))"
             ></c-date-picker>
           </el-form-item>
         </c-col>
@@ -1278,8 +1227,7 @@
               disabled
               size="small"
               type="primary"
-              style="margin: 5px 0 0 10px;float: left;
-  text-align: center;"
+              style="margin: 5px 0 0 10px;float: left;text-align: center;"
               @click="onGitpButdifhisexptxt"
             >
               查看历史文本
@@ -1451,6 +1399,9 @@ export default {
     flag() {
       return this.model.gidgrp.apl.pts.extkey == "";
     },
+    amtwidth(){
+        return this.model.gitp.swiftflg != 'Y'? 'width:80%' : 'width:100%';
+    }
   },
   watch: {
     "model.gidgrp.rec.expflg": function () {