Browse Source

柯赛+生产进度看板,列宽还原回取配置

xiaost 4 months ago
parent
commit
3472bbba4c
2 changed files with 2 additions and 7 deletions
  1. 0 1
      src/views/makeprocess/index.vue
  2. 2 6
      src/views/makeprocess/list.vue

+ 0 - 1
src/views/makeprocess/index.vue

@@ -105,7 +105,6 @@ export default {
   },
   },
   beforeRouteEnter(to, from, next) {
   beforeRouteEnter(to, from, next) {
     next(vm => {
     next(vm => {
-      console.log(from.meta.title)
       if (from.meta.title == '组装看板' || from.meta.title == '车间看板') {
       if (from.meta.title == '组装看板' || from.meta.title == '车间看板') {
         vm.fromComponent = from.meta.title;
         vm.fromComponent = from.meta.title;
       }
       }

+ 2 - 6
src/views/makeprocess/list.vue

@@ -62,18 +62,14 @@ export default {
             for (let index = 0; index < columns.length; index++) {
             for (let index = 0; index < columns.length; index++) {
               const element = columns[index];
               const element = columns[index];
               if(element.width>0) {
               if(element.width>0) {
-                if(element.text == "抵达线体"){
-                  continue;
-                }else{
-                  headers.push(element.text);
-                }
+                headers.push(element.text);
                 columnWidths.push(element.width);
                 columnWidths.push(element.width);
                 fieldnames.push(element.dataIndex);
                 fieldnames.push(element.dataIndex);
                 aligns.push('center');
                 aligns.push('center');
               }
               }
             }
             }
             this.config.header = headers;
             this.config.header = headers;
-            this.config.columnWidth = [180,120,320,140,140,100,200,200,465];
+            this.config.columnWidth = columnWidths;
             this.config.align = aligns;
             this.config.align = aligns;
             let dataList = JSON.parse(result.data.data);
             let dataList = JSON.parse(result.data.data);
             let resultList = new Array();
             let resultList = new Array();