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

.gitignore

@@ -24,6 +24,7 @@ pnpm-debug.log*
 .idea
 .svn
 # .vscode
+*.java
 *.suo
 *.ntvs*
 *.njsproj

src/components/semri/process/FlowScheduleStartModal.vue

@@ -1,12 +1,5 @@
 <template>
-  <j-modal
+  <j-modal :title="title" :width="720" :visible="visible" @ok="handleOk" @cancel="handleCancel" cancelText="取消">
-    :title="title"
-    :width="720"
-    :visible="visible"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="取消"
-  >
     <a-form :model="formData" :label-col="{ style: { width: '120px' } }" :wrapper-col="{ span: 16 }">
       <a-form-item label="发起类型">
         <a-radio-group v-model:value="formData.triggerMode">
@@ -15,12 +8,12 @@
         </a-radio-group>
       </a-form-item>
 
-      <a-form-item v-if="deptOptions.length" label="被督办部门">
+      <a-form-item v-if="deptOptions.length" label="牵头部门">
         <a-select
           v-model:value="formData.deptIds"
           mode="multiple"
           :options="deptOptions"
-          placeholder="请选择被督办部门"
+          placeholder="请选择牵头部门"
           allow-clear
           style="width: 100%"
           :getPopupContainer="(node) => node?.parentNode"
@@ -28,16 +21,12 @@
       </a-form-item>
 
       <template v-if="showSuoleaderFields">
-        <a-form-item label="是否所办领导审批">
+        <a-form-item label="是否所党委审批">
           <j-switch v-model:value="formData.isNeedAppro" />
         </a-form-item>
 
-        <a-form-item label="所办领导">
+        <a-form-item label="所党委领导">
-          <j-select-user
+          <j-select-user v-model:value="formData.supDeptleaderid" :disabled="String(formData.isNeedAppro) !== '1'" allow-clear />
-            v-model:value="formData.supDeptleaderid"
-            :disabled="String(formData.isNeedAppro) !== '1'"
-            allow-clear
-          />
         </a-form-item>
       </template>
 
@@ -52,13 +41,7 @@
         </a-form-item>
 
         <a-form-item label="重复次数">
-          <a-input-number
+          <a-input-number v-model:value="formData.startCount" :min="1" :precision="0" placeholder="重复次数" style="width: 100%" />
-            v-model:value="formData.startCount"
-            :min="1"
-            :precision="0"
-            placeholder="重复次数"
-            style="width: 100%"
-          />
         </a-form-item>
 
         <a-form-item label="重复开始日期">

src/views/bg/xispeak/BgXiSpeak.api.ts

@@ -105,6 +105,17 @@ export const bgXiSpeakFeedbackList = (params) => {
   return Promise.resolve({});
 };
 
+/**
+ * 子表列表接口
+ * @param params
+ */
+export const bgXiSpeakFeedbackListWithDept = (params) => {
+  if (params['mainId']) {
+    return defHttp.get({ url: '/bg/xispeak/bgXiSpeak/listBgXiSpeakFeedbackByMainIdWithUserDept', params });
+  }
+  return Promise.resolve({});
+};
+
 /**
  * 子表删除单个
  */

src/views/bg/xispeak/BgXiSpeak.data.ts

@@ -34,15 +34,15 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'responsiblePerson_dictText',
   },
-  {
+  // {
-    title: '落实方案',
+  //   title: '落实方案',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'implPlan',
+  //   dataIndex: 'implPlan',
-  },
+  // },
   {
     title: '牵头部门',
     align: 'center',
-    dataIndex: 'leadDepartment_dictText',
+    dataIndex: 'implDept_dictText',
   },
   {
     title: '贯彻落实措施',
@@ -54,36 +54,36 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'numberOfResolutions',
   },
+  // {
+  //   title: '落实情况',
+  //   align: 'left',
+  //   dataIndex: 'implStatus',
+  // },
   {
-    title: '落实情况',
+    title: '落实措施条数',
-    align: 'left',
-    dataIndex: 'implStatus',
-  },
-  {
-    title: '落实条数',
     align: 'center',
     dataIndex: 'implCount',
   },
   {
-    title: '已闭环数量',
+    title: '措施已闭环数',
     align: 'center',
     dataIndex: 'closedCount',
   },
-  {
+  // {
-    title: '报告反馈情况',
+  //   title: '报告反馈情况',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'reportFeedbackStatus',
+  //   dataIndex: 'reportFeedbackStatus',
-  },
+  // },
-  {
+  // {
-    title: '是否存在完成风险(0不存在，1存在)',
+  //   title: '是否存在完成风险(0不存在，1存在)',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'isCompletionRisk',
+  //   dataIndex: 'isCompletionRisk',
-  },
+  // },
-  {
+  // {
-    title: '拖期风险应对措施',
+  //   title: '拖期风险应对措施',
-    align: 'center',
+  //   align: 'center',
-    dataIndex: 'delayRiskMitigation',
+  //   dataIndex: 'delayRiskMitigation',
-  },
+  // },
   {
     title: '完成状态',
     align: 'center',
@@ -105,11 +105,6 @@ export const columns: BasicColumn[] = [
       return text.length > 10 ? text.substr(0, 10) : text;
     },
   },
-  {
-    title: '落实部门',
-    align: 'center',
-    dataIndex: 'implDept_dictText',
-  },
   // {
   //   title: '层深(最顶层节点层深为0)',
   //   align: 'center',
@@ -220,7 +215,12 @@ export const bgXiSpeakFeedbackColumns: BasicColumn[] = [
   {
     title: '完成状态',
     align: 'center',
-    dataIndex: 'completionStatus',
+    dataIndex: 'completionStatus_dictText',
+  },
+  {
+    title: '是否有报送上级报告',
+    align: 'center',
+    dataIndex: 'isReportedToHigher_dictText',
   },
   {
     title: '落实计划',
@@ -257,7 +257,7 @@ export const superQuerySchema = {
   status: { title: '学习传达研究部署情况', order: 4, view: 'text', type: 'string' },
   responsiblePerson: { title: '责任人', order: 5, view: 'sel_user', type: 'string' },
   implPlan: { title: '落实方案', order: 6, view: 'text', type: 'string' },
-  leadDepartment: { title: '牵头部门', order: 7, view: 'sel_depart', type: 'string' },
+  implDept: { title: '牵头部门', order: 7, view: 'sel_depart', type: 'string' },
   implMeasures: { title: '贯彻落实措施', order: 8, view: 'text', type: 'string' },
   numberOfResolutions: { title: '会议决策数', order: 9, view: 'number', type: 'number' },
   implStatus: { title: '落实情况', order: 10, view: 'text', type: 'string' },
@@ -268,7 +268,6 @@ export const superQuerySchema = {
   delayRiskMitigation: { title: '拖期风险应对措施', order: 15, view: 'text', type: 'string' },
   completionStatus: { title: '完成状态(督办中，1已完成)', order: 16, view: 'number', type: 'number' },
   deadline: { title: '截止日期', order: 17, view: 'date', type: 'string' },
-  implDept: { title: '落实部门id', order: 18, view: 'sel_depart', type: 'string' },
   treeDepth: { title: '层深(最顶层节点层深为0)', order: 18, view: 'number', type: 'number' },
   sortOrder: { title: '同级数据排序号', order: 19, view: 'number', type: 'number' },
   bpmStatus: { title: '流程引擎状态字段', order: 21, view: 'number', type: 'number' },

src/views/bg/xispeak/BgXiSpeakList.vue

@@ -1,86 +1,90 @@
 <template>
   <div>
-    <BasicTable @register="registerTable" :rowSelection="rowSelection" :expandedRowKeys="expandedRowKeys" @expand="handleExpand" @fetch-success="onFetchSuccess">
+    <BasicTable
-        <!--插槽:table标题-->
+      @register="registerTable"
-        <template #tableTitle>
+      :rowSelection="rowSelection"
-          <a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">新增</a-button>
+      :expandedRowKeys="expandedRowKeys"
-          <a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"
+      @expand="handleExpand"
-            >导出</a-button
+      @fetch-success="onFetchSuccess"
-          >
+    >
-          <j-upload-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
+      <!--插槽:table标题-->
-            >导入</j-upload-button
+      <template #tableTitle>
-          >
+        <a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">新增</a-button>
-          <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">导出</a-button>
-            <template #overlay>
+        <j-upload-button type="primary" v-auth="'bg.xispeak:bg_xi_speak:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
-              <a-menu>
+          >导入</j-upload-button
-                <a-menu-item key="1" @click="batchHandleDelete">
+        >
-                  <Icon icon="ant-design:delete-outlined"></Icon>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
-                  删除
+          <template #overlay>
-                </a-menu-item>
+            <a-menu>
-              </a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
-            </template>
+                <Icon icon="ant-design:delete-outlined"></Icon>
-            <a-button v-auth="'bg.xispeak:bg_xi_speak:deleteBatch'"
+                删除
-              >批量操作
+              </a-menu-item>
-              <Icon icon="ant-design:down-outlined"></Icon>
+            </a-menu>
-            </a-button>
+          </template>
-          </a-dropdown>
+          <a-button v-auth="'bg.xispeak:bg_xi_speak:deleteBatch'"
-          <!-- 高级查询 -->
+            >批量操作
-          <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+            <Icon icon="ant-design:down-outlined"></Icon>
-        </template>
+          </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
 
-        <!--操作栏-->
+      <!--操作栏-->
-        <template #action="{ record }">
+      <template #action="{ record }">
-          <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
-        </template>
+      </template>
-        <!--字段回显插槽-->
+      <!--字段回显插槽-->
-        <template v-slot:bodyCell="{ column, record, index, text }"> </template>
+      <template v-slot:bodyCell="{ column, record, index, text }"> </template>
-        <!--嵌套子表-->
+      <!--嵌套子表-->
-        <template #expandedRowRender="{ record }">
+      <template #expandedRowRender="{ record }">
-          <div class="feedback-expand-table" v-if="selectedFeedbackId === record.id">
+        <div class="feedback-expand-table" v-if="selectedFeedbackId === record.id">
-            <div class="feedback-expand-header">
+          <div class="feedback-expand-header">
-              <div class="feedback-expand-title">
+            <div class="feedback-expand-title">
-                <span class="feedback-expand-icon">
+              <span class="feedback-expand-icon">
-                  <Icon icon="ant-design:message-outlined" />
+                <Icon icon="ant-design:message-outlined" />
-                </span>
+              </span>
-                <span>反馈信息</span>
+              <span>反馈信息</span>
-                <a-tag class="feedback-expand-count" color="processing">
+              <a-tag class="feedback-expand-count" color="processing">
-                  {{ getFeedbackTableLoading(record) ? '加载中' : `${getFeedbackCount(record)} 条` }}
+                {{ getFeedbackTableLoading(record) ? '加载中' : `${getFeedbackCount(record)} 条` }}
-                </a-tag>
+              </a-tag>
-              </div>
+            </div>
-              <div class="feedback-expand-actions">
+            <div class="feedback-expand-actions">
-                <a-button type="link" size="small" @click="handleCloseFeedback">收起</a-button>
+              <a-button type="link" size="small" @click="handleCloseFeedback">收起</a-button>
-              </div>
             </div>
-            <BasicTable
-              class="feedback-inner-table"
-              bordered
-              size="small"
-              rowKey="id"
-              :canResize="false"
-              :showIndexColumn="false"
-              :showActionColumn="false"
-              :showTableSetting="false"
-              :clickToRowSelect="false"
-              :columns="feedbackExpandColumns"
-              :dataSource="getFeedbackTableData(record)"
-              :loading="getFeedbackTableLoading(record)"
-              :pagination="false"
-              :scroll="{ x: 1220 }"
-            >
-              <template #feedbackAttachments="{ record: feedbackRecord }">
-                <SUploadFile
-                  v-if="feedbackRecord.id"
-                  class="feedback-attachment-list"
-                  :bussiness-id="feedbackRecord.id"
-                  :disabled="true"
-                  :multiple="true"
-                />
-                <span v-else>-</span>
-              </template>
-            </BasicTable>
           </div>
-        </template>
+          <BasicTable
-      </BasicTable>
+            class="feedback-inner-table"
+            bordered
+            size="small"
+            rowKey="id"
+            :canResize="false"
+            :showIndexColumn="false"
+            :showActionColumn="false"
+            :showTableSetting="false"
+            :clickToRowSelect="false"
+            :columns="feedbackExpandColumns"
+            :dataSource="getFeedbackTableData(record)"
+            :loading="getFeedbackTableLoading(record)"
+            :pagination="false"
+            :scroll="{ x: 1220 }"
+          >
+            <template #feedbackAttachments="{ record: feedbackRecord }">
+              <SUploadFile
+                v-if="feedbackRecord.id"
+                class="feedback-attachment-list"
+                :bussiness-id="feedbackRecord.id"
+                :disabled="true"
+                :multiple="true"
+              />
+              <span v-else>-</span>
+            </template>
+          </BasicTable>
+        </div>
+      </template>
+    </BasicTable>
     <!-- 表单区域 -->
     <BgXiSpeakModal ref="registerModal" @success="handleSuccess"></BgXiSpeakModal>
     <!-- 审批记录 -->
@@ -187,7 +191,8 @@
     },
   });
 
-  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
+  const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] =
+    tableContext;
   const mainId = computed(() => (unref(selectedRowKeys).length > 0 ? unref(selectedRowKeys)[0] : ''));
   provide('mainId', mainId);
 
@@ -470,7 +475,7 @@
 
     if (record.bpmStatus == '1' || !record.bpmStatus) {
       dropDownAction.push({
-        label: '发起督办计划收集流程',
+        label: '发起落实措施收集流程',
         onClick: handleProcess.bind(null, record),
       });
       dropDownAction.push({
@@ -508,8 +513,8 @@
   }
 
   function getLeadDeptOptions(record) {
-    const deptIds = splitDeptValue(record?.leadDepartment);
+    const deptIds = splitDeptValue(record?.implDept);
-    const deptNames = splitDeptValue(record?.leadDepartment_dictText);
+    const deptNames = splitDeptValue(record?.implDept_dictText);
     return deptIds.map((deptId, index) => ({
       value: deptId,
       label: deptNames[index] || deptId,
@@ -528,7 +533,7 @@
   function handleFeedbackRightNowConfirm({ record, feedbackRightNow }) {
     pendingFeedbackRightNow.value = feedbackRightNow;
     flowScheduleModalRef.value?.open({
-      title: '发起督办计划收集流程',
+      title: '发起落实措施收集流程',
       payload: { record },
       deptOptions: getLeadDeptOptions(record),
       showSuoleaderFields: true,
@@ -657,7 +662,7 @@
         title: record.speakStatus,
         content: record.implStatus,
         urgencyLevel: record.completionStatus,
-        deptId: options.deptId || record.leadDepartment,
+        deptId: options.deptId || record.implDept,
         deptLeaderId: record.responsiblePerson,
         requireFinishDate: formatDate(record.time, 'YYYY-MM-DD'),
         deadline: record.deadline || formatDate(record.time, 'YYYY-MM-DD HH:mm:ss'),

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

@@ -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
+    <a-form ref="formRef" class="bpm-feedback-modal-form" :model="formData" :rules="formRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
-      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-col :span="12">-->
-          <a-form-item label="序号" name="num">
+        <!--          <a-form-item label="序号" name="num">-->
-            <a-input-number v-model:value="formData.num" style="width: 100%" allow-clear />
+        <!--            <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-col :span="24">-->
-          <a-form-item label="落实情况" name="implStatus" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
+        <!--          <a-form-item label="落实情况" name="implStatus" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">-->
-            <a-textarea v-model:value="formData.implStatus" :rows="3" allow-clear />
+        <!--            <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-form-item label="监督意见(纪检)" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-            <a-textarea v-model:value="formData.completionPlan" :rows="3" allow-clear />
+            <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-form-item label="措施数量(纪检)" name="measureNum">
-            <a-input v-model:value="formData.sumMethodNum" allow-clear />
+            <a-input-number v-model:value="formData.measureNum" placeholder="填写本条举措设计的措施数量" style="width: 100%" 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>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="监督意见" name="inspectionAdvice" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
+          <a-form-item label="体现落实措施，取得成果的证明材料" :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">
             <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>
 

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

@@ -43,12 +43,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="牵头部门" name="leadDepartment">
+              <a-form-item label="牵头部门" name="implDept">
-                <j-select-dept v-model:value="mainForm.leadDepartment" :disabled="mainDisabled" :multiple="true" checkStrictly allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="落实部门" name="implDept">
                 <j-select-dept v-model:value="mainForm.implDept" :disabled="mainDisabled" :multiple="true" checkStrictly allow-clear />
               </a-form-item>
             </a-col>
@@ -153,7 +148,7 @@
         :columns="feedbackColumns"
         :data-source="feedbackList"
         :pagination="false"
-        :scroll="{ x: 1400 }"
+        :scroll="{ x: 2080 }"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'attachments'">
@@ -166,6 +161,12 @@
             />
             <span v-else>-</span>
           </template>
+          <template v-if="column.key === 'feedbackAction'">
+            <a-button type="link" size="small" @click="handleEditFeedback(record)">编辑</a-button>
+            <a-popconfirm title="确定删除该反馈吗？" @confirm="handleDeleteFeedback(record)">
+              <a-button type="link" size="small" danger>删除</a-button>
+            </a-popconfirm>
+          </template>
         </template>
       </a-table>
 
@@ -218,7 +219,7 @@
   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, saveBpmForm, setProcessVariable } from '../BgXiSpeak.api';
+  import { bgXiSpeakFeedbackList, bgXiSpeakFeedbackDelete, saveBpmForm, setProcessVariable } 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';
@@ -268,7 +269,6 @@
     needSdwApproval: 0,
     sdwLeaderList: '',
     implPlan: '',
-    leadDepartment: '',
     implMeasures: '',
     numberOfResolutions: undefined,
     implStatus: '',
@@ -286,16 +286,26 @@
     supervisionCount: undefined,
   });
 
-  const feedbackColumns = [
+  const feedbackColumns = computed(() => {
-    { title: '序号', dataIndex: 'num', align: 'center', width: 60 },
+    const cols: any[] = [
-    { title: '反馈部门名称', dataIndex: 'responDeptname', align: 'center', width: 140 },
+      { title: '序号', dataIndex: 'num', align: 'center', width: 60 },
-    { title: '反馈人姓名', dataIndex: 'responPersonname', align: 'center', width: 120 },
+      { title: '反馈部门名称', dataIndex: 'responDeptname', align: 'center', width: 140 },
-    { title: '措施内容', dataIndex: 'method', align: 'left', width: 200 },
+      { title: '反馈人姓名', dataIndex: 'responPersonname', align: 'center', width: 120 },
-    { title: '完成状态', dataIndex: 'completionStatus_dictText', align: 'center', width: 100 },
+      { title: '措施内容', dataIndex: 'method', align: 'left', width: 200 },
-    { title: '进展情况', dataIndex: 'progress', align: 'left', width: 200 },
+      { title: '完成状态', dataIndex: 'completionStatus_dictText', align: 'center', width: 100 },
-    { title: '落实情况', dataIndex: 'implStatus', align: 'left', width: 200 },
+      { title: '是否有报送上级报告', dataIndex: 'isReportedToHigher_dictText', align: 'center', width: 140 },
-    { title: '附件', dataIndex: 'id', key: 'attachments', align: 'left', width: 340 },
+      { 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 (showEditFeedback.value) {
+      cols.push({ title: '操作', dataIndex: 'id', key: 'feedbackAction', align: 'center', width: 120, fixed: 'right' });
+    }
+    return cols;
+  });
 
   const mainDisabled = computed(() => {
     if (props.formBpm) {
@@ -305,6 +315,7 @@
   });
   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 showSubApproveUser = computed(() => String(props.formData?.extendUrlParams?.selectuser ?? '') === '1');
   const showSubApproveUserSelector = computed(() => showSubApproveUser.value && String(isEnd.value) !== '1');
 
@@ -432,6 +443,18 @@
     feedbackModalRef.value?.open(mainForm.id, undefined, processInstanceId);
   }
 
+  function handleEditFeedback(record) {
+    feedbackModalRef.value?.openEdit(record);
+  }
+
+  async function handleDeleteFeedback(record) {
+    if (!record.id) {
+      createMessage.warning('反馈记录ID不存在');
+      return;
+    }
+    await bgXiSpeakFeedbackDelete({ id: record.id }, loadFeedbackList);
+  }
+
   async function saveSubApproveUserVariable(options: { showSuccessMessage?: boolean } = {}) {
     const { showSuccessMessage = true } = options;
     const processInstanceId = processInfo.value.processInstanceId;

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

@@ -51,7 +51,12 @@
             </a-col>
             <a-col :span="12">
               <a-form-item label="完成状态" v-bind="validateInfos.completionStatus" name="completionStatus">
-                <a-input v-model:value="formData.completionStatus" placeholder="请输入完成状态" allow-clear></a-input>
+                <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">
@@ -130,6 +135,7 @@
   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';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
 
   const mainId = inject('mainId');
   const formRef = ref();
@@ -144,6 +150,7 @@
     responTime: '',
     implStatus: '',
     completionStatus: '',
+    isReportedToHigher: undefined,
     completionPlan: '',
     mainId: '',
     num: undefined,

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

@@ -5,8 +5,13 @@
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BgXiSpeakForm">
           <a-row>
             <a-col :span="12">
-              <a-form-item label="重要讲话指示批示" v-bind="validateInfos.speakStatus" id="BgXiSpeakForm-speakStatus" name="speakStatus">
+              <a-form-item
-                <a-textarea v-model:value="formData.speakStatus" :rows="4" placeholder="请输入重要指示批示情况" allow-clear />
+                label="习近平总书记重要讲话指示批示情况"
+                v-bind="validateInfos.speakStatus"
+                id="BgXiSpeakForm-speakStatus"
+                name="speakStatus"
+              >
+                <a-textarea v-model:value="formData.speakStatus" :rows="4" placeholder="请输入习近平总书记重要讲话指示批示情况" allow-clear />
               </a-form-item>
             </a-col>
             <a-col :span="12">
@@ -14,23 +19,53 @@
                 <a-date-picker placeholder="请选择时间" v-model:value="formData.time" value-format="YYYY-MM-DD" style="width: 100%" 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" allow-clear />
-              </a-form-item>
-            </a-col>
             <a-col :span="12">
               <a-form-item label="企业负责同志批示情况" v-bind="validateInfos.elmComment" id="BgXiSpeakForm-elmComment" name="elmComment">
-                <a-input v-model:value="formData.elmComment" placeholder="请输入" allow-clear></a-input>
+                <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-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-form-item label="责任人" v-bind="validateInfos.responsiblePerson" id="BgXiSpeakForm-responsiblePerson" name="responsiblePerson">
+                <j-select-user v-model:value="formData.responsiblePerson" placeholder="请从所党委选择责任人" allow-clear />
+              </a-form-item>
+            </a-col>
+            <!--            <a-col :span="12">-->
+            <!--              <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-form-item>-->
+            <!--            </a-col>-->
+            <a-col :span="12">
+              <a-form-item label="牵头部门" v-bind="validateInfos.implDept" id="BgXiSpeakForm-implDept" name="implDept">
+                <j-select-dept v-model:value="formData.implDept" :multiple="true" placeholder="请选择牵头部门" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <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-form-item>
+            </a-col>
+            <a-col :span="12">
+              <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-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="0">否</a-radio>
@@ -38,95 +73,96 @@
               </a-form-item>
             </a-col>
             <a-col v-if="formData.needSdwApproval === 1" :span="12">
-              <a-form-item label="督导领导列表" v-bind="validateInfos.sdwLeaderList" id="BgXiSpeakForm-sdwLeaderList" name="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-col>
+
+            <a-col :span="12">
+              <a-form-item label="指定落实措施条数" v-bind="validateInfos.implCount" id="BgXiSpeakForm-implCount" name="implCount">
+                <a-input-number
+                  v-model:value="formData.implCount"
+                  placeholder="指定落实措施条数无需输入，每增加一条反馈数量加1"
+                  style="width: 100%"
+                />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="牵头部门" v-bind="validateInfos.leadDepartment" id="BgXiSpeakForm-leadDepartment" name="leadDepartment">
+              <a-form-item label="措施已闭环数量" v-bind="validateInfos.closedCount" id="BgXiSpeakForm-closedCount" name="closedCount">
-                <j-select-dept v-model:value="formData.leadDepartment" :multiple="true" checkStrictly allow-clear />
+                <a-input-number v-model:value="formData.closedCount" placeholder="措施已闭环数量无需输入，每一个牵头部门完成反馈全流程，增加相应反馈数量" style="width: 100%" />
               </a-form-item>
             </a-col>
+<!--            <a-col :span="12">-->
+<!--              <a-form-item label="落实情况" v-bind="validateInfos.implStatus" id="BgXiSpeakForm-implStatus" name="implStatus">-->
+<!--                <a-textarea v-model:value="formData.implStatus" :rows="4" placeholder="请输入" allow-clear />-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <a-col :span="12">
-              <a-form-item label="落实部门" v-bind="validateInfos.implDept" id="BgXiSpeakForm-implDept" name="implDept">
+              <a-form-item
-                <j-select-dept v-model:value="formData.implDept" :multiple="true" checkStrictly allow-clear />
+                label="报告反馈情况"
-              </a-form-item>
+                v-bind="validateInfos.reportFeedbackStatus"
-            </a-col>
+                id="BgXiSpeakForm-reportFeedbackStatus"
-            <a-col :span="12">
+                name="reportFeedbackStatus"
-              <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-form-item>
-            </a-col>
-            <a-col :span="12">
-              <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-form-item>
-            </a-col>
-            <a-col :span="12">
-              <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-form-item>
-            </a-col>
-            <a-col :span="12">
-              <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-form-item>
-            </a-col>
-            <a-col :span="12">
-              <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-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="落实情况" v-bind="validateInfos.implStatus" id="BgXiSpeakForm-implStatus" name="implStatus">
-                <a-textarea v-model:value="formData.implStatus" :rows="4" placeholder="请输入" allow-clear />
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <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-form-item>
             </a-col>
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="是否存在完成风险" id="BgXiSpeakForm-isCompletionRisk" name="isCompletionRisk">-->
+            <!--                <a-radio-group v-model:value="formData.isCompletionRisk">-->
+            <!--                  <a-radio :value="0">不存在</a-radio>-->
+            <!--                  <a-radio :value="1">存在</a-radio>-->
+            <!--                </a-radio-group>-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col :span="12">
-              <a-form-item label="是否存在完成风险" id="BgXiSpeakForm-isCompletionRisk" name="isCompletionRisk">
+              <a-form-item label="完成状态" v-bind="validateInfos.completionStatus" id="BgXiSpeakForm-completionStatus" name="completionStatus">
-                <a-radio-group v-model:value="formData.isCompletionRisk">
-                  <a-radio :value="0">不存在</a-radio>
-                  <a-radio :value="1">存在</a-radio>
-                </a-radio-group>
-              </a-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="完成状态" id="BgXiSpeakForm-completionStatus" name="completionStatus">
                 <JDictSelectTag v-model:value="formData.completionStatus" dictCode="db_status" placeholder="请选择完成状态" type="radio" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="截止日期" id="BgXiSpeakForm-deadline" name="deadline">
+              <a-form-item label="截止日期" v-bind="validateInfos.deadline" id="BgXiSpeakForm-deadline" name="deadline">
-                <a-date-picker placeholder="请选择截止日期" v-model:value="formData.deadline" value-format="YYYY-MM-DD HH:mm:ss" :show-time="true" style="width: 100%" allow-clear />
+                <a-date-picker
-              </a-form-item>
+                  placeholder="请选择截止日期"
-            </a-col>
+                  v-model:value="formData.deadline"
-            <a-col :span="12">
+                  value-format="YYYY-MM-DD HH:mm:ss"
-              <a-form-item label="拖期风险应对措施" v-bind="validateInfos.delayRiskMitigation" id="BgXiSpeakForm-delayRiskMitigation" name="delayRiskMitigation">
+                  :show-time="true"
-                <a-input v-model:value="formData.delayRiskMitigation" placeholder="请输入" allow-clear></a-input>
+                  style="width: 100%"
-              </a-form-item>
+                  allow-clear
-            </a-col>
-            <a-col :span="12">
-              <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-form-item>
-            </a-col>
-            <a-col :span="12">
-              <a-form-item label="父级节点" v-bind="validateInfos.pid" id="BgXiSpeakForm-pid" name="pid">
-                <j-tree-select
-                  v-model:value="formData.pid"
-                  dict="bg_xi_speak,impl_status,id"
-                  pidField="pid"
-                  pidValue="0"
-                  hasChildField="has_child"
-                  :disabled="disabled"
                 />
               </a-form-item>
             </a-col>
+            <!--            <a-col :span="12">-->
+            <!--              <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-form-item>-->
+            <!--            </a-col>-->
+            <a-col :span="12">
+              <a-form-item label="督办次数" v-bind="validateInfos.supervisionCount" id="BgXiSpeakForm-supervisionCount" name="supervisionCount">
+                <a-input-number
+                  v-model:value="formData.supervisionCount"
+                  placeholder="督办次数无需输入，每次发起督办流程自动加1"
+                  style="width: 100%"
+                />
+              </a-form-item>
+            </a-col>
+            <!--            <a-col :span="12">-->
+            <!--              <a-form-item label="父级节点" v-bind="validateInfos.pid" id="BgXiSpeakForm-pid" name="pid">-->
+            <!--                <j-tree-select-->
+            <!--                  v-model:value="formData.pid"-->
+            <!--                  dict="bg_xi_speak,impl_status,id"-->
+            <!--                  pidField="pid"-->
+            <!--                  pidValue="0"-->
+            <!--                  hasChildField="has_child"-->
+            <!--                  :disabled="disabled"-->
+            <!--                />-->
+            <!--              </a-form-item>-->
+            <!--            </a-col>-->
             <a-col v-if="showFlowSubmitButton" :span="24" style="width: 100%; text-align: center">
               <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
             </a-col>
@@ -164,13 +200,12 @@
     pid: '',
     speakStatus: '',
     time: '',
-    elmComment: '',
+    elmComment: '经单位主要负责同时签批同意，由xx部做好贯彻落实',
-    status: '',
+    status: 'x月x日召开xxxx年第x次党委会议',
     responsiblePerson: '',
     needSdwApproval: 0,
     sdwLeaderList: '',
     implPlan: '',
-    leadDepartment: '',
     implMeasures: '',
     numberOfResolutions: undefined,
     implStatus: '',
@@ -195,8 +230,18 @@
   const confirmLoading = ref<boolean>(false);
 
   const validatorRules = reactive({
+    speakStatus: [{ required: true, message: '请输入重要讲话指示批示情况' }],
+    time: [{ required: true, message: '请选择时间' }],
+    elmComment: [{ required: true, message: '请输入企业负责同志批示情况' }],
+    status: [{ required: true, message: '请输入学习传达研究部署情况' }],
+    responsiblePerson: [{ required: true, message: '请选择责任人' }],
     needSdwApproval: [{ required: true, message: '请选择是否需要督办领导' }],
-    speakStatus: [{ required: true, message: '请输入指示批示情况' }],
+    implMeasures: [{ required: true, message: '请输入贯彻落实措施' }],
+    numberOfResolutions: [{ required: true, message: '请输入会议决策数' }],
+    reportFeedbackStatus: [{ required: true, message: '请输入报告反馈情况' }],
+    completionStatus: [{ required: true, message: '请选择完成状态' }],
+    deadline: [{ required: true, message: '请选择截止日期' }],
+    implDept: [{ required: true, message: '请选择牵头部门' }],
   });
   const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
 

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

@@ -1,6 +1,6 @@
 <template>
   <JModal
-    title="发起督办计划收集流程"
+    title="发起落实措施收集流程"
     :width="480"
     :visible="visible"
     :confirmLoading="confirming"