diff --git a/src/views/collect/CollectOrderAllot.vue b/src/views/collect/CollectOrderAllot.vue index 8e901aae..0f828c5f 100644 --- a/src/views/collect/CollectOrderAllot.vue +++ b/src/views/collect/CollectOrderAllot.vue @@ -50,7 +50,16 @@ export default { methods: { parentMethod(data,url) { // 处理从子组件传来的数据 - this.callParentMethod(url) + if (this.workPlaceCode == null){ + this.callParentMethod(url) + }else { + this.callParentMethodA(data) + } + + }, + callParentMethodA(val) { + // 触发自定义事件 'parent-method' + this.$emit('parent-method', val); // someData 是你想要传递给父组件的数据 }, callParentMethod(val) { window.open(val, '_blank'); diff --git a/src/views/collect/CollectOrderAllotBlank.vue b/src/views/collect/CollectOrderAllotBlank.vue deleted file mode 100644 index d5a2feef..00000000 --- a/src/views/collect/CollectOrderAllotBlank.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - - diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue index 96506f15..a9ff28f4 100644 --- a/src/views/collect/CollectOrderAllotCardComponents.vue +++ b/src/views/collect/CollectOrderAllotCardComponents.vue @@ -515,7 +515,7 @@ export default { callParentMethod(index) { let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.list[index].workPlaceCode + "&billNo=" + this.list[index].billNo // 触发自定义事件 'parent-method' - this.$emit('parent-method', "DealOrderBlank",url); // someData 是你想要传递给父组件的数据 + this.$emit('parent-method', "DealOrder",url); // someData 是你想要传递给父组件的数据 }, linkPage(_this, row) { diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue index 306fb68f..ab8811cf 100644 --- a/src/views/collect/CollectOrderTabs.vue +++ b/src/views/collect/CollectOrderTabs.vue @@ -55,6 +55,10 @@ 已完成单 + + + 单据上传 + @@ -80,21 +84,23 @@ - - diff --git a/src/views/collect/IoCreateOrderBlank.vue b/src/views/collect/IoCreateOrderBlank.vue deleted file mode 100644 index 68f033f8..00000000 --- a/src/views/collect/IoCreateOrderBlank.vue +++ /dev/null @@ -1,1956 +0,0 @@ - - - - - - - - - diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue new file mode 100644 index 00000000..b183f1a0 --- /dev/null +++ b/src/views/collect/PanelOrderUpload.vue @@ -0,0 +1,459 @@ + + + + + diff --git a/src/views/collect/ioSplitFifoCode.vue b/src/views/collect/ioSplitFifoCode.vue index 797fe139..749bb7b7 100644 --- a/src/views/collect/ioSplitFifoCode.vue +++ b/src/views/collect/ioSplitFifoCode.vue @@ -1,28 +1,6 @@