diff --git a/src/router/index.js b/src/router/index.js index 04760f3e..7534d21a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -63,27 +63,7 @@ export const constantRoutes = [ }, { path: '/tagCodeBlank', - component: (resolve) => require([`@/views/collect/DealOrderBlank`],resolve), - hidden: true - }, - { - path: '/CollectOrderAllotBlank', - component: (resolve) => require([`@/views/collect/CollectOrderAllotBlank`],resolve), - hidden: true - }, - { - path: '/CollectOrderEndBlank', - component: (resolve) => require([`@/views/collect/CollectOrderEndBlank`],resolve), - hidden: true - }, - { - path: '/IoCreateOrderBlank', - component: (resolve) => require([`@/views/collect/IoCreateOrderBlank`],resolve), - hidden: true - }, - { - path: '/ioSplitFifoCodeBlank', - component: (resolve) => require([`@/views/collect/ioSplitFifoCodeBlank`],resolve), + component: (resolve) => require([`@/views/collect/CollectOrderTabs`],resolve), hidden: true }, { diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue new file mode 100644 index 00000000..35276363 --- /dev/null +++ b/src/views/collect/CollectOrderTabs.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index c1fc485f..64f9f391 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -53,20 +53,20 @@ >处理完成 - - - 更多功能 - - - 工位上货 - 工位退货 - - 工位存量 - 待处理单 - - 已完成单 - - + + + + + + + + + + + + + + @@ -284,9 +284,9 @@
+ > -

{{ info.documentTypeCode }}

+

{{ info.documentTypeCode }}

开始作业 @@ -453,10 +453,11 @@ export default { if (this.formDataVisible.scanType == 1) { this.findFromInvList(""); } + this.findCurOrder(); } else { this.formData.busType = null } - this.findCurOrder(); + } } diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue index c1fc485f..651626a7 100644 --- a/src/views/collect/DealOrderBlank.vue +++ b/src/views/collect/DealOrderBlank.vue @@ -53,20 +53,20 @@ >处理完成 - - - 更多功能 - - - 工位上货 - 工位退货 - - 工位存量 - 待处理单 - - 已完成单 - - + + + + + + + + + + + + + + @@ -284,9 +284,9 @@
+ > -

{{ info.documentTypeCode }}

+

{{ info.documentTypeCode }}

开始作业 @@ -453,10 +453,11 @@ export default { if (this.formDataVisible.scanType == 1) { this.findFromInvList(""); } + this.findCurOrder(); } else { this.formData.busType = null } - this.findCurOrder(); + } } diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index bcea792e..466893a6 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -362,6 +362,10 @@ export default { type: Object, required: true, }, + splitType: {//splitType + type: Object, + required: true, + }, }, @@ -584,7 +588,7 @@ export default { this.corpOrderIdDisabled = false; - this.splitType = this.$route.query.splitType; + this.splitType = this.splitType; if (this.splitType == "search") { } else if (this.splitType == "out") { this.orderFormData.action = 'SC72197936495755'; @@ -1831,7 +1835,7 @@ export default { inputer.focus(); }, created() { - this.splitType = this.$route.query.splitType; + this.splitType = this.splitType; this.init(); if (this.$route.query.workplaceId != null) { this.corpOrderIdDisabled = true diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue index b92b50ef..d21949b8 100644 --- a/src/views/collect/IoCreateOrderBlank.vue +++ b/src/views/collect/IoCreateOrderBlank.vue @@ -362,6 +362,10 @@ export default { type: Object, required: true, }, + splitType: {//splitType + type: Object, + required: true, + }, }, @@ -584,7 +588,7 @@ export default { this.corpOrderIdDisabled = false; - this.splitType = this.$route.query.splitType; + this.splitType = this.splitType; if (this.splitType == "search") { } else if (this.splitType == "out") { this.orderFormData.action = 'SC72197936495755'; @@ -1831,7 +1835,7 @@ export default { inputer.focus(); }, created() { - this.splitType = this.$route.query.splitType; + this.splitType = this.splitType; this.init(); if (this.$route.query.workplaceId != null) { this.corpOrderIdDisabled = true