修改xispeak前端界面,增加必填项,按照bg给出的新excel表格更新主表子表字段。

This commit is contained in:
wsm
2026-05-19 16:29:23 +08:00
parent e051205167
commit 7e766f7ea1
10 changed files with 379 additions and 322 deletions
@@ -1,6 +1,6 @@
<template>
<JModal
title="新增反馈"
:title="isEdit ? '编辑反馈' : '新增反馈'"
:width="820"
:visible="visible"
:confirmLoading="saving"
@@ -9,14 +9,7 @@
@ok="handleOk"
@cancel="handleCancel"
>
<a-form
ref="formRef"
class="bpm-feedback-modal-form"
:model="formData"
:rules="formRules"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<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="responDeptid">
@@ -28,9 +21,15 @@
<j-select-user v-model:value="formData.responPersonid" allow-clear @change="handleUserChange" />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="序号" name="num">
<a-input-number v-model:value="formData.num" style="width: 100%" allow-clear />
<!-- <a-col :span="12">-->
<!-- <a-form-item label="序号" name="num">-->
<!-- <a-input-number v-model:value="formData.num" style="width: 100%" allow-clear />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :span="24">
<a-form-item label="具体措施" name="method" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.method" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
@@ -38,11 +37,6 @@
<a-date-picker v-model:value="formData.deadline" 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="method" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.method" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="成果形式" name="outcomeForm">
<a-input v-model:value="formData.outcomeForm" allow-clear />
@@ -50,75 +44,47 @@
</a-col>
<a-col :span="12">
<a-form-item label="完成状态" name="completionStatus">
<a-input v-model:value="formData.completionStatus" allow-clear />
<JDictSelectTag v-model:value="formData.completionStatus" dictCode="measure_complete_status" placeholder="请选择完成状态" type="select" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="是否有报送上级报告" name="isReportedToHigher">
<JDictSelectTag v-model:value="formData.isReportedToHigher" dictCode="need_report_higher" placeholder="请选择" type="select" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="进展情况" name="progress" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.progress" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实情况" name="implStatus" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.implStatus" :rows="3" allow-clear />
<!-- <a-col :span="24">-->
<!-- <a-form-item label="落实情况" name="implStatus" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">-->
<!-- <a-textarea v-model:value="formData.implStatus" :rows="3" allow-clear />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :span="24">-->
<!-- <a-form-item label="落实计划" name="completionPlan" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">-->
<!-- <a-textarea v-model:value="formData.completionPlan" :rows="3" allow-clear />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :span="12">
<a-form-item label="检查情况(纪检)" name="checkStatus">
<a-input v-model:value="formData.checkStatus" placeholder="填写监督检查情况,成果是否完整,符合,时间是否按时等" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="落实计划" name="completionPlan" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.completionPlan" :rows="3" allow-clear />
<a-form-item label="监督意见(纪检)" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.inspectionAdvice" placeholder="是否通过审核" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="措施" name="sumMethodNum">
<a-input v-model:value="formData.sumMethodNum" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="检查情况" name="checkStatus">
<a-input v-model:value="formData.checkStatus" allow-clear />
<a-form-item label="措施数量(纪检)" name="measureNum">
<a-input-number v-model:value="formData.measureNum" placeholder="填写本条举措设计的措施数量" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="监督意见" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-textarea v-model:value="formData.inspectionAdvice" :rows="3" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="措施数量" name="measureNum">
<a-input-number v-model:value="formData.measureNum" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="发起类型" name="launchType">
<a-select v-model:value="formData.launchType" placeholder="请选择发起类型" allow-clear>
<a-select-option :value="0">立即发起</a-select-option>
<a-select-option :value="1">周期发起</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="周期类型" name="intervalType">
<a-select v-model:value="formData.intervalType" placeholder="请选择周期类型" allow-clear>
<a-select-option :value="1"></a-select-option>
<a-select-option :value="2"></a-select-option>
<a-select-option :value="3">两周</a-select-option>
<a-select-option :value="4"></a-select-option>
<a-select-option :value="5"></a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="周期任务数量" name="startCount">
<a-input-number v-model:value="formData.startCount" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="周期开始时间" name="startTime">
<a-date-picker v-model:value="formData.startTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" placeholder="请选择周期开始时间" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="附件" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<a-form-item label="体现落实措施,取得成果的证明材料" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
<SUploadFile
:key="uploadKey"
ref="uploadFileRef"
@@ -143,6 +109,7 @@
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
const emit = defineEmits(['success']);
const { createMessage } = useMessage();
@@ -150,6 +117,7 @@
const visible = ref(false);
const saving = ref(false);
const isEdit = ref(false);
const formRef = ref();
const uploadFileRef = ref<InstanceType<typeof SUploadFile> | null>(null);
const uploadSecretLevel = ref(1);
@@ -167,6 +135,7 @@
responPersonname: '',
implStatus: '',
completionStatus: '',
isReportedToHigher: undefined,
completionPlan: '',
mainId: '',
bpmProcessId: '',
@@ -205,11 +174,24 @@
function open(mainId: string, secretLevel?: string | number, bpmProcessId = '') {
resetForm(mainId, bpmProcessId);
isEdit.value = false;
uploadSecretLevel.value = normalizeSecretLevel(secretLevel);
void applyCurrentUserFeedbackInfo();
visible.value = true;
}
function openEdit(record: Record<string, any>) {
resetForm(record.mainId || '', record.bpmProcessId || '');
isEdit.value = true;
Object.keys(formData).forEach((key) => {
if (record[key] !== undefined) {
formData[key] = record[key];
}
});
uploadKey.value += 1;
visible.value = true;
}
function normalizeSecretLevel(value?: string | number) {
const level = Number(value);
return [1, 2, 3, 4].includes(level) ? level : 1;
@@ -277,7 +259,7 @@
if (!formData.id && uploadFileRef.value?.hasPendingFiles?.()) {
formData.id = buildUUID();
}
const res = await bgXiSpeakFeedbackSaveOrUpdate({ ...formData }, false);
const res = await bgXiSpeakFeedbackSaveOrUpdate({ ...formData }, isEdit.value);
if (res.success) {
if (formData.id && uploadFileRef.value?.hasPendingFiles?.()) {
await uploadFileRef.value.bindBussinessId(formData.id);
@@ -295,6 +277,7 @@
defineExpose({
open,
openEdit,
});
</script>