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/Bftdcr/Betdcrs.vue

@@ -664,6 +664,7 @@ export default {
       },
       set(val) {
         this.model.advdisflg = val ? "X" : "";
+        this.model.trnmod.trndoc.addstr750 = "";
       },
     },
   },

src/views/Business/Bftdrv/index.vue

@@ -131,6 +131,9 @@ export default {
         if(rtnmsg.respCode == SUCCESS)
         {
            this.updateModel(rtnmsg.data)
+           if(this.isInDisplay){
+        this.restoreDisplay();
+      }
            //TODO 处理数据逻辑
 
         }

src/views/Business/Bftset/Setp.vue

@@ -454,11 +454,11 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="SG000254" prop="bpdgrp.rec.ffttyp">
+        <el-form-item label="福费廷转卖类型" prop="bpdgrp.rec.ffttyp">
           <c-input
             v-model="model.bpdgrp.rec.ffttyp"
             maxlength="40"
-            placeholder="请输入SG000254"
+            placeholder="请输入福费廷转卖类型"
             disabled
           ></c-input>
         </el-form-item>

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/Infbfd/index.vue

@@ -106,6 +106,7 @@ import Ordpan from "./Ordpan"
 
 
 export default {
+     name: 'Infbfd',
     components:{
         "m-infsea" : Infsea,
         "m-ovwp" : Ovwp,

src/views/Business/Infdet/Infsea.vue

@@ -646,7 +646,7 @@
             -->
     <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
       <div class="m-list-btns">
-        <m-busbtn ref="childs" :ownref="ownref" @onChoose="onChoose"
+        <m-busbtn ref="childs" :ownref="ownref" trnCode="detsel" ownrefPath="dedgrp" :model="detselModel" @onChoose="onChoose"
           >11</m-busbtn
         >
       </div>
@@ -659,8 +659,9 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Infdet/Event";
+import DetselModel from "~/model/Detsel"
 //交易跳转逻辑
-import BusNavbar from "~/views/Business/Infdet/BusNavbar";
+import BusNavbar from "~/views/Public/BusNavbar";
 
 export default {
   inject: ["root"],
@@ -669,6 +670,7 @@ export default {
   components: { "m-busbtn": BusNavbar },
   data() {
     return {
+      detselModel:new DetselModel().data,
       ownref: "",
       initdialog: false,
       dialogTableVisible: false,

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">

src/views/Review/Business/ReviewBftdrv.vue

+<template>
+  <ReviewWrapper>
+    <Bftdrv></Bftdrv>
+  </ReviewWrapper>
+</template>
+
+<script>
+import Bftdrv from "~/views/Business/Bftdrv";
+import { ReviewWrapper } from "~/components/gj-common.min.js";
+
+export default {
+  name: "ReviewBftsnd",
+  components: { ReviewWrapper, Bftdrv },
+  created() {},
+  mounted() {},
+};
+</script>
+
+<style></style>

src/views/Review/ReviewRouter.js

@@ -24,6 +24,7 @@ import ReviewBftsnd from "./Business/ReviewBftsnd.vue";
 import ReviewBftdcr from "./Business/ReviewBftdcr.vue";
 import ReviewLitopn from "./Business/ReviewLitopn.vue";
 import ReviewBftset from "./Business/ReviewBftset.vue";
+import ReviewBftdrv from "./Business/ReviewBftdrv.vue";
 
 
 const ReviewRouter = [
@@ -71,6 +72,7 @@ const ReviewRouter = [
     { path: "litopn", component: ReviewLitopn, name: "ReviewLitopn", meta: { title: "复核-Litopn" } },
     { path: "bftset", component: ReviewBftset, name: "ReviewBftset", meta: { title: "复核-Bftset" } },
     { path: "litame", component: ReviewLitame, name: "ReviewLitame", meta: { title: "复核-Litame" } },
+    { path: "bftdrv", component: ReviewBftdrv, name: "ReviewBftdrv", meta: { title: "复核-Bftdrv" } },
 
 ];