上货推荐
@@ -738,7 +738,9 @@ export default {
resetKeys: {},
sendData: '',
//默认业务类型 为药品 sys_workplace_document
- productType: 2
+ productType: 2,
+ //作业模式
+ jobMode : 0,
}
},
methods: {
@@ -1053,23 +1055,43 @@ export default {
created() {
this.workPlaceClass = this.$route.query.workPlaceClass
this.productType = this.$route.query.productType
+ this.jobMode = this.$route.query.jobMode
if (this.workPlaceClass == 2) {
this.closeAllTabs()
if (this.productType == 2){
- this.editableTabsValue = 'IoCreateOrderOut'
- this.menuActive = 1,
- this.editableTabs = [{
- number: 1,
- title: '工位上货',
- name: 'IoCreateOrderOut',
- component: IoCreateOrderOut,
- // 假设你需要传递的参数
- componentProps: {
- fromSplitType: 'out',
- fifoSplitTag:0
+ if (this.jobMode == 0){
+ this.editableTabsValue = 'IoCreateOrderOut'
+ this.menuActive = 1,
+ this.editableTabs = [{
+ number: 1,
+ title: '工位上货',
+ name: 'IoCreateOrderOut',
+ component: IoCreateOrderOut,
+ // 假设你需要传递的参数
+ componentProps: {
+ fromSplitType: 'out',
+ fifoSplitTag:0
+ }
}
- }
- ]
+ ]
+ }
+ if (this.jobMode == 1){
+ this.editableTabsValue = 'IoSplitCreateOrder'
+ this.menuActive = 15,
+ this.editableTabs = [{
+ number: 15,
+ title: '拆零上货',
+ name: 'IoSplitCreateOrder',
+ component: IoSplitCreateOrder,
+ // 假设你需要传递的参数
+ componentProps: {
+ fromSplitType: 'out',
+ fifoSplitTag:1
+ }
+ }
+ ]
+ }
+
}else if (this.productType == 1){
this.editableTabsValue = 'DevicesIoCreateOrderOut'
this.menuActive = 100,
@@ -1103,6 +1125,7 @@ export default {
]
}
+
this.findCurWorkPlaces(this.$route.query.workplaceId)
if (this.$route.query.workplaceId != null) {
this.isLinkDisabled = true
diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue
index ab9c252d..d89c43a3 100644
--- a/src/views/collect/ConfirmDrugDealOrder.vue
+++ b/src/views/collect/ConfirmDrugDealOrder.vue
@@ -274,14 +274,14 @@
{{ formData.billTime }}
-
-
-
- {{ledName}}
- {{ledName}}
-
+
+
+
+
+
+
+
+
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 93a7d3ac..39b1fa73 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -237,15 +237,18 @@
-
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+ {{ formData.billNo }}
{{ formData.shipperName }}
{{ formData.fromCorpName }}
{{ formData.busTypeName }}
@@ -257,8 +260,8 @@
-
-
+
+
-
+
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index ec34a1b2..42cdc82f 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -48,7 +48,7 @@
取消上货
@@ -1861,7 +1861,6 @@ export default {
this.checkSuccess = true
// this.workPlaceQueueCode = this.scanCode
if (this.getDMHotskeyValue(this.scanCode)) {
-
if (this.scanCode.includes("DMOENTER")) {
this.submit()
this.scanCode = ''
@@ -2089,7 +2088,7 @@ export default {
},
getDMHotskeyValue(str) {
- console.log(str)
+ console.log("解析" , str)
if (str.includes('DMHotskey')) {
try {
const jsonObj = JSON.parse(str)
@@ -2157,6 +2156,7 @@ export default {
})
return true
}else if (str.includes("DMOENTER")) {
+ alert("hahhahahahha")
return true
}else if (str.includes("DMOCANCEL")) {
return true
@@ -2506,7 +2506,6 @@ export default {
this.ws.onmessage = function (event) {
let scanData = event.data // 获取扫码数据
let currentTime = Date.now()
- console.log(scanData + "33333")
// 如果时间间隔超过预设的阈值，表示这是一次新的扫码
if (currentTime - lastScanTime > SCAN_TIMEOUT) {
// 处理上一次完整的扫码数据
diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue
index 181fa8cd..1c770ad6 100644
--- a/src/views/collect/PannelOrderBiz.vue
+++ b/src/views/collect/PannelOrderBiz.vue
@@ -1,115 +1,150 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{
- item.lableRuleObj[scope.row[item.columnName]]
- }}
-
-
-
-
-
- {{
- item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
- }}
-
-
-
-
-
- {{ buttonItem.name }}
-
-
-
-
-
- {{
- scope.row[item.columnName]
- }}
-
-
-
-
- {{
- convertDateFun(scope.row[item.columnName])
- }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.scanActCount }}
+
+
+
+
+ {{ scope.row.count }}
+
+
+
+
+ {{ scope.row.tempWorkPlaceCount }}
+
+
+
+
+ {{ scope.row.tempSplitCount }}
+
+
+
+
+
+
+
+ 扫码明细
+
+
= row.count) {
rowBackground.color = '#56a717';
}
- rowBackground.height = "38px"
return rowBackground;
},
diff --git a/src/views/collect/fieldOperation.vue b/src/views/collect/fieldOperation.vue
index 1a740ada..1acbb24d 100644
--- a/src/views/collect/fieldOperation.vue
+++ b/src/views/collect/fieldOperation.vue
@@ -133,7 +133,7 @@ export default {
getUserWorkByWorkplaceCode(query).then(res => {
if (res.code == 20000){
let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId +`&workPlaceClass=`+ this.stationList[index].workPlaceClass
- +`&productType=`+ this.stationList[index].productType
+ +`&productType=`+ this.stationList[index].productType + `&jobMode=` + this.stationList[index].jobMode
// this.$router.push( workplaceId)
window.open(url, '_blank');
}else {