diff --git a/src/views/bg/bgpartymatter/BgPartymatter.data.ts b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
index 5985371..be6dd89 100644
--- a/src/views/bg/bgpartymatter/BgPartymatter.data.ts
+++ b/src/views/bg/bgpartymatter/BgPartymatter.data.ts
@@ -183,7 +183,7 @@ export const bgPartymatterFeedbackColumns: BasicColumn[] = [
dataIndex: 'actualExect'
},
{
- title: '实际完成时间',
+ title: '实际完成日期',
align:"center",
dataIndex: 'actualTime',
width: 155,
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
index 182ff5d..7729f77 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
@@ -54,8 +54,8 @@
-
-
+
+
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
index fb20d9b..46bc106 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, customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)) },
+ { 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 661a1bb..bf5d318 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
@@ -40,8 +40,8 @@
-
-
+
+
diff --git a/src/views/bg/bqtakepulse/BgTakepulse.data.ts b/src/views/bg/bqtakepulse/BgTakepulse.data.ts
index d359c0d..a9b44f3 100644
--- a/src/views/bg/bqtakepulse/BgTakepulse.data.ts
+++ b/src/views/bg/bqtakepulse/BgTakepulse.data.ts
@@ -204,7 +204,7 @@ export const bgTakepulseFeedbackColumns: JVxeColumn[] = [
defaultValue:'',
},
{
- title: '实际完成时间',
+ title: '实际完成日期',
key: 'actualTime',
type: JVxeTypes.date,
width:"200px",
@@ -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: 'date', 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 5f30613..6156782 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, customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)) },
+ { 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 d8c760f..ecfea3d 100644
--- a/src/views/bg/bqtakepulse/components/BgTakepulseBPMFeedbackModal.vue
+++ b/src/views/bg/bqtakepulse/components/BgTakepulseBPMFeedbackModal.vue
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue b/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue
index bae4740..4897ab0 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, customRender: ({ text }) => (!text ? '' : String(text).slice(0, 10)) },
+ { 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 },