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

src/components/Table.vue

@@ -201,6 +201,9 @@ export default {
 .el-table .success-row {
   background: #f0f9eb;
 }
+.el-table--small td, .el-table--small th {
+    padding: 3px 0;
+}
 /* .eContainer-table thead tr th.is-leaf{
   border-bottom: transparent;
 } */

src/views/Business/Ditopn/Ccvpan.vue

@@ -184,13 +184,13 @@
         </c-button>
        </c-col>
        -->
-    <c-col :span="11" style="text-align: right">
-      <c-row>
-        <c-col :span="1" style="margin-right:35px;text-align: right">
+    <c-col :span="11" style="margin-left:25px;text-align:right">
+      <!-- <c-row> -->
+        <!-- <c-col :span="23" style="margin-left:35px;text-align:right"> -->
           <c-button size="small" type="primary" @click="onLiaccvAdd">
             Add
           </c-button>
-        </c-col>
+        <!-- </c-col> -->
           <el-dialog
             :visible.sync="dialogTableVisible"
             :close-on-click-modal="false"
@@ -212,12 +212,12 @@
             Del
           </c-button>
         </c-col> -->
-      </c-row>
+      <!-- </c-row> -->
     </c-col>
 
     <!-- <c-col :span="24"><div style="height: 10px"></div></c-col> -->
 
-    <c-col :span="23" style="margin:0 35px">
+    <c-col :span="23" style="margin:0 25px">
       <c-table
         :border="true"
         :list="model.liaall.liaccv.liaccvg"

src/views/Business/Ditopn/Ovwp.vue

@@ -91,12 +91,12 @@
                  
             </c-col> -->
 
-      <c-col :span="12">
+      <c-col :span="13">
         <el-form-item label="信用证金额" prop="didgrp.cbs.nom1.cur">
           <c-select
             disabled
             v-model="model.didgrp.cbs.nom1.cur"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择Currency"
             @keyup.enter.native="nom1CurEvent"
           >
@@ -110,10 +110,10 @@
           </c-select>
         </el-form-item>
       </c-col>
-      <c-col :span="12">
+      <c-col :span="11">
         <el-form-item
           style="text-align: left"
-          label-width="7px"
+          label-width="0"
           prop="didgrp.cbs.nom1.amt"
         >
           <c-input-currency
@@ -140,14 +140,14 @@
           <c-input
             v-model="model.didgrp.rec.nomtop"
             maxlength="9"
-            style="width: 55px"
+            style="width: 40%"
             placeholder="请输入Amount Tolerance - Positive"
           ></c-input>
-          <label style="display:inline-block;width:20.22px;text-align:center;">-</label>
+          <label style="display:inline-block;width:10%;text-align:center;">-</label>
           <c-input
             v-model="model.didgrp.rec.nomton"
             maxlength="9"
-            style="width: 55px"
+            style="width: 40%"
             placeholder="请输入Amount Tolerance - Negative"
           ></c-input>
         </el-form-item>
@@ -170,11 +170,11 @@
 
       <!-- <c-col> &nbsp; </c-col> -->
 
-      <c-col :span="12">
+      <c-col :span="13">
         <el-form-item label="信用证最大金额" prop="didgrp.cbs.max.cur">
           <c-select
             v-model="model.didgrp.cbs.max.cur"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择Currency"
             disabled
           >
@@ -189,8 +189,8 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="12">
-        <el-form-item label="" label-width="7px" prop="didgrp.cbs.max.amt">
+      <c-col :span="11">
+        <el-form-item label="" label-width="0" prop="didgrp.cbs.max.amt">
           <c-input
             v-model="model.didgrp.cbs.max.amt"
             placeholder="请输入信用证最大金额"
@@ -234,19 +234,19 @@
       </c-col>
 
       <c-col :span="24">
-      <c-col :span="12">
+      <c-col :span="13">
         <el-form-item label="开证日期" prop="didgrp.rec.opndat">
           <c-date-picker
             type="date"
             v-model="model.didgrp.rec.opndat"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择Date"
           ></c-date-picker>
         </el-form-item>
       </c-col>
       </c-col>
        <c-col :span="24">
-      <c-col :span="12">
+      <c-col :span="13">
         <el-form-item
           v-if="model.didgrp.rec.mytype == 'H'"
           label="最迟货物装运日"
@@ -256,7 +256,7 @@
             type="date"
             v-model="model.didgrp.rec.shpdat"
             value-format="yyyy-MM-dd"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择Date"
           ></c-date-picker>
         </el-form-item>
@@ -269,7 +269,7 @@
             type="date"
             v-model="model.didgrp.rec.shpdat"
             value-format="yyyy-MM-dd"
-            style="width: 45%"
+            style="width: 95%"
             placeholder="请选择Date"
           ></c-date-picker>
         </el-form-item>
@@ -282,20 +282,20 @@
             type="date"
             v-model="model.didgrp.rec.shpdat"
             value-format="yyyy-MM-dd"
-            style="width: 45%"
+            style="width: 95%"
             placeholder="请选择"
           ></c-date-picker>
         </el-form-item>
       </c-col>
       </c-col>
       <c-col :span="24">
-      <c-col :span="12">
+      <c-col :span="13">
         <el-form-item label="有效日期" prop="didgrp.rec.expdat">
           <c-date-picker
             type="date"
             v-model="model.didgrp.rec.expdat"
             value-format="yyyy-MM-dd"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择Date"
           ></c-date-picker>
         </el-form-item>

src/views/Public/Docpan.vue

@@ -130,9 +130,10 @@
                     </c-select>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="160">
+            <el-table-column label="操作" width="115px">
                 <template slot-scope="scope">
                     <el-button
+                        type="primary"
                         size="small"
                         :disabled="
                             model.trnmod.trndoc.doceot[scope.row.index]
@@ -140,13 +141,17 @@
                             model.didgrp.rec.elcflg == 'Y'
                         "
                         @click="handleDisplay(scope.row.index, scope.row)"
-                        >显示</el-button
+                        icon="el-icon-search"
+                        style="margin-left:0"
+                        ></el-button
                     >
                     <el-button
                         size="small"
-                        type="danger"
+                        type="primary"
+                        icon="el-icon-edit"
+                        style="margin-left:0"
                         @click="handleDetail(scope.row.index, scope.row)"
-                        >明细</el-button
+                        ></el-button
                     >
                 </template>
             </el-table-column>

src/views/Public/Setpan.vue

@@ -78,7 +78,7 @@
             <el-form-item
                 class="formItemLabel"
                 label="Foreign Commission/Charges:"
-                label-width="200px"
+                label-width="300px"
             >
             </el-form-item>
         </c-col>
@@ -321,7 +321,7 @@
             </c-table>
         </c-col>
         <setpan-dialog ref="setpanDialog" :model="model" :idx="index" :codes="codes"/>
-        <c-col :span="24" style="margin-left:9px;height:24px;margin-top:15px">
+        <c-col :span="23" style="margin-left:9px;height:24px;margin-top:15px">
             <el-form-item class="formItemLabel" label="Settlement:" label-width="200px">
             </el-form-item>
         </c-col>