From fbeb8cb4919426edd605e820f500c6a480cbd244 Mon Sep 17 00:00:00 2001 From: shaoleiliu-netizen123 <480188199@qq.com> Date: Wed, 26 Aug 2026 11:18:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/biz/stockIn/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/biz/stockIn/index.vue b/src/views/biz/stockIn/index.vue index afafdbc..3e5c61d 100644 --- a/src/views/biz/stockIn/index.vue +++ b/src/views/biz/stockIn/index.vue @@ -353,7 +353,7 @@ const columns: DataTableColumns = [ render(row) { return h('div', [ h('div', row.updateTime || '-'), - h('div', { class: 'muted' }, row.updateBy ? `更新人 ${row.updateBy}` : ''), + h('div', { class: 'muted' }, row.userName ? `更新人 ${row.userName}` : ''), ]) }, }, From affe0aee525c2569d3bc7f8ea1ebc2170475b895 Mon Sep 17 00:00:00 2001 From: shaoleiliu-netizen123 <480188199@qq.com> Date: Wed, 26 Aug 2026 16:33:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/biz/orderProcessPlan/board.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/biz/orderProcessPlan/board.vue b/src/views/biz/orderProcessPlan/board.vue index d0c3b49..a83a034 100644 --- a/src/views/biz/orderProcessPlan/board.vue +++ b/src/views/biz/orderProcessPlan/board.vue @@ -1327,7 +1327,8 @@ function disphand(process: ProcessPlanItemVO, order?: OrderProcessPlanVO) { const planQty = Number(entity.quantity) || 0 const completedQty = Number(process.completedQty) || 0 const patchNum = Number(process.patchNum) || 0 - const remainQty = Math.max(0, planQty - patchNum) + const refillNum = Number(process.refillNum) || 0 //补料数量 + const remainQty = Math.max(0, (planQty+refillNum) - patchNum) dispatchmodal.value = true dispatchformRef.value?.restoreValidation() dispatchform.id = entity.id