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 @@