brtudp交易ui美化

src/assets/css/common.css

@@ -187,9 +187,10 @@
   line-height: var(--lineheight);
   font-size: var(--normalfont);
 }
+
 /* input框去除margin值 */
-.el-input--prefix .el-input__inner{
-  padding-right:0px;
+.el-input--prefix .el-input__inner {
+  padding-right: 0px;
 }
 
 .el-form-item--small .el-form-item__content,
@@ -313,7 +314,6 @@
 }
 
 .el-dialog__body
-
 /* form 必填项的内容区域颜色突出显示 *
   暂时封掉
   .el-form-item.is-required .el-form-item__content .el-input__inner, 
@@ -367,13 +367,16 @@
 }
 
 /* 表格中去除下边距 */
-.el-table__row .cell .el-form-item--mini.el-form-item,.el-table__row .cell .el-form-item--small.el-form-item{
+.el-table__row .cell .el-form-item--mini.el-form-item,
+.el-table__row .cell .el-form-item--small.el-form-item {
   margin-bottom: 0px;
 }
+
 /* 表格按钮居中 */
-.cell{
+.cell {
   text-align: center;
 }
+
 .el-tooltip__popper.is-dark {
   max-width: 600px;
 }
@@ -418,25 +421,25 @@
   border-bottom: 0px solid #fff;
 }
 
-.el-collapse .el-collapse-item__wrap{
+.el-collapse .el-collapse-item__wrap {
   /* background-color: var(--bgcolor); */
   border-bottom: 0px solid #fff;
 }
 
-.el-collapse-item__header{
+.el-collapse-item__header {
   /* background-color: var(--bgcolor); */
   font-size: 15px;
   font-weight: bold;
   border-bottom: 0px solid #fff;
 }
 
-.el-collapse-item__header.is-active{
+.el-collapse-item__header.is-active {
   font-size: 15px;
   font-weight: bold;
-  color:#1561E0;
+  color: #1561E0;
 }
 
-.el-collapse-item__arrow.is-active{
+.el-collapse-item__arrow.is-active {
   transform: rotate(0deg);
 }
 
@@ -448,9 +451,9 @@
   padding-left: 20px;
 }
 
-.el-button{
+.el-button {
   height: 32px;
-  padding:0px 15px !important;
+  padding: 0px 15px !important;
 }
 
 
@@ -465,89 +468,92 @@
 }
 
 /* 表格内+、-调整 */
-.el-table__fixed-header-wrapper .cell .el-button{
+.el-table__fixed-header-wrapper .cell .el-button {
   width: 32px;
-  padding:0px !important;
+  padding: 0px !important;
 }
 
 /* 去除按钮默认圆角 */
-.el-button{
-  border-radius:0px;
+.el-button {
+  border-radius: 0px;
 }
 
 /* 去除input框默认圆角 */
-.el-input__inner{
-  border-radius:0px;
+.el-input__inner {
+  border-radius: 0px;
 }
 
 /* 去除勾选框默认圆角 */
-.el-checkbox__inner{
-  border-radius:0px;
+.el-checkbox__inner {
+  border-radius: 0px;
 }
 
 /* 去除文本框默认圆角 */
-.el-textarea__inner{
-  border-radius:0px;
+.el-textarea__inner {
+  border-radius: 0px;
 }
 
 /* 去除tabs标签默认圆角 */
-.el-tabs--card>.el-tabs__header .el-tabs__nav{
-  border-radius:0px;
+.el-tabs--card>.el-tabs__header .el-tabs__nav {
+  border-radius: 0px;
   margin-bottom: -1px;
 }
 
 /* 去除表格左右滑动默认圆角 */
-.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li{
-  border-radius:0px;
+.el-pagination.is-background .btn-next,
+.el-pagination.is-background .btn-prev,
+.el-pagination.is-background .el-pager li {
+  border-radius: 0px;
 }
 
 
 @media screen and (min-width: 2561px) {
 
-  #business_container .eibs-tab{
+  #business_container .eibs-tab {
     padding: 25px 28px;
   }
 }
 
 @media screen and (min-width: 1921px) and (max-width: 2560px) {
 
-   #business_container .eibs-tab{
+  #business_container .eibs-tab {
     padding: 20px 23px;
   }
 }
 
 @media screen and (min-width: 1441px) and (max-width: 1920px) {
 
-   #business_container .eibs-tab{
+  #business_container .eibs-tab {
     padding: 20px 18px;
   }
 }
 
 @media screen and (min-width: 1200px) and (max-width: 1440px) {
 
-   #business_container .eibs-tab{
+  #business_container .eibs-tab {
     padding: 20px 15px;
   }
 }
 
 @media screen and (max-width: 1199px) {
 
-   #business_container .eibs-tab{
+  #business_container .eibs-tab {
     padding: 20px 10px;
   }
 }
 
 /* checkbox右对齐 */
-.el-checkbox{
+.el-checkbox {
   float: right;
   text-align: center;
 }
 
 /* checkbox左对齐 */
-.checkbox-left{
+.checkbox-left {
   float: left;
   text-align: center;
 }
+
 /* .el-checkbox:last-of-type{
   margin-right:30px;
 } */
@@ -558,22 +564,23 @@ margin-left: 120px;
 }
 
 /* 去除工具条默认圆角 */
-.toolbar-core{
-  border-radius:0px;
+.toolbar-core {
+  border-radius: 0px;
 }
 
 /* 改变折叠面板箭头样式 */
-.el-icon-arrow-right:before{
+.el-icon-arrow-right:before {
   content: "";
   display: inline-block;
   color: #ecf5ff;
-  width: 97%;
-  height: 5px;
+  /* width: 97%;
+  height: 5px; */
   border-top: 2px solid;
   margin-right: 10px;
+  flex: 1;
 }
 
-.el-icon-arrow-right:after{
+.el-icon-arrow-right:after {
   content: "\e791";
 }
 
@@ -582,11 +589,11 @@ margin-left: 120px;
 }
 
 /* 左箭头 */
-.el-icon-arrow-left:before{
+.el-icon-arrow-left:before {
   content: "\e792";
 }
 
-.el-collapse-item__arrow{
+.el-collapse-item__arrow {
   border-bottom: 0px solid #fff;
   color: var(--themecolor);
   margin: 0 10px 0 10px;
@@ -594,6 +601,8 @@ margin-left: 120px;
   font-weight: 300;
   content: '';
   flex: 1;
+  display: flex;
+  align-items: center;
 }
 
 /* .el-input__inner {
@@ -612,12 +621,11 @@ margin-left: 120px;
   }
 } */
 
- /* 更改文本框的placeholder的颜色 */
- /* input[type=text]::placeholder {
+/* 更改文本框的placeholder的颜色 */
+/* input[type=text]::placeholder {
   color: blue;
  } */
 
- /* .el-input__inner::placeholder {
+/* .el-input__inner::placeholder {
   color: blue;
  } */
\ No newline at end of file
-

src/components/IStreamTable.vue

@@ -56,7 +56,8 @@
       appenD-to-body
       v-if="showButtonFlg"
     >
-      <el-form-item label-width="0">
+      <el-form-item label-width="0" style="display: flex;
+    align-items: center;">
         <el-checkbox-group v-model="columnGroup" @change="handleColumnChange">
           <el-checkbox
             class="selectColumnClass checkbox-left"

src/views/Business/Brtudp/Docpre.vue

@@ -46,20 +46,20 @@
       </c-col>
 
       <!-- 表格 -->
-      <c-col :span="24">
+      <!-- <c-col :span="24">
         <c-docpre :model="model" :argadr="{
           path: 'brdgrp.blk.prsdoc',
           grp: 'brtp',
           code: 'docpre',
         }"></c-docpre>
-      </c-col>
+      </c-col> -->
 
 
     </c-col>
 
     <!--=== ========================================右边======================================== -->
     <c-col :span="12" style="padding-left: 20px;">
-      <c-col :span="24">
+      <!-- <c-col :span="24">
         <c-checkbox v-model="model.brdgrp.rec.igndisflg">忽略不符点</c-checkbox>
       </c-col>
 
@@ -67,7 +67,32 @@
         <c-checkbox v-model="docdisflg"
         @change="docdisDefault"
         >录入不符点</c-checkbox>
-        <!-- <c-checkbox v-model="model.brdgrp.blk.docdisflg">不符点修改</c-checkbox> -->
+      </c-col> -->
+      <c-col :span="12">
+        <el-form-item
+          label=""
+          prop="brdgrp.rec.igndisflg"
+          label-width="0px"
+        >
+        <c-checkbox
+          style="margin: 0px 0 10px 120px;float: left;"
+          v-model="model.brdgrp.rec.igndisflg"
+          >忽略不符点</c-checkbox
+        >
+        </el-form-item>
+      </c-col>
+      <c-col :span="12">
+        <el-form-item
+          label=""
+          prop="brdgrp.blk.docdis"
+        >
+        <c-checkbox
+          style="margin: 0px 0 10px 150px;"
+          v-model="docdisflg"
+        @change="docdisDefault"
+          >录入不符点</c-checkbox
+        >
+        </el-form-item>
       </c-col>
 
       <c-col :span="24">
@@ -87,7 +112,7 @@
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="不符点通知日期" prop="brdgrp.rec.disdat" label-width="155px">
+        <el-form-item label="不符点通知日期" prop="brdgrp.rec.disdat">
           <c-date-picker type="date" v-model="model.brdgrp.rec.disdat" style="width: 100%"
             placeholder="请选择日期" disabled></c-date-picker>
         </el-form-item>
@@ -96,6 +121,17 @@
 
     </c-col>
 
+    <!-- 底部表格 -->
+    <c-col :span="24" label-width="0px">
+        <c-docpre
+          :model="model"
+          :argadr="{
+            path: 'brdgrp.blk.prsdoc',
+            grp: 'brtp',
+            code: 'docpre',
+          }"
+        ></c-docpre>
+      </c-col>
 
    
   </div>

src/views/Business/Brtudp/Mt750p.vue

@@ -132,41 +132,41 @@
           ></c-input>
         </el-form-item>
       </c-col>
-      <c-col :span="18" :offset="6">
+      <c-col :span="24">
+        <el-form-item label="" prop="" class="checkbox-left">
           <c-checkbox v-model="model.brdgrp.blk.docdisflg" disabled
             >不符点修改</c-checkbox
           >
+        </el-form-item>
         <!-- <c-checkbox v-model="model.brdgrp.blk.docdisflg">不符点修改</c-checkbox> -->
       </c-col>
     </c-col>
-
-   
   </div>
 </template>
 <script>
-import Api from '~/service/Api'
-import commonProcess from '~/mixin/commonProcess'
-import CodeTable from '~/config/CodeTable'
-import Event from '~/model/Brtudp/Event'
-import Ptap1 from '~/views/Public/Ptap1'
+import Api from "~/service/Api";
+import commonProcess from "~/mixin/commonProcess";
+import CodeTable from "~/config/CodeTable";
+import Event from "~/model/Brtudp/Event";
+import Ptap1 from "~/views/Public/Ptap1";
 
 export default {
   components: {
-    'c-ptap1': Ptap1,
+    "c-ptap1": Ptap1,
     // "c-ptap": Ptap,
     // "c-ptsmsg": Ptsmsg,
   },
-  inject: ['root'],
-  props: ['model', 'codes'],
+  inject: ["root"],
+  props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {}
+    return {};
   },
   methods: {
     ...Event,
-    onSeainf(){}, 
+    onSeainf() {},
   },
   created: function () {},
-}
+};
 </script>
 <style></style>

src/views/Business/Brtudp/Ovwp.vue

@@ -10,12 +10,12 @@
       <el-collapse-item title="不符点通知" name="mt750p" v-if="model.brdgrp.rec.advtyp == '750'">
         <m-mt750p :model="model" :codes="codes" />
       </el-collapse-item>
-      <el-collapse-item title="装运详情" name="shpdet" v-if="model.brdgrp.rec.dscinsflg">
-        <m-shpdet :model="model" :codes="codes" />
-      </el-collapse-item>
       <el-collapse-item title="付款通知" name="mt754p" v-if="model.brdgrp.rec.advtyp == '754'">
         <m-mt754p :model="model" :codes="codes" />
       </el-collapse-item>
+      <el-collapse-item title="装运详情" name="shpdet" v-if="model.brdgrp.rec.dscinsflg">
+        <m-shpdet :model="model" :codes="codes" />
+      </el-collapse-item>
       <el-collapse-item title="通知详情" name="othadvtypp" v-if="model.brdgrp.rec.advtyp == 'oth'">
         <m-othadvtypp :model="model" :codes="codes" />
       </el-collapse-item>
@@ -46,6 +46,8 @@ import Othadvtypp from "./Othadvtypp";
 import Cfap from "./Cfap";
 import Conp from "./Conp";
 import Dclpp from "./Dclpp";
+// import Shisuan from "./Shisuan";
+
 
 export default {
   components: {

src/views/Business/Brtudp/Payp.vue

@@ -418,7 +418,7 @@
       <!-- ====================================右边 ======================================-->
       <c-col :span="12" style="padding-left: 20px">
         <!--  信用证余额 -->
-        <c-col :span="12">
+        <c-col :span="13">
           <c-form-item label="信用证余额" prop="lidgrp.cbs.opn1.cur">
             <c-input
               v-model="model.lidgrp.cbs.opn1.cur"
@@ -428,8 +428,8 @@
             ></c-input>
           </c-form-item>
         </c-col>
-        <c-col :span="12">
-          <c-form-item label="" label-width="10px" prop="lidgrp.cbs.opn1.amt">
+        <c-col :span="11">
+          <c-form-item label="" label-width="5px" prop="lidgrp.cbs.opn1.amt">
             <c-input
               v-model="model.lidgrp.cbs.opn1.amt"
               placeholder=""

src/views/Business/Brtudp/Shisuan.vue

 <template>
-  <div class="eibs-tab">
+  <div class="eibs">
                               
        <c-col :span="24">
         <div class="e-table-wrapper">
@@ -17,13 +17,13 @@
                   prop="cur"
                   label="业务币种"
                   sortable
-                  width="80">
+                  width="70">
                 </el-table-column>
                 <el-table-column
                   prop="cbeamt"
                   label="业务发生额"
                   sortable
-                  width="90">
+                  width="100">
                 </el-table-column>
                 <el-table-column
                   prop="reqtyp1"

src/views/Business/Brtudp/index.vue

@@ -38,9 +38,28 @@
           </el-tab-pane>
 
           <!--PD000001 -->
+          <!-- <el-tab-pane label="统一授信" name="limitbody">
+            <c-content>
+              <m-limitbody :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
+          <el-collapse-item title="试算" name="shisuan">
+        <m-shisuan :model="model" :codes="codes"/>
+      </el-collapse-item> -->
           <el-tab-pane label="统一授信" name="limitbody">
             <c-content>
+              <div class="eibs-tab">
+                <el-collapse v-model="activeNames">
+                  <el-collapse-item title="统一授信" name="limitbody">
+                    <!-- 统一授信 -->
                     <m-limitbody :model="model" :codes="codes" />
+                  </el-collapse-item>
+                  <el-collapse-item title="试算" name="shisuan">
+                    <!-- 试算 -->
+                    <m-shisuan :model="model" :codes="codes" />
+                  </el-collapse-item>
+                </el-collapse>
+              </div>
             </c-content>
           </el-tab-pane>
 
@@ -237,7 +256,7 @@ import Ovwp from "./Ovwp";
 // import Docpan from "./Docpan";
 // import Doctre from "./Doctre";
 import Cfap from "./Cfap";
-import Shisuan from "./Shisuan";
+// import Shisuan from "./Shisuan";
 // import Limitbody from "./Limitbody";
 import Conp from "./Conp";
 import Dclpp from "./Dclpp";
@@ -251,6 +270,7 @@ 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 Shisuan from "~/views/Public/Shisuan";
 
 export default {
   name: "Brtudp",

src/views/Business/Litopn/Ovwp.vue

@@ -8,6 +8,14 @@
         <!-- 详情 -->
         <m-detp :model="model" :codes="codes" />
       </el-collapse-item>
+      <el-collapse-item
+        title="附加金额"
+        name="aamp"
+        v-if="model.litp.aamp.aammod.addamtflg"
+      >
+        <!-- 附加金额 -->
+        <m-aamp :model="model" :codes="codes" />
+      </el-collapse-item>
       <el-collapse-item title="当事人" name="ptyp">
         <!-- 当事人 -->
         <m-ptyp :model="model" :codes="codes" />
@@ -25,14 +33,6 @@
         <m-doxp :model="model" :codes="codes" :dtyp="'adcp'" :rec="'lid'" />
       </el-collapse-item>
       <el-collapse-item
-        title="附加金额"
-        name="aamp"
-        v-if="model.litp.aamp.aammod.addamtflg"
-      >
-        <!-- 附加金额 -->
-        <m-aamp :model="model" :codes="codes" />
-      </el-collapse-item>
-      <el-collapse-item
         title="仅适用于指定银行的特殊付款条款"
         name="spcrcvp"
         v-if="model.lidgrp.rec.spcrcbflg"