From 1b73a97ec12424274eeae824d9a358ad8c7f6fe9 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Fri, 22 Aug 2025 15:31:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(workflow):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=90=AF=E5=8A=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=92=8C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了审批人设置卡片，改为在表单中直接选择指定审批人 - 调整了表单布局，优化了用户界面 - 在加载表单数据时隐藏了表单按钮 - 保留了提交和重置功能 --- klp-ui/src/views/workflow/work/start.vue | 36 +++++++++--------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/klp-ui/src/views/workflow/work/start.vue b/klp-ui/src/views/workflow/work/start.vue index 157c9709..5165711d 100644 --- a/klp-ui/src/views/workflow/work/start.vue +++ b/klp-ui/src/views/workflow/work/start.vue @@ -8,23 +8,11 @@
- + - -
- 审批人设置 -
+ - - - 指定用户 - 角色 - 部门 - 发起人 - - - - + - - + +
提交 @@ -45,7 +33,7 @@
- + @@ -162,6 +150,8 @@ export default { }).then(res => { if (res.data) { this.formData = res.data; + // 表单按钮隐藏 + this.formData.formBtns = false; this.formOpen = true } }) @@ -195,15 +185,15 @@ export default { this.$modal.msgError("表单未加载完成"); return; } - + // 获取表单数据 parserRef.getData(); - + // 验证表单 parserRef.$refs[parserRef.formConfCopy.formRef].validate(valid => { if (valid) { const formData = parserRef[parserRef.formConfCopy.formModel]; - + // 添加审批人信息到表单数据 // 根据审批类型添加不同的审批人信息 if (this.approvalForm.approvalType === 1 && this.approvalUsers.length > 0) { @@ -228,7 +218,7 @@ export default { formData.flowable.candidateUsers = ''; formData.flowable.candidateGroups = ''; } - + // 启动流程并将表单数据加入流程变量 if (this.definitionId) { startProcess(this.definitionId, JSON.stringify(formData)).then(res => { @@ -245,7 +235,7 @@ export default { } }); }, - + // 重置表单 resetForm() { const parserRef = this.$refs.parser; From 326c7c760abb6326785315df2360cbea4e7ec3c9 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Fri, 22 Aug 2025 15:46:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor(workflow):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=B8=B2=E6=9F=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 使用 parserKey 替代时间戳作为 parser组件的 key，提升性能 - 仅在加载新表单时更新 parserKey，减少不必要的渲染- 移除了冗余的角色、部门和发起人相关的代码块 --- klp-ui/src/views/workflow/work/start.vue | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/klp-ui/src/views/workflow/work/start.vue b/klp-ui/src/views/workflow/work/start.vue index 5165711d..a8d2296d 100644 --- a/klp-ui/src/views/workflow/work/start.vue +++ b/klp-ui/src/views/workflow/work/start.vue @@ -6,7 +6,7 @@
- +
@@ -104,6 +104,7 @@ export default { procInsId: null, formOpen: false, formData: {}, + parserKey: 1, // 审批表单 approvalForm: { approvalType: 1, // 默认指定用户 @@ -152,6 +153,7 @@ export default { this.formData = res.data; // 表单按钮隐藏 this.formData.formBtns = false; + this.parserKey++ // 只有加载新表单时才更新 key this.formOpen = true } }) @@ -202,21 +204,6 @@ export default { formData.flowable.candidateUsers = this.approvalUsers.map(user => user.userId).join(','); formData.flowable.candidateGroups = ''; formData.flowable.text = this.approvalUsers.map(user => user.nickName).join(','); - } else if (this.approvalForm.approvalType === 2) { - // 角色 - formData.flowable = formData.flowable || {}; - formData.flowable.candidateUsers = ''; - formData.flowable.candidateGroups = 'ROLE_'; - } else if (this.approvalForm.approvalType === 3) { - // 部门 - formData.flowable = formData.flowable || {}; - formData.flowable.candidateUsers = ''; - formData.flowable.candidateGroups = 'DEPT_'; - } else if (this.approvalForm.approvalType === 4) { - // 发起人 - formData.flowable = formData.flowable || {}; - formData.flowable.candidateUsers = ''; - formData.flowable.candidateGroups = ''; } // 启动流程并将表单数据加入流程变量 From ce3701d6d181a3db73b505a495309328e35b5639 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Fri, 22 Aug 2025 17:22:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改物品ID列为物品信息列，根据物品类型显示不同信息 - 添加原材料和产品信息的组件引用 - 优化表格列的显示逻辑- 调整部分UI样式，提高可读性 --- .../src/views/wms/stockIo/panels/detail.vue | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/klp-ui/src/views/wms/stockIo/panels/detail.vue b/klp-ui/src/views/wms/stockIo/panels/detail.vue index 62911052..246f00c3 100644 --- a/klp-ui/src/views/wms/stockIo/panels/detail.vue +++ b/klp-ui/src/views/wms/stockIo/panels/detail.vue @@ -29,7 +29,13 @@ - + + + @@ -100,11 +106,11 @@ -