Merge branch 'development-202206' of http://192.168.0.110:11080/fukai/vue-gjjs…

Merge branch 'development-202206' of http://192.168.0.110:11080/fukai/vue-gjjs into development-202206

src/config/CodeTable/index.js

@@ -7135,6 +7135,9 @@ const CodeTable = {
         {label:"MAYADD",value:"A"},
         {label:"CONFIRM",value:"C"},
         {label:"WITHOUT",value:"W"},    
-    ]
+    ],
+    ELC022: [
+        { label: "拒绝通知", value: "ADRE" },
+    ],
 }
 export default CodeTable;

src/model/Public/Mtabut/index.js

@@ -25,6 +25,9 @@ export default class Mtabut {
                 dsp:"",			//  Display		.mtabut.syswrn.dsp
             },
             clsflg: "",
+            entmod: {
+                entsubpenl1blk: ""      //XMLPanel entsubpenl1的内置block
+            }
         }
     }
 }
\ No newline at end of file

src/views/Business/Botacc/Setp.vue

@@ -356,12 +356,12 @@ export default {
                     selIds = [];
                     this.model.setmod.docamt = "0.000";
                     this.model.liaall.tensetstm.rows = [];
-                    this.model.bodgrp.rec.focflg = '';
+                    // this.model.bodgrp.rec.focflg = '';
                     // this.model.liaall.tenstm.rows = []
                 } else {
                     selIds = [selection[0] + 1];
                     this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
-                    this.model.bodgrp.rec.focflg = 'X';
+                    // this.model.bodgrp.rec.focflg = 'X';
 
                 }
                 //

src/views/Business/Botacc/index.vue

@@ -136,6 +136,9 @@ export default {
         if (rtnmsg.respCode == SUCCESS) {
             this.updateModel(rtnmsg.data)
             //TODO 处理数据逻辑
+            if (this.isInDisplay) {
+                this.restoreDisplay();
+            }
             this.$nextTick(() => {
                 this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
                 this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;

src/views/Business/Botpay/Setp.vue

@@ -297,7 +297,6 @@ export default {
     mixins: [commonProcess],
     data() {
         return {
-            isDisabled: false,
             stmData: {
                 columns: [
                     '1 1 "Type" 80',
@@ -351,12 +350,10 @@ export default {
         ...Event,
         async change() {
             if (this.model.bodgrp.rec.focflg === "X") {
-                this.isDisabled = true;
                 this.model.setmod.redamt = this.model.setmod.docamt;
                 let rtnmsg = await this.executeDefault("liaall.tenstm");
                 this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta;
             } else {
-                this.isDisabled = false;
                 this.model.setmod.redamt = "0.00";
                 let rtnmsg = await this.executeDefault("liaall.tenstm");
                 this.model.bodgrp.rec.docsta = rtnmsg.data.bodgrp_rec_docsta;
@@ -375,12 +372,12 @@ export default {
                     selIds = [];
                     this.model.setmod.docamt = "0.000";
                     this.model.liaall.tensetstm.rows = [];
-                    this.model.bodgrp.rec.focflg = '';
+                    // this.model.bodgrp.rec.focflg = '';
                     // this.model.liaall.tenstm.rows = []
                 } else {
                     selIds = [selection[0] + 1];
                     this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
-                    this.model.bodgrp.rec.focflg = 'X';
+                    // this.model.bodgrp.rec.focflg = 'X';
                 }
                 //
                 console.log(this.model.liaall.tensetstm);

src/views/Business/Botpay/index.vue

@@ -140,6 +140,9 @@ export default {
         if (rtnmsg.respCode == SUCCESS) {
             this.updateModel(rtnmsg.data)
             //TODO 处理数据逻辑
+            if (this.isInDisplay) {
+                this.restoreDisplay();
+            }
             this.$nextTick(() => {
                 this.$refs.setp.$refs.table.$refs.table.toggleAllSelection();
                 this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;

src/views/Business/Brtame/index.vue

@@ -55,6 +55,13 @@
                     <m-setpan :model="model" :codes="codes" />
                     </c-content>
                 </el-tab-pane>
+
+                <el-tab-pane label="Booking" name="glepan">
+                    <c-content>
+                    <m-glepan :model="model" :codes="codes" />
+                    </c-content>
+                </el-tab-pane>
+
                 <!--coninf PD000000 Completion -->
                 <el-tab-pane label="Completion" name="coninfp">
                     <m-coninfp :model="model" :codes="codes" />
@@ -89,6 +96,7 @@ import Shpdet from "./Shpdet";
 
 import Engp from "~/views/Public/Engp";
 import Setpan from "~/views/Public/Setpan";
+import Glepan from "~/views/Public/Glepan";
 import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/views/Public/Docpan";
 import Doctre from "~/views/Public/Doctre";
@@ -101,6 +109,7 @@ export default {
         "m-shpdet": Shpdet,
         "m-engp": Engp,
         "m-setpan": Setpan,
+        "m-glepan": Glepan,
         "m-coninfp": Coninfp,
         "m-docpan": Docpan,
         "m-doctre": Doctre,

src/views/Business/Brtdck/Brtdckp.vue

@@ -145,7 +145,7 @@
           </el-form-item>
         </c-col>
         <!-- S0000080 : Maturity Date -->
-        <c-col :span="12">
+        <c-col :span="24">
           <el-form-item label="Maturity Date" prop="brdgrp.rec.matdat">
             <c-date-picker
               type="date"
@@ -157,7 +157,7 @@
           </el-form-item>
         </c-col>
         <!-- SG000232 : Start Date -->
-        <c-col :span="12">
+        <c-col :span="24">
           <el-form-item label="Start Date" prop="brdgrp.rec.stadat">
             <c-date-picker
               type="date"
@@ -203,7 +203,7 @@
               v-model="model.brdgrp.rec.docsta"
               style="width: 100%"
               placeholder="请输入"
-              :code="codes.docsta"
+              :code="codes.docsta1"
               disabled
             >
             </c-select>
@@ -333,7 +333,7 @@
             ></c-date-picker>
           </el-form-item>
         </c-col>
-        <c-col :span="12">
+        <c-col :span="24">
           <el-form-item label="Maturity Date" prop="brdgrp.rec.matdat">
             <c-date-picker
               type="date"
@@ -345,7 +345,7 @@
           </el-form-item>
         </c-col>
         <!-- S0000083 : Shipped on -->
-        <c-col :span="12">
+        <c-col :span="24">
           <el-form-item label="Shipped on" prop="brdgrp.rec.shpdat">
             <c-date-picker
               type="date"

src/views/Business/Cnysel/Selp.vue

@@ -95,17 +95,6 @@
             <c-col :span="11" style="text-align: left"><span>操作</span></c-col>
             <!-- <c-col :span="12" style="text-align:right"><c-button icon="el-icon-s-tools"></c-button></c-col> -->
           </template>
-          <template slot-scope="scope">
-            <a href="javascript:void(0)" @click="continueEdit(scope.row)"
-              >详情</a
-            >
-            <a href="javascript:void(0)" @click="continueEdit(scope.row)"
-              >修改</a
-            >
-            <a href="javascript:void(0)" @click="continueEdit(scope.row)"
-              >删除</a
-            >
-          </template>
         </el-table-column>
       </c-istream-table>
     </c-col>

src/views/Business/Detame/Ovwp.vue

@@ -34,7 +34,7 @@
 
             <c-col :span="24">
                 <el-form-item label="是否可以转让" prop="dedgrp.rec.lcrtyp">
-                    <c-select v-model="model.dedgrp.rec.lcrtyp" style="width: 100%" placeholder="请选择">
+                    <c-select v-model="model.dedgrp.rec.lcrtyp" style="width: 100%" placeholder="请选择" disabled>
                         <el-option v-for="item in codes.lcrtyp" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
@@ -71,7 +71,7 @@
 
             <c-col :span="11">
                 <el-form-item style="text-align: left" label-width="5px" prop="dedgrp.cbs.nom1.amt">
-                    <c-input-currency v-model="model.dedgrp.cbs.nom1.amt" style="text-align: left; width: 100%"
+                    <c-input-currency v-model="model.dedgrp.cbs.nom1.amt" style="text-align: left; width: 100%" disabled
                         placeholder="请输入信用证金额" @keyup.enter.native="
                             defaultFunction(
                                 'dedgrp.cbs.nom1.amt',
@@ -112,7 +112,7 @@
             <c-col :span="24">
                 <c-col :span="13">
                     <c-form-item label="上下浮动限额" prop="dedgrp.rec.nomtop">
-                        <c-input v-model="model.dedgrp.rec.nomtop" maxlength="10" style="width: 100%"
+                        <c-input v-model="model.dedgrp.rec.nomtop" maxlength="10" style="width: 100%" disabled
                             placeholder="请输入Amount Tolerance - Positive"></c-input>
                     </c-form-item>
                 </c-col>
@@ -125,7 +125,7 @@
                 </c-col>
                 <c-col :span="10">
                 <c-form-item label="" prop="dedgrp.rec.nomton" label-width="0">
-                    <c-input v-model="model.dedgrp.rec.nomton" prop="dedgrp.rec.nomton" maxlength="10" style="width: 100%"
+                    <c-input v-model="model.dedgrp.rec.nomton" prop="dedgrp.rec.nomton" maxlength="10" style="width: 100%" disabled
                         placeholder="请输入Amount Tolerance - Negative"></c-input></c-form-item>
                 </c-col>
             </c-col>
@@ -222,7 +222,7 @@
       </c-col> -->
             <c-col :span="24">
                 <c-form-item label="有效日期" prop="dedgrp.rec.expdat">
-                    <c-date-picker type="date" v-model="model.dedgrp.rec.expdat" value-format="yyyy-MM-dd"
+                    <c-date-picker type="date" v-model="model.dedgrp.rec.expdat" value-format="yyyy-MM-dd" disabled
                         placeholder="请选择Date" style="width: 100%"></c-date-picker>
                 </c-form-item>
             </c-col>
@@ -264,7 +264,7 @@
 
             <c-col :span="24">
                 <el-form-item label="是否通过电证系统" prop="dedgrp.rec.elcflg">
-                    <c-select v-model="model.dedgrp.rec.elcflg" style="width: 100%" placeholder="请选择是否通过电证系统">
+                    <c-select v-model="model.dedgrp.rec.elcflg" style="width: 100%" placeholder="请选择是否通过电证系统" disabled>
                         <el-option v-for="item in codes.elcflg" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
@@ -331,7 +331,7 @@
                     title: '受益人',
                     grp: 'dedgrp',
                     rol: 'ben',
-                }" :isAdrblk="false" @onSeainf="onSeainf" @onAplpDet="onBenpDet">
+                }" :isAdrblk="false" @onSeainf="onSeainf" @onAplpDet="onBenpDet" :disabledRef="true">
                 </c-ptap>
             </c-col>
 

src/views/Business/Detopn/Detp1.vue

@@ -291,9 +291,9 @@
       -->
      
       <c-ptapdome
-        :disabledBankno="this.model.dedgrp.rec.lcrtyp == 'I'"
-        :disabledJigomc="this.model.dedgrp.rec.lcrtyp == 'I'"
-        :disabledDizhii="this.model.dedgrp.rec.lcrtyp == 'I'"
+        :disabledBankno="this.model.dedgrp.rec.lcrtyp != 'IT'"
+        :disabledJigomc="this.model.dedgrp.rec.lcrtyp != 'IT'"
+        :disabledDizhii="this.model.dedgrp.rec.lcrtyp != 'IT'"
         :model="model"
         :argadr="{
           title: '转让行',

src/views/Business/Detopn/Ovwp.vue

@@ -482,7 +482,7 @@
 
             <c-col :span="24">
                 <el-form-item label="是否通知客户" prop="dedgrp.rec.rejflg">
-                    <c-select v-model="model.dedgrp.rec.rejflg" style="width: 100%" placeholder="请选择是否通知客户">
+                    <c-select v-model="model.dedgrp.rec.rejflg" style="width: 100%" placeholder="请选择是否通知客户" :code="codes.ELC022">
                     </c-select>
                 </el-form-item>
             </c-col>
@@ -490,7 +490,7 @@
             <c-col :span="24">
                 <el-form-item label="拒绝通知理由" prop="dedgrp.blk.rejadvrsn">
                     <c-input type="textarea" v-model="model.dedgrp.blk.rejadvrsn" maxlength="35" show-word-limit
-                        placeholder="请输入拒绝通知理由"></c-input>
+                        placeholder="请输入拒绝通知理由" :disabled="model.dedgrp.rec.rejflg != 'ADRE'"></c-input>
                 </el-form-item>
             </c-col>
 

src/views/Business/Ditopn/Mt799.vue

@@ -2,13 +2,13 @@
   <div class="eibs-tab">
                                                
        <c-col :span="20">
-        <el-form-item label="受益人英文名称" prop="ditp.bennam">
+        <el-form-item label="MT799(79)受益人英文名称" prop="ditp.bennam">
             <c-input  v-model="model.ditp.bennam" maxlength="100" @blur="BlurBennam" ></c-input>
         </el-form-item>
        </c-col>             
                                    
        <c-col :span="20">
-        <el-form-item label="申请人英文名称" prop="ditp.aplname">
+        <el-form-item label="MT799(79)申请人英文名称" prop="ditp.aplname">
             <c-input  v-model="model.ditp.aplname" maxlength="100" @blur="BlurAplname"></c-input>
         </el-form-item>
        </c-col>             

src/views/Home/cells/Hall.vue

@@ -223,7 +223,7 @@ export default {
 }
 
 .display1 {
-    padding: 5px 0 35px 0;
+    padding: 5px 0 55px 0;
 }
 
 .display2 {

src/views/Public/Ccvpan.vue

@@ -301,7 +301,8 @@
         <!-- </c-col> -->
       </el-form-item>
 
-      <el-form-item label="Additional Information ">
+      <el-form-item label="Additional Information "
+        v-if="model.liaall.liaccv.addinf!=''">
         <c-input
           type="textarea"
           :rows="5"

src/views/Public/Docpan.vue

@@ -158,6 +158,7 @@
                 <el-form-item
                     label="国内证落款"
                     prop="trnmod.trndoc.advnam"
+                    v-if="root.trnName=='DITCAN' || root.trnName == 'BDTSET' || root.trnName == 'TRTAME' || root.trnName == 'TRTSET' || root.trnName == 'DETOPN' || root.trnName == 'DETAME' || root.trnName == 'BFTDRV' || root.trnName == 'BFTSND' || root.trnName == 'BPTOPN' || root.trnName == 'BPTAME' || root.trnName == 'BPTSET' || root.trnName == 'BFTACC' || root.trnName == 'DFTAME' || root.trnName == 'DFTSET'"
                 >
                     <c-input
                         v-model="model.trnmod.trndoc.advnam"

src/views/Review/Business/ReviewBotacc.vue

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

src/views/Review/Business/ReviewBotpay.vue

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

src/views/Review/ReviewRouter.js

@@ -42,6 +42,8 @@ import ReviewBetset from "./Business/ReviewBetset.vue";
 import ReviewDetame from "./Business/ReviewDetame.vue";
 import ReviewBetdcr from "./Business/ReviewBetdcr.vue";
 import ReviewLitdav from "./Business/ReviewLitdav.vue";
+import ReviewBotacc from "./Business/ReviewBotacc.vue";
+import ReviewBotpay from "./Business/ReviewBotpay.vue";
 
 
 const ReviewRouter = [
@@ -103,6 +105,8 @@ const ReviewRouter = [
     { path: "detame", component: ReviewDetame, name: "ReviewDetame", meta: { title: "复核-Detame" } },
     { path: "betdcr", component: ReviewBetdcr, name: "ReviewBetdcr", meta: { title: "复核-Betdcr" } },
     { path: "litdav", component: ReviewLitdav, name: "ReviewLitdav", meta: { title: "复核-Litdav" } },
+    { path: "botacc", component: ReviewBotacc, name: "ReviewBotacc", meta: { title: "复核-Botacc" } },
+    { path: "botpay", component: ReviewBotpay, name: "ReviewBotpay", meta: { title: "复核-Botpay" } },
 
 ];