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/components/IStreamTable.vue

@@ -34,6 +34,7 @@
         :prop="item.prop"
         :label="item.label"
         :width="item.width"
+        sortable
       >
         <template v-slot="{ scope }">
         <!-- <template slot-scope="{ scope }"> -->

src/model/Botame/Pattern.js

@@ -52,7 +52,7 @@ export default {
 
 
     "oldbodgrp.rec.matdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        //{type: "date", required: false, message: "输入正确的日期"}
     ],
     "trnmod.swiadd.newmatdat":[
         //{type: "date", required: false, message: "输入正确的日期"}
@@ -122,7 +122,7 @@ export default {
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "bodgrp.drr.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        //{type: "string", required: true, message: "必输项"},
         //{max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.drr.dbfadrblkcn":[
@@ -173,7 +173,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.col.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        //{type: "string", required: true, message: "必输项"},
         //{max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.col.dbfadrblkcn":[
@@ -230,7 +230,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.dre.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        //{type: "string", required: true, message: "必输项"},
         //{max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.dre.dbfadrblkcn":[
@@ -249,7 +249,7 @@ export default {
 
     "bodgrp.blk.colins":[
         {type: "string", required: true, message: "必输项"},
-        {max: 65,message:"长度不能超过65"}
+        {max: 3250,message:"长度不能超过3250"}
     ],
 
 

src/model/Botset/Pattern.js

 export default {
     "bodgrp.blk.colins":[
         {type: "string", required: true, message: "必输项"},
-        {max: 65,message:"长度不能超过65"}
+        {max: 3250,message:"长度不能超过3250"}
     ],
 
 
@@ -82,7 +82,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.drr.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        //{type: "string", required: true, message: "必输项"},
         //{max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.drr.dbfadrblkcn":[
@@ -90,7 +90,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.col.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        //{type: "string", required: true, message: "必输项"},
         //{max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.col.dbfadrblkcn":[
@@ -127,7 +127,7 @@ export default {
         {max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.dre.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
+        //{type: "string", required: true, message: "必输项"},
         //{max: 35,message:"长度不能超过35"}
     ],
     "bodgrp.dre.dbfadrblkcn":[
@@ -441,8 +441,8 @@ export default {
 
 
     "bopmod.dbdgrp.bas.actiondesc":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 32,message:"长度不能超过32"}
+        //{type: "string", required: true, message: "必输项"},
+        //{max: 32,message:"长度不能超过32"}
     ],
 
 
@@ -519,8 +519,8 @@ export default {
 
 
     "bopmod.dbagrp.bas.actiondesc":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 32,message:"长度不能超过32"}
+        //{type: "string", required: true, message: "必输项"},
+        //{max: 32,message:"长度不能超过32"}
     ],
 
 

src/model/Infbdd/Event.js

@@ -110,9 +110,8 @@ export default {
                 this.$notify.error({title: '错误',message: '服务请求失败！'});
                 }
             },
-            async handleReset() {
-              
-        
+            async handleReset(formName) {
+                this.$refs[formName].resetFields();
             },
             async handleSearch() {
 

src/model/Infdid/Event.js

@@ -173,8 +173,25 @@ export default {
         }
     },
     async handleReset() {
-
-
+      this.model.infcon.seaownref="";
+      this.model.infcon.opndatfrom="";
+      this.model.infcon.opndatto="";
+      this.model.infcon.searef="";
+      this.model.infcon.pty.extkey="";
+      this.model.infcon.pty.nam="";
+      this.model.infcon.seapty="";
+      this.model.infcon.nam="";
+      this.model.infcon.searol="";
+      this.model.infcon.usr.extkey="";
+      this.model.infcon.seasta="";
+      this.model.infcon.seacur="";
+      this.model.infcon.seaamtfr="";
+      this.model.infcon.seaamtto="";
+      this.model.seacnfdet="";
+      this.model.sealcrtyp="";
+      this.model.jyqflg="";
+      this.model.mylx="";
+      this.model.elcflg="";
     },
     async handleSearch() {
         this.stmData.data = [];

src/model/Infgid/Event.js

@@ -375,6 +375,10 @@ export default {
                 }
             },
 
+            async handleReset(formName) {
+                this.$refs[formName].resetFields();
+            },
+
             async handleSearch() {
                 this.stmData.data = [];
                 let opndatfrom = this.model.infcon.opndatfrom;

src/views/Business/Bdtcan/Canp.vue

@@ -324,7 +324,7 @@
           placeholder="请选择Booking Procedure"
         >
           <el-option
-            v-for="item in codes.rebkpflg"
+            v-for="item in rebkpflg"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -346,7 +346,12 @@ export default {
   props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {};
+    return {
+      rebkpflg: [
+        { label: "Reverse Booking (Document Set)", value: "N" },
+        { label: "Reverse Booking (Doc. Set, L/C)", value: "B" },
+    ],
+    };
   },
   methods: { ...Event, changed(e) {} },
   created: function () {},

src/views/Business/Betrcl/index.vue

@@ -66,12 +66,6 @@
           <m-limitbody :model="model" :codes="codes" />
         </el-tab-pane>
       </c-tabs>
-      <c-grid-ety-prompt-dialog
-        ref="etyDialog"
-        :promptData="promptData"
-        v-on:select-ety="selectEty"
-      >
-      </c-grid-ety-prompt-dialog>
     </el-form>
   </div>
 </template>

src/views/Business/Botame/Inst.vue

@@ -5,7 +5,7 @@
       <c-col :span="23">
         <el-form-item label="Delivery of Documents Instructions" style="padding-top:15px">
           <c-fullbox>
-            <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit
+            <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="3250" show-word-limit
               placeholder="请输入Collection Instructions" >
             </c-input>
             <template slot="footer">

src/views/Business/Botame/Ovwp.vue

@@ -344,6 +344,8 @@
           rol: 'drr',
         }"
         :disabled="true"
+        :disabledRef="true"
+        :disabledExtkey="true"
       >
       </c-ptap>
       <c-ptap

src/views/Business/Botame/Ptyp.vue

@@ -9,6 +9,8 @@
             rol: 'drr',
         }"
         :disabled="true"
+        :disabledRef="true"
+        :disabledExtkey="true"
         >
         </c-ptap>
     

src/views/Business/Botame/index.vue

@@ -60,7 +60,9 @@
  
             <!--Settlement -->
            <el-tab-pane label="Settlement" name="setpan">
+                <c-content>
                 <m-setpan :model="model" :codes="codes"/>
+                </c-content>
            </el-tab-pane>
  
             <!--Bookings -->

src/views/Business/Botset/Inst.vue

@@ -5,11 +5,11 @@
       <c-col :span="23">
         <el-form-item label="Delivery of Documents Instructions" style="padding-top:15px">
           <c-fullbox>
-            <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="65" show-word-limit
-              placeholder="请输入Collection Instructions" :disabled="model.bodgrp.blk.colinsflg !='X'">
+            <c-input type="textarea" v-model="model.bodgrp.blk.colins" maxlength="3250" show-word-limit
+              placeholder="请输入Collection Instructions" disabled>
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button size="small" type="primary" disabled>
                 ...
               </c-button>
             </template>
@@ -75,7 +75,7 @@
               placeholder="请输入Draft Instructions">
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button size="small" type="primary" disabled>
                 ...
               </c-button>
             </template>
@@ -108,7 +108,7 @@
               placeholder="请输入Protest Instructions">
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button size="small" type="primary" disabled>
                 ...
               </c-button>
             </template>
@@ -143,7 +143,7 @@
               placeholder="请输入Other Instructions">
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button size="small" type="primary" disabled>
                 ...
               </c-button>
             </template>
@@ -174,7 +174,7 @@
               placeholder="请输入Warehouse/Insurance instruction">
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button size="small" type="primary" disabled>
                 ...
               </c-button>
             </template>

src/views/Business/Botset/Ptyp.vue

@@ -9,6 +9,8 @@
             rol: 'drr',
         }"
         :disabled="true"
+        :disabledRef="true"
+        :disabledExtkey="true"
         >
         </c-ptap>
     
@@ -20,6 +22,8 @@
             rol: 'dre',
         }"
         :disabled="true"
+        :disabledRef="true"
+        :disabledExtkey="true"
         >
         </c-ptap>
     </c-col>
@@ -32,6 +36,8 @@
             rol: 'col',
         }"
         :disabled="true"
+        :disabledRef="true"
+        :disabledExtkey="true"
         >
         </c-ptap>
     </c-col>

src/views/Business/Botset/index.vue

@@ -45,7 +45,9 @@
  
             <!--Settlement -->
            <el-tab-pane label="Settlement" name="setpan">
+             <c-content>
                 <m-setpan :model="model" :codes="codes"/>
+                </c-content>
            </el-tab-pane>
  
             <!--Bookings -->

src/views/Business/Ditame/Amep.vue

@@ -234,6 +234,7 @@
         <c-input
           v-model="model.trnmod.swiadd.newnomtopame"
           style="width: 48%"
+          @change="newnomtopame"
         ></c-input>
         <label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
         <c-input
@@ -327,6 +328,7 @@
           show-word-limit
           :rows="2"
           placeholder="请输入Shipment from"
+          @change="shpfroelc"
         ></c-input>
       </el-form-item>
     </c-col>
@@ -351,6 +353,7 @@
           show-word-limit
           :rows="2"
           placeholder="请输入货物目的地/交货地(港)"
+          @change="shptoelc"
         ></c-input>
       </el-form-item>
     </c-col>
@@ -396,6 +399,27 @@ export default {
     return {};
   },
   methods: { ...Event ,
+    shptoelc(){
+      this.executeDefault("DIDGRP.REC.SHPTO").then((res) => {
+        if ((res.respCode == 'AAAAAA')) {
+          Utils.copyValueFromVO(this.model, res.data);
+        }
+      });
+    },
+    shpfroelc(){
+      this.executeDefault("DIDGRP.REC.SHPFRO").then((res) => {
+        if ((res.respCode == 'AAAAAA')) {
+          Utils.copyValueFromVO(this.model, res.data);
+        }
+      });
+    },
+    newnomtopame() {
+      this.executeRule("trnmod.swiadd.newnomtopame").then((res) => {
+        if ((res.respCode == 'AAAAAA')) {
+          Utils.copyValueFromVO(this.model, res.data);
+        }
+      });
+    },
   ameamt() {
       console.log("进入前---------");
       this.executeRule("trnmod.swiadd.ameamt").then((res) => {

src/views/Business/Ditame/index.vue

@@ -2036,6 +2036,9 @@ export default {
     if (rtnmsg.respCode == SUCCESS) {
       //TODO 处理数据逻辑
       Utils.copyValueFromVO(this.model, rtnmsg.data);
+      if(this.isInDisplay){
+        this.restoreDisplay();
+      }
     } else {
       this.$notify.error({ title: "错误", message: "服务请求失败！" });
     }

src/views/Business/Ditdla/index.vue

@@ -49,7 +49,9 @@
 
         <!--PD000342 -->
         <el-tab-pane label="条款" name="tk">
-          <m-tk :model="model" :codes="codes" />
+          <c-content>            
+            <m-tk :model="model" :codes="codes" />
+          </c-content>
         </el-tab-pane>
 
         <!--PD000021 -->
@@ -93,7 +95,9 @@
 
         <!--PD000000 -->
         <el-tab-pane label="账务" name="setpan">
-          <m-setpan :model="model" :codes="codes" />
+            <c-content>
+              <m-setpan :model="model" :codes="codes" />
+            </c-content>
         </el-tab-pane>
 
         <el-tab-pane label="分录" name="glepan">

src/views/Business/Getamc/Ovwp.vue

@@ -250,14 +250,8 @@
             style="width: 100%"
             placeholder="请选择Form of Undertaking"
             disabled
+            :code="codes.legfrm"
           >
-            <el-option
-              v-for="item in codes.legfrm"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
           </c-select>
         </el-form-item>
       </c-col>
@@ -426,6 +420,7 @@
               v-model="model.gidgrp.blk.apprul"
               style="width: 100%"
               placeholder="请选择Applicable Rules"
+              
             >
             </c-select>
           </el-form-item>

src/views/Business/Infbcd/Infsea.vue

@@ -278,21 +278,21 @@ export
           columns: [
             "1 1 \"Reference\" 150",
             "2 2 \"Resp. User\" 100",
-            "3 3 \"Opened\" 200 4 7",
-            "4 4 \"Closed\" 200 4 7",
+            "3 3 \"Opened\" 150 4 7",
+            "4 4 \"Closed\" 150 4 7",
             "5 5 \"Goods Code\" 130 1 0 1 GODCOD",
             "6 6\"分行名称\" 136",
             "7 7 \"Pta.No\" 130",
-            "8 8 \"Party Number\" 150",
+            "8 8 \"Drawee Party Number\" 150",
             "9 9 \"Drawee\" 300",
             "10 10 \"Drawee CN\" 130",
-            "11 11 \"Party Number\" 150",
+            "11 11 \"Drawer Party Number\" 150",
             "12 12 \"Drawer\" 100",
-            "13 13 \"Party Number\" 150",
+            "13 13 \"Remitting Bank Party Number\" 200",
             "14 14 \"Remitting Bank\" 200",
-            "15 15 \"Cur\" 50",
+            "15 15 \"Doc.Amount Cur\" 130",
             "16 16 \"Doc.Amount\" 100 2 8 1 15",
-            "17 17 \"Cur\" 50",
+            "17 17 \"Open Amount Cur\" 130",
             "18 18 \"Open Amount\" 100 2 8 1 17",
           ],
           data: []

src/views/Business/Infbdd/Infsea.vue

 <template>
   <div class="eibs-tab">
       <!-- 持续展示区 -->
-      <c-list-search @form-reset="handleReset" @form-search="handleSearch">
+      <c-list-search @form-reset="handleReset('paramsForm')" @form-search="handleSearch">
       <template v-slot="searchSlot">
         <el-form
           class="m-table-search-form"
@@ -10,6 +10,7 @@
           label-position="right"
           label-width="110px"
           size="small"
+          :model="model"
         >
           
         <c-row>
@@ -28,7 +29,7 @@
                 &nbsp;
             </c-col> -->
             <c-col :span="8">
-              <el-form-item label="Opening between" prop="infcon.opndatfrom" style="width: 100%">
+              <el-form-item label="Opening" prop="infcon.opndatfrom" style="width: 100%">
                 <c-col :span="11">
                   <c-date-picker
                     type="date"
@@ -128,6 +129,7 @@
                     v-model="model.infcon.searol"
                     style="width: 100%"
                     placeholder="请选择Role"
+                    :code="searol"
                   >
                   </c-select>
                 </el-form-item>
@@ -141,6 +143,8 @@
                     v-model="model.infcon.seasta"
                     style="width: 100%"
                     placeholder="请选择Status"
+                    :code="codes.seasta"
+                    
                   >
                   </c-select>
                 </el-form-item>
@@ -151,13 +155,13 @@
                     v-model="model.infcon.seacur"
                     style="width: 100%"
                     placeholder="请选择Currency"
-                    :code="codes.cur"
+                    :code="codes.currencycode"
                   >
                   </c-select>
                 </el-form-item>
               </c-col>
               <c-col :span="8">
-                <el-form-item label="Amount between" prop="infcon.seaamtfr" style="width: 100%">
+                <el-form-item label="Amount" prop="infcon.seaamtfr" style="width: 100%">
                 <c-col :span="11">
                   <c-input-currency
                     v-model="model.infcon.seaamtfr"
@@ -186,6 +190,7 @@
                     v-model="model.seadocflg"
                     style="width: 100%"
                     placeholder="请选择Document Type"
+                    :code="codes.brdtyp"
                   >
                   </c-select>
                 </el-form-item>
@@ -196,6 +201,7 @@
                     v-model="model.jyqflg"
                     style="width: 100%"
                     placeholder="请选择假远期信用证"
+                    :code="codes.jyqflg"
                   >
                   </c-select>
                 </el-form-item>
@@ -206,6 +212,7 @@
                     v-model="model.elcflg"
                     style="width: 100%"
                     placeholder="请选择是否通过电证系统"
+                    :code="codes.elcflg"
                   >
                   </c-select>
                 </el-form-item>
@@ -324,6 +331,17 @@ export default {
   components:{'m-busbtn':BusNavbar},
   data() {
     return {
+      searol:[
+        { label: "Acc. with Bank (ACB)", value: "ACB" },
+        { label: "Applicant", value: "APL" },
+        { label: "Beneficiary's Bank", value: "BEB" },
+        { label: "Beneficiary", value: "BEN" },
+        { label: "Issuing Bank", value: "ISS" },
+        { label: "Old Account Party", value: "OAP" },
+        { label: "Presenter (PRP)", value: "PRB" },
+        { label: "Reimbursement Bank", value: "RMB" },
+        { label: "Carrier (ROG)", value: "ROG" },
+      ],
       ditselModel: new DitselModel().data,
       ownref:"",
       trnData: {

src/views/Business/Infbod/Infsea.vue

@@ -242,16 +242,12 @@
       </c-istream-table>
     </c-col>
 
-    <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
-      <div class="m-list-btns">
-        <m-busbtn ref="childs" :ownref="ownref" :model="BotselModel" ownrefPath="bodgrp" trnCode="botsel"
-          @onChoose="onChoose">11</m-busbtn>
-      </div>
-    </el-dialog>
+    <m-busbtn ref="childs" :ownref="ownref" :model="BotselModel" ownrefPath="bodgrp" trnCode="botsel"
+      @onChoose="onChoose">11</m-busbtn>
   </div>
+  
 </template>
 <script>
-import Utils from "~/utils/index";
 import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
@@ -288,21 +284,22 @@ export default {
         columns: [
           '1 1 "Reference" 150',
           '2 2 "Resp. User" 100',
-          '3 3 "Opened" 200 4 7',
-          '4 4 "Closed" 200 4 7',
+          '3 3 "Opened" 150 4 7',
+          '4 4 "Closed" 150 4 7',
           '5 5 "分行名称" 200',
-          '6 6 "Party Number" 150',
+          '6 6 "Drawee Party Number" 150',
           '7 7 "Drawee" 133',
           '8 8 "PTA NO." 100',
-          '9 9 "Party Number" 150',
+          '9 9 "Drawer Party Number" 150',
           '10 10 "Drawer" 300',
           '11 11 "Invoice No." 133',
           '12 12 "Drawer CN" 150',
-          '13 13 "Party Number" 150',
+          '13 13 "Collecting Party Number" 200',
           '14 14 "Collecting Bank" 200',
-          '15 15 "Cur" 50',
-          '16 16 "Doc.Amount" 150 2 8 1 15',
-          '17 17 "Cur" 50',
+          '15 15 "Doc.Amount Cur" 130',
+          '16 16 "Doc.Amount" 100 2 8 1 15',
+          '17 17 "Open Amount Cur" 130',
+          '18 18 "Open Amount" 100 2 8 1 -1'
         ],
         data: [],
       },
@@ -311,37 +308,22 @@ export default {
   methods: {
     ...Event,
     async getButtons(ownref) {
-      this.initdialog = true;
+      this.$refs.childs.initdialog = true
       this.ownref = ownref
       console.log("ownref:" + ownref);
-      setTimeout(() => {
-        this.$refs.childs.$emit("childmethods")
-      }, 10)
     },
     async onChoose(code) {
       //跳转交易
       this.$router.history.push("/business/" + code)
-      this.initdialog = false;
+      this.$refs.childs.initdialog = false
     },
     closeTrn(refId) {
       this.$refs[refId].doClose();
     },
-    async getTrnInfo(idx, row) {
+    async getTrnInfo(code) {
+ this.$router.history.push("/business/" + code) 
+          this.$refs.childs.initdialog = false     
 
-      this.model.infcon.objinr = row["INR"];
-      this.model.bodgrp.rec.inr = row["INR"];
-      this.model.infcon.chksubcon = "X";
-
-      this.dialogTableVisible = true;
-
-      let rtnmsg = await this.executeDefault("infcon.chksubcon");
-      console.log(rtnmsg);
-      console.log(this.model.infcon.chksubcon);
-
-      if ((rtnmsg.respCode = SUCCESS)) {
-        this.trnData.data = rtnmsg.data.infcon_trnstm.rows;
-        console.log(this.trnData.data);
-      }
     },
     async getDitSelInfo(idx, row) {
       //TD中选中行触发

src/views/Business/Infdid/Infsea.vue

@@ -30,7 +30,7 @@
 
               <c-col :span="8">
                 <el-form-item
-                  label="Opening between"
+                  label="Opening"
                   prop="infcon.opndatfrom"
                   style="width: 100%"
                 >
@@ -39,7 +39,7 @@
                       type="date"
                       v-model="model.infcon.opndatfrom"
                       style="width: 100%"
-                      placeholder="请选择Opening between"
+                      placeholder="请选择Opening"
                       value-format="yyyy-MM-dd"
                     ></c-date-picker>
                   </c-col>
@@ -141,6 +141,7 @@
                     v-model="model.infcon.searol"
                     style="width: 100%"
                     placeholder="请选择Role"
+                    :code="codes.payrol"
                   >
                   </c-select>
                 </el-form-item>
@@ -171,6 +172,7 @@
                     v-model="model.infcon.seasta"
                     style="width: 100%"
                     placeholder="请选择Status"
+                    :code="codes.seasta"
                   >
                   </c-select>
                 </el-form-item>
@@ -185,13 +187,14 @@
                     v-model="model.infcon.seacur"
                     style="width: 100%"
                     placeholder="请选择Currency"
+                    :code="codes.curtxt1"
                   >
                   </c-select>
                 </el-form-item>
               </c-col>
               <c-col :span="8">
                 <el-form-item
-                  label="Amount between"
+                  label="Amount"
                   prop="infcon.seaamtfr"
                   style="width: 100%"
                 >
@@ -199,7 +202,7 @@
                     <c-input
                       v-model="model.infcon.seaamtfr"
                       style="width: 100%"
-                      placeholder="请输入Amount between"
+                      placeholder="请输入Amount"
                     >
                     </c-input>
                   </c-col>
@@ -228,6 +231,7 @@
                     v-model="model.seacnfdet"
                     style="width: 100%"
                     placeholder="请选择Confirmation Status"
+                    :code="codes.cnfins"
                   >
                   </c-select>
                 </el-form-item>
@@ -243,6 +247,7 @@
                     v-model="model.sealcrtyp"
                     style="width: 100%"
                     placeholder="请选择form of L/C"
+                    :code="codes.lcrtyp"
                   >
                   </c-select>
                 </el-form-item>
@@ -258,6 +263,7 @@
                     v-model="model.jyqflg"
                     style="width: 100%"
                     placeholder="请选择假远期信用证"
+                    :code="codes.jyqflg"
                   >
                   </c-select>
                 </el-form-item>
@@ -270,6 +276,7 @@
                     v-model="model.mylx"
                     style="width: 100%"
                     placeholder="请选择贸易类型"
+                    :code="codes.mylx"
                   >
                   </c-select>
                 </el-form-item>
@@ -285,6 +292,7 @@
                     v-model="model.elcflg"
                     style="width: 100%"
                     placeholder="请选择是否通过电证系统"
+                    :code="codes.elcflg"
                   >
                   </c-select>
                 </el-form-item>
@@ -668,7 +676,7 @@ export default {
     },
     toDitopn(){
       this.$router.history.push("/business/ditopn") 
-    }
+    },
   },
   created: function () {},
 };

src/views/Business/Infgid/Infsea.vue

 <template>
   <div class="eibs-tab">
-    <c-list-search @form-reset="handleReset" @form-search="handleSearch">
+    <c-list-search @form-reset="handleReset('paramsForm')" @form-search="handleSearch">
       <!-- 持续展示区 -->
       <template v-slot="searchSlot">
         <el-form
@@ -10,6 +10,7 @@
           label-position="left"
           label-width="110px"
           size="small"
+          :model="model"
         >
           <c-row>
             <c-col :span="24">
@@ -841,12 +842,12 @@ export default {
     toGetopn() {
       this.$router.history.push("/business/getopn");
     },
-    handleReset: function () {
-      this.model = {
-        instNo: "",
-        instName: "",
-      };
-    },
+    // handleReset: function () {
+    //   this.model = {
+    //     instNo: "",
+    //     instName: "",
+    //   };
+    // },
   },
   created: function () {},
   watch: {

src/views/Business/Inflid/Infsea.vue

@@ -441,8 +441,7 @@
       </c-istream-table>
     </c-col>
 
-        <m-busbtn ref="childs" :ownref="ownref" @onChoose="onChoose"
-          >11</m-busbtn
+        <m-busbtn ref="childs" :ownref="ownref" trnCode="litsel" :model="litselModel" ownrefPath="lidget.lid.ownref" @onChoose="onChoose"></m-busbtn
         >
   </div>
 </template>
@@ -452,6 +451,9 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Inflid/Event";
+
+import Litsel from "~/model/Litsel"
+
 import BusNavbar from "~/views/Public/BusNavbar";
 
 export default {
@@ -463,7 +465,7 @@ export default {
     return {
       curinr:"",
       ownref: "",
-      
+      litselModel: new Litsel().data,
       initdialog: false,
       dialogTableVisible: false,
       trnData: {

src/views/Business/Letopn/Ovwp.vue

@@ -451,39 +451,39 @@
   </div>
 </template>
 <script>
-import Api from '~/service/Api'
-import commonProcess from '~/mixin/commonProcess'
-import CodeTable from '~/config/CodeTable'
-import Event from '~/model/Letopn/Event'
-import Utils from '~/utils'
-import Ptap from '~/views/Public/Ptap'
+import Api from "~/service/Api";
+import commonProcess from "~/mixin/commonProcess";
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Letopn/Event";
+import Utils from "~/utils";
+import Ptap from "~/views/Public/Ptap";
 // import Amtpanl from "~/views/Public/Amtpanl";
 
 export default {
-  components: { 'c-ptap': Ptap },
-  inject: ['root'],
-  props: ['model', 'codes'],
+  components: { "c-ptap": Ptap },
+  inject: ["root"],
+  props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {}
+    return {};
   },
   methods: {
     ...Event,
     nom1CurEvent() {
-      this.executeDefault('ledgrp.cbs.nom1.cur').then((res) => {
+      this.executeDefault("ledgrp.cbs.nom1.cur").then((res) => {
         if (res.respCode == SUCCESS) {
-          Utils.copyValueFromVO(this.model, res.data)
+          Utils.copyValueFromVO(this.model, res.data);
         }
-      })
+      });
     },
     apprulChange(v) {
-      if (v !== 'OTHR') {
-        this.model.ledgrp.rec.apprultxt = ''
+      if (v !== "OTHR") {
+        this.model.ledgrp.rec.apprultxt = "";
       }
     },
   },
   created: function () {},
-}
+};
 </script>
 <style>
 .centerLable {
@@ -493,6 +493,6 @@ export default {
   padding-bottom: 2px;
 }
 .marginLable {
-  padding-left: 150px;
+  padding-left: 160px;
 }
 </style>

src/views/Business/Letrsv/Aamp.vue

 <template>
   <div class="eibs-tab">
-    <!-- left -->
+
     <c-col :span="11">
       <c-col :span="24">
         <c-col :span="12">
@@ -22,6 +22,9 @@
               v-model="model.ledgrp.cbs.max2.amt"
               style="width: 100%"
               placeholder="Please input Additional Amount"
+              @keyup.enter.native="
+              defaultFunction('ledgrp.cbs.max2.amt', model.ledgrp.cbs.max2.amt)
+            "
             ></c-input-currency>
           </el-form-item>
         </c-col>
@@ -52,10 +55,6 @@
           </el-form-item>
         </c-col>
       </c-col>
-    </c-col>
-
-    <!-- right -->
-    <c-col :span="11" :offset="1">
       <c-col :span="24">
         <el-form-item label="Covered" prop="ledgrp.blk.addamtcov">
           <c-input
@@ -69,6 +68,7 @@
       </c-col>
     </c-col>
 
+
     <!-- <c-col :span="12">
       <el-form-item label="Additional Amount" prop="ledgrp.cbs.max2.cur">
         <c-select

src/views/Business/Letrsv/index.vue

@@ -33,7 +33,10 @@
  
             <!--PD000063 -->
            <el-tab-pane label="Details" name="detp">
-                <m-detp :model="model" :codes="codes"/>
+               <c-content>
+                    <m-detp :model="model" :codes="codes"/>
+               </c-content>
+                
            </el-tab-pane>
  
             <!--PD000042 -->
@@ -97,6 +100,12 @@
            </el-tab-pane>
        </c-tabs>
     </el-form>
+    <c-grid-ety-prompt-dialog
+      ref="etyDialog"
+      :promptData="promptData"
+      v-on:select-ety="selectEty"
+    >
+    </c-grid-ety-prompt-dialog>
   </div>
 </template>
 <script>

src/views/Layout/SideMenu.vue

@@ -96,14 +96,14 @@ export default {
         // { inifrm: "bctset", ininam: "进口代收付款", pntmiu: "5" },
         // { inifrm: "bctcan", ininam: "进口代收注销", pntmiu: "5" },
         { inifrm: "infbcd", ininam: "进口代收查询", pntmiu: "5" },
+
         { inifrm: "6", ininam: "出口托收", pntmiu: "" },
-        
-        { inifrm: "infbod", ininam: "出口托收入口交易", pntmiu: "6" },
-        { inifrm: "botdav", ininam: "出口托收寄单", pntmiu: "6" },
-        { inifrm: "botame", ininam: "出口托收修改", pntmiu: "6" },
-        { inifrm: "botdcr", ininam: "出口托收拒付/不符点", pntmiu: "6" },
-        { inifrm: "botset", ininam: "出口托收收汇", pntmiu: "6" },
-        { inifrm: "botcan", ininam: "出口托收闭卷", pntmiu: "6" },
+        { inifrm: "infbod", ininam: "出口托收查询", pntmiu: "6" },
+        // { inifrm: "botdav", ininam: "出口托收寄单", pntmiu: "6" },
+        // { inifrm: "botame", ininam: "出口托收修改", pntmiu: "6" },
+        // { inifrm: "botdcr", ininam: "出口托收拒付/不符点", pntmiu: "6" },
+        // { inifrm: "botset", ininam: "出口托收收汇", pntmiu: "6" },
+        // { inifrm: "botcan", ininam: "出口托收闭卷", pntmiu: "6" },
         { inifrm: "7", ininam: "转让信用证", pntmiu: "" },
         { inifrm: "lttopn", ininam: "转让证开立", pntmiu: "7" },
         { inifrm: "lttame", ininam: "转让证修改", pntmiu: "7" },

src/views/Public/BusNavbar.vue

@@ -30,6 +30,8 @@
 import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 
+import _ from "~/utils/Lodash"
+
 export default {
   props: {
     ownref: {
@@ -105,8 +107,15 @@ export default {
 
         this.navcode = [];
         //请求按钮数据
-        this.model[this.ownrefPath].rec.ownref = this.ownref;
-        let rtnmsg = await this.executeRule(this.ownrefPath + ".rec.ownref"); //didgrp_rec_ownref
+        let rulePath
+        if (this.ownrefPath.endsWith(".ownref")) {
+          _.set(this.model, this.ownrefPath, this.ownref);
+          rulePath = this.ownrefPath
+        } else {
+          this.model[this.ownrefPath].rec.ownref = this.ownref;
+          rulePath = this.ownrefPath + ".rec.ownref"
+        }
+        let rtnmsg = await this.executeRule(rulePath); //didgrp_rec_ownref
         if (rtnmsg.respCode == SUCCESS) {
           //重置数组
           this.navcode = [];

src/views/Public/Docpre.vue

@@ -36,8 +36,8 @@
                                     </c-col>
                                     <c-col :span="12">
                                         <div style="float: right;">
-                                            <span class="add_del_button add_button" @click="addTableValue">+</span>
-                                            <span class="add_del_button" @click="deleteTable">-</span>
+                                            <span class="add_del_button add_button" @click="addTableValue" v-if="ifShowAdd">+</span>
+                                            <span class="add_del_button" @click="deleteTable" v-if="ifShowDelete">-</span>
                                         </div>
                                     </c-col>
                                 </row>

src/views/Review/Business/ReviewDitame.vue

+<template>
+    <ReviewWrapper>
+      <Ditame></Ditame>
+    </ReviewWrapper>
+  </template>
+  
+  <script>
+  import Ditame from "~/views/Business/Ditame";
+  import { ReviewWrapper } from "~/components/gj-common.min.js";
+  
+  export default {
+    name: "ReviewDitame",
+    components: { ReviewWrapper, Ditame },
+    created() {},
+    mounted() {},
+  };
+  </script>
+  
+  <style></style>
+  
\ No newline at end of file

src/views/Review/ReviewRouter.js

@@ -32,6 +32,7 @@ import ReviewGetamc from "./Business/ReviewGetamc.vue";
 import ReviewBftdrv from "./Business/ReviewBftdrv.vue";
 import ReviewLetdrv from "./Business/ReviewLetdrv.vue";
 import ReviewBetacc from "./Business/ReviewBetacc.vue";
+import ReviewDitame from "./Business/ReviewDitame.vue";
 
 
 const ReviewRouter = [
@@ -68,7 +69,6 @@ const ReviewRouter = [
     { path: "bdtdck", component: ReviewBdtdck, name: "ReviewBdtdck", meta: { title: "复核-Bdtdck" } },
     { path: "botdcr", component: ReviewBotdcr, name: "ReviewBotdcr", meta: { title: "复核-Botdcr" } },
     { path: "botrad", component: ReviewBotrad, name: "ReviewBotrad", meta: { title: "复核-Botrad" } },
-    { path: "botdav", component: ReviewBotdav, name: "ReviewBotdav", meta: { title: "复核-botdav" } },
     { path: "brtdck", component: ReviewBrtdck, name: "ReviewBrtdck", meta: { title: "复核-Brtdck" } },
     { path: "brtudp", component: ReviewBrtudp, name: "ReviewBrtudp", meta: { title: "复核-Brtudp" } },
     { path: "brteus", component: ReviewBrteus, name: "ReviewBrteus", meta: { title: "复核-Brteus" } },
@@ -87,6 +87,7 @@ const ReviewRouter = [
     { path: "bftdrv", component: ReviewBftdrv, name: "ReviewBftdrv", meta: { title: "复核-Bftdrv" } },
     { path: "letdrv", component: ReviewLetdrv, name: "ReviewLetdrv", meta: { title: "复核-Letdrv" } },
     { path: "betacc", component: ReviewBetacc, name: "ReviewBetacc", meta: { title: "复核-Betacc" } },
+    { path: "ditame", component: ReviewDitame, name: "ReviewDitame", meta: { title: "复核-Ditame" } },
 
 ];