修改xispeak的数据form保持与bgpartymatter同步

This commit is contained in:
wsm
2026-05-14 11:07:29 +08:00
parent 7cd932871d
commit c1d5d239ba
+59 -100
View File
@@ -3,118 +3,118 @@
<JFormContainer :disabled="disabled"> <JFormContainer :disabled="disabled">
<template #detail> <template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BgXiSpeakForm"> <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BgXiSpeakForm">
<a-row :gutter="20"> <a-row>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="习近平总书记重要讲话指示批示情况" v-bind="validateInfos.speakStatus"> <a-form-item label="重要讲话指示批示" v-bind="validateInfos.speakStatus" id="BgXiSpeakForm-speakStatus" name="speakStatus">
<a-input v-model:value="formData.speakStatus" placeholder="请输入重要指示批示情况" allow-clear></a-input> <a-textarea v-model:value="formData.speakStatus" :rows="4" placeholder="请输入重要指示批示情况" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="时间" v-bind="validateInfos.time"> <a-form-item label="时间" v-bind="validateInfos.time" id="BgXiSpeakForm-time" name="time">
<a-date-picker placeholder="请选择时间" v-model:value="formData.time" value-format="YYYY-MM-DD" style="width: 100%" allow-clear /> <a-date-picker placeholder="请选择时间" v-model:value="formData.time" value-format="YYYY-MM-DD" style="width: 100%" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="责任人" v-bind="validateInfos.responsiblePerson"> <a-form-item label="责任人" v-bind="validateInfos.responsiblePerson" id="BgXiSpeakForm-responsiblePerson" name="responsiblePerson">
<j-select-user v-model:value="formData.responsiblePerson" allow-clear /> <j-select-user v-model:value="formData.responsiblePerson" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="是否需要督办领导" v-bind="validateInfos.needSdwApproval"> <a-form-item label="企业负责同志批示情况" v-bind="validateInfos.elmComment" id="BgXiSpeakForm-elmComment" name="elmComment">
<a-radio-group v-model:value="formData.needSdwApproval" class="radio-group"> <a-input v-model:value="formData.elmComment" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="学习传达研究部署情况" v-bind="validateInfos.status" id="BgXiSpeakForm-status" name="status">
<a-input v-model:value="formData.status" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="是否需要督办领导" v-bind="validateInfos.needSdwApproval" id="BgXiSpeakForm-needSdwApproval" name="needSdwApproval">
<a-radio-group v-model:value="formData.needSdwApproval">
<a-radio :value="1"></a-radio> <a-radio :value="1"></a-radio>
<a-radio :value="0"></a-radio> <a-radio :value="0"></a-radio>
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24" v-if="formData.needSdwApproval === 1"> <a-col v-if="formData.needSdwApproval === 1" :span="12">
<a-form-item label="督导领导列表" v-bind="validateInfos.sdwLeaderList"> <a-form-item label="督导领导列表" v-bind="validateInfos.sdwLeaderList" id="BgXiSpeakForm-sdwLeaderList" name="sdwLeaderList">
<j-select-user v-model:value="formData.sdwLeaderList" :multiple="true" allow-clear placeholder="请选择督导领导" /> <j-select-user v-model:value="formData.sdwLeaderList" :multiple="true" allow-clear placeholder="请选择督导领导" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="企业负责同志批示情况" v-bind="validateInfos.elmComment"> <a-form-item label="牵头部门" v-bind="validateInfos.leadDepartment" id="BgXiSpeakForm-leadDepartment" name="leadDepartment">
<a-input v-model:value="formData.elmComment" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="学习传达研究部署情况" v-bind="validateInfos.status">
<a-input v-model:value="formData.status" placeholder="请输入" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="牵头部门" v-bind="validateInfos.leadDepartment">
<j-select-dept v-model:value="formData.leadDepartment" :multiple="true" checkStrictly allow-clear /> <j-select-dept v-model:value="formData.leadDepartment" :multiple="true" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="落实部门" v-bind="validateInfos.implDept"> <a-form-item label="落实部门" v-bind="validateInfos.implDept" id="BgXiSpeakForm-implDept" name="implDept">
<j-select-dept v-model:value="formData.implDept" :multiple="true" checkStrictly allow-clear /> <j-select-dept v-model:value="formData.implDept" :multiple="true" checkStrictly allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="落实方案" v-bind="validateInfos.implPlan"> <a-form-item label="落实方案" v-bind="validateInfos.implPlan" id="BgXiSpeakForm-implPlan" name="implPlan">
<a-input v-model:value="formData.implPlan" placeholder="请输入" allow-clear></a-input> <a-input v-model:value="formData.implPlan" placeholder="请输入" allow-clear></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="贯彻落实措施" v-bind="validateInfos.implMeasures"> <a-form-item label="贯彻落实措施" v-bind="validateInfos.implMeasures" id="BgXiSpeakForm-implMeasures" name="implMeasures">
<a-input v-model:value="formData.implMeasures" placeholder="请输入" allow-clear></a-input> <a-input v-model:value="formData.implMeasures" placeholder="请输入" allow-clear></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="会议决策数" v-bind="validateInfos.numberOfResolutions"> <a-form-item label="会议决策数" v-bind="validateInfos.numberOfResolutions" id="BgXiSpeakForm-numberOfResolutions" name="numberOfResolutions">
<a-input-number v-model:value="formData.numberOfResolutions" placeholder="请输入" style="width: 100%" /> <a-input-number v-model:value="formData.numberOfResolutions" placeholder="请输入" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="落实条数" v-bind="validateInfos.implCount"> <a-form-item label="落实条数" v-bind="validateInfos.implCount" id="BgXiSpeakForm-implCount" name="implCount">
<a-input-number v-model:value="formData.implCount" placeholder="请输入" style="width: 100%" /> <a-input-number v-model:value="formData.implCount" placeholder="请输入" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="已闭环数量" v-bind="validateInfos.closedCount"> <a-form-item label="已闭环数量" v-bind="validateInfos.closedCount" id="BgXiSpeakForm-closedCount" name="closedCount">
<a-input-number v-model:value="formData.closedCount" placeholder="请输入" style="width: 100%" /> <a-input-number v-model:value="formData.closedCount" placeholder="请输入" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="落实情况" v-bind="validateInfos.implStatus"> <a-form-item label="落实情况" v-bind="validateInfos.implStatus" id="BgXiSpeakForm-implStatus" name="implStatus">
<a-input v-model:value="formData.implStatus" placeholder="请输入" allow-clear></a-input> <a-textarea v-model:value="formData.implStatus" :rows="4" placeholder="请输入" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="报告反馈情况" v-bind="validateInfos.reportFeedbackStatus"> <a-form-item label="报告反馈情况" v-bind="validateInfos.reportFeedbackStatus" id="BgXiSpeakForm-reportFeedbackStatus" name="reportFeedbackStatus">
<a-input v-model:value="formData.reportFeedbackStatus" placeholder="请输入" allow-clear></a-input> <a-input v-model:value="formData.reportFeedbackStatus" placeholder="请输入" allow-clear></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="是否存在完成风险"> <a-form-item label="是否存在完成风险" id="BgXiSpeakForm-isCompletionRisk" name="isCompletionRisk">
<a-radio-group v-model:value="formData.isCompletionRisk" class="radio-group"> <a-radio-group v-model:value="formData.isCompletionRisk">
<a-radio :value="0">不存在</a-radio> <a-radio :value="0">不存在</a-radio>
<a-radio :value="1">存在</a-radio> <a-radio :value="1">存在</a-radio>
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="完成状态"> <a-form-item label="完成状态" id="BgXiSpeakForm-completionStatus" name="completionStatus">
<a-radio-group v-model:value="formData.completionStatus" class="radio-group"> <a-radio-group v-model:value="formData.completionStatus">
<a-radio :value="0">推进中</a-radio> <a-radio :value="0">推进中</a-radio>
<a-radio :value="1">已完成</a-radio> <a-radio :value="1">已完成</a-radio>
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="拖期风险应对措施" v-bind="validateInfos.delayRiskMitigation"> <a-form-item label="拖期风险应对措施" v-bind="validateInfos.delayRiskMitigation" id="BgXiSpeakForm-delayRiskMitigation" name="delayRiskMitigation">
<a-input v-model:value="formData.delayRiskMitigation" placeholder="请输入" allow-clear></a-input> <a-input v-model:value="formData.delayRiskMitigation" placeholder="请输入" allow-clear></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="督办次数" v-bind="validateInfos.supervisionCount"> <a-form-item label="督办次数" v-bind="validateInfos.supervisionCount" id="BgXiSpeakForm-supervisionCount" name="supervisionCount">
<a-input-number v-model:value="formData.supervisionCount" placeholder="请输入" style="width: 100%" /> <a-input-number v-model:value="formData.supervisionCount" placeholder="请输入" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<a-form-item label="父级节点" v-bind="validateInfos.pid"> <a-form-item label="父级节点" v-bind="validateInfos.pid" id="BgXiSpeakForm-pid" name="pid">
<j-tree-select <j-tree-select
v-model:value="formData.pid" v-model:value="formData.pid"
dict="bg_xi_speak,impl_status,id" dict="bg_xi_speak,impl_status,id"
@@ -125,8 +125,8 @@
/> />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col v-if="showFlowSubmitButton" :span="24" class="submit-area"> <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%; text-align: center">
<a-button preIcon="ant-design:check-outlined" style="width: 140px; height: 40px" type="primary" @click="submitForm"> </a-button> <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm"> </a-button>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
@@ -156,7 +156,6 @@
const emit = defineEmits(['register', 'ok']); const emit = defineEmits(['register', 'ok']);
let model: Nullable<Recordable> = null; let model: Nullable<Recordable> = null;
// 1. 初始化值修改:needSdwApproval 默认为 0
const formData = reactive<Record<string, any>>({ const formData = reactive<Record<string, any>>({
id: '', id: '',
pid: '', pid: '',
@@ -187,11 +186,10 @@
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 6 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 18 } }); const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false); const confirmLoading = ref<boolean>(false);
// 2. 表单验证:明确 needSdwApproval 的验证
const validatorRules = reactive({ const validatorRules = reactive({
needSdwApproval: [{ required: true, message: '请选择是否需要督办领导' }], needSdwApproval: [{ required: true, message: '请选择是否需要督办领导' }],
speakStatus: [{ required: true, message: '请输入指示批示情况' }], speakStatus: [{ required: true, message: '请输入指示批示情况' }],
@@ -244,7 +242,6 @@
const tmpData = {}; const tmpData = {};
Object.keys(formData).forEach((key) => { Object.keys(formData).forEach((key) => {
// 3. 赋值增强:处理后端返回 null 的情况
if (record.hasOwnProperty(key)) { if (record.hasOwnProperty(key)) {
tmpData[key] = record[key] === null ? (key === 'needSdwApproval' ? 0 : '') : record[key]; tmpData[key] = record[key] === null ? (key === 'needSdwApproval' ? 0 : '') : record[key];
} }
@@ -278,7 +275,6 @@
return Promise.reject(errorFields); return Promise.reject(errorFields);
} }
// 4. 提交兜底:确保数值有效
if (formData.needSdwApproval === undefined || formData.needSdwApproval === null) { if (formData.needSdwApproval === undefined || formData.needSdwApproval === null) {
formData.needSdwApproval = 0; formData.needSdwApproval = 0;
} }
@@ -286,7 +282,6 @@
confirmLoading.value = true; confirmLoading.value = true;
const isUpdate = !!formData.id; const isUpdate = !!formData.id;
// 拷贝一份数据进行转换,避免污染原始响应式对象
const params = { ...formData }; const params = { ...formData };
for (let key in params) { for (let key in params) {
@@ -323,43 +318,7 @@
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/* 保持原有样式不变 */
.antd-modal-form { .antd-modal-form {
padding: 20px; padding: 14px;
.submit-area {
text-align: center;
padding-top: 16px;
margin-top: 8px;
border-top: 1px dashed #e8e8e8;
}
:deep(.ant-form-item-label > label) {
font-weight: 500;
color: #333;
}
:deep(.ant-radio-group.radio-group .ant-radio-wrapper) {
margin-right: 16px;
font-size: 14px;
}
:deep(.ant-input),
:deep(.ant-input-number),
:deep(.ant-select),
:deep(.ant-picker) {
border-radius: 6px;
transition: all 0.3s ease;
&:hover {
border-color: #40a9ff;
}
}
:deep(.ant-btn-primary) {
height: 40px;
padding: 0 32px;
border-radius: 6px;
background: linear-gradient(135deg, #1890ff 0%, #096dd9 100%);
border: none;
font-size: 15px;
&:hover {
background: linear-gradient(135deg, #40a9ff 0%, #1890ff 100%);
}
}
} }
</style> </style>