Explorar o código

修复工序配置排序问题,质检参数项全屏显示的问题

695593266@qq.com hai 9 meses
pai
achega
43ae005617

+ 10 - 1
src/views/material/BOMmanage/components/workmanship.vue

@@ -562,7 +562,16 @@
         });
         if (data?.length > 0) {
           this.currentTableData = data[0];
-          return data[0].taskParam;
+          let dataList = [];
+          if (data[0].taskParam.length != 0) {
+            dataList = data[0].taskParam.sort(
+              (it, ie) => Number(it.sort) - Number(ie.sort)
+            );
+          }
+
+          return dataList;
+
+          // return data[0].taskParam;
         } else {
           return [];
         }

+ 12 - 2
src/views/material/BOMmanage/qualityTesting/term.vue

@@ -4,12 +4,13 @@
       ref="table"
       :columns="columns"
       :datasource="list"
-      height="calc(100vh - 500px)"
+      :height="tableHeight"
       tool-class="ele-toolbar-form"
       cache-key="inspectionClassify"
       row-key="qualityLevelId"
       :selection.sync="selection"
       @selection-change="handleSelectionChange"
+      @fullscreen-change="fullscreenChange"
     >
       <template v-slot:toolbar>
         <el-button @click="handAdd" size="mini" type="primary" v-if="!isView"
@@ -233,7 +234,8 @@
             slot: 'action',
             fixed: 'right'
           }
-        ]
+        ],
+        tableHeight: 'calc(100vh - 500px)'
       };
     },
 
@@ -262,6 +264,14 @@
         this.$refs.termRef.open(this.list);
       },
 
+      fullscreenChange(fullscreen) {
+        if (fullscreen) {
+          this.tableHeight = 'calc(100vh - 120px)';
+        } else {
+          this.tableHeight = 'calc(100vh - 500px)';
+        }
+      },
+
       async getDictList(code) {
         let { data: res } = await getByCode(code);
         this.dictList = res.map((item) => {

+ 2 - 2
vue.config.js

@@ -38,12 +38,12 @@ module.exports = {
 
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.125:18086',
-
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',
 
-        target: 'http://192.168.1.116:18086',
+        // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {