Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

pages/crm/statistical/costomer/approval.vue

@@ -31,7 +31,7 @@ export default {
         { key: 'schemaName', title: '类别', align: 'center' },
         { key: 'currentNodeName', title: '环节', align: 'center' },
         { key: 'nextNodeName', title: '下一环节', align: 'center' },
-        { key: 'creationTime', title: '创建时间', align: 'center' },
+        { key: 'creationTime', title: '创建时间', align: 'center',width:'190' },
         {
           key: 'id',
           title: '操作',

pages/qc/dataTrace/index.vue

@@ -17,7 +17,7 @@
     <div class="tableBox mb10" :style="{height:tbHeight}">
       <div class="table">
         <div v-if="listTask.length==0" class="wu_data">暂无数据</div>
-        <Row :gutter="16">
+        <Row :gutter="16" :style="{width:rowWidth}">
           <Col span="6" v-for="(item,index) in listTask" :key="index">
             <Card class="card">
               <h3 slot="title">
@@ -264,6 +264,7 @@ export default {
         total: 0, //总数
         conditions: []
       },
+      rowWidth:'',
       showPagesize: [20, 50, 100],
       showModel: false,
       list: [],
@@ -381,6 +382,9 @@ export default {
         .then(res => {
           this.listTask = res.result.items;
           this.search.total = res.result.totalCount;
+          if(this.listTask.length<4){
+            this.rowWidth = "100%"
+          }
         });
     },
     searchModel() {