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

@@ -4046,8 +4046,8 @@ const CodeTable = {
         { label: "是", value: "X" },
     ],
     key2: [
-        { label: "Transaction", value: "TRN" },
-        { label: "Database", value: "DBF" },
+        { label: "交易", value: "TRN" },
+        { label: "数据库", value: "DBF" },
     ],
     payrol: [
         { label: "第二通知行", value: "A2B" },
@@ -4151,7 +4151,7 @@ const CodeTable = {
         { label: "借方", value: "UMS" },
     ],
     payrol1: [
-        { label: "Applicant", value: "APL" },
+        { label: "申请人", value: "APL" },
         { label: "Further Party", value: "OTH" },
     ],
     ptyp2:[
@@ -6651,12 +6651,12 @@ const CodeTable = {
         { label: "APL 申请人", 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" },
+        { label: "A2B 第二通知行", value: "A2B" },
+        { label: "ADV 通知行", value: "ADV" },
+        { label: "APL 申请人", value: "APL" },
+        { label: "AVB 可用银行", value: "AVB" },
+        { label: "BEN 受益人", value: "BEN" },
+        { label: "CON 保兑行", value: "CON" },
     ],
     ptydbt: [
         { label: "OWN Ourselves", value: "OWN" },
@@ -6974,9 +6974,6 @@ const CodeTable = {
         { label: "电子汇总征税保函", value: "02" },
     ],
 
-    // typgar: [
-    //     { label: "农民工工资保函", value: "1" },
-    // ],
     gtxinr: [
         { label: "性能保函2", value: "00000008" },
         { label: "预付款保函", value: "00000006" },
@@ -7111,19 +7108,19 @@ const CodeTable = {
     ],
     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" },
+        { label: "ADV 通知行", value: "ADV" },
+        { label: "APL 申请人", value: "APL" },
+        { label: "AVB 可用银行", value: "AVB" },
+        { label: "BEN 受益人", value: "BEN" },
+        { label: "CON 保兑行", 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" },
+        { label: "A2B 第二通知行", value: "A2B" },
+        { label: "ADV 通知行", value: "ADV" },
+        { label: "AVB 可用银行", value: "AVB" },
+        { label: "BEN 受益人", value: "BEN" },
+        { label: "CON 保兑行", value: "CON" },
     ],
     apprul2: [
         { label: "保函受ICC见索即付保函规则约束", value: "URDG" },
@@ -7218,13 +7215,13 @@ const CodeTable = {
         {label:"GB 英国",value:"GB"},
     ],
     ctytxt2:[
-        {label:"People's Republic of China",value:"CN"},
-        {label:"HONG KONG",value:"HK"},
-        {label:"Great Britain",value:"GB"},
+        {label:"中华人民共和国",value:"CN"},
+        {label:"香港",value:"HK"},
+        {label:"英国",value:"GB"},
     ],
     trndoc_advdoc: [
-        { label: "经核验，证实电相符/印鉴相符。", value: "" },
-        { label: "信用证真实性待核实。", value: "2" },
+        { label: "经核验，证实电相符/印鉴相符", value: "" },
+        { label: "信用证真实性待核实", value: "2" },
     ],
     swiftflg:[
         {label:"是",value:"Y"},
@@ -7367,14 +7364,14 @@ const CodeTable = {
         { label: "选定的用户", value: "<SELU>" },
     ],
     sta_ordrel: [
-        { label: "All", value: "" },
-        { label: "Break", value: "BRK" },
-        { label: "Correction", value: "COR" },
-        { label: "Delete", value: "DEL" },
-        { label: "ORD Break", value: "CMB" },
-        { label: "ORD Correction", value: "CMR" },
-        { label: "ORD Delete", value: "DES" },
-        { label: "ORD Waiting", value: "CRE" },
+        { label: "全部", value: "" },
+        { label: "终止", value: "BRK" },
+        { label: "修改", value: "COR" },
+        { label: "删除", value: "DEL" },
+        { label: "ORD终止", value: "CMB" },
+        { label: "ORD修改", value: "CMR" },
+        { label: "ORD删除", value: "DES" },
+        { label: "ORD等待", value: "CRE" },
         { label: "已发布", value: "REL" },
         { label: "总行退回", value: "CTR" },
     ],
@@ -7382,6 +7379,15 @@ const CodeTable = {
         { label: "全部业务", value: "" },
         { label: "国内业务", value: "1" },
         { label: "国际业务", value: "2" }
-    ]
+    ],
+    fintyp_bpd1: [
+        { label: "出口贴现", value: "D" },
+        { label: "出口押汇", value: "P" },
+        { label: "汇入汇款押汇", value: "I" },
+        { label: "票据买断", value: "F" },
+        { label: "第三方参贷", value: "U" },
+        { label: "国内证包买单据", value: "G" },
+        { label: "国内证第三方风险参贷", value: "V" },
+    ],
 }
 export default CodeTable;

src/model/Litdav/Default.js

@@ -69,5 +69,6 @@ export default {
     "lidgrp.cbs.nom1.cur"                      :Utils.defaultFunction,
     "brdgrp.ben.pts.nam"                      :Utils.defaultFunction,
     "brdgrp.rec.docprbrol"                      :Utils.defaultFunction,
+    "brdgrp.prb.pts.ref"                      :Utils.defaultFunction,
 }
 //你可以添加自动default处理

src/views/Business/Betset/Setp.vue

@@ -453,13 +453,13 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="Narrative:77A:" prop="trnmod.trndoc.nar754">
+        <el-form-item label="叙述内容（77A）" prop="trnmod.trndoc.nar754">
           <c-input
             type="textarea"
             v-model="model.trnmod.trndoc.nar754"
             maxlength="35"
             show-word-limit
-            placeholder="请输入Narrative:77A:"
+            placeholder="请输入叙述内容（77A）"
           ></c-input>
         </el-form-item>
       </c-col>

src/views/Business/Bptopn/Bptopnp.vue

@@ -217,7 +217,7 @@
                 placeholder=""
               >
                 <el-option
-                  v-for="item in codes.fintyp_bpd"
+                  v-for="item in codes.fintyp_bpd1"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -398,6 +398,7 @@
           <c-col :span="12">
             <el-form-item label="百分比" prop="bpdgrp.rec.pctfin">
               <c-input
+                disabled
                 v-model="model.bpdgrp.rec.pctfin"
                 placeholder="请输入百分比"
               ></c-input>
@@ -669,6 +670,7 @@
           <c-col :span="12">
             <el-form-item label="借据编号" prop="bpdgrp.rec.fincod">
               <c-input
+                disabled
                 v-model="model.bpdgrp.rec.fincod"
                 maxlength="17"
                 placeholder=""
@@ -679,6 +681,7 @@
           <c-col :span="12">
             <el-form-item label="计息日期" prop="bptmod.finmod.intdat">
               <c-input
+                :disabled="model.bptmod.finmod.intprd==''||model.bptmod.finmod.intprd=='6'||model.bptmod.finmod.intprd=='7'"
                 v-model="model.bptmod.finmod.intdat"
                 maxlength="2"
                 placeholder="请输入计息日期"
@@ -740,6 +743,7 @@
           <c-col :span="12">
             <el-form-item label="月日数" prop="bptmod.finmod.ratchgdat">
               <c-input
+                :disabled="!(model.bptmod.finmod.ratchgtyp=='4'||model.bptmod.finmod.ratchgtyp=='5')"
                 v-model="model.bptmod.finmod.ratchgdat"
                 maxlength="4"
                 placeholder=""
@@ -753,6 +757,7 @@
           <c-col :span="12">
             <el-form-item label="融资天数" prop="bpdgrp.rec.intday">
               <c-input
+                disabled
                 v-model="model.bpdgrp.rec.intday"
                 placeholder=""
               ></c-input>
@@ -792,6 +797,7 @@
           <c-col :span="12">
             <el-form-item label="浮动值" prop="bptmod.finmod.fltval">
               <c-input
+                :disabled="model.bptmod.finmod.flttyp=='0'||model.bptmod.finmod.flttyp==''"
                 v-model="model.bptmod.finmod.fltval"
                 placeholder="请输入浮动值"
               ></c-input>
@@ -822,6 +828,7 @@
           <c-col :span="12">
             <el-form-item label="罚息比率" prop="bptmod.finmod.ovdintrat">
               <c-input
+                :disabled="model.bptmod.finmod.ovdinttyp!='1'"
                 v-model="model.bptmod.finmod.ovdintrat"
                 placeholder="请输入罚息比率"
               ></c-input>
@@ -866,6 +873,7 @@
           <c-col :span="12">
             <el-form-item label="第三方还款账号" prop="bptmod.finmod.act3">
               <c-input
+                :disabled="model.bptmod.finmod.acttyp==''"
                 v-model="model.bptmod.finmod.act3"
                 style="width: 100%"
                 placeholder="请输入第三方还款账号"

src/views/Business/Brtset/Utlp.vue

@@ -141,11 +141,22 @@
        </c-col>
        <c-col :span="24">
         <el-form-item label="待付款单据" style="margin-bottom: 0;">            
+                    <c-istream-table
+
+                ref="table"
+                :list="model.liaall.tenstm.rows || []"
+                :columns="columns"
+                :showSelection=true
+                v-on:multipleSelect="multipleSelect"
+                prop="liaall.tenstm"
+                >
+                </c-istream-table>
 
         </el-form-item>
        </c-col>
         <c-col :span="24">
             <el-form-item label="" label-width="0">
+                <!--
                 <c-istream-table
                 ref="table"
                 :list="model.liaall.tenstm.rows || []"
@@ -154,7 +165,7 @@
                 v-on:multipleSelect="multipleSelect"
                 prop="liaall.tenstm"
                 >
-                </c-istream-table>
+                </c-istream-table>-->
             </el-form-item>
         </c-col>
          <c-col :span="24">
@@ -232,8 +243,8 @@
                       </c-select>
                 </el-form-item>
             </c-col>
-           <c-col :span="12"  class="centerLable marginLable">
-                <el-form-item label=""  prop="mtabut.clsflg" style="text-align: left; margin-left: -160px;float:left;">
+           <c-col :span="12"  class="">
+                <el-form-item label=" " prop="mtabut.clsflg" label-width="120px" style=" float:left;">
         	        <c-checkbox v-model="model.mtabut.clsflg"  true-label="X">闭卷标识</c-checkbox>
                 </el-form-item>
             </c-col>
@@ -256,7 +267,7 @@
        </c-col>
 
        <c-col :span="24">
-        <el-form-item label="" label-width="0" >
+        <el-form-item label="待偿还账单"  >
             <div class="e-table-wrapper">
                 <c-table
                     style="text-align: center"
@@ -366,32 +377,28 @@
      
 
 
-       <c-col :span="12" class="centerLable marginLable">
-        <el-form-item label="" prop="trtcre.crefinflg" style="text-align: left; margin-left: -160px;float:left;"> 
+       <c-col :span="24" class="">
+        <el-form-item label=" " prop="trtcre.crefinflg" label-width="120px" style=" float:left;"> 
 	        <c-checkbox v-model="model.trtcre.crefinflg" :disabled="model.paypsb != '' || model.brdgrp.rec.frepayflg !=''?true:false">创建融资</c-checkbox>
         </el-form-item>
-       </c-col>       
 
+        <el-form-item label=" " prop="dftcre.dfflag" label-width="120px" style=" float:left;">
+	        <c-checkbox v-model="model.dftcre.dfflag">同业代付</c-checkbox>
+        </el-form-item>
 
+       </c-col>       
 
 
 
-       <c-col :span="12">
-        <el-form-item label="" prop="dftcre.dfflag">
-	    <c-checkbox v-model="model.dftcre.dfflag">同业代付</c-checkbox>
-        </el-form-item>
-       </c-col>
 
-         <c-col :span="12" class="centerLable marginLable">
-            <el-form-item label="" prop="paypsb" style="text-align: left; margin-left: -160px;float:left;">
+         <c-col :span="24" class="">
+            <el-form-item label=" " prop="paypsb" label-width="120px" style=" float:left;">
 	                <c-checkbox v-model="model.paypsb"
                         :disabled="model.brdgrp.rec.frepayflg == ''?false:true"
 	                >垫款</c-checkbox>
             </el-form-item>
-       </c-col>
 
-       <c-col :span="12">
-        <el-form-item label="" prop="brdgrp.rec.frepayflg">
+            <el-form-item label=" " prop="brdgrp.rec.frepayflg" label-width="120px" style=" float:left;">
 	        <c-checkbox v-model="model.brdgrp.rec.frepayflg">自由付款标志</c-checkbox>
             </el-form-item>
        </c-col>
@@ -416,8 +423,8 @@
        </c-col>
 
        <c-col :span="24">
-        <el-form-item label=":77A:内容" prop="nar754">
-            <c-input type="textarea" v-model="model.nar754" maxlength="700" show-word-limit placeholder="请输入:77A:内容" ></c-input>
+        <el-form-item label="77A字段" prop="nar754">
+            <c-input type="textarea" v-model="model.nar754" maxlength="700" show-word-limit placeholder="请输入77A字段内容" ></c-input>
         </el-form-item>
         </c-col>
 
@@ -497,8 +504,8 @@ export default {
              table1:[],
             columns:[
                 "1 1 \"类型\" 80",
-                "2 2 \"债务方\" 80",
-                "3 3 \"债券方\" 80",
+                "2 2 \"债务方\" 100",
+                "3 3 \"债券方\" 100",
                 "4 4 \"币种\" 80",
                 "5 5 \"金额\" 85 2 8 1 4",
                 "6 6 \"到期日\" 105 4 7 1"

src/views/Business/Brtset/index.vue

@@ -395,7 +395,7 @@ export default {
 
   created: async function () {
     console.log("进入brtset交易");
-    let rtnmsg = await this.init({});
+    let rtnmsg = await this.init(this.$route.query);
     if (rtnmsg.respCode == SUCCESS) {
       this.updateModel(rtnmsg.data);
       this.model.mtabut.clsflg = "X";

src/views/Business/Litcan/Canp.vue

@@ -166,16 +166,11 @@
 
       
                   
-       <c-col :span="24" class="centerLable marginLable">
+       <c-col :span="24" class="">
 
-        <el-form-item
-          label=""
-          style="text-align: left; margin-left: -160px;float:left;"
-          prop="byinst"
-        >
+        <el-form-item label=" " prop="byinst" label-width="120px" style=" float:left;">
           <c-checkbox v-model="model.byinst" 
-            >关于申请人的指示</c-checkbox
-          >
+            >关于申请人的指示</c-checkbox>
         </el-form-item>
 
         <!--c-checkbox style="text-align: left; margin-left: -160px;float:left;" v-model="model.byinst">关于申请人的指示</c-checkbox-->

src/views/Business/Litdav/Davp.vue

@@ -199,6 +199,7 @@
             style="width:100%" 
             placeholder="请选择Presented by"
             :code="codes.docprbrol"
+            @change="selectOrCheckboxRule('brdgrp.rec.docprbrol')"
             >
             </c-select>
         </el-form-item>
@@ -215,6 +216,7 @@
             v-model="model.brdgrp.prb.pts.extkey" 
             maxlength="16"  
             placeholder="请输入地址编码"
+            :disabled="model.brdgrp.rec.docprbrol != 'PRB'"
             @keyup.enter.native="showGridPromptDialog('brdgrp.prb.pts.extkey')"
             ></c-input>
             <template slot="footer">
@@ -240,7 +242,12 @@
         <el-form-item label="地址信息" prop="brdgrp.prb.pts.adrblk">
             <c-input 
             :rows="4"
-            disabled type="textarea" v-model="model.brdgrp.prb.pts.adrblk" maxlength="80" show-word-limit placeholder="请输入地址信息" ></c-input>
+            :disabled="model.brdgrp.rec.docprbrol != 'PRB'"
+             type="textarea" 
+             v-model="model.brdgrp.prb.pts.adrblk" 
+             maxlength="80" 
+             show-word-limit 
+             placeholder="请输入地址信息" ></c-input>
         </el-form-item>
         </c-col>
     </el-col>                   

src/views/Business/Litopn/Ovwp1.vue

@@ -657,12 +657,8 @@
             </c-col>
             -->
 
-      <c-col :span="12" class="centerLable marginLable">
-        <el-form-item
-          label=""
-          style="text-align: left; margin-left: -160px;float:left;"
-          prop="lidgrp.rec.rmbflg"
-        >
+      <c-col :span="12" class="">
+        <el-form-item label=" " prop="lidgrp.rec.rmbflg" label-width="120px" style=" float:left;">
           <c-checkbox
             v-model="model.lidgrp.rec.rmbflg"
             true-label="Y"

src/views/Layout/SideMenu.vue

@@ -392,8 +392,7 @@ export default {
 }
 
 .el-submenu__title,
-.el-menu-item,
-.el-submenu .el-menu-item {
+.el-menu-item {
   font-size: 14px;
   height: 40px;
   line-height: 40px;
@@ -401,6 +400,13 @@ export default {
 .el-submenu__title.active{
   font-weight: bold;
 }
+
+.el-submenu .el-menu-item {
+  height: 40px;
+  line-height: 40px;
+  font-size: 12px;
+}
+
 .el-menu-vertical-demo [class^="el-icon-caret-"] {
   color: #606266;
 }

src/views/Public/Ccvpan.vue

@@ -146,12 +146,8 @@
           style="text-align: left"
           prop="liaall.liaccv.gleflg"
         >
-          <c-col :span="7" class="centerLable marginLable">
-            <el-form-item
-              label=""
-              style="text-align: left; margin-left: -160px;float:left;"
-              prop="liaall.liaccv.gleflg"
-            >
+          <c-col :span="7" class="">
+            <el-form-item label=" " prop="liaall.liaccv.gleflg" label-width="120px" style=" float:left;">
               <c-checkbox v-model="model.liaall.liaccv.gleflg">过账</c-checkbox>
             </el-form-item>
           </c-col>