From fdadcaf4a1cda984ce5b96cdd15cb9fc09cae204 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 16 Jan 2026 14:36:02 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-16=20=E6=94=B6=E8=B4=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5/=E6=8B=A3?= =?UTF-8?q?=E8=B4=A7=E5=87=BA=E5=BA=93=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E5=88=AB/=E5=87=BA=E5=BA=93=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qc/Inbound_notification.js | 2 ++ src/api/qc/outbound_notification.js | 2 ++ src/views/modules/qc/inboundNotification.vue | 32 +++++++++++++++-- src/views/modules/qc/outboundNotification.vue | 34 ++++++++++++++++--- 4 files changed, 63 insertions(+), 7 deletions(-) diff --git a/src/api/qc/Inbound_notification.js b/src/api/qc/Inbound_notification.js index 2391341..c33bcd6 100644 --- a/src/api/qc/Inbound_notification.js +++ b/src/api/qc/Inbound_notification.js @@ -25,4 +25,6 @@ export const deleteInboundDetail = data => createAPI('/inbound/deleteInboundDeta export const updateInboundDetail = data => createAPI('/inbound/updateInboundDetail','post',data) // 获取入库明细 export const getInboundDetail2 = data => createAPI('/inbound/getInboundDetail2','post',data) +// 查询入库类别列表 +export const getInboundCategoryList = data => createAPI('/inbound/getInboundCategoryList','post',data) diff --git a/src/api/qc/outbound_notification.js b/src/api/qc/outbound_notification.js index 4e4c6f0..27a8824 100644 --- a/src/api/qc/outbound_notification.js +++ b/src/api/qc/outbound_notification.js @@ -26,4 +26,6 @@ export const deleteOutboundDetail = data => createAPI('/outbound/deleteOutboundD export const updateOutboundDetail = data => createAPI('/outbound/updateOutboundDetail','post',data) // 获取出库明细 export const getOutboundDetail2 = data => createAPI('/outbound/getOutboundDetail2','post',data) +// 查询出库类别列表 +export const getOutboundCategoryList = data => createAPI('/outbound/getOutboundCategoryList','post',data) diff --git a/src/views/modules/qc/inboundNotification.vue b/src/views/modules/qc/inboundNotification.vue index 003e5cf..f74922a 100644 --- a/src/views/modules/qc/inboundNotification.vue +++ b/src/views/modules/qc/inboundNotification.vue @@ -122,7 +122,7 @@ - + @@ -152,18 +152,28 @@ value-format="yyyy-MM-dd"> + + + + + + 供应商 - + - + @@ -662,6 +672,7 @@ getInboundPartList, // 查物料 updateInboundDetail, // 批量编辑明细 getInboundDetail2, // 获取入库明细 + getInboundCategoryList, // 查询入库类别列表 } from "@/api/qc/Inbound_notification.js" import { getSiteAndBuByUserName, @@ -738,7 +749,9 @@ remarks: '', createdBy: '', updatedBy: '', + category: '', // 入库类别 }, + categoryList: [], // 入库类别列表 dataList: [], detailList: [], userBuList: [], @@ -1252,8 +1265,10 @@ supplierName: '', remarks: '', createdBy: this.$store.state.user.name, + category: '', // 入库类别 } this.modalDisableFlag = false + this.loadCategoryList() // 加载入库类别列表 this.modalFlag = true }, @@ -1274,8 +1289,10 @@ supplierName: row.supplierName, remarks: row.remarks, updatedBy: this.$store.state.user.name, + category: row.category || '', // 入库类别 } this.modalDisableFlag = true + this.loadCategoryList() // 加载入库类别列表 this.modalFlag = true }, @@ -1814,6 +1831,15 @@ this.authClose = !closeFlag this.authIssue = !issueFlag }, + + // 加载入库类别列表 + loadCategoryList () { + getInboundCategoryList({}).then(({data}) => { + if (data && data.code === 0) { + this.categoryList = data.rows || [] + } + }) + }, } } diff --git a/src/views/modules/qc/outboundNotification.vue b/src/views/modules/qc/outboundNotification.vue index 38718d6..6c75ca6 100644 --- a/src/views/modules/qc/outboundNotification.vue +++ b/src/views/modules/qc/outboundNotification.vue @@ -123,7 +123,7 @@ - + @@ -153,24 +153,34 @@ value-format="yyyy-MM-dd"> + + + + + + 供应商 - + 直接客户 - + - + @@ -629,6 +639,7 @@ getOutboundPartList, // 查物料 updateOutboundDetail, // 批量编辑明细 getOutboundDetail2, // 获取出库明细 + getOutboundCategoryList, // 查询出库类别列表 } from "@/api/qc/outbound_notification.js" import { getSiteAndBuByUserName, @@ -706,7 +717,9 @@ remarks: '', createdBy: '', updatedBy: '', + category: '', // 出库类别 }, + categoryList: [], // 出库类别列表 dataList: [], detailList: [], userBuList: [], @@ -1186,8 +1199,10 @@ customerName: '', remarks: '', createdBy: this.$store.state.user.name, + category: '', // 出库类别 } this.modalDisableFlag = false + this.loadCategoryList() // 加载出库类别列表 this.modalFlag = true }, @@ -1208,8 +1223,10 @@ customerName: row.customerName, remarks: row.remarks, updatedBy: this.$store.state.user.name, + category: row.category || '', // 出库类别 } this.modalDisableFlag = true + this.loadCategoryList() // 加载出库类别列表 this.modalFlag = true }, @@ -1837,6 +1854,15 @@ this.authClose = !closeFlag this.authIssue = !issueFlag }, + + // 加载出库类别列表 + loadCategoryList () { + getOutboundCategoryList({}).then(({data}) => { + if (data && data.code === 0) { + this.categoryList = data.rows || [] + } + }) + }, } }