From 0b1d0f45ccee84581319553ab43f8db6941366e3 Mon Sep 17 00:00:00 2001 From: chenhao Date: Fri, 12 Dec 2025 10:59:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(inventory):=20=E4=BF=AE=E6=AD=A3=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=8A=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了采购订单导入前的判断逻辑，确保新华三产品类型正确处理 - 在内部库存查询中增加了产品类型'70'的支持 - 更新了用户个人资料页面的部门显示逻辑 - 移除了控制台调试日志输出 - 新增批量审批订单功能接口与实现 - 优化项目选择回调函数并同步 shipmentAmount 字段 - 修正采购订单详情中的制造商名称显示问题 - 在采购订单明细中增加税率展示列 - 更新用户密码重置接口调用方式和参数结构 - 调整后端获取用户信息接口路径以支持 Vue 页面需求 --- oms_web/oms_vue/src/api/system/user.js | 13 +++++-------- oms_web/oms_vue/src/views/inventory/inner/index.vue | 4 ++-- .../outer/components/GenerateDeliveryForm.vue | 2 +- .../oms_vue/src/views/project/order/OrderDetail.vue | 10 +++++++--- .../components/PurchaseOrderDetail.vue | 4 ++-- .../components/PurchaseOrderDetailView.vue | 5 +++++ .../oms_vue/src/views/system/user/profile/index.vue | 6 +++--- .../src/views/system/user/profile/resetPwd.vue | 9 ++++++++- .../web/controller/system/SysProfileController.java | 8 ++++++++ .../sip/controller/ProjectOrderInfoController.java | 7 +++++++ .../ruoyi/sip/service/IProjectOrderInfoService.java | 2 ++ .../service/impl/OmsInventoryInnerServiceImpl.java | 4 ++-- .../service/impl/ProjectOrderInfoServiceImpl.java | 13 +++++++++++++ 13 files changed, 65 insertions(+), 22 deletions(-) diff --git a/oms_web/oms_vue/src/api/system/user.js b/oms_web/oms_vue/src/api/system/user.js index 020b9f16..8169ac5e 100644 --- a/oms_web/oms_vue/src/api/system/user.js +++ b/oms_web/oms_vue/src/api/system/user.js @@ -79,7 +79,7 @@ export function changeUserStatus(userId, status) { // 查询用户个人信息 export function getUserProfile() { return request({ - url: '/system/user/profile', + url: '/system/user/profile/vue', method: 'get' }) } @@ -94,14 +94,11 @@ export function updateUserProfile(data) { } // 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { - const data = { - oldPassword, - newPassword - } +export function updateUserPwd(data) { return request({ - url: '/system/user/profile/updatePwd', - method: 'put', + url: '/system/user/profile/resetPwd', + method: 'post', + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, data: data }) } diff --git a/oms_web/oms_vue/src/views/inventory/inner/index.vue b/oms_web/oms_vue/src/views/inventory/inner/index.vue index 01aff739..de141546 100644 --- a/oms_web/oms_vue/src/views/inventory/inner/index.vue +++ b/oms_web/oms_vue/src/views/inventory/inner/index.vue @@ -421,7 +421,7 @@ export default { handleQuery() { this.queryParams.pageNum = 1; if (this.activeTab==='service'){ - this.queryParams.productTypeList = ['11','22']; + this.queryParams.productTypeList = ['11','22','70']; }else{ this.queryParams.productTypeList = ['1','2','99']; } @@ -452,7 +452,7 @@ export default { this.reset(); if (type==='maintenance'){ this.isServiceIn = true; - this.queryProductType=['11','22'] + this.queryProductType=['11','22','70'] }else{ this.isServiceIn = false; this.queryProductType=['1','2','99'] diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue index 2b2a0b85..688a3049 100644 --- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue +++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue @@ -177,7 +177,7 @@ export default { }); }, handleSelectPurchaseBeforeImport() { - if (((this.productData.orderType || '1') === '1' ) || !(this.outerData.vendorName.startsWith('新华三') && this.productData.productType==='2')) { + if (((this.productData.orderType || '1') === '1' ) && !(this.outerData.vendorName.startsWith('新华三') && this.productData.productType==='2')) { this.purchaseOrderSelectVisible = true; }else{ this.handleImport() diff --git a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue index 44e3ddc8..77fbb06b 100644 --- a/oms_web/oms_vue/src/views/project/order/OrderDetail.vue +++ b/oms_web/oms_vue/src/views/project/order/OrderDetail.vue @@ -149,7 +149,7 @@ 取 消 - + @@ -400,8 +400,6 @@ export default { ] }); this.activeContractVersionTab = currentVersion; - console.log('11111') - console.log(this.projectId) if (this.projectId) { getProject(this.projectId).then(response => { this.handleProjectSelected(response.data.project); @@ -409,6 +407,11 @@ export default { } } }, + selectProject(projectData){ + getProject(projectData.id).then(response => { + this.handleProjectSelected(response.data.project); + }); + }, handleClose() { this.$emit('update:visible', false); }, @@ -505,6 +508,7 @@ export default { this.form.industryType = projectData.industryType; this.isProjectSelected = true; this.selectProjectVisible = false; + this.form.shipmentAmount = this.totalConfigAmount; }, openSelectPeople() { this.selectUserVisible = true; diff --git a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue index 2bdd9f20..8e790d98 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue @@ -19,7 +19,7 @@ - + @@ -27,7 +27,7 @@ - {{ selectedVendor.vendorAddress }} + {{ selectedVendor.vendorName }} diff --git a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue index 448f77b2..6fba255b 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue @@ -142,6 +142,11 @@ {{ scope.row.price }} + + +