Browse Source

Merge branch 'develop_fenbiao0309' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh13

# Conflicts:
#	public/version.json
lilei 2 years ago
parent
commit
7015feb7f6
1 changed files with 11 additions and 9 deletions
  1. 11 9
      src/views/inventoryManagement/intelligentReplenishment/import.vue

+ 11 - 9
src/views/inventoryManagement/intelligentReplenishment/import.vue

@@ -26,7 +26,7 @@
           <div class="btn-cont">
           <div class="btn-cont">
             <a-button
             <a-button
               type="primary"
               type="primary"
-              v-if="errorFlag.indexOf('1')==-1"
+              v-if="errorFlag"
               id="intelligentReplenishmentLevel-submit"
               id="intelligentReplenishmentLevel-submit"
               size="large"
               size="large"
               class="button-primary"
               class="button-primary"
@@ -34,7 +34,7 @@
               style="padding: 0 60px;">确认导入</a-button>
               style="padding: 0 60px;">确认导入</a-button>
             <a-button
             <a-button
               type="primary"
               type="primary"
-              v-if="errorFlag.indexOf('1')!=-1"
+              v-else
               id="intelligentReplenishmentLevel-set"
               id="intelligentReplenishmentLevel-set"
               size="large"
               size="large"
               class="button-primary"
               class="button-primary"
@@ -67,7 +67,7 @@ export default {
       tableHeight: 500,
       tableHeight: 500,
       cellStyleOption: {
       cellStyleOption: {
           bodyCellClass: ({ row, column, rowIndex }) => {
           bodyCellClass: ({ row, column, rowIndex }) => {
-            return row.cost ? 'redBg-row':'';
+            return row.errorFlag == 1 ? 'redBg-row':'';
           },
           },
       },
       },
       columns: [
       columns: [
@@ -79,10 +79,10 @@ export default {
         { title: '是否淘汰', field: 'eliminateText',key: "f", width: 100, align: 'center',operationColumn: false,renderBodyCell: ({ row, column, rowIndex }, h) => { return row[column.field] || '--'}},
         { 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: '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: '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: [],
       listData: [],
-      errorFlag: []
+      errorFlag: false
     }
     }
   },
   },
   methods: {
   methods: {
@@ -101,11 +101,13 @@ export default {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = i + 1
-              this.errorFlag.push(data.list[i].errorFlag)
+            this.errorFlag = data.isok
+            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
           this.spinning = false
         })
         })