From a856710c7a3e345c0b482669d5cab67436677dd3 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 4 Nov 2025 11:11:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=9B=E4=BB=93=E5=AF=B9=E8=B4=A7-?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/oms/emisWarehouseIn.js | 11 + .../oms/orderCheck/OrderWarehouseInList.vue | 49 ++- .../oms/orderCheck/WarehouseInBatchPanel.vue | 374 ++++-------------- src/views/oms/orderCheck/WarehouseInPanel.vue | 5 +- 4 files changed, 123 insertions(+), 316 deletions(-) diff --git a/src/api/oms/emisWarehouseIn.js b/src/api/oms/emisWarehouseIn.js index bacd866..acbe764 100644 --- a/src/api/oms/emisWarehouseIn.js +++ b/src/api/oms/emisWarehouseIn.js @@ -50,3 +50,14 @@ export function delEmisWarehouseIn(id) { method: 'delete' }) } + +//根据进仓单编号查询进仓单详情 +export function getWarehouseInDetail(query) { + return request({ + url: '/oms2c/emisWarehouseIn/getWarehouseInDetail', + method: 'get', + params: { + inNo: query.inNo + } + }) +} \ No newline at end of file diff --git a/src/views/oms/orderCheck/OrderWarehouseInList.vue b/src/views/oms/orderCheck/OrderWarehouseInList.vue index 318b729..a6d25e1 100644 --- a/src/views/oms/orderCheck/OrderWarehouseInList.vue +++ b/src/views/oms/orderCheck/OrderWarehouseInList.vue @@ -4,10 +4,10 @@
- + - - + +
@@ -30,6 +30,8 @@ export default { return { activeTab:'billList', billTabs:[], + selectInNo:null, + openViewForm:false, }; }, created() { @@ -39,27 +41,36 @@ export default { }, onSelectBill(item) { - let old=this.billTabs.find(mItem=>mItem.settleBillNo==item.settleBillNo); - if(old){ - this.activeTab=item.settleBillNo; - }else{ - this.billTabs.push(item); - this.activeTab=item.settleBillNo; - } + this.selectInNo=item.inNo; + this.openViewForm=true; + this.activeTab='wsInView'; }, - removeTab(targetName) { - - var self=this; + removeTab(targetName) { + if (targetName == 'wsInPanel') { + this.showWsInPanel = false; + this.activeTab = "billList"; + } + else if (targetName == 'wsInView') { + this.openViewForm = false; + this.activeTab = "billList"; + } + else { + var self = this; let tabs = self.billTabs; - self.billTabs = tabs.filter(tab => tab.settleBillNo !== targetName); - if(self.billTabs.length>0){ - this.activeTab=self.billTabs[self.billTabs.length-1].settleBillNo; - }else{ - this.activeTab="billList"; + self.billTabs = tabs.filter(tab => tab.inNo !== targetName); + if (self.billTabs.length > 0) { + this.activeTab = self.billTabs[self.billTabs.length - 1].inNo; + } else { + this.activeTab = "billList"; } + } }, - + onStockIn(inNo) { + this.selectInNo = inNo; + this.showWsInPanel = true; + this.activeTab = 'wsInPanel'; + }, } }; diff --git a/src/views/oms/orderCheck/WarehouseInBatchPanel.vue b/src/views/oms/orderCheck/WarehouseInBatchPanel.vue index 2727de3..b9ad4b1 100644 --- a/src/views/oms/orderCheck/WarehouseInBatchPanel.vue +++ b/src/views/oms/orderCheck/WarehouseInBatchPanel.vue @@ -1,311 +1,86 @@ diff --git a/src/views/oms/orderCheck/WarehouseInPanel.vue b/src/views/oms/orderCheck/WarehouseInPanel.vue index 2ee5c0c..995e15f 100644 --- a/src/views/oms/orderCheck/WarehouseInPanel.vue +++ b/src/views/oms/orderCheck/WarehouseInPanel.vue @@ -249,6 +249,7 @@ export default { daterangeCreateTime: [], // 更新站点时间范围 daterangeUpdateTime: [], + currentSelectOrder:null, // 查询参数 queryParams: { pageNum: 1, @@ -329,7 +330,7 @@ export default { this.selectionList=selection; if(this.selectionList&&this.selectionList.length>0){ - // this.currentSelectOrder=this.selectionList[0]; + this.currentSelectOrder=this.selectionList[0]; } }, @@ -358,7 +359,7 @@ export default { // this.id=row.id; // this.titleView="查看"; // this.openView=true; - this.$emit("onSelect",row); + this.$emit("onSelect",this.currentSelectOrder); // this.router.push({ path: '/oms2c/emisWarehouseIn/viewDetail', query: { id: row.id }}) }, handleFormChanged(){ From 2c7a92dc30d3fcbbda686b67df790b0bbe806732 Mon Sep 17 00:00:00 2001 From: wuteng <419274783@qq.com> Date: Tue, 4 Nov 2025 15:21:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?oms=E8=BF=9B=E4=BB=93=E5=AF=B9=E8=B4=A7?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/oms/emisWaybill/WsInBatchList.vue | 392 ++++++++++++++++++ .../oms/orderCheck/WarehouseInBatchPanel.vue | 9 +- src/views/oms/orderCheck/WarehouseInPanel.vue | 13 - 3 files changed, 397 insertions(+), 17 deletions(-) create mode 100644 src/views/oms/emisWaybill/WsInBatchList.vue diff --git a/src/views/oms/emisWaybill/WsInBatchList.vue b/src/views/oms/emisWaybill/WsInBatchList.vue new file mode 100644 index 0000000..9fa907a --- /dev/null +++ b/src/views/oms/emisWaybill/WsInBatchList.vue @@ -0,0 +1,392 @@ + + + + + diff --git a/src/views/oms/orderCheck/WarehouseInBatchPanel.vue b/src/views/oms/orderCheck/WarehouseInBatchPanel.vue index b9ad4b1..14a836c 100644 --- a/src/views/oms/orderCheck/WarehouseInBatchPanel.vue +++ b/src/views/oms/orderCheck/WarehouseInBatchPanel.vue @@ -52,7 +52,7 @@
- +
@@ -67,11 +67,13 @@