From e42d9c3c1f12cf9f0eff2a2c12476bbc8d107aa4 Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Wed, 8 Jul 2026 16:30:13 +0800 Subject: [PATCH] =?UTF-8?q?yxk-20260708=20=E5=85=9A=E5=A7=94=E4=BC=9A?= =?UTF-8?q?=E3=80=81=E6=89=80=E5=8A=A1=E4=BC=9A=E3=80=81=E6=8A=8A=E6=8A=8A?= =?UTF-8?q?=E8=84=89=E7=9A=84=E5=AE=9E=E9=99=85=E5=AE=8C=E6=88=90=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=97=A5=E6=9C=9F=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=20=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E8=BF=9B=E8=A1=8C=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bg/bgpartymatter/BgPartymatter.data.ts | 4 +++ .../BgPartymatterBPMFeedbackModal.vue | 25 +++++++--------- .../components/BgPartymatterBPMForm.vue | 2 +- .../components/BgPartymatterFeedbackForm.vue | 2 +- src/views/bg/bqtakepulse/BgTakepulse.data.ts | 6 ++-- src/views/bg/bqtakepulse/BgTakepulseList.vue | 2 +- .../BgTakepulseBPMFeedbackModal.vue | 29 ++++++++----------- .../components/BgTakepulseBPMForm.vue | 2 +- 8 files changed, 34 insertions(+), 38 deletions(-) diff --git a/src/views/bg/bgpartymatter/BgPartymatter.data.ts b/src/views/bg/bgpartymatter/BgPartymatter.data.ts index 5ac2e03..5985371 100644 --- a/src/views/bg/bgpartymatter/BgPartymatter.data.ts +++ b/src/views/bg/bgpartymatter/BgPartymatter.data.ts @@ -187,6 +187,10 @@ export const bgPartymatterFeedbackColumns: BasicColumn[] = [ align:"center", dataIndex: 'actualTime', width: 155, + customRender:({text}) =>{ + text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text); + return text; + }, }, { title: '完成状态', diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue index 9be2113..182ff5d 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue @@ -38,16 +38,6 @@ - - - - - - - - - - @@ -58,6 +48,16 @@ + + + + + + + + + + @@ -87,15 +87,13 @@ 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 DEFAULT_COMPLETED_STATUS = '2'; const visible = ref(false); const saving = ref(false); @@ -152,7 +150,6 @@ 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 f67d3be..fb20d9b 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue @@ -343,7 +343,7 @@ customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)), }, { title: '实际执行情况', dataIndex: 'actualExect', align: 'center', width: 280 }, - { title: '实际完成时间', dataIndex: 'actualTime', align: 'center', width: 180 }, + { title: '实际完成时间', dataIndex: 'actualTime', align: 'center', width: 180, customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)) }, { title: '完成状态', dataIndex: 'bpmStatus', align: 'center', width: 120, customRender: ({ record }) => record?.bpmStatus_dictText || record?.bpmStatus }, { title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 }, ]; diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue index 8522b50..661a1bb 100644 --- a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue +++ b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue @@ -41,7 +41,7 @@ - + diff --git a/src/views/bg/bqtakepulse/BgTakepulse.data.ts b/src/views/bg/bqtakepulse/BgTakepulse.data.ts index 6dc25db..d359c0d 100644 --- a/src/views/bg/bqtakepulse/BgTakepulse.data.ts +++ b/src/views/bg/bqtakepulse/BgTakepulse.data.ts @@ -206,9 +206,9 @@ export const bgTakepulseFeedbackColumns: JVxeColumn[] = [ { title: '实际完成时间', key: 'actualTime', - type: JVxeTypes.datetime, + type: JVxeTypes.date, width:"200px", - placeholder: '请输入${title}', + placeholder: '请选择${title}', defaultValue:'', }, { @@ -287,7 +287,7 @@ export const superQuerySchema = { planExect: {title: '计划完成目标',order: 4,view: 'textarea', type: 'string',}, planTime: {title: '计划完成日期',order: 5,view: 'date', type: 'string',}, actualExect: {title: '实际执行情况',order: 6,view: 'textarea', type: 'string',}, - actualTime: {title: '实际完成时间',order: 7,view: 'datetime', type: 'string',}, + actualTime: {title: '实际完成时间',order: 7,view: 'date', type: 'string',}, actSt: {title: '调整落实措施及执行情况',order: 8,view: 'textarea', type: 'string',}, bpmStatus: {title: '完成状态',order: 9,view: 'text', type: 'string',}, proposerConfirm: {title: '提出人确认',order: 10,view: 'text', type: 'string',}, diff --git a/src/views/bg/bqtakepulse/BgTakepulseList.vue b/src/views/bg/bqtakepulse/BgTakepulseList.vue index 624c0d5..5f30613 100644 --- a/src/views/bg/bqtakepulse/BgTakepulseList.vue +++ b/src/views/bg/bqtakepulse/BgTakepulseList.vue @@ -229,7 +229,7 @@ customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)), }, { title: '实际执行情况', dataIndex: 'actualExect', align: 'left', width: 280 }, - { title: '实际完成时间', dataIndex: 'actualTime', align: 'center', width: 155 }, + { title: '实际完成时间', dataIndex: 'actualTime', align: 'center', width: 155, customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)) }, { title: '调整落实措施及执行情况', dataIndex: 'actSt', align: 'left', width: 260 }, { title: '完成状态', diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseBPMFeedbackModal.vue b/src/views/bg/bqtakepulse/components/BgTakepulseBPMFeedbackModal.vue index f2e196b..d8c760f 100644 --- a/src/views/bg/bqtakepulse/components/BgTakepulseBPMFeedbackModal.vue +++ b/src/views/bg/bqtakepulse/components/BgTakepulseBPMFeedbackModal.vue @@ -11,16 +11,6 @@ > - - - - - - - - - - @@ -31,6 +21,16 @@ + + + + + + + + + + @@ -70,15 +70,13 @@ import { bgTakepulseFeedbackSaveOrUpdate } from '../BgTakepulse.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 DEFAULT_COMPLETED_STATUS = '2'; const visible = ref(false); const saving = ref(false); @@ -109,9 +107,7 @@ mainId: '', }); - const formRules = { - actualExect: [{ required: true, message: '请输入实际执行情况' }], - }; + const formRules = {}; function resetForm(mainId = '', bpmProcessId = '') { Object.keys(formData).forEach((key) => { @@ -139,7 +135,6 @@ 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/bqtakepulse/components/BgTakepulseBPMForm.vue b/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue index f5d8328..bae4740 100644 --- a/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue +++ b/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue @@ -369,7 +369,7 @@ customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)), }, { title: '实际执行情况', dataIndex: 'actualExect', align: 'left', width: 280 }, - { title: '实际完成时间', dataIndex: 'actualTime', align: 'center', width: 155 }, + { title: '实际完成时间', dataIndex: 'actualTime', align: 'center', width: 155, customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)) }, { title: '调整落实措施及执行情况', dataIndex: 'actSt', align: 'left', width: 260 }, { title: '完成状态', dataIndex: 'bpmStatus', align: 'center', width: 95, customRender: ({ record }) => record?.bpmStatus_dictText || record?.bpmStatus }, { title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },