diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index f118e522..7e0316a0 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -100,8 +100,11 @@
+
+
+
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{ formData.billNo }}
- {{ formData.shipperName }}
- {{ formData.fromCorpName }}
- {{ formData.billTime }}
-
+
+ {{ formData.billNo }}
+ {{ formData.shipperName }}
+ {{ formData.fromCorpName }}
+ {{ formData.billTime }}
+
-
+
-
-
-
-
-
- |
-
未赋码 |
-
-
-
-
- |
-
- 预赋码
- |
-
-
-
-
- |
-
- 已赋码
- |
-
+
+ {{ codingStatus }}
+
+
+
+
+
+
+ {{ scope.row.cpmctymc }}
+
+
+
{{ scope.row.count }}
-
+
- {{ scope.row.scanActCount }}
+ {{scope.row.scanCount}}/{{ scope.row.shouldCount }}
+
+
+
+
+ {{ scope.row.prepnSpec }}
+
+
+
+
+ {{ scope.row.spec }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ scope.row.ybbm }}
+
+
+
+
+ {{ scope.row.batchNo }}
+
+
-
+>
+
扫码明细({{scope.row.scanCount == null ? 0 : scope.row.scanCount }})
@@ -233,6 +259,7 @@ export default {
countVisible: false,
scanDetailVisible: false,
bizId: null,
+ codingStatus: '已赋码',
}
},
methods: {
@@ -348,6 +375,38 @@ export default {
return rowBackground;
},
+ getCellStyle(row){
+ let cellStyle = {
+ fontSize: '32px'
+ };
+ if (row.shouldCount == 0){
+ cellStyle.fontSize = '30px'
+ cellStyle.color = '#F56C6C'
+ return cellStyle;
+ }
+ if (row.scanCount < row.shouldCount) {
+ cellStyle.color = '#F56C6C';
+ } else if (row.scanCount === row.shouldCount) {
+ cellStyle.color = '#56a717';
+ }
+ return cellStyle;
+ },
+ // cellStyle({ row, column, rowIndex, columnIndex }) {
+ // return { height: '60px' };
+ // },
+ getTagColor(row) {
+ if (row.scanActCount < row.count) {
+ this.codingStatus = '未赋码'
+ return 'danger'; // 红色
+ } else if (row.autoTagStatus == 2) {
+ this.codingStatus = '预赋码'
+ return 'warning'; // 黄色
+ } else if (row.scanActCount >= row.count) {
+ this.codingStatus = '已赋码'
+ return 'success'; // 绿色
+ }
+ }
+
},
@@ -379,4 +438,5 @@ export default {