diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue index db6ce375..5835a41d 100644 --- a/src/views/collect/CollectOrderTabs.vue +++ b/src/views/collect/CollectOrderTabs.vue @@ -93,6 +93,14 @@ <span slot="title">工位上货</span> </el-menu-item> + <el-menu-item :index=15 @click="clickMenuItem(15)" v-if="workPlaceClass == 2"> + + <span slot="title">拆零上货</span> + </el-menu-item> + <el-menu-item :index=16 @click="clickMenuItem(16)" v-if="workPlaceClass == 2"> + + <span slot="title">整取上货</span> + </el-menu-item> <el-menu-item :index=13 @click="clickMenuItem(13)" v-if="workPlaceClass == 2"> <span slot="title">工位剔除</span> @@ -327,6 +335,8 @@ import IoSplitFifoRemind from '@/views/collect/IoSplitFifoRemind.vue' import IocCollectOrderCheckCode from '@/views/collect/IocCollectOrderCheckCode.vue' import IocCollectOrderVerify from '@/views/collect/IocCollectOrderVerify.vue' import IoSplitFifoRemove from '@/views/collect/IoSplitFifoRemove.vue' +import IoSplitCreateOrder from '@/views/collect/IoCreateOrder.vue' +import IoFullCreateOrder from '@/views/collect/IoCreateOrder.vue' // 导入器械相关工位上货页面 import DevicesIoCreateOrderOut from '@/views/collect/device/DevicesIoCreateOrder.vue' @@ -366,6 +376,7 @@ export default { IoCreateOrderOutRecord, IocCollectOrderVerify, IoSplitFifoRemove, + IoSplitCreateOrder, //器械页面 DevicesDealOrder, @@ -439,7 +450,8 @@ export default { component: IoCreateOrderOut, // 假设你需要传递的参数 componentProps: { - fromSplitType: 'out' + fromSplitType: 'out', + fifoSplitTag: 0 } }, { @@ -550,6 +562,28 @@ export default { // 假设你需要传递的参数 componentProps: {} }, + { + number: 15, + title: '拆零上货', + name: 'IoSplitCreateOrder', + component: IoSplitCreateOrder, + // 假设你需要传递的参数 + componentProps: { + fromSplitType: 'out', + fifoSplitTag: 1 + } + }, + { + number: 16, + title: '整取上货', + name: 'IoFullCreateOrder', + component: IoFullCreateOrder, + // 假设你需要传递的参数 + componentProps: { + fromSplitType: 'out', + fifoSplitTag: 2 + } + }, //器械页面 { @@ -1013,7 +1047,8 @@ export default { component: IoCreateOrderOut, // 假设你需要传递的参数 componentProps: { - fromSplitType: 'out' + fromSplitType: 'out', + fifoSplitTag:0 } } ] diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index c1e85e2d..a48e23eb 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -436,7 +436,11 @@ export default { resetKey: { type: Function, required: true - } + }, + fifoSplitTag: {//拆零标记 + type: Object, + required: true + }, }, watch: { @@ -1188,6 +1192,8 @@ export default { //添加条码后提交 addCodeSubmit(tQuery) { + console.log("当前拆零标记" , this.fifoSplitTag) + tQuery.fifoSplitTag = this.fifoSplitTag addOrderWeb(tQuery).then((response) => { if (response.code === 20000) { this.orderFormData.billNo = response.data.orderId