Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/components/SearchInput.vue

@@ -258,7 +258,7 @@ export default {
   position: relative;
 }
 .search-wrapper >>> .el-input {
-  z-index: 2001;
+  /* z-index: 2001; */
 }
 .search-wrapper >>> .el-input .el-input__inner {
   height: 30px;

src/views/Business/Bdtset/Utlp.vue

 <template>
-  <div class="eibs-tab">
+  <div class="eibs-tab" style="margin-left:9px;">
 
     <c-col :span="24">
         <c-col :span="11">
@@ -530,7 +530,7 @@
     <c-col :span="23" style="height: 0px">
         <el-divider></el-divider>
     </c-col>
-    <c-col :span="22" :offset="1">
+    <c-col :span="23" :offset="0">
         <c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false" :showSelection="true">
         </c-istream-table>
       </c-col>
@@ -542,7 +542,7 @@
     <c-col :span="23" style="height: 0px">
         <el-divider></el-divider>
     </c-col>
-    <c-col :span="22" :offset="1">
+    <c-col :span="23" :offset="0">
         <div class="e-table-wrapper">
           <c-table :data="model.bptbck.bptbckg" style="width: 100%" :paginationShow="false">
             <el-table-column prop="ownref" label="Reference" width="auto">

src/views/Business/Ditopn/Ovwp.vue

@@ -76,13 +76,14 @@
           </c-fullbox>
         </el-form-item>
       </c-col>
-      <c-col :span="11">
+      <c-col :span="13">
         <c-form-item label="信用证金额" prop="didgrp.cbs.nom1.cur" previewLabel="信用证币种">
           <c-select
             disabled
             v-model="model.didgrp.cbs.nom1.cur"
             placeholder="请选择Currency"
             @keyup.enter.native="nom1CurEvent"
+            style="width:100%"
           >
             <el-option
               v-for="item in codes.cur"
@@ -94,16 +95,15 @@
           </c-select>
         </c-form-item>
       </c-col>
-      <c-col :span="13">
+      <c-col :span="11">
         <c-form-item
           previewLabel="信用证金额"
-          style="text-align: left"
+          style="text-align: left;"
           label-width="5px"
           prop="didgrp.cbs.nom1.amt"
         >
           <c-input-currency
             v-model="model.didgrp.cbs.nom1.amt"
-            style="text-align: left; width: 100%"
             placeholder="请输入信用证金额"
             @keyup.enter.native="defaultFunction('didgrp.cbs.nom1.amt', model.didgrp.cbs.nom1.amt)"
           ></c-input-currency>
@@ -120,21 +120,28 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <c-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
-          <c-input
-            v-model="model.didgrp.rec.nomtop"
-            maxlength="9"
-            style="width: 48%"
-            placeholder="请输入Amount Tolerance - Positive"
-          ></c-input>
-          <label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
-          <c-input
-            v-model="model.didgrp.rec.nomton"
-            maxlength="9"
-            style="width: 48%"
-            placeholder="请输入Amount Tolerance - Negative"
-          ></c-input>
-        </c-form-item>
+            <c-col :span="13">
+               <c-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
+                    <c-input
+                        v-model="model.didgrp.rec.nomtop"
+                        maxlength="9"
+                        style="width: 100%"
+                        placeholder="请输入Amount Tolerance - Positive"
+                    ></c-input>
+                </c-form-item>
+            </c-col>
+            <c-col :span="1" style="text-align:center">
+                <label style="display:inline-block;width:calc(3% - 4px);text-align:center;">-</label>
+            </c-col>
+            <c-col :span="10">
+                <c-input
+                    v-model="model.didgrp.rec.nomton"
+                    maxlength="9"
+                    style="width: 100%"
+                    placeholder="请输入Amount Tolerance - Negative"
+                ></c-input>
+            </c-col>
+        
       </c-col>
       <!-- <c-col :span="12" style="text-align: left">
         <el-form-item
@@ -153,7 +160,7 @@
 
       <!-- <c-col> &nbsp; </c-col> -->
 
-      <c-col :span="11">
+      <c-col :span="13">
         <el-form-item label="信用证最大金额" prop="didgrp.cbs.max.cur">
           <c-select
             v-model="model.didgrp.cbs.max.cur"
@@ -172,7 +179,7 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="13">
+      <c-col :span="11">
         <el-form-item label="" label-width="5px" prop="didgrp.cbs.max.amt">
           <c-input
             v-model="model.didgrp.cbs.max.amt"
@@ -308,7 +315,7 @@
         </el-form-item>
       </c-col>
       <c-col :span="11">
-        <el-form-item label="报文类型">
+        <el-form-item label="报文类型" label-width="40%" style="text-align:right">
           <c-select v-model="model.ditp.msgtyp" placeholder="请选择报文类型"
            :code="getValues('ditp.msgtyp')"
            :disabled="model.didgrp.rec.elcflg!='Y'" />

src/views/Business/Infdid/Infsea.vue

@@ -296,7 +296,7 @@
     </c-list-search>
 
     <c-col :span="24" style="margin-top: 10px">
-      <c-button class="medium_bcs" size="medium" type="primary" @click="toDitopn">信用证开立</c-button>
+      <c-button class="medium_bcs" size="medium" style="margin-left: 0px" type="primary" @click="toDitopn">信用证开立</c-button>
     </c-col>
 
     <!-- <el-row> -->

src/views/Business/Sptsel/Menu.vue

@@ -428,11 +428,11 @@ export default {
       // setColumn: [],
       stmData: {
         columns: [
-          '4 1 "交易代码" 70 ',
+          '4 1 "交易代码" 80 ',
           '5 2 "业务编号" 300',
-          '6 3 "交易名称" 140',
+          '6 3 "交易名称" 150',
           //'1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
-          {index:1,position:4,width:100,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
+          {index:1,position:4,width:110,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
           '17 5 "报文类型" 100',
           '18 6 "对方银行BIC" 110',
           '7 7 "创建时间" 160 20 DateTime 1',

src/views/Business/Sptsel/Sptbrk/Menu.vue

@@ -380,7 +380,7 @@ export default {
       },
       stmData: {
         columns: [
-          '4 1 "交易代码" 70 ',
+          '4 1 "交易代码" 80 ',
           '5 2 "业务编号" 300',
           '6 3 "交易名称" 180',
           // '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',

src/views/Business/Sptsel/Sptpopup.vue

@@ -16,7 +16,7 @@
           </el-form-item>
         </c-col>
         <c-col :span="2" style="text-align:right">
-         <c-button size="small" @click="exit">返回</c-button>
+         <c-button type="primary" size="small" @click="exit">返回</c-button>
        </c-col>
         <c-col :span="24" style="height: 10px">
           <el-divider></el-divider>

src/views/Layout/Header.vue

@@ -180,7 +180,8 @@ export default {
       this.langSelectVisible = false;
     },
     showLogoutDialog(flg) {
-      this.$refs.logoutform.show(flg);
+      // this.$refs.logoutform.show(flg);
+      this.$store.dispatch("TagsView/delAllViews").then(() => this.$router.push("/login"))
     },
     showChgPwdDialog() {
       this.$refs["chgPwdForm"].dialogOpen = true;