lilei 2 rokov pred
rodič
commit
626858cca8

+ 6 - 4
src/views/inventoryManagement/intelligentReplenishment/import.vue

@@ -79,7 +79,7 @@ export default {
         { title: '是否淘汰', field: 'eliminateText',key: "f", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
         { title: '淘汰描述', field: 'eliminateDesc',key: "g", width: 200, align: 'center',operationColumn: false, ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
         { title: '备注', field: 'remark', width: 200,key: "h", align: 'center',operationColumn: false, ellipsis: { showTitle: true },renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'} },
-        { title: '错误原因', field: 'errorDesc',key: "i", width: 200, align: 'center',operationColumn: false, ellipsis: { showTitle: true } ,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}}
+        { title: '错误原因', field: 'errorDesc',key: "i", width: 200, align: 'center',operationColumn: false, ellipsis: { showTitle: true } ,renderBodyCell: ({ row, column, rowIndex }, h) => { return row.errorFlag == 1 ? (row[column.field] || '--') : '--'}}
       ],
       listData: [],
       errorFlag: false
@@ -102,10 +102,12 @@ export default {
           if (res.status == 200) {
             data = res.data
             this.errorFlag = data.isok
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = i + 1
+            const as = data.list.filter(item => item.errorFlag == 1)
+            const bs = data.list.filter(item => item.errorFlag != 1)
+            this.listData = as.concat(bs)
+            for (var i = 0; i < this.listData.length; i++) {
+              this.listData[i].no = i + 1
             }
-            this.listData = data.list
           }
           this.spinning = false
         })