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

@@ -4134,6 +4134,10 @@ const CodeTable = {
         { label: "Credit Party", value: "UMH" },
         { label: "Debit Party", value: "UMS" },
     ],
+    payrol1: [
+        { label: "Applicant", value: "APL" },
+        { label: "Further Party", value: "OTH" },
+    ],
     ptyp2:[
         { label: "TPO Third Party", value: "TPO" },
         { label: "TP1 Third Party .", value: "TP1" },
@@ -6644,6 +6648,14 @@ const CodeTable = {
         { label: "ISS issuing Bank", value: "ISS" },
         { label: "APL Applicat", value: "APL" }
     ],
+    setfelRol1: [
+        { label: "A2B 2nd Advising Bank", value: "A2B" },
+        { label: "ADV Advising Bank", value: "ADV" },
+        { label: "APL Applicant", value: "APL" },
+        { label: "AVB Available with Bank", value: "AVB" },
+        { label: "BEN Beneficiary", value: "BEN" },
+        { label: "CON Confirming Bank", value: "CON" },
+    ],
     ptydbt: [
         { label: "OWN Ourselves", value: "OWN" },
         { label: "ISS issuing Bank", value: "ISS" },
@@ -7095,6 +7107,22 @@ const CodeTable = {
         { label: "OWN Ourselves", value: "OWN" },
         { label: "Advising Bank", value: "ADV" },
     ],
+    ptydbt_setpan1: [
+        { label: "OWN Ourselves", value: "OWN" },
+        { label: "ADV Advising Bank", value: "ADV" },
+        { label: "APL Applicant", value: "APL" },
+        { label: "AVB Available with Bank", value: "AVB" },
+        { label: "BEN Beneficiary", value: "BEN" },
+        { label: "CON Confirming Bank", value: "CON" },
+    ],
+    ptydbt_setpan2: [
+        { label: "OWN Ourselves", value: "OWN" },
+        { label: "A2B 2nd Advising Bank", value: "A2B" },
+        { label: "ADV Advising Bank", value: "ADV" },
+        { label: "AVB Available with Bank", value: "AVB" },
+        { label: "BEN Beneficiary", value: "BEN" },
+        { label: "CON Confirming Bank", value: "CON" },
+    ],
     apprul2: [
         { label: "The guarantee is subject to the ICC Rules for Demand Guarantees", value: "URDG" },
         { label: "The guarantee is subject to the ICC Rules for Contract Guarantees", value: "URCG" },

src/model/Brtdck/Pattern.js

@@ -183,6 +183,7 @@ export default {
     "days":[
         {required: true, message: "必输项"},
         // {max: 2,message:"长度不能超过2"}
+        // {pattern: /^-?[1-9][0-9]{0,2}$/, message: "应在-999至999之间" }
     ],
     "brtp.oth.namelc":[
         {type: "string", required: true, message: "必输项"},

src/views/Business/Brtdck/Brtdckp.vue

@@ -3,7 +3,7 @@
     <c-row>
 
       <!-- =================================左边================================= -->
-      <c-col :span="12">
+      <c-col :span="12" class="col-left">
         <!-- S0000198 : 信用证编号 -->
         <c-col :span="24">
           <c-form-item label="信用证编号" prop="lidgrp.rec.ownref">
@@ -86,7 +86,7 @@
                 v-model="model.brdgrp.cbs.max.amt"
                 placeholder=""
                 class="m-input-currency"
-                disabled
+                :disabled="model.mhtyp=='R'"
               ></c-input>
             </c-form-item>
           </c-col>
@@ -231,7 +231,6 @@
                 style="width: 100%"
                 placeholder=""
                 :code="codes.curtxt1"
-                disabled
               >
               </c-select>
             </el-form-item>
@@ -242,6 +241,7 @@
                 v-model="model.brdgrp.cbs.max.amt"
                 placeholder=""
                 class="m-input-currency"
+                :disabled="model.mhtyp=='R'"
               ></c-input>
             </c-form-item>
           </c-col>
@@ -275,7 +275,6 @@
                 style="width: 100%"
                 placeholder="请输入Drawn Add Amount"
                 :code="codes.curtxt1"
-                disabled
               >
               </c-select>
             </el-form-item>
@@ -287,6 +286,7 @@
                 v-model="model.brdgrp.cbs.max2.amt"
                 class="m-input-currency"
                 placeholder=""
+                :disabled="model.mhtyp=='R'"
               ></c-input>
             </c-form-item>
           </c-col>
@@ -431,7 +431,7 @@
       </c-col>
 
       <!-- =================================右边=============================== -->
-      <c-col :span="11" :offset="1">
+      <c-col :span="12" class="col-right">
         
         <!-- S0000192 : 信用证余额 -->
         <c-col :span="12">
@@ -526,7 +526,7 @@
               v-model="model.brdgrp.rec.payrol"
               style="width: 100%"
               placeholder="请输入付款人"
-              :code="codes.payrol"
+              :code="codes.payrol1"
             >
             </c-select>
           </el-form-item>

src/views/Business/Brtdck/Docpre.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
 
        <!--================================左边================================== -->
-   <c-col :span="11"> 
+   <c-col :span="12" class="col-left"> 
     <c-col :span="21" >           
         <el-form-item label="不符点信息" prop="brdgrp.blk.docdis" >
             <c-input type="textarea" v-model="model.brdgrp.blk.docdis" 
@@ -50,7 +50,7 @@
    </c-col>
   
           <!--===========================右边============================== -->
-   <c-col :span="11" :offset="1"> 
+   <c-col :span="12" class="col-right"> 
     <c-col :span="24">           
         <c-checkbox v-model="model.brdgrp.rec.igndisflg">忽略不符点</c-checkbox>
     </c-col>

src/views/Business/Brtdck/Shpdet.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
 
     <!--=== ==========左边=============== -->
-    <c-col :span="11"> 
+    <c-col :span="12" class="col-left"> 
       <c-col :span="24">
         <el-form-item label="提货担保申请人" prop="brdgrp.rec.relgodflg">
             <c-select v-model="model.brdgrp.rec.relgodflg" style="width:100%" placeholder="请选择提货担保申请人" :code="codes.relgod">
@@ -95,7 +95,7 @@
       </c-col>
     </c-col>
     <!--=== ==========右边=============== -->
-    <c-col :span="11" :offset="1">
+    <c-col :span="12" class="col-right">
       <c-col :span="24">
         <el-form-item label="合同编号" prop="brtp.connum">
             <c-input  v-model="model.brtp.connum" maxlength="35"  placeholder="请输入合同编号"></c-input>

src/views/Business/Brtdck/index.vue

 <template>
+  <c-page>
     <div class="eContainer">
       <!-- <c-bus-button :$pntvm="this"></c-bus-button> j加操作按钮-->
-    <c-function-btn
-      :handleSubmit="handleSubmit"
-      :handleCheck="handleCheck"
-      :handleStash="handleStash"
-    >
-      <el-button size="small">查询</el-button>
-      <el-button size="small">用户确认</el-button>
-      <el-button size="small">检核</el-button>
-      <el-button size="small">日志</el-button>
-      <!-- <el-button size="small">保存模板</el-button> -->
-      <!-- <el-button size="small">使用模板</el-button> -->
-      <el-button size="small">imgyge</el-button>
-      <!-- <el-button size="small">拆分报文</el-button> -->
-      <el-button size="small">img</el-button>
-      <el-button size="small">His.img</el-button>
-    </c-function-btn>
-
       <el-form
         :model="model"
         :rules="rules"
@@ -55,16 +39,23 @@
               <m-shpdet :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
-        <!--liaall PD000027 Liability -->
-        <el-tab-pane label="表外记账" name="engp">
+
+          <el-tab-pane label="费用/账务" name="engp,setpan">
               <c-content>
+                <el-collapse v-model="fyzw">
+                  <el-collapse-item title="表外记账" name="engp">
+                    <!--liaall PD000027 Liability -->
                     <m-engp :model="model" :codes="codes" />
-          </c-content>
-        </el-tab-pane>
+                  </el-collapse-item>
+                  <el-collapse-item title="结算" name="setpan">
                     <!--setmod PD000000 Settlement -->
-        <el-tab-pane label="结算" name="setpan">
+                    <!-- 结算 -->
                     <m-setpan :model="model" :codes="codes" />
+                  </el-collapse-item>
+                </el-collapse>
+              </c-content>
             </el-tab-pane>
+
           <!--coninf PD000000 Completion -->
           <el-tab-pane label="提示信息" name="coninfp">
             <c-content>
@@ -72,11 +63,11 @@
             </c-content>
           </el-tab-pane>
           <!--trndoc PD000529 &Messages -->
-        <el-tab-pane label="报文和面函" name="docpan">
+          <el-tab-pane label="报文/面函" name="docpan">
             <m-docpan :model="model" :codes="codes" />
           </el-tab-pane>
           <!--trndoc PD000546 Attachments -->
-        <el-tab-pane label="附件" name="doctre">
+          <el-tab-pane label="附件信息" name="doctre">
             <c-content>
               <m-doctre :model="model" :codes="codes" />
             </c-content>
@@ -89,6 +80,22 @@
           </el-tab-pane>
         </c-tabs>
       </el-form>
+      <c-function-btn
+        :handleSubmit="handleSubmit"
+        :handleCheck="handleCheck"
+        :handleStash="handleStash"
+      >
+        <!-- <el-button size="small">查询</el-button> -->
+        <!-- <el-button size="small">用户确认</el-button> -->
+        <!-- <el-button size="small">检核</el-button> -->
+        <!-- <el-button size="small">日志</el-button> -->
+        <!-- <el-button size="small">保存模板</el-button> -->
+        <!-- <el-button size="small">使用模板</el-button> -->
+        <!-- <el-button size="small">imgyge</el-button> -->
+        <!-- <el-button size="small">拆分报文</el-button> -->
+        <!-- <el-button size="small">img</el-button> -->
+        <!-- <el-button size="small">His.img</el-button> -->
+      </c-function-btn>
       <c-grid-ety-prompt-dialog
         ref="etyDialog"
         :promptData="promptData"
@@ -103,6 +110,7 @@
       >
       </c-grid-ety-prompt-dialog>
     </div>
+  </c-page>
 </template>
 <script>
 import Api from '~/service/Api'
@@ -121,14 +129,14 @@ import Shpdet from './Shpdet'
 // import Coninfp from "./Coninfp"
 // import Docpan from "./Docpan"
 // import Doctre from "./Doctre"
-// import Limitbody from "./Limitbody"
+import Limitbody from "./Limitbody"
 
 import Engp from '~/views/Public/Engp'
 import Setpan from '~/views/Public/Setpan'
 import Coninfp from '~/views/Public/Coninfp'
 import Docpan from '~/views/Public/Docpan'
 import Doctre from '~/views/Public/Doctre'
-import Limitbody from '~/views/Public/Limitbody'
+// import Limitbody from '~/views/Public/Limitbody'
 
 export default {
   name: 'Brtdck',

src/views/Business/Litdck/Litdckp.vue

@@ -271,7 +271,8 @@
         <c-col :span="12">
 	    <c-checkbox 
         :disabled="this.model.brdgrp.blk.docdisflg == 'X'"
-        v-model="model.brdgrp.rec.dscinsflg">记录单据和不符点</c-checkbox>
+        v-model="model.brdgrp.rec.dscinsflg"
+        @change="dscinsflgChange">记录单据和不符点</c-checkbox>
        </c-col>
        <c-col :span="24">
             <el-form-item label="最迟送达日期" prop="zcsdrq">
@@ -551,6 +552,14 @@ export default {
     methods:{...Event},
     created:function(){
 
+    },
+    dscinsflgChang(){
+        if(this.model.brdgrp.rec.dscinsflg==='X'){
+            this.model.brdgrp.rec.docsta='H'
+        }
+        else{
+            this.model.brdgrp.rec.docsta='G'
+        }
     }
 }
 </script>

src/views/Business/Litdck/index.vue

@@ -29,42 +29,58 @@
             label="不符点/说明"
             name="docpre"
           >
-            <m-docpre :model="model" :codes="codes" />
+            <c-content>
+                <m-docpre :model="model" :codes="codes"/>
+            </c-content>
           </el-tab-pane>
 
           <!--PD000027 -->
           <el-tab-pane label="表外记账" name="engp">
-            <m-engp :model="model" :codes="codes" />
+            <c-content>
+                <m-engp :model="model" :codes="codes"/>
+            </c-content>
           </el-tab-pane>
 
           <!--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>
 
           <!--PD000000 -->
           <el-tab-pane label="提示信息" name="coninfp">
-            <m-coninfp :model="model" :codes="codes" />
+            <c-content>
+                <m-coninfp :model="model" :codes="codes"/>
+            </c-content>
           </el-tab-pane>
 
           <!--PD000529 -->
           <el-tab-pane label="面函/报文" name="docpan">
-            <m-docpan :model="model" :codes="codes" />
+            <c-content>
+                <m-docpan :model="model" :codes="codes"/>
+            </c-content>
           </el-tab-pane>
 
           <!--PD000546 -->
           <el-tab-pane label="附件" name="doctre">
-            <m-doctre :model="model" :codes="codes" />
+            <c-content>
+                <m-doctre :model="model" :codes="codes"/>
+            </c-content>
           </el-tab-pane>
 
           <!--PD000001 -->
           <el-tab-pane label="货权单据" name="srmp">
-            <m-srmp :model="model" :codes="codes" />
+            <c-content>
+                <m-srmp :model="model" :codes="codes"/>
+            </c-content>
           </el-tab-pane>
 
           <!--PD000001 -->
           <el-tab-pane label="统一授信" name="limitbody">
-            <m-limitbody :model="model" :codes="codes" />
+            <c-content>
+                <m-limitbody :model="model" :codes="codes"/>
+            </c-content>
           </el-tab-pane>
         </c-tabs>
       </el-form>
@@ -107,15 +123,15 @@ import Docpre from "./Docpre";
 // import Coninfp from "./Coninfp"
 // import Docpan from "./Docpan"
 // import Doctre from "./Doctre"
-// import Limitbody from "./Limitbody"
-import Srmp from "./Srmp";
+import Limitbody from "./Limitbody"
+import Srmp from "./Srmp"
 
-import Engp from "~/views/Public/Engp";
-import Setpan from "~/views/Public/Setpan";
-import Coninfp from "~/views/Public/Coninfp";
-import Docpan from "~/views/Public/Docpan";
-import Doctre from "~/views/Public/Doctre";
-import Limitbody from "~/views/Public/Limitbody";
+import Engp from "~/views/Public/Engp"
+import Setpan from "~/views/Public/Setpan"
+import Coninfp from "~/views/Public/Coninfp"
+import Docpan from "~/views/Public/Docpan"
+import Doctre from "~/views/Public/Doctre"
+// import Limitbody from "~/views/Public/Limitbody"
 
 export default {
   name: "Litdck",