sz-team/supervision-test-frontend-repo
17
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yxk-20260708

Browse Source 
党委会、所务会、把把脉的实际完成实际修改为日期格式
完成状态默认为进行中
This commit is contained in:
ye1023
2026-07-08 16:30:13 +08:00
parent b2284adc30
commit e42d9c3c1f
8 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/bg/bgpartymatter/BgPartymatter.data.ts
+4
View File
@@ -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: '完成状态',
src/views/bg/bgpartymatter/components/BgPartymatterBPMFeedbackModal.vue
+11 -14
View File
@@ -38,16 +38,6 @@
<!-- <a-input v-model:value="formData.responPersonname" allow-clear />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :span="12">
<a-form-item label="完成状态" name="bpmStatus">
<JDictSelectTag v-model:value="formData.bpmStatus" dictCode="feedback_status" placeholder="请选择完成状态" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="实际完成时间" name="actualTime">
<a-date-picker v-model:value="formData.actualTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="计划完成目标" name="planExect" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.planExect" :rows="3" allow-clear />
@@ -58,6 +48,16 @@
<a-date-picker v-model:value="formData.planTime" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="完成状态" name="bpmStatus">
<JDictSelectTag v-model:value="formData.bpmStatus" dictCode="feedback_status" placeholder="请选择完成状态" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="实际完成时间" name="actualTime">
<a-date-picker v-model:value="formData.actualTime" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="实际执行情况" name="actualExect" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.actualExect" :rows="4" allow-clear />
@@ -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;
src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue
+1 -1
View File
@@ -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 },
];
src/views/bg/bgpartymatter/components/BgPartymatterFeedbackForm.vue
+1 -1
View File
@@ -41,7 +41,7 @@
</a-col>
<a-col :span="12">
<a-form-item label="实际完成时间" v-bind="validateInfos.actualTime" id="BgPartymatterFeedback-actualTime" name="actualTime">
<a-date-picker placeholder="请选择实际完成时间" v-model:value="formData.actualTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
<a-date-picker placeholder="请选择实际完成时间" v-model:value="formData.actualTime" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
src/views/bg/bqtakepulse/BgTakepulse.data.ts
+3 -3
View File
@@ -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',},
src/views/bg/bqtakepulse/BgTakepulseList.vue
+1 -1
View File
@@ -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: '完成状态',
src/views/bg/bqtakepulse/components/BgTakepulseBPMFeedbackModal.vue
+12 -17
View File
@@ -11,16 +11,6 @@
>
<a-form ref="formRef" class="bpm-feedback-modal-form" :model="formData" :rules="formRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="完成状态" name="bpmStatus">
<JDictSelectTag v-model:value="formData.bpmStatus" dictCode="feedback_status" placeholder="请选择完成状态" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="实际完成时间" name="actualTime">
<a-date-picker v-model:value="formData.actualTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="计划完成目标" name="planExect" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.planExect" :rows="3" allow-clear />
@@ -31,6 +21,16 @@
<a-date-picker v-model:value="formData.planTime" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="完成状态" name="bpmStatus">
<JDictSelectTag v-model:value="formData.bpmStatus" dictCode="feedback_status" placeholder="请选择完成状态" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="实际完成时间" name="actualTime">
<a-date-picker v-model:value="formData.actualTime" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="实际执行情况" name="actualExect" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.actualExect" :rows="4" allow-clear />
@@ -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;
src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue
+1 -1
View File
@@ -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 },