Merge branch 'master' of http://114.115.138.98:8900/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: 32px;
-  margin-bottom: 5px;
+  height: 28px;
+  /* margin-bottom: 5px; */
 }
 .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: 10px 20px; position: relative">
+    <div style="flex: 1; padding: 3px 10px; position: relative">
       <slot></slot>
     </div>
   </div>

src/model/Ditopn/index.js

@@ -201,6 +201,8 @@ export default class Ditopn{
 							exttotamt:"",	
 							liaallg:[],		//  Total booking amount external assinged		.liaall.exttotamt
 							limmod:{
+								limgrd:[],
+								lmegrd:[],
 								limpts:{
 									wrklab:"",			//  Label		.liaall.limmod.limpts.wrklab
 									othlab:"",			//  Label		.liaall.limmod.limpts.othlab

src/views/Business/Ditopn/Engp.vue

@@ -26,7 +26,7 @@
         <el-table-column prop="tenpct" label="%" width="80px"> 
         </el-table-column>
         <el-table-column prop="acc" label="Account" width="150px"> </el-table-column>
-        <el-table-column prop="valdat" label="Value Date" width="120px">
+        <el-table-column prop="valdat" label="Value Date" width="200px">
          <!-- <template slot-scope="scope">
                   {{dateFormat(scope.row.valdat)}}
          </template> -->

src/views/Business/Ditopn/Limitbody.vue

@@ -230,7 +230,28 @@
            -->
 
         <c-col :span="23" style="margin-left:9px">
-            <c-table style="text-align: center" :data="tableData" :border="true">
+            <c-table :list="model.liaall.limmod.limgrd" :border="true">
+                <el-table-column prop="" label="可否串用" width="auto">
+                </el-table-column>
+                <el-table-column label="序号" width="auto"> </el-table-column>
+                <el-table-column label="额度类型" width="auto">
+                </el-table-column>
+                <el-table-column label="入账机构" width="auto">
+                </el-table-column>
+                <el-table-column label="额度编号" width="auto">
+                </el-table-column>
+                <el-table-column label="额度明细编号" width="auto">
+                </el-table-column>
+                <el-table-column label="额度品种代码" width="auto">
+                </el-table-column>
+                <el-table-column label="品种代码描述" width="auto">
+                </el-table-column>
+                <el-table-column label="" width="auto"> </el-table-column>
+            </c-table>
+        </c-col>
+
+        <c-col :span="23" style="margin-left:9px" v-if="false">
+            <c-table :list="model.liaall.limmod.lmegrd" :border="true">
                 <el-table-column label="可否串用" width="auto">
                 </el-table-column>
                 -->

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

@@ -225,8 +225,9 @@ export default {
   border-bottom: 1px solid #d8dce5;
   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-top: 5px; */
+  /* padding-bottom: 5px; */
+  padding-bottom: 1px;
 }
 
 .tags-view-container .tags-view-wrapper .tags-view-item {
@@ -244,7 +245,7 @@ export default {
   margin-top: 4px;
 }
 .tags-view-container .tags-view-wrapper .tags-view-item:first-of-type {
-  margin-left: 15px;
+  margin-left: 10px;
 }
 .tags-view-container .tags-view-wrapper .tags-view-item:last-of-type {
   margin-right: 15px;