diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 624ba191..f1ad9ada 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -462,6 +462,7 @@ export default { this.findCurOrder(); } else { this.formData.busType = this.$route.query.busType + this.findCurOrder(); this.$refs.inputRef.focus(); } diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue index f2ae4265..a61af13f 100644 --- a/src/views/collect/PanelOrderDeal.vue +++ b/src/views/collect/PanelOrderDeal.vue @@ -221,26 +221,26 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue index d254deb6..673ce363 100644 --- a/src/views/collect/PannelOrderBiz.vue +++ b/src/views/collect/PannelOrderBiz.vue @@ -297,7 +297,13 @@ export default { rowStyle({row, rowIndex}) { let rowBackground = {}; - if (row.count != row.scanActCount) { + if (row.autoTagStatus == 2) { + rowBackground.color = '#fffb00'; + }else + if (row.scanActCount > row.count) { + rowBackground.color = '#000000'; + }else + if (row.scanActCount < row.count) { rowBackground.color = '#f60303'; }