From 5ea9c5fa860d63339251c368ae78d4b446151a7c Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Mon, 1 Jun 2026 16:00:51 +0800 Subject: [PATCH] =?UTF-8?q?yxk-20260601-bug=E4=BF=AE=E5=A4=8D=201=E3=80=81?= =?UTF-8?q?=E5=85=9A=E5=A7=94=E4=BC=9A=E5=8F=8D=E9=A6=88=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9=E5=B7=B2=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E3=80=81=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=E4=B8=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4=202=E3=80=81=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8C=96=E6=B5=81=E7=A8=8Bbpm=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=EF=BC=8C=E9=99=84=E4=BB=B6=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E8=BF=87=E9=AB=98=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bg/bgpartymatter/BgOfficematterList.vue | 2 +- .../BgPartymatterBPMFeedbackModal.vue | 6 +++++ .../components/BgPartymatterBPMForm.vue | 26 ++++++++++++++++--- .../content/TaskApprovalHistoryContent.vue | 2 +- .../myHandleTask/task.handle.data.ts | 2 +- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/views/bg/bgpartymatter/BgOfficematterList.vue b/src/views/bg/bgpartymatter/BgOfficematterList.vue index e4efb6c..c48b2ae 100644 --- a/src/views/bg/bgpartymatter/BgOfficematterList.vue +++ b/src/views/bg/bgpartymatter/BgOfficematterList.vue @@ -2,7 +2,7 @@ diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue index 46cffd8..5c209a1 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue @@ -77,12 +77,15 @@ import { bgPartymatterFeedbackSaveOrUpdate } from '../BgPartymatter.api'; import { useUserStore } from '/@/store/modules/user'; import { buildUUID } from '/@/utils/uuid'; + import { dateUtil } from '/@/utils/dateUtil'; import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; const emit = defineEmits(['success']); const { createMessage } = useMessage(); const userStore = useUserStore(); + const DEFAULT_COMPLETED_STATUS = '3'; + const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss'; const visible = ref(false); const saving = ref(false); @@ -137,6 +140,9 @@ formData.bpmProcessId = formData.bpmProcessId || bpmProcessId; } else { modalTitle.value = '新增反馈'; + // 新增反馈默认按“已完成”处理，时间取打开弹窗时刻，编辑已有记录不覆盖。 + formData.bpmStatus = DEFAULT_COMPLETED_STATUS; + formData.actualTime = dateUtil().format(DATE_TIME_FORMAT); void applyCurrentUserFeedbackInfo(); } visible.value = true; diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue index d3b331b..a48a4ae 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue @@ -810,8 +810,14 @@ min-width: 300px; :deep(.file-list-wrapper) { - min-height: auto; - padding: 8px; + min-height: 0 !important; + padding: 4px 8px; + } + + :deep(.ant-spin-nested-loading), + :deep(.ant-spin-container) { + min-height: 0 !important; + line-height: 20px; } :deep(.file-list-header) { @@ -825,7 +831,21 @@ } :deep(.ant-empty) { - margin: 0; + margin: 0 !important; + display: flex; + align-items: center; + min-height: 20px; + text-align: left; + } + + :deep(.ant-empty-image) { + display: none !important; + } + + :deep(.ant-empty-description) { + color: #94a3b8; + font-size: 12px; + line-height: 20px; } } diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue index 901beaf..7bb1eea 100644 --- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue +++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskApprovalHistoryContent.vue @@ -15,7 +15,7 @@ import { list as queryApprovalOpinionList } from '/@/views/taskApprovalOpinion/TaskApprovalOpinion.api'; const approvalHistoryColumns: BasicColumn[] = [ - { title: '节点名称', dataIndex: 'taskName', width: 160, align: 'center' }, + { title: '节点名称', dataIndex: 'taskName', width: 160, align: 'left' }, { title: '开始时间', dataIndex: 'startTime', width: 170, align: 'center' }, { title: '办理时间', dataIndex: 'opTime', width: 170, align: 'center' }, { diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts b/src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts index 2fa8ea0..b904edf 100644 --- a/src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts +++ b/src/views/super/bpm/process/personalOffice/myHandleTask/task.handle.data.ts @@ -50,7 +50,7 @@ export const columns: BasicColumn[] = [ { title: '事项截止时间', align: 'center', - width: 120, + width: 180, dataIndex: 'deadline', customRender: ({ text, record }) => { const value = !text ? '' : text.length > 10 ? text.substr(0, 10) : text;