diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue index 211b086c..9769ed04 100644 --- a/src/views/collect/PannelOrderBiz.vue +++ b/src/views/collect/PannelOrderBiz.vue @@ -26,14 +26,20 @@ - - - {{ scope.row.scanCount }}/{{ scope.row.shouldCount }} + + + + {{ scope.row.splitCount }} + + + + + {{ scope.row.prepnSpec }} @@ -233,6 +239,7 @@ export default { return 'warning' } if (row.scanActCount == null) return 'danger' + if (row.scanActCount + row.tempWorkPlaceCount > row.count) return 'success' if (row.scanActCount < row.count) return 'danger' if (row.scanActCount >= row.count) return 'success' return "success" @@ -274,6 +281,27 @@ export default { return row.scanCount < row.shouldCount ? 'error' : 'success' }, + getSplitCountClass(row) { + //判断是否已经预付码 + if (row.autoTagStatus === 2){ + if (row.scanCount > row.shouldCount){ + return "success" + } + return 'warning' + } + if (row.scanCount === 0 && row.splitCount > row.tempWorkPlaceCount){ + return 'error' + } + if (row.splitCount != 0 &&row.splitCount <= row.tempWorkPlaceCount && (row.scanActCount + row.tempWorkPlaceCount < row.count) ){ + return 'warning' + } + if(row.scanActCount + row.tempWorkPlaceCount >= row.count){ + return "success" + } + if(row.scanActCount < row.count){ + return "error" + } + }, customSort(a, b) { // 如果扫码数量和应扫码数量相等,则排在最后 if (a.scanCount >= a.shouldCount ) {