架构化审批表单控制权限，添加xispeak审批节点的控制权限说明，修改反馈表单查看格式，修改树形表单实现正确的折叠效果，实现反馈表单的必填字段校验

src/views/bg/xispeak/components/BgXiSpeakBPMFeedbackModal.vue

@@ -68,17 +68,17 @@
 <!--            <a-textarea v-model:value="formData.completionPlan" :rows="3" allow-clear />-->
 <!--          </a-form-item>-->
 <!--        </a-col>-->
-        <a-col :span="12">
+        <a-col v-if="showJiJianFields" :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-col v-if="showJiJianFields" :span="24">
           <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-col v-if="showJiJianFields" :span="12">
           <a-form-item label="措施数量(纪检)" name="measureNum">
             <a-input-number v-model:value="formData.measureNum" placeholder="填写本条举措设计的措施数量" style="width: 100%" allow-clear />
           </a-form-item>
@@ -112,6 +112,9 @@
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   const emit = defineEmits(['success']);
+  const props = defineProps({
+    showJiJianFields: { type: Boolean, default: false },
+  });
   const { createMessage } = useMessage();
   const userStore = useUserStore();
 
@@ -155,7 +158,8 @@
   });
 
   const formRules = {
-    implStatus: [{ required: true, message: '请输入落实情况' }],
+    progress: [{ required: true, message: '请输入进展情况' }],
+    completionStatus: [{ required: true, message: '请选择完成状态' }],
   };
 
   function resetForm(mainId = '', bpmProcessId = '') {
@@ -188,7 +192,6 @@
         formData[key] = record[key];
       }
     });
-    uploadKey.value += 1;
     visible.value = true;
   }
 

src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue

@@ -1,7 +1,14 @@
 <template>
   <a-spin :spinning="loading">
     <div class="bg-xispeak-bpm-form">
-      <a-form class="main-form" :class="{ 'main-form-readonly': mainDisabled }" labelAlign="left" :labelCol="labelCol" :wrapperCol="wrapperCol" :model="mainForm">
+      <a-form
+        class="main-form"
+        :class="{ 'main-form-readonly': mainDisabled }"
+        labelAlign="left"
+        :labelCol="labelCol"
+        :wrapperCol="wrapperCol"
+        :model="mainForm"
+      >
         <div class="base-info-header section-toolbar">
           <div class="section-title">基础信息</div>
           <a-space class="section-actions">
@@ -9,7 +16,12 @@
               <Icon icon="ant-design:save-outlined" />
               保存
             </a-button>
-            <a-button class="section-action-button" :type="showBaseInfoDetail ? 'default' : 'link'" size="small" @click="showBaseInfoDetail = !showBaseInfoDetail">
+            <a-button
+              class="section-action-button"
+              :type="showBaseInfoDetail ? 'default' : 'link'"
+              size="small"
+              @click="showBaseInfoDetail = !showBaseInfoDetail"
+            >
               <Icon :icon="showBaseInfoDetail ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
               {{ showBaseInfoDetail ? '收起基础信息' : '展开全部信息' }}
             </a-button>
@@ -32,6 +44,17 @@
                 <a-date-picker v-model:value="mainForm.time" value-format="YYYY-MM-DD" :disabled="mainDisabled" style="width: 100%" allow-clear />
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="密级" name="secretLevel">
+                <j-dict-select-tag
+                  v-model:value="mainForm.secretLevel"
+                  dictCode="secret_level"
+                  placeholder="请选择密级"
+                  :disabled="mainDisabled"
+                  allow-clear
+                />
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="责任人" name="responsiblePerson">
                 <j-select-user v-model:value="mainForm.responsiblePerson" :disabled="mainDisabled" allow-clear />
@@ -74,12 +97,25 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="完成状态" name="completionStatus">
-                <JDictSelectTag v-model:value="mainForm.completionStatus" dictCode="db_status" placeholder="请选择完成状态" type="radio" :disabled="mainDisabled" />
+                <JDictSelectTag
+                  v-model:value="mainForm.completionStatus"
+                  dictCode="db_status"
+                  placeholder="请选择完成状态"
+                  type="radio"
+                  :disabled="mainDisabled"
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="截止日期" name="deadline">
-                <a-date-picker v-model:value="mainForm.deadline" value-format="YYYY-MM-DD HH:mm:ss" :show-time="true" :disabled="mainDisabled" style="width: 100%" allow-clear />
+                <a-date-picker
+                  v-model:value="mainForm.deadline"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  :show-time="true"
+                  :disabled="mainDisabled"
+                  style="width: 100%"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -120,7 +156,15 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="父级节点" name="pid">
-                <j-tree-select v-model:value="mainForm.pid" dict="bg_xi_speak,impl_status,id" pidField="pid" pidValue="0" hasChildField="has_child" :disabled="mainDisabled" allow-clear />
+                <j-tree-select
+                  v-model:value="mainForm.pid"
+                  dict="bg_xi_speak,impl_status,id"
+                  pidField="pid"
+                  pidValue="0"
+                  hasChildField="has_child"
+                  :disabled="mainDisabled"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -134,14 +178,26 @@
 
       <a-divider />
 
-      <div class="feedback-header section-toolbar">
+      <div class="feedback-header section-toolbar" v-if="showFeedbackInfo">
         <div class="section-title">反馈信息</div>
-        <a-button v-if="showAddFeedback" class="section-action-button feedback-add-button" type="primary" @click="openFeedbackModal">
-          <Icon icon="ant-design:plus-outlined" />
-          新增反馈
-        </a-button>
+        <a-space class="section-actions">
+          <a-button v-if="showAddFeedback" class="section-action-button feedback-add-button" type="primary" @click="openFeedbackModal">
+            <Icon icon="ant-design:plus-outlined" />
+            新增反馈
+          </a-button>
+          <a-button
+            class="section-action-button"
+            :type="showFeedbackDetail ? 'default' : 'link'"
+            size="small"
+            @click="showFeedbackDetail = !showFeedbackDetail"
+          >
+            <Icon :icon="showFeedbackDetail ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+            {{ showFeedbackDetail ? '收起反馈信息' : '展开反馈信息' }}
+          </a-button>
+        </a-space>
       </div>
       <a-table
+        v-if="showFeedbackInfo"
         rowKey="id"
         size="small"
         bordered
@@ -152,13 +208,7 @@
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'attachments'">
-            <SUploadFile
-              v-if="record.id"
-              class="feedback-attachment-list"
-              :bussiness-id="record.id"
-              :disabled="true"
-              :multiple="true"
-            />
+            <SUploadFile v-if="record.id" class="feedback-attachment-list" :bussiness-id="record.id" :disabled="true" :multiple="true" />
             <span v-else>-</span>
           </template>
           <template v-if="column.key === 'feedbackAction'">
@@ -170,7 +220,7 @@
         </template>
       </a-table>
 
-      <BgXiSpeakBPMFeedbackModal ref="feedbackModalRef" @success="loadFeedbackList" />
+      <BgXiSpeakBPMFeedbackModal ref="feedbackModalRef" :showJiJianFields="showJiJianFields" @success="loadFeedbackList" />
 
       <template v-if="showProcessHandle">
         <a-divider />
@@ -187,13 +237,9 @@
                 </a-radio-group>
               </a-form-item>
             </a-col>
-            <a-col v-if="showSubApproveUserSelector" :span="12">
+            <a-col v-if="showSubApproveUser" :span="12">
               <a-form-item label="部门经办人" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-                <j-select-user
-                  v-model:value="subApproveUser"
-                  :disabled="savingSubApproveUser"
-                  allow-clear
-                />
+                <j-select-user v-model:value="subApproveUser" :disabled="savingSubApproveUser" allow-clear />
               </a-form-item>
             </a-col>
           </a-row>
@@ -219,7 +265,14 @@
   import JTreeSelect from '/@/components/Form/src/jeecg/components/JTreeSelect.vue';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import Icon from '/@/components/Icon/index';
-  import { bgXiSpeakFeedbackList, bgXiSpeakFeedbackListWithDept, bgXiSpeakFeedbackDelete, saveBpmForm, setProcessVariable } from '../BgXiSpeak.api';
+  import {
+    bgXiSpeakFeedbackList,
+    bgXiSpeakFeedbackListWithDept,
+    bgXiSpeakFeedbackDelete,
+    saveBpmForm,
+    setProcessVariable,
+    updateDeptHandlerName,
+  } from '../BgXiSpeak.api';
   import { usePermission } from '/@/hooks/web/usePermission';
   import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
   import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
@@ -235,8 +288,8 @@
   });
 
   initBpmFormData(props.formData);
-  console.log("@props.formData", props.formData);
-  console.log("@props", props);
+  console.log('@props.formData', props.formData);
+  console.log('@props', props);
 
   const emit = defineEmits(['ok', 'success', 'claimSuccess']);
   const { createMessage } = useMessage();
@@ -254,6 +307,7 @@
   const savingMain = ref(false);
   const savingSubApproveUser = ref(false);
   const showBaseInfoDetail = ref(true);
+  const showFeedbackDetail = ref(true);
   const feedbackList = ref<any[]>([]);
   const subApproveUser = ref('');
   const isEnd = ref(0);
@@ -265,6 +319,7 @@
     time: '',
     elmComment: '',
     status: '',
+    secretLevel: '',
     responsiblePerson: '',
     needSdwApproval: 0,
     sdwLeaderList: '',
@@ -296,11 +351,15 @@
       { title: '是否有报送上级报告', dataIndex: 'isReportedToHigher_dictText', align: 'center', width: 140 },
       { title: '进展情况', dataIndex: 'progress', align: 'left', width: 200 },
       { title: '落实情况', dataIndex: 'implStatus', align: 'left', width: 200 },
-      { title: '检查情况(纪检)', dataIndex: 'checkStatus', align: 'left', width: 160 },
-      { title: '监督意见(纪检)', dataIndex: 'inspectionAdvice', align: 'left', width: 160 },
-      { title: '措施数量(纪检)', dataIndex: 'measureNum', align: 'center', width: 100 },
       { title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },
     ];
+    if (showJiJianFields.value) {
+      cols.push(
+        { title: '检查情况(纪检)', dataIndex: 'checkStatus', align: 'left', width: 160 },
+        { title: '监督意见(纪检)', dataIndex: 'inspectionAdvice', align: 'left', width: 160 },
+        { title: '措施数量(纪检)', dataIndex: 'measureNum', align: 'center', width: 100 }
+      );
+    }
     if (showEditFeedback.value) {
       cols.push({ title: '操作', dataIndex: 'id', key: 'feedbackAction', align: 'center', width: 120, fixed: 'right' });
     }
@@ -313,11 +372,36 @@
     }
     return props.formDisabled;
   });
-  const showProcessHandle = computed(() => props.formBpm && !!props.formData?.taskId);
-  const showAddFeedback = computed(() => String(props.formData?.extendUrlParams?.addfeedback ?? '') === '1');
-  const showEditFeedback = computed(() => String(props.formData?.extendUrlParams?.editfeedback ?? '') === '1');
-  const showDeptFeedback = computed(() => String(props.formData?.extendUrlParams?.deptfeedback ?? '') === '1');
-  const showSubApproveUser = computed(() => String(props.formData?.extendUrlParams?.selectuser ?? '') === '1');
+  const showProcessHandle = computed(() => {
+    const explicit = props.formData?.extendUrlParams?.showProcessHandle;
+    if (explicit === '0') return false;
+    if (explicit === '1') return true;
+    return props.formBpm && !!props.formData?.taskId;
+  });
+  const showAddFeedback = computed(
+    () => String(props.formData?.extendUrlParams?.showAddFeedback ?? props.formData?.extendUrlParams?.addfeedback ?? '') === '1'
+  );
+  const showFeedbackInfo = computed(() => {
+    const p = props.formData?.extendUrlParams;
+    const explicit = p?.showFeedbackInfo ?? p?.showApproveInfo;
+    if (explicit === '0') return false;
+    if (explicit === '1') return true;
+    // 未显式设置时，任一子属性开启则自动显示反馈区域
+    return String(p?.showAddFeedback ?? p?.addfeedback ?? '') === '1'
+      || String(p?.showEditFeedback ?? p?.editfeedback ?? '') === '1'
+      || String(p?.showDeptFeedback ?? p?.deptfeedback ?? '') === '1';
+  });
+  const showEditFeedback = computed(
+    () => String(props.formData?.extendUrlParams?.showEditFeedback ?? props.formData?.extendUrlParams?.editfeedback ?? '') === '1'
+  );
+  const showDeptFeedback = computed(
+    () => String(props.formData?.extendUrlParams?.showDeptFeedback ?? props.formData?.extendUrlParams?.deptfeedback ?? '') === '1'
+  );
+  const showJiJianFields = computed(() => String(props.formData?.extendUrlParams?.showJiJianFields ?? '') === '1');
+  const showDeptFields = computed(() => String(props.formData?.extendUrlParams?.deptfields ?? '') === '1');
+  const showSubApproveUser = computed(
+    () => String(props.formData?.extendUrlParams?.showSubApproveUser ?? props.formData?.extendUrlParams?.selectuser ?? '') === '1'
+  );
   const showSubApproveUserSelector = computed(() => showSubApproveUser.value && String(isEnd.value) !== '1');
 
   const processInfo = computed(() => ({
@@ -339,10 +423,7 @@
     initFormData();
   });
 
-  watch(
-    [() => props.formData?.dataId, () => processInfo.value.processInstanceId],
-    () => initFormData()
-  );
+  watch([() => props.formData?.dataId, () => processInfo.value.processInstanceId], () => initFormData());
 
   watch(
     () => props.formData?.vars?.isEnd,
@@ -442,7 +523,7 @@
       createMessage.warning('流程实例ID不能为空，无法新增反馈');
       return;
     }
-    feedbackModalRef.value?.open(mainForm.id, undefined, processInstanceId);
+    feedbackModalRef.value?.open(mainForm.id, mainForm.secretLevel, processInstanceId);
   }
 
   function handleEditFeedback(record) {
@@ -485,6 +566,8 @@
           createMessage.warning(subApproveUserResult.message || '保存失败');
           return false;
         }
+        // 同步更新 task_task 表的 deptHandlerName，供 XiSpeakFeedbackFlow.getImplDeptWorker 使用
+        updateDeptHandlerName({ processInstanceId, deptHandlerName: usernameValue }).catch(() => {});
       }
       if (showSuccessMessage) {
         createMessage.success('保存成功');

src/views/bg/xispeak/components/BgXiSpeakFeedbackForm.vue

@@ -2,21 +2,30 @@
   <a-spin :spinning="confirmLoading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef" name="BgXiSpeakFeedbackForm">
-          <a-row>
+        <a-form class="antd-modal-form" v-bind="formItemLayout" ref="formRef" :model="formData" :rules="validatorRules" name="BgXiSpeakFeedbackForm">
+          <!-- 基本信息 -->
+          <a-divider orientation="left" plain>基本信息</a-divider>
+          <a-row :gutter="[16, 0]">
             <a-col :span="12">
-              <a-form-item label="反馈部门" v-bind="validateInfos.responDeptid" name="responDeptid">
+              <a-form-item label="反馈部门" name="responDeptid">
                 <j-select-dept v-model:value="formData.responDeptid" :multiple="true" checkStrictly allow-clear @change="handleDeptChange" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="反馈人" v-bind="validateInfos.responPersonid" name="responPersonid">
+              <a-form-item label="反馈人" name="responPersonid">
                 <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="反馈时间" v-bind="validateInfos.responTime" name="responTime">
-                <a-date-picker placeholder="请选择反馈时间" v-model:value="formData.responTime" showTime value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
+              <a-form-item label="反馈时间" name="responTime">
+                <a-date-picker
+                  placeholder="请选择反馈时间"
+                  v-model:value="formData.responTime"
+                  showTime
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  allow-clear
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -24,6 +33,10 @@
                 <a-input-number v-model:value="formData.num" placeholder="请输入序号" style="width: 100%" allow-clear />
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 措施内容 -->
+          <a-divider orientation="left" plain>措施信息</a-divider>
+          <a-row :gutter="[16, 0]">
             <a-col :span="24">
               <a-form-item label="措施内容" name="method">
                 <a-textarea v-model:value="formData.method" placeholder="请输入措施内容" :rows="3" allow-clear></a-textarea>
@@ -31,7 +44,13 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="完成期限" name="deadline">
-                <a-date-picker placeholder="请选择完成期限" v-model:value="formData.deadline" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
+                <a-date-picker
+                  placeholder="请选择完成期限"
+                  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="12">
@@ -40,27 +59,48 @@
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="进展情况" name="progress">
+              <a-form-item label="进展情况" v-bind="validateInfos.progress" name="progress">
                 <a-textarea v-model:value="formData.progress" placeholder="请输入进展情况" :rows="3" allow-clear></a-textarea>
               </a-form-item>
             </a-col>
+          </a-row>
+          <!-- 状态与落实 -->
+          <a-divider orientation="left" plain>状态与落实</a-divider>
+          <a-row :gutter="[16, 0]">
             <a-col :span="12">
-              <a-form-item label="落实情况" v-bind="validateInfos.implStatus" name="implStatus">
+              <a-form-item label="落实情况" name="implStatus">
                 <a-input v-model:value="formData.implStatus" placeholder="请输入落实情况" allow-clear></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="12">
               <a-form-item label="完成状态" v-bind="validateInfos.completionStatus" name="completionStatus">
-                <JDictSelectTag v-model:value="formData.completionStatus" dictCode="measure_complete_status" placeholder="请选择完成状态" type="select" 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 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="12">
+              <a-form-item label="检查情况" name="checkStatus">
+                <a-input v-model:value="formData.checkStatus" placeholder="请输入检查情况" allow-clear></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="24">
-              <a-form-item label="落实计划" v-bind="validateInfos.completionPlan" name="completionPlan">
+              <a-form-item label="落实计划" name="completionPlan">
                 <a-textarea v-model:value="formData.completionPlan" placeholder="请输入落实计划" :rows="3" allow-clear></a-textarea>
               </a-form-item>
             </a-col>
@@ -70,8 +110,8 @@
               </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-input>
+              <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">
@@ -79,11 +119,10 @@
                 <a-textarea v-model:value="formData.inspectionAdvice" placeholder="请输入监督意见" :rows="3" allow-clear></a-textarea>
               </a-form-item>
             </a-col>
-            <a-col :span="12">
-              <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-row>
+          <!-- 周期配置 -->
+          <a-divider orientation="left" plain>周期配置</a-divider>
+          <a-row :gutter="[16, 0]">
             <a-col :span="12">
               <a-form-item label="发起类型" name="launchType">
                 <a-select v-model:value="formData.launchType" placeholder="请选择发起类型" allow-clear>
@@ -110,15 +149,21 @@
             </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="12">
-              <a-form-item label="外键" name="mainId" style="display: none">
-                <a-input v-model:value="formData.mainId" placeholder="请输入外键" allow-clear></a-input>
+                <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-row>
+          <!-- 外键隐藏 -->
+          <a-form-item label="外键" name="mainId" style="display: none">
+            <a-input v-model:value="formData.mainId" placeholder="请输入外键" allow-clear></a-input>
+          </a-form-item>
         </a-form>
       </template>
     </JFormContainer>
@@ -127,11 +172,11 @@
 
 <script lang="ts" setup>
   import { ref, reactive, defineExpose, nextTick, inject, unref } from 'vue';
+  import { Form } from 'ant-design-vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getValueType } from '/@/utils';
   import { bgXiSpeakFeedbackSaveOrUpdate } from '../BgXiSpeak.api';
-  import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
@@ -139,7 +184,6 @@
 
   const mainId = inject('mainId');
   const formRef = ref();
-  const useForm = Form.useForm;
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
@@ -171,14 +215,17 @@
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
   const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
   const confirmLoading = ref<boolean>(false);
-  const validatorRules = {};
+  const validatorRules = reactive({
+    completionStatus: [{ required: true, message: '请选择完成状态' }],
+    progress: [{ required: true, message: '请输入进展情况' }],
+  });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
   const props = defineProps({
     disabled: { type: Boolean, default: false },
   });
   const formItemLayout = {
-    labelCol: { xs: { span: 24 }, sm: { span: 5 } },
-    wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
+    labelCol: { xs: { span: 24 }, sm: { span: 6 } },
+    wrapperCol: { xs: { span: 24 }, sm: { span: 18 } },
   };
 
   /**
@@ -229,7 +276,7 @@
 
   async function submitForm() {
     try {
-      await validate();
+      await formRef.value?.validate();
     } catch ({ errorFields }) {
       if (errorFields) {
         const firstField = errorFields[0];

src/views/bg/xispeak/components/BgXiSpeakFeedbackModal.vue

@@ -34,7 +34,7 @@
   }
 
   function handleOk() {
-    registerForm.value.submitForm();
+    return registerForm.value.submitForm();
   }
 
   function submitCallback() {

src/views/bg/xispeak/components/BgXiSpeakFeedbackViewModal.vue

@@ -0,0 +1,100 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="900"
+    :visible="visible"
+    :okButtonProps="{ class: { 'jee-hidden': true } }"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <BasicTable
+      size="small"
+      rowKey="id"
+      :canResize="false"
+      :showIndexColumn="false"
+      :showActionColumn="false"
+      :showTableSetting="false"
+      :clickToRowSelect="false"
+      :columns="columns"
+      :dataSource="feedbackTableData"
+      :loading="loading"
+      :pagination="false"
+      :bordered="false"
+    />
+  </j-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref, computed, defineExpose } from 'vue';
+  import { BasicTable } from '/@/components/Table';
+  import type { BasicColumn } from '/@/components/Table';
+  import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+  import { bgXiSpeakFeedbackList } from '../BgXiSpeak.api';
+
+  const visible = ref(false);
+  const loading = ref(false);
+  const feedbackTableData = ref<Recordable[]>([]);
+  const currentRecord = ref<Recordable>({});
+
+  const columns: BasicColumn[] = [
+    {
+      title: '反馈人',
+      dataIndex: 'responPersonname',
+      align: 'center',
+      width: 100,
+    },
+    {
+      title: '反馈部门',
+      dataIndex: 'responDeptname',
+      align: 'center',
+      width: 140,
+    },
+    {
+      title: '反馈措施',
+      dataIndex: 'method',
+      align: 'left',
+      ellipsis: true,
+    },
+    {
+      title: '完成状态',
+      dataIndex: 'completionStatus_dictText',
+      align: 'center',
+      width: 100,
+    },
+    {
+      title: '成果形式',
+      dataIndex: 'outcomeForm',
+      align: 'center',
+      width: 120,
+    },
+  ];
+
+  const title = computed(() => {
+    const count = loading.value ? '加载中' : `${feedbackTableData.value.length} 条`;
+    return `反馈信息（${count}）`;
+  });
+
+  async function open(record: Recordable) {
+    currentRecord.value = record;
+    visible.value = true;
+    loading.value = true;
+    try {
+      const res = await bgXiSpeakFeedbackList({
+        mainId: record.id,
+        pageNo: 1,
+        pageSize: 9999,
+        column: 'createTime',
+        order: 'desc',
+      });
+      feedbackTableData.value = Array.isArray(res) ? res : res?.records || [];
+    } finally {
+      loading.value = false;
+    }
+  }
+
+  function handleCancel() {
+    visible.value = false;
+  }
+
+  defineExpose({ open });
+</script>

src/views/bg/xispeak/components/BgXiSpeakForm.vue

@@ -29,6 +29,11 @@
                 <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.secretLevel" id="BgXiSpeakForm-secretLevel" name="secretLevel">
+                <j-dict-select-tag v-model:value="formData.secretLevel" dictCode="secret_level" placeholder="请选择密级" allow-clear />
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="责任人" v-bind="validateInfos.responsiblePerson" id="BgXiSpeakForm-responsiblePerson" name="responsiblePerson">
                 <j-select-user v-model:value="formData.responsiblePerson" placeholder="请从所党委选择责任人" allow-clear />
@@ -202,6 +207,7 @@
     time: '',
     elmComment: '经单位主要负责同时签批同意，由xx部做好贯彻落实',
     status: 'x月x日召开xxxx年第x次党委会议',
+    secretLevel: '',
     responsiblePerson: '',
     needSdwApproval: 0,
     sdwLeaderList: '',
@@ -234,6 +240,7 @@
     time: [{ required: true, message: '请选择时间' }],
     elmComment: [{ required: true, message: '请输入企业负责同志批示情况' }],
     status: [{ required: true, message: '请输入学习传达研究部署情况' }],
+    secretLevel: [{ required: true, message: '请选择密级' }],
     responsiblePerson: [{ required: true, message: '请选择责任人' }],
     needSdwApproval: [{ required: true, message: '请选择是否需要督办领导' }],
     implMeasures: [{ required: true, message: '请输入贯彻落实措施' }],