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

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-col :span="13">
                <c-form-item label="上下浮动限额" prop="didgrp.rec.nomtop">
                     <c-input
                         v-model="model.didgrp.rec.nomtop"
                         maxlength="9"
-            style="width: 48%"
+                        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: 48%"
+                    style="width: 100%"
                     placeholder="请输入Amount Tolerance - Negative"
                 ></c-input>
-        </c-form-item>
+            </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/Trnrel/InftrnpsDetail.vue

@@ -411,14 +411,14 @@ export default {
             stmData: {
                 columns: [
                     '1 1 "ID" 100',
-                    '2 2 "Service" 125',
+                    '2 2 "Service" 100',
                     // '3 3 "Status" 100',
                     {index:3,position:3,width:100,pattern:'code',label:'Status',code: CodeTable.wfetrssta},
-                    '4 4 "Last Update" 125',
+                    '4 4 "Last Update" 100',
                     '5 5 "Retries" 100',
-                    '6 6 "Text" 300',
-                    '7 7 "Contrary Text" 300',
-                    '8 8 "Target Time" 200'
+                    '6 6 "Text" 200',
+                    '7 7 "Contrary Text" 200',
+                    '8 8 "Target Time" auto'
                     ],
                 data: [],
             },

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

@@ -411,14 +411,14 @@ export default {
             stmData: {
                 columns: [
                     '1 1 "ID" 100',
-                    '2 2 "Service" 125',
+                    '2 2 "Service" 100',
                     // '3 3 "Status" 100',
                     {index:3,position:3,width:100,pattern:'code',label:'Status',code: CodeTable.wfetrssta},
-                    '4 4 "Last Update" 125',
+                    '4 4 "Last Update" 100',
                     '5 5 "Retries" 100',
-                    '6 6 "Text" 300',
-                    '7 7 "Contrary Text" 300',
-                    '8 8 "Target Time" 200'
+                    '6 6 "Text" 200',
+                    '7 7 "Contrary Text" 200',
+                    '8 8 "Target Time" auto'
                     ],
                 data: [],
             },