Merge remote-tracking branch 'origin/development-202206' into development-202206

src/assets/css/common.css

@@ -415,6 +415,7 @@
 
 .el-collapse .el-collapse-item__wrap{
    /* background-color: var(--bgcolor); */
+  border-bottom: 0px solid #fff;
 }
 
 .el-collapse-item__header{
@@ -586,3 +587,28 @@ margin-left: 120px;
   flex: 1;
 }
 
+/* .el-input__inner {
+  &::placeholder {
+    color: red;
+}
+} */
+
+/* ::-ms-input-placeholder{
+  color: red;
+} */
+/* /deep/.el-input__inner {
+  &::placeholder {
+    color: red;
+    font-size: 16px;
+  }
+} */
+
+ /* 更改文本框的placeholder的颜色 */
+ /* input[type=text]::placeholder {
+  color: blue;
+ } */
+
+ /* .el-input__inner::placeholder {
+  color: blue;
+ } */
+

src/components/Table.vue

@@ -207,4 +207,8 @@ export default {
 /* .eContainer-table thead tr th.is-leaf{
   border-bottom: transparent;
 } */
+.eContainer-table-block .el-icon-arrow-right:before{
+  margin-right: 0px;
+  width: 0px;
+}
 </style>
\ No newline at end of file

src/views/Business/Betcan/Canp.vue

@@ -388,9 +388,9 @@
     </c-col>
     <c-col :span="24">
         <!-- SF000052 : to Beneficiary Side -->
-    <!-- SF000043 : Booking Procedure -->
+    <!-- SF000043 : 预订程序 -->
     <c-col :span="12">
-      <el-form-item label="Booking Procedure" prop="rebkpflg">
+      <el-form-item label="预订程序" prop="rebkpflg">
         <c-select
           v-model="model.rebkpflg"
           style="width: 100%"

src/views/Business/Bftcan/Canp.vue

@@ -346,11 +346,11 @@
     </c-col>
 
     <!-- <c-col :span="24">
-      <el-form-item label="Booking Procedure" prop="rebkpflg">
+      <el-form-item label="预订程序" prop="rebkpflg">
         <c-select
           v-model="model.rebkpflg"  
           style="width: 100%"
-          placeholder="请选择Booking Procedure"
+          placeholder="请选择预订程序"
         >
         </c-select>
       </el-form-item>
@@ -669,11 +669,11 @@
     </c-col>
 
     <c-col :span="12">
-      <el-form-item label="Booking Procedure" prop="rebkpflg">
+      <el-form-item label="预订程序" prop="rebkpflg">
         <c-select
           v-model="model.rebkpflg"
           style="width: 100%"
-          placeholder="请选择Booking Procedure"
+          placeholder="请选择预订程序"
         >
         </c-select>
       </el-form-item>

src/views/Business/Brtacp/Acpp.vue

@@ -307,9 +307,9 @@ export default {
     data() {
         return {
             furide: [
-        { label: "Negotiate", value: "NEG" },
-        { label: "Reimburse", value: "REI" },
-        { label: "See72", value: "SEE" },
+        { label: "议付", value: "NEG" },
+        { label: "偿付", value: "REI" },
+        { label: "见72域", value: "SEE" },
     ],
             flag: true,
         };

src/views/Business/Brtame/index.vue

@@ -41,15 +41,33 @@
                 <!--liaall PD000027 Liability -->
                 <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
                     <c-content>
-                        <m-engp :model="model" :codes="codes" />
+                      <div class="eibs-tab">
+                        <el-collapse v-model="fyzw">
+                          <el-collapse-item title="表外记账" name="engp">
+                            <!-- 表外记账 -->
+                            <m-engp :model="model" :codes="codes" />
+                          </el-collapse-item>
+                          <el-collapse-item title="结算" name="setpan">
+                            <!-- 结算 -->
+                            <m-setpan :model="model" :codes="codes" />
+                          </el-collapse-item>
+                          <el-collapse-item title="会计分录" name="glepan">
+                            <!-- 会计分录 -->
+                            <m-glepan :model="model" :codes="codes" />
+                          </el-collapse-item>
+                        </el-collapse>
+                      </div>
                     </c-content>
                 </el-tab-pane>
                
+
+                <!--
                 <el-tab-pane label="结算" name="setpan">
                     <c-content>
                     <m-setpan :model="model" :codes="codes" />
                     </c-content>
                 </el-tab-pane>
+                -->
 
                 <!-- <el-tab-pane label="会计分录" name="glepan">
                     <c-content>
@@ -145,6 +163,7 @@ export default {
             codes: {
                 ...CodeTable
             },
+            fyzw: ['engp'],
         };
     },
     methods: {

src/views/Business/Brtcan/Canp.vue

@@ -151,11 +151,11 @@
     </el-row>
 
     <c-col :span="12">
-      <el-form-item label="Booking Procedure" prop="rebkpflg">
+      <el-form-item label="预订程序" prop="rebkpflg">
         <c-select
           v-model="model.rebkpflg"
           style="width: 100%"
-          placeholder="请选择Booking Procedure"
+          placeholder="请选择预订程序"
           :code="codes.rebkpflg"
         >
         </c-select>

src/views/Business/Litame/Ovwp.vue

@@ -31,10 +31,10 @@
       <el-collapse-item title="单据修改" name="aamp" v-if="this.model.litp.aamp.aammod.addamtflg">
         <m-aamp :model="model" :codes="codes" />
       </el-collapse-item>
-      <el-collapse-item title="受益人特殊付款条件修改" name="spbpame" v-if="this.model.lidgrp.rec.spcbenflg">
+      <el-collapse-item title="受益人特殊付款条款修改" name="spbpame" v-if="this.model.lidgrp.rec.spcbenflg">
         <m-spbpame :model="model" :codes="codes" />
       </el-collapse-item>
-      <el-collapse-item title="Spe.pay.cond.bank only [Amend]" name="sprpame" v-if="this.model.lidgrp.rec.spcrcbflg">
+      <el-collapse-item title="银行专用付款条款修改" name="sprpame" v-if="this.model.lidgrp.rec.spcrcbflg">
         <m-sprpame :model="model" :codes="codes" />
       </el-collapse-item>
     </el-collapse>

src/views/Business/Litopn/Diapan.vue

@@ -124,7 +124,7 @@
                   
        <c-col :span="12">
         <el-form-item label="Entered by" prop="trnmod.trndia.diarec.usr">
-            <c-input  v-model="model.trnmod.trndia.diarec.usr" maxlength="8"  placeholder="请输入Entered by"></c-input>
+            <c-input  v-model="model.trnmod.trndia.diarec.usr" maxlength="8"  placeholder="请输入经办人"></c-input>
         </el-form-item>
        </c-col>
                   

src/views/Business/Sptneg/Menu.vue

@@ -35,7 +35,7 @@
                    </c-col>
                   <c-col :span="4">
                    <c-button size="small" type="primary"  @click="onUsfmodShwflt">
-                       Show & Set
+                       显示
                    </c-button>
                   </c-col>
                </c-col>

src/views/Business/Sptneg/Sptp0.vue

@@ -84,19 +84,19 @@
            <c-col :span="12">
                <c-col :span="12">
                 <el-form-item label="经办柜员" prop="spt.usr">
-                    <c-input  v-model="model.spt.usr" maxlength="8"  placeholder="请输入Entered by" disabled></c-input>
+                    <c-input  v-model="model.spt.usr" maxlength="8"  placeholder="请输入经办人" disabled></c-input>
                 </el-form-item>
                </c-col>
                <c-col :span="12">
                     <el-form-item label="at" prop="spt.dattim" label-width="50px">
-                        <c-input  v-model="model.spt.dattim"  placeholder="请输入Time of Creation" disabled></c-input>
+                        <c-input  v-model="model.spt.dattim"  placeholder="请输入创建时间" disabled></c-input>
                     </el-form-item>
                </c-col>
            </c-col>
 
            <c-col :span="12">
                <c-col :span="12">
-                <el-form-item label="in TRN" prop="spt.cretrn">
+                <el-form-item label="创建交易" prop="spt.cretrn">
                     <c-input  v-model="model.spt.cretrn" maxlength="6"  placeholder="请输入Creating Transaction ID" disabled></c-input>
                 </el-form-item>
                </c-col>

src/views/Business/Sptsel/Sptpopup.vue

@@ -167,7 +167,7 @@
               <c-input
                 v-model="model.spt.usr"
                 maxlength="8"
-                placeholder="请输入Entered by"
+                placeholder="请输入经办人"
                 disabled
               ></c-input>
             </el-form-item>
@@ -177,18 +177,18 @@
             <el-form-item label="at" prop="spt.dattim" label-width="50px">
               <c-input
                 v-model="model.spt.dattim"
-                placeholder="请输入Time of Creation"
+                placeholder="请输入创建时间"
                 disabled
               ></c-input>
             </el-form-item>
           </c-col>
 
           <c-col :span="7">
-            <el-form-item label="in TRN" prop="spt.cretrn" label-width="70px">
+            <el-form-item label="创建交易" prop="spt.cretrn" label-width="70px">
               <c-input
                 v-model="model.spt.cretrn"
                 maxlength="6"
-                placeholder="请输入Creating Transaction ID"
+                placeholder="请输入创建交易码"
                 disabled
               ></c-input>
             </el-form-item>

src/views/Business/Trnrel/InftrnpsDetail.vue

@@ -191,7 +191,7 @@
                             <c-col :span="24">
                                 <c-col :span="24">
                                     <el-form-item label="经办柜员">
-                                        <c-input  v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入Entered by"></c-input>
+                                        <c-input  v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入经办人"></c-input>
                                     </el-form-item>
                                 </c-col>             
                                                             

src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue

@@ -190,7 +190,7 @@
                             <c-col :span="24">
                                 <c-col :span="12">
                                     <el-form-item label="经办柜员">
-                                        <c-input  v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入Entered by"></c-input>
+                                        <c-input  v-model="model.recpan.cretrs.usr" maxlength="8" disabled placeholder="请输入经办人"></c-input>
                                     </el-form-item>
                                 </c-col>             
                                                             

src/views/Business/Trnrel/Trnp0.vue

@@ -140,7 +140,7 @@
                                    
        <c-col :span="12">
         <el-form-item label="经办柜员">
-            <c-input  v-model="model.recpan.cretrs.usr" maxlength="8"  placeholder="请输入Entered by"></c-input>
+            <c-input  v-model="model.recpan.cretrs.usr" maxlength="8"  placeholder="请输入经办人"></c-input>
         </el-form-item>
        </c-col>             
                                    

src/views/Home/config.js

@@ -14,15 +14,15 @@ export const cellDataDefinition = [
     name: "NoticeAnnouncement",
     description: "最新的通知公告",
   },
-  { title: "电子大厅", name: "Hall", description: "电子大厅" },
+  //{ title: "电子大厅", name: "Hall", description: "电子大厅" },
   {
     title: "大客户分析",
     name: "CustomerAnalyse",
     description: "客户数据分析",
   },
-  {
-    title: "快速查询",
-    name: "QuickSearch",
-    description: "交易快速查询入口",
-  },
+  //{
+  //  title: "快速查询",
+  //  name: "QuickSearch",
+  //  description: "交易快速查询入口",
+  //},
 ];

src/views/Public/Ccvpan.vue

@@ -194,7 +194,7 @@
       <c-table
         :border="true"
         :list="model.liaall.liaccv.liaccvg"
-        style="width:80%,text-align:center"
+        style="width:100%,text-align:center"
       >
         <el-table-column prop="ccdflg" label="调整标识" width="78px">
         </el-table-column>

src/views/Public/Engp.vue

@@ -6,7 +6,7 @@
         <c-col :span="24" style="">
           <c-table
             :list="model.liaall.liaallg"
-            style="width:80%,text-align:center,margin-bottom:18px"
+            style="width:100%,text-align:center,margin-bottom:18px"
             :border="true"
           >
             <el-table-column prop="bussec" label="业务" width="50px">

src/views/Public/Limitbody.vue

@@ -3,7 +3,7 @@
     
 
     <!-- 左边-->
-    <c-col :span="8">
+    <c-col :span="len==true?12:8" @change="spanChange">
       <!-- line2 -->
       <c-row>
         <c-col :span="24">
@@ -221,7 +221,7 @@
     </c-col>
 
     <!-- 右边-->
-    <c-col :span="8">
+    <c-col :span="len==true?12:8" @change="spanChange">
       <!-- line1 -->
       <c-row>
         <c-col :span="24">
@@ -362,7 +362,8 @@ export default {
   data() {
     return {
       tableData: {},
-      same:false
+      same:false,
+      len:true
     };
   },
   methods: {
@@ -450,6 +451,11 @@ export default {
       if(len1>0&&len2>0){
         this.same = true;
       }
+    },
+    spanChange(){
+      if(same==false){
+        len = true;
+      }
     }
   },
   created: function () {},