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

@@ -233,6 +233,17 @@ export default {
       })
     },
     /**
+     * 下拉框/多选框 改变时执行rule
+     * @param {String} rulePath 路径
+     */
+    selectOrCheckboxChangeExecuteRule(rulePath){
+        this.executeRule(rulePath).then((res) => {
+            if (res.respCode == SUCCESS) {
+                Utils.copyValueFromVO(this.model, res.data);
+            }
+        })
+    },
+    /**
      * 机构回填
      * @param {String} val 选种行的值（一般是首列）
      * @param {String} rulePath 路径

src/model/Detopn/Pattern.js

@@ -146,7 +146,8 @@ export default {
     ],
 
     "dedgrp.rec.tenmaxday":[
-        {required: true, message: "必输项"}
+        {required: true, message: "必输项"},
+        {type:"number", max:9999, message: "大小不超过9999" }
     ],
     "dedgrp.blk.defdet":[
         {type: "string", required: false, message: "必输项"},

src/views/Business/Botdav/Ovwp.vue

@@ -188,7 +188,9 @@
         </c-table>
       </c-col> -->
 
-        <c-docpre :model="model" :argadr="{
+        <c-docpre 
+        :model="model" 
+        :argadr="{
           path: 'bodgrp.blk.docpre',
           grp: 'botp',
           code: 'docpre'

src/views/Business/Detdrv/Dscins.vue

@@ -109,11 +109,13 @@
                 </el-form-item>
             </c-col>
             <c-col :span="24">
-                <el-form-item label="付款人" prop="bfdgrp.rec.payrol">
+                <el-form-item label="付款人开户行" prop="bfdgrp.rec.payrol">
                     <c-select
                         v-model="model.bfdgrp.rec.payrol"
                         style="width: 100%"
-                        placeholder="请选择付款人"
+                        placeholder="请选择付款人开户行"
+                        :code="codes.rolall"
+                        disabled
                     >
                     </c-select>
                 </el-form-item>
@@ -126,7 +128,10 @@
                         grp: 'bfdgrp',
                         rol: 'oth',
                     }"
+                    :noRef="true"
                     :disabled="true"
+                    :isAdrblk="false"
+                    :disabledExtkey="true"
                 >
                 </c-ptap>
             </c-col>
@@ -170,9 +175,7 @@ export default {
     inject: ["root"],
     props: ["model", "codes"],
     mixins: [commonProcess],
-    components: {
-        "c-ptap": Ptap,
-    },
+    components: { "c-ptap": Ptap },
     data() {
         return {};
     },

src/views/Business/Detopn/Detp1.vue

@@ -8,6 +8,7 @@
             v-model="model.dedgrp.rec.isyifu"
             style="width: 100%"
             placeholder="请选择是否可议付"
+            @change="selectOrCheckboxChangeExecuteRule('dedgrp.rec.isyifu')"
           >
             <el-option
               v-for="item in codes.isyifu"
@@ -60,9 +61,9 @@
        -->
 
       <c-ptapdome
-        :disabledBankno="model.dedgrp.rec.isyifu != 'Y'"
+        :disabledBankno="model.dedgrp.rec.avbwth != 'S'"
         :disabledJigomc="true"
-        :disabledDizhii="model.dedgrp.rec.isyifu != 'Y'"
+        :disabledDizhii="model.dedgrp.rec.avbwth != 'S'"
         :model="model"
         :argadr="{
           title: '议付行',

src/views/Business/Detopn/Ovwp.vue

@@ -473,8 +473,7 @@
             <c-col :span="24">
                 <el-form-item label="天数" prop="dedgrp.rec.tenmaxday">
                     <c-input
-                        v-model="model.dedgrp.rec.tenmaxday"
-                        maxlength="35"
+                        v-model.number="model.dedgrp.rec.tenmaxday"
                         placeholder="请输入天数"
                         :disabled="model.dedgrp.rec.avbby == 'P'"
                     ></c-input>
@@ -482,10 +481,10 @@
             </c-col>
 
             <c-col :span="24">
-                <el-form-item label="远期付款指示" prop="dedgrp.blk.defdet">
+                <el-form-item label="远期付款指示" prop="dedgrp.blk.dftat">
                     <c-input
                         type="textarea"
-                        v-model="model.dedgrp.blk.defdet"
+                        v-model="model.dedgrp.blk.dftat"
                         maxlength="35"
                         show-word-limit
                         placeholder="请输入远期付款指示"

src/views/Business/Infbfd/Infsea.vue

@@ -120,6 +120,7 @@
                                             v-model="model.infcon.searol"
                                             style="width: 100%"
                                             placeholder="请选择Role"
+                                            :code="codes.payrol"
                                         >
                                         </c-select>
                                     </el-form-item>
@@ -217,7 +218,7 @@
                                             v-model="model.infcon.seacur"
                                             style="width: 100%"
                                             placeholder="请选择Currency"
-                                            :code="codes.seacur"
+                                            :code="codes.curtxt1"
                                         >
                                         </c-select>
                                     </el-form-item>
@@ -274,6 +275,7 @@
                                             v-model="model.seadoctypcod"
                                             style="width: 100%"
                                             placeholder="请选择Document Type"
+                                            :code="codes.brdtyp"
                                         >
                                         </c-select>
                                     </el-form-item>

src/views/Business/Infled/Infsea.vue

@@ -354,6 +354,15 @@
       >
         出口信用证开立
       </c-button>
+      <c-button
+        class="medium_bcs"
+        size="medium"
+        type="primary"
+        title="LETDRW"
+        @click="toLetdrw"
+      >
+        非我行通知及收单行登记
+      </c-button>
       <!-- <c-button size="small" type="primary"  @click="onInfbutDsp">
             Display
         </c-button> -->
@@ -621,6 +630,9 @@ export default {
     toLetopn(){
         this.$router.history.push("/business/letopn")
     },
+    toLetdrw(){
+        this.$router.history.push("/business/letdrw")
+    },
 
     handleReset: function () {
       this.model = {

src/views/Public/Docpre.vue

@@ -10,7 +10,7 @@
         </c-col> -->
         <c-col :span="24" style="margin-bottom: 30px;">
             <el-form-item :prop="'${argadr.grp}.docgrdm.docgrd'" label="" style="margin-left:-150px;">
-                <c-table height="300px" style="text-align: center;" stripe
+                <c-table max-height="300px" style="text-align: center;" stripe
                     :list="this.model[argadr.grp].docgrdm.docgrd || []" :paginationShow="false" :border="true">
                     <el-table-column :label="model[argadr.grp].docgrdm.docdsclab || 'Documents Presented'" class="messageLabel">
                         <el-table-column label="1st" width="auto" prop="cmail1" background-color="red">