diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index 9b35d13e..73bdd675 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -38,8 +38,8 @@ 更多功能 - 工位上货 - 工位退货 + 工位上货 + 工位退货 工位存量 待处理单 已完成单 @@ -211,6 +211,18 @@ export default { // this.$router.push( workplaceId) window.open(url, '_blank'); }, + handleClickOut(blankName) { + // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId + let url = window.location.origin+`#/`+ blankName+`?splitType=out&workplaceId=`+ this.workplaceId + // this.$router.push( workplaceId) + window.open(url, '_blank'); + }, + handleClickReturn(blankName) { + // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId + let url = window.location.origin+`#/`+ blankName+`?splitType=return&workplaceId=`+ this.workplaceId + // this.$router.push( workplaceId) + window.open(url, '_blank'); + }, //界面配置相关------------ executeFuc(row, type, clickFuc, value) { return executeFuc(this, row, type, clickFuc, value); diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue index e38afe2d..73bdd675 100644 --- a/src/views/collect/DealOrderBlank.vue +++ b/src/views/collect/DealOrderBlank.vue @@ -38,8 +38,8 @@ 更多功能 - 工位上货 - 工位退货 + 工位上货 + 工位退货 工位存量 待处理单 已完成单 @@ -95,6 +95,7 @@ @@ -150,7 +151,7 @@ import {executeFuc, getHead} from "@/utils/customConfig"; import {convertDate} from "@/utils/date"; import {materialPrescribePage} from "@/api/inout/splitCode"; import {detail, page as prescribePage, tagCode} from "@/api/basic/sicker/prescribeApi"; -import selectPrescribeDialog from "@/views/collect/prescribe/selectPrescribeDialog"; +import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog"; import prescribeCodePanel from "./PanelOrderTagCode"; import PannelOrderBiz from "./PannelOrderBiz"; @@ -210,6 +211,18 @@ export default { // this.$router.push( workplaceId) window.open(url, '_blank'); }, + handleClickOut(blankName) { + // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId + let url = window.location.origin+`#/`+ blankName+`?splitType=out&workplaceId=`+ this.workplaceId + // this.$router.push( workplaceId) + window.open(url, '_blank'); + }, + handleClickReturn(blankName) { + // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId + let url = window.location.origin+`#/`+ blankName+`?splitType=return&workplaceId=`+ this.workplaceId + // this.$router.push( workplaceId) + window.open(url, '_blank'); + }, //界面配置相关------------ executeFuc(row, type, clickFuc, value) { return executeFuc(this, row, type, clickFuc, value); diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index 08b0a69f..17856eb4 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -310,6 +310,7 @@ export default { }, data() { return { + workplaceId: null, //单据相关 orderFormData: { billNo: null, @@ -1646,6 +1647,10 @@ export default { }, created() { this.init(); + if (this.$route.query.workplaceId != null){ + this.corpOrderIdDisabled = true + this.workplaceId = this.$route.query.workplaceId + } }, }; diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue index a888628d..17856eb4 100644 --- a/src/views/collect/IoCreateOrderBlank.vue +++ b/src/views/collect/IoCreateOrderBlank.vue @@ -7,6 +7,14 @@ label-width="110px" > + + + + + - -
-

{{ - result - }}

-
- + + +
@@ -302,6 +310,7 @@ export default { }, data() { return { + workplaceId: null, //单据相关 orderFormData: { billNo: null, @@ -444,7 +453,9 @@ export default { showSearch: false, scanCode: "", isSuccess: false, - result: "扫码解析结果：" + result: "", + scanResultType: "success", + msgTip: "工位存量提醒：", }; }, components: { @@ -1636,6 +1647,10 @@ export default { }, created() { this.init(); + if (this.$route.query.workplaceId != null){ + this.corpOrderIdDisabled = true + this.workplaceId = this.$route.query.workplaceId + } }, };