From 11f6ba396123d47aaecea2881d352997c88c01fb Mon Sep 17 00:00:00 2001 From: wsm <8454518+new-twice@user.noreply.gitee.com> Date: Fri, 24 Jul 2026 03:16:38 +0000 Subject: [PATCH] =?UTF-8?q?!112=20refactor(bg):=20=E5=B9=B4=E4=BB=BD?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BB=8E=E5=AD=97=E5=85=B8=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=E5=B9=B4=E4=BB=BD=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor(bg): 年份字段从字典组件替换为年份选择器 * feat(bpm): 待办/已办/待阅/已阅弹窗标题改为业务标题 * feat(bpmform): 反馈新增时计划完成目标/日期必填可编辑,编辑时禁用并提示 * style(bpmform): 统一表单标签宽度和对齐,清理调试代码 * feat(bg): 再次发起督办弹窗标题显示中文数字督办次数 * style(bpmform): 新增反馈按钮添加悬浮提示"可以多次新增反馈" --- .../bg/bgpartymatter/BgPartymatterList.vue | 14 +++- .../BgPartymatterBPMFeedbackModal.vue | 26 ++++--- .../components/BgPartymatterBPMForm.vue | 27 ++++---- .../components/BgPartymatterForm.vue | 2 +- src/views/bg/bqtakepulse/BgTakepulseList.vue | 12 +++- .../BgTakepulseBPMFeedbackModal.vue | 26 ++++--- .../components/BgTakepulseBPMForm.vue | 69 +++++++++++++++---- .../components/BgTakepulseForm.vue | 2 +- .../myCcTask/CcTaskListContent.vue | 2 +- .../myHandleTask/TaskGroupList.vue | 2 +- .../myHandleTask/TaskHistoryList.vue | 2 +- .../myHandleTask/TaskRunningList.vue | 4 +- 12 files changed, 136 insertions(+), 52 deletions(-) diff --git a/src/views/bg/bgpartymatter/BgPartymatterList.vue b/src/views/bg/bgpartymatter/BgPartymatterList.vue index a941eff..5a5a961 100644 --- a/src/views/bg/bgpartymatter/BgPartymatterList.vue +++ b/src/views/bg/bgpartymatter/BgPartymatterList.vue @@ -6,7 +6,7 @@ - + @@ -554,9 +554,19 @@ return dropDownAction; } + const CN = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九']; + + function toChinese(num: number): string { + return String(num).split('').map(c => CN[Number(c)]).join(''); + } + function handleProcess(record) { + const nextCount = getNextSuperviseCount(record.superviseCount); + const title = nextCount > 1 + ? `发起流程(${record?.title || ''} 第${toChinese(nextCount)}次督办)` + : '发起流程'; flowScheduleModalRef.value?.open({ - title: '发起流程', + title, taskTitle: record?.title, payload: { record }, deptOptions: getResponsibleDeptOptions(record), diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue index 7729f77..00760a0 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue @@ -39,14 +39,18 @@ - - - + + + + + - - - + + + + + @@ -55,7 +59,7 @@ - + @@ -97,6 +101,7 @@ const visible = ref(false); const saving = ref(false); + const isEdit = ref(false); const modalTitle = ref('新增反馈'); const formRef = ref(); const uploadFileRef = ref | null>(null); @@ -122,7 +127,10 @@ mainId: '', }); - const formRules = {}; + const formRules = { + planExect: [{ required: true, message: '请输入计划完成目标' }], + planTime: [{ required: true, message: '请选择计划完成日期' }], + }; function resetForm(mainId = '', bpmProcessId = '') { Object.keys(formData).forEach((key) => { @@ -138,6 +146,7 @@ resetForm(mainId, bpmProcessId); uploadSecretLevel.value = normalizeSecretLevel(secretLevel); if (record?.id) { + isEdit.value = true; modalTitle.value = '编辑反馈'; Object.keys(formData).forEach((key) => { if (Object.prototype.hasOwnProperty.call(record, key)) { @@ -147,6 +156,7 @@ formData.mainId = formData.mainId || mainId; formData.bpmProcessId = formData.bpmProcessId || bpmProcessId; } else { + isEdit.value = false; modalTitle.value = '新增反馈'; // 新增反馈默认按“已完成”处理,时间取打开弹窗时刻,编辑已有记录不覆盖。 formData.bpmStatus = DEFAULT_COMPLETED_STATUS; diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue index 92da328..2492227 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue @@ -29,12 +29,12 @@ - + - + @@ -42,11 +42,13 @@ - @@ -170,10 +172,12 @@ - + - + @@ -30,7 +30,7 @@ - + @@ -170,10 +170,12 @@