Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/components/FunctionBtn.vue

@@ -125,8 +125,8 @@ export default {
   flex-wrap: nowrap;
   justify-content: space-between;
   align-items: flex-start;
-  height: 28px;
-  /* margin-bottom: 5px; */
+  height: 29px;
+  /* margin-bottom: 1px; */
 }
 .m-funcBtn-eContainer {
   order: 1;

src/components/c-page.vue

@@ -4,7 +4,7 @@
       <i class="el-icon-location" style="color: #409eff;"></i>
       <span>{{ title }}</span>
     </div> -->
-    <div style="flex: 1; padding: 3px 10px; position: relative">
+    <div style="flex: 1; padding: 5px 15px; position: relative">
       <slot></slot>
     </div>
   </div>

src/views/Business/Ditopn/Engp.vue

@@ -13,7 +13,7 @@
         <el-table-column prop="nam" label="Name" width="170px"> </el-table-column>
         <el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
         <el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
-        <el-table-column prop="oldamt" label="Old Amount" width="150px">
+        <el-table-column prop="oldamt" label="Old Amount" width="150px" fixed="right">
          <!-- <template slot-scope="scope">
                   {{moneyFormat(scope.row.oldamt)}}
          </template> -->

src/views/Layout/components/TagsView/index.vue

@@ -226,7 +226,6 @@ export default {
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
   /* box-sizing: inherit; */
   /* padding-top: 5px; */
-  /* padding-bottom: 5px; */
   padding-bottom: 1px;
 }
 

src/views/Public/Ccvpan.vue

@@ -242,7 +242,7 @@
         </el-table-column>
         <el-table-column prop="acccovamt" label="Acc Amount" width="150px">
         </el-table-column>
-        <el-table-column label="OP" width="75px">
+        <el-table-column label="OP" width="75px" fixed="right">
           <template slot-scope="scope">
             <c-button style="margin-left:0" type="primary" size="small" @click="onLiaccvDel(scope.$index,scope.row)">
             Del</c-button>

src/views/Public/Docpan.vue

@@ -130,7 +130,7 @@
                     </c-select>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="115px">
+            <el-table-column label="操作" width="115px" fixed="right">
                 <template slot-scope="scope">
                     <el-button
                         type="primary"

src/views/Public/Setpan.vue

@@ -149,7 +149,7 @@
                 </el-table-column>
                 <el-table-column label="Amount" prop="amt" width="150px">
                 </el-table-column>
-                <el-table-column label="" prop="det" width="80px">
+                <el-table-column label="" prop="det" width="80px" fixed="right">
                     <template slot-scope="scope" slot="header">
                         <el-button
                             circle
@@ -312,7 +312,7 @@
                 </el-table-column>
                 <el-table-column label="Fee Amount" prop="amt" width="150px">
                 </el-table-column>
-                <el-table-column label="" prop="det" width="80px">
+                <el-table-column label="" prop="det" width="80px" fixed="right">
                      <template slot-scope="scope" slot="header">
                         <el-button
                             circle
@@ -419,7 +419,7 @@
                 </el-table-column>
                 <el-table-column label="Rate" prop="rat" width="120px">
                 </el-table-column>
-                <el-table-column label="" width="80px"> 
+                <el-table-column label="" width="80px" fixed="right"> 
                     <template>
                         <el-button
                             style="margin-left:0"

src/views/TaskList/index.vue

@@ -58,6 +58,6 @@ export default {
 
 <style scoped>
 .eContainer-taskList {
-  padding: 3px 10px;
+  padding: 3px 15px;
 }
 </style>