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

@@ -6943,18 +6943,18 @@ const CodeTable = {
         { label: "EUR 欧元", value: "EUR" },
         { label: "FIM 芬兰马克", value: "FIM" },
         { label: "FRF 法国法郎", value: "FRF" },
-        { label: "GBP 英镑", value: "FRF" },
-        { label: "HKD 港币", value: "FRF" },
-        { label: "JPY 日元", value: "FRF" },
-        { label: "KRW 韩圆", value: "FRF" },
-        { label: "MOP 澳门元", value: "FRF" },
-        { label: "NOK 挪威克朗", value: "FRF" },
-        { label: "NZD 新西兰元", value: "FRF" },
-        { label: "SEK 瑞典克朗", value: "FRF" },
-        { label: "SGD 新加坡元", value: "FRF" },
-        { label: "THB 泰国铢", value: "FRF" },
-        { label: "TWD 新台湾元", value: "FRF" },
-        { label: "USD 美元", value: "FRF" },
+        { label: "GBP 英镑", value: "GBP" },
+        { label: "HKD 港币", value: "HKD" },
+        { label: "JPY 日元", value: "JPY" },
+        { label: "KRW 韩圆", value: "KRW" },
+        { label: "MOP 澳门元", value: "MOP" },
+        { label: "NOK 挪威克朗", value: "NOK" },
+        { label: "NZD 新西兰元", value: "NZD" },
+        { label: "SEK 瑞典克朗", value: "SEK" },
+        { label: "SGD 新加坡元", value: "SGD" },
+        { label: "THB 泰国铢", value: "THB" },
+        { label: "TWD 新台湾元", value: "TWD" },
+        { label: "USD 美元", value: "USD" },
     ],
     infled_sealcrtyp: [
         { label: "不可撤销", value: "0" },

src/views/Business/Botdav/Ovwp1.vue

@@ -9,7 +9,7 @@
                 <c-input v-model="model.bodgrp.rec.ownref" maxlength="16" placeholder="请输入托收业务编号" style="width: 100%"
                          disabled></c-input>
                 <template slot="footer">
-                  <c-button type="primary" :disabled="this.model.bodgrp.drr.pts.extkey !== '' && model.bedgrp.rec.ownref == ''? false:true" @click="onBotpButgetref">
+                  <c-button type="primary" :disabled="this.model.bodgrp.drr.pts.extkey !== '' && model.bodgrp.rec.ownref === ''? false:true" @click="onBotpButgetref">
                     获取
                   </c-button>
                 </template>
@@ -64,7 +64,7 @@
       <c-col :span="12">
         <el-form-item label="托收金额" prop="bodgrp.cbs.max.cur">
           <c-select v-model="model.bodgrp.cbs.max.cur" style="width: 100%" placeholder="请选择币种"  @change="changeCur">
-            <el-option v-for="item in codes.curtxt1" :key="item.value" :label="item.label" :value="item.value">
+            <el-option v-for="item in codes.infled_Cur" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </c-select>
         </el-form-item>

src/views/Business/Brtset/Trtcrep.vue

@@ -155,7 +155,7 @@
             <c-col :span="12">
                 <el-form-item label="计息周期" prop="trtcre.trtmod.finmod.intprd">
                     <c-select v-model="model.trtcre.trtmod.finmod.intprd" style="width: 100%" placeholder="请选择计息周期">
-                        <el-option v-for="item in codes.intprd" :key="item.value" :label="item.label" :value="item.value">
+                        <el-option v-for="item in codes.intprd1" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </c-select>
                 </el-form-item>

src/views/Business/Brtset/Utlp.vue

@@ -287,7 +287,7 @@
               <c-input
                 v-model="model.aamset.utlamt"
                 placeholder="请输入金额"
-                :disabled="true"
+                
                 @keyup.enter.native="$event.target.blur()"
                 @blur="eventFunction('aamset.utlamt')"
               ></c-input>
@@ -313,7 +313,7 @@
               <c-input
                 v-model="model.aamset.utlamt2"
                 placeholder="请输入金额"
-                :disabled="true"
+              
                 @change="eventFunction('aamset.utlamt2')"
               ></c-input>
             </el-form-item>
@@ -343,7 +343,7 @@
               label-width="120px"
               style="float: left"
             >
-              <c-checkbox v-model="model.mtabut.clsflg" true-label="C"
+              <c-checkbox :disabled="this.model.trnmod.cmtflg==''" v-model="model.mtabut.clsflg" true-label="C"
                 >闭卷标识</c-checkbox
               >
             </el-form-item>

src/views/Business/Litdck/Litdckp.vue

@@ -209,7 +209,7 @@
           <c-select
             v-model="model.invtyp"
             style="width: 100%"
-            :code="codes.invtyp"
+            :code="codes.invtyp2"
           >
           </c-select>
         </el-form-item>