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 },