diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue
index b54779f3..68fdcedd 100644
--- a/src/views/collect/ConfirmDrugDealOrder.vue
+++ b/src/views/collect/ConfirmDrugDealOrder.vue
@@ -4,6 +4,7 @@
+
@@ -167,8 +168,8 @@
-
-
+
+
-
+
{{ formData.billTime }}
{{ formData.remark }}
+
+
+
+
+
+
@@ -599,7 +606,7 @@ export default {
needSplitConfirm: false,
workplaceId: null,
ws: null,
- scanTip: "单据录入:",
+ scanTip: "单据录入",
scanSplit: false,
info: {},
//
@@ -641,7 +648,18 @@ export default {
}
})
},
-
+ colorStyle(ledNum) {
+ switch (ledNum) {
+ case 1:
+ return { color: 'red' };
+ case 2:
+ return { color: '#ec951f' };
+ case 3:
+ return { color: 'blue' };
+ case 4:
+ return { color: 'green' };
+ }
+ },
//是否拆零的组件调用父级方法
fifoSplitResult(data,info){
this.info = info
@@ -650,7 +668,7 @@ export default {
if (data.needSplitConfirm){//需要
this.needSplitConfirm = data.needSplitConfirm
this.scanTitle = "拆零扫码结果:";
- this.scanTip = "拆零扫码:";
+ this.scanTip = "拆零扫码";
this.result = "";
return;
}else {//不需要
diff --git a/src/views/collect/PannelOrderBizCard.vue b/src/views/collect/PannelOrderBizCard.vue
index 961c0795..fa816f8d 100644
--- a/src/views/collect/PannelOrderBizCard.vue
+++ b/src/views/collect/PannelOrderBizCard.vue
@@ -27,8 +27,8 @@
{{ info.count }}
-
- {{ info.colorName }}
+
+