!19 feat(dq): 新增整改任务BPM审批界面及extendUrlParams权限控制架构

* feat(dq): 新增整改任务BPM审批界面及extendUrlParams权限控制架构
* feat(dq): 整改任务列表新增查询督办流程按钮并清理未使用导入
* style(dq): 优化整改任务表单为双列分区布局参考BgXiSpeakForm样式
* feat(dq): 整改任务列表新增FlowScheduleStartModal流程调度和弹窗式反馈查看
* feat(dq): 新增反馈查看弹窗组件并在进展列表中集成查看反馈按钮
* fix(dq): 修正巡视工作进展反馈查询接口地址并与Controller对齐
* fix(dq): 修正巡视工作进展反馈API地址与后端Controller对齐
* feat(dq): 新增整改任务列表发起流程和查看反馈按钮
* feat(dq): 新增巡视工作进展反馈页面

src/views/dq/inspectTask/DqInspectTaskList.vue

@@ -4,16 +4,21 @@
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
-        <a-col :lg="6">
-        <a-form-item name="improveMeasure">
-        <template #label><span title="整改措施">整改措施</span></template>
-            <JInput v-model:value="queryParam.improveMeasure"/>
-        </a-form-item>
-        </a-col>
+          <a-col :lg="6">
+            <a-form-item name="improveMeasure">
+              <template #label><span title="整改措施">整改措施</span></template>
+              <JInput v-model:value="queryParam.improveMeasure" />
+            </a-form-item>
+          </a-col>
           <a-col :lg="6">
             <a-form-item name="measureResLeader">
               <template #label><span title="措施责任领导">措施责任</span></template>
-              <j-select-user placeholder="请选择措施责任领导" v-model:value="queryParam.measureResLeader" @change="(value)=>handleFormJoinChange('measureResLeader',value)" allow-clear />
+              <j-select-user
+                placeholder="请选择措施责任领导"
+                v-model:value="queryParam.measureResLeader"
+                @change="(value) => handleFormJoinChange('measureResLeader', value)"
+                allow-clear
+              />
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -40,57 +45,67 @@
       </a-form>
     </div>
     <!--引用表格-->
-   <BasicTable @register="registerTable" :rowSelection="rowSelection">
-     <!--插槽:table标题-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
       <template #tableTitle>
-          <a-button type="primary" v-auth="'dqinspecttask:dq_inspect_task:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-          <a-button  type="primary" v-auth="'dqinspecttask:dq_inspect_task:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
-          <j-upload-button  type="primary" v-auth="'dqinspecttask:dq_inspect_task:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
-          <a-dropdown v-if="selectedRowKeys.length > 0">
-              <template #overlay>
-                <a-menu>
-                  <a-menu-item key="1" @click="batchHandleDelete">
-                    <Icon icon="ant-design:delete-outlined"></Icon>
-                    删除
-                  </a-menu-item>
-                </a-menu>
-              </template>
-              <a-button v-auth="'dqinspecttask:dq_inspect_task:deleteBatch'">批量操作
-                <Icon icon="mdi:chevron-down"></Icon>
-              </a-button>
+        <a-button type="primary" v-auth="'dqinspecttask:dq_inspect_task:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary" v-auth="'dqinspecttask:dq_inspect_task:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
+          导出</a-button
+        >
+        <j-upload-button type="primary" v-auth="'dqinspecttask:dq_inspect_task:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls"
+          >导入</j-upload-button
+        >
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item key="1" @click="batchHandleDelete">
+                <Icon icon="ant-design:delete-outlined"></Icon>
+                删除
+              </a-menu-item>
+            </a-menu>
+          </template>
+          <a-button v-auth="'dqinspecttask:dq_inspect_task:deleteBatch'"
+            >批量操作
+            <Icon icon="mdi:chevron-down"></Icon>
+          </a-button>
         </a-dropdown>
         <!-- 高级查询 -->
         <super-query :config="superQueryConfig" @search="handleSuperQuery" />
       </template>
-       <!--操作栏-->
+      <!--操作栏-->
       <template #action="{ record }">
-        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
       </template>
       <!--字段回显插槽-->
-      <template v-slot:bodyCell="{ column, record, index, text }">
-      </template>
+      <template v-slot:bodyCell="{ column, record, index, text }"> </template>
     </BasicTable>
     <!-- 表单区域 -->
+    <DqInspectProgressFeedbackViewModal ref="feedbackViewModalRef" />
     <DqInspectTaskModal @register="registerModal" @success="handleSuccess"></DqInspectTaskModal>
-      <!-- 审批记录 -->
-      <BpmPictureModal @register="registerBpmModal" />
+    <!-- 审批记录 -->
+    <BpmPictureModal @register="registerBpmModal" />
+    <FlowScheduleStartModal ref="flowScheduleModalRef" @confirm="handleFlowScheduleConfirm" />
+    <BusinessProcessListModal ref="businessProcessListModalRef" />
   </div>
 </template>
 
 <script lang="ts" name="dqinspecttask-dqInspectTask" setup>
-  import {ref, reactive, computed, unref} from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import {useModal} from '/@/components/Modal';
-  import DqInspectTaskModal from './components/DqInspectTaskModal.vue'
-  import {ledgerColumns, superQuerySchema} from './DqInspectTask.data';
-  import {ledgerList, deleteOne, batchDelete, getImportUrl,getExportUrl} from './DqInspectTask.api';
-  import {downloadFile} from '/@/utils/common/renderUtils';
+  import { ref, reactive, computed, unref } from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useModal } from '/@/components/Modal';
+  import DqInspectTaskModal from './components/DqInspectTaskModal.vue';
+  import DqInspectProgressFeedbackViewModal from '../inspectProgress/components/DqInspectProgressFeedbackViewModal.vue';
+  import { ledgerColumns, superQuerySchema } from './DqInspectTask.data';
+  import { ledgerList, deleteOne, batchDelete, getImportUrl, getExportUrl, saveOrUpdate } from './DqInspectTask.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
   import { useMessage } from '/@/hooks/web/useMessage';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
-  import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
-  import { startProcess } from '/@/api/common/api';
+  import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
+  import { startProcessSchedules } from '/@/api/common/api';
+  import FlowScheduleStartModal from '/src/components/semri/process/FlowScheduleStartModal.vue';
+  import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
 
   const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
   import { useUserStore } from '/@/store/modules/user';
@@ -98,40 +113,43 @@
   const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
-  const [registerModal, {openModal}] = useModal();
+  const [registerModal, { openModal }] = useModal();
+  const feedbackViewModalRef = ref();
+  const flowScheduleModalRef = ref();
+  const businessProcessListModalRef = ref();
   const userStore = useUserStore();
   const { createMessage } = useMessage();
-   //注册table数据
-  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
-      tableProps:{
-           title: 'dq_inspect_task',
-           api: ledgerList,
-           columns: ledgerColumns,
-           canResize:false,
-           useSearchForm: false,
-           actionColumn: {
-               width: 120,
-               fixed:'right'
-           },
-           beforeFetch: async (params) => {
-             return Object.assign(params, queryParam);
-           },
-           afterFetch: async (items) => {
-             return calcLedgerRowSpan(items);
-           },
-        },
-        exportConfig: {
-            name:"dq_inspect_task",
-            url: getExportUrl,
-            params: queryParam,
-        },
-        importConfig: {
-            url: getImportUrl,
-            success: handleSuccess
-        },
-    })
+  //注册table数据
+  const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
+    tableProps: {
+      title: 'dq_inspect_task',
+      api: ledgerList,
+      columns: ledgerColumns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 240,
+        fixed: 'right',
+      },
+      beforeFetch: async (params) => {
+        return Object.assign(params, queryParam);
+      },
+      afterFetch: async (items) => {
+        return calcLedgerRowSpan(items);
+      },
+    },
+    exportConfig: {
+      name: 'dq_inspect_task',
+      url: getExportUrl,
+      params: queryParam,
+    },
+    importConfig: {
+      url: getImportUrl,
+      success: handleSuccess,
+    },
+  });
 
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
   // 高级查询配置
   const superQueryConfig = reactive(superQuerySchema);
@@ -146,53 +164,53 @@
     reload();
   }
 
-   /**
-    * 新增事件
-    */
+  /**
+   * 新增事件
+   */
   function handleAdd() {
-     openModal(true, {
-       isUpdate: false,
-       showFooter: true,
-     });
+    openModal(true, {
+      isUpdate: false,
+      showFooter: true,
+    });
   }
-   /**
-    * 编辑事件
-    */
+  /**
+   * 编辑事件
+   */
   function handleEdit(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: true,
-     });
-   }
-   /**
-    * 详情
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: true,
+    });
+  }
+  /**
+   * 详情
    */
   function handleDetail(record: Recordable) {
-     openModal(true, {
-       record,
-       isUpdate: true,
-       showFooter: false,
-     });
-   }
-   /**
-    * 删除事件
-    */
+    openModal(true, {
+      record,
+      isUpdate: true,
+      showFooter: false,
+    });
+  }
+  /**
+   * 删除事件
+   */
   async function handleDelete(record) {
-     await deleteOne({id: record.id}, handleSuccess);
-   }
-   /**
-    * 批量删除事件
-    */
+    await deleteOne({ id: record.id }, handleSuccess);
+  }
+  /**
+   * 批量删除事件
+   */
   async function batchHandleDelete() {
-     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
-   }
-   /**
-    * 成功回调
-    */
+    await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
+  }
+  /**
+   * 成功回调
+   */
   function handleSuccess() {
-      (selectedRowKeys.value = []) && reload();
-   }
+    (selectedRowKeys.value = []) && reload();
+  }
   /**
    * 只在当前页内计算台账合并行，避免跨页合并导致表格分页行为不可控。
    */
@@ -202,7 +220,11 @@
     }
     calcGroupRowSpan(items, (item) => item.categoryId || item.categoryName, '_categoryRowSpan');
     calcGroupRowSpan(items, (item) => `${item.categoryId || item.categoryName}_${item.surfaceId || item.surfaceName}`, '_surfaceRowSpan');
-    calcGroupRowSpan(items, (item) => `${item.categoryId || item.categoryName}_${item.surfaceId || item.surfaceName}_${item.specificId || item.specificName}`, '_specificRowSpan');
+    calcGroupRowSpan(
+      items,
+      (item) => `${item.categoryId || item.categoryName}_${item.surfaceId || item.surfaceName}_${item.specificId || item.specificName}`,
+      '_specificRowSpan'
+    );
     return items;
   }
 
@@ -226,83 +248,157 @@
   /**
    * 操作栏
    */
-  function getTableAction(record){
-       return [
-         {
-           label: '编辑',
-           onClick: handleEdit.bind(null, record),
-           auth: 'dqinspecttask:dq_inspect_task:edit'
-         }
-       ]
-   }
-     /**
-        * 下拉操作栏
-        */
-  function getDropDownAction(record){
-       let dropDownAction = [
-         {
-           label: '详情',
-           onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record)
-           },
-           auth: 'dqinspecttask:dq_inspect_task:delete'
-         },
-           {
-             label: '审批进度',
-             onClick: handlePreviewPic.bind(null, record),
-             ifShow: !!record.bpmStatus && record.bpmStatus !== '1',
-           }
-       ];
-       if(record.bpmStatus == '1' || !record.bpmStatus){
-         dropDownAction.push({
-           label: '发起流程',
-           popConfirm: {
-             title: '确认提交流程吗？',
-             confirm: handleProcess.bind(null, record),
-             placement: 'topLeft',
-           }
-         })
-       }
-       return dropDownAction;
-   }
+  function getTableAction(record) {
+    const actions = [
+      {
+        label: '查看反馈',
+        onClick: handleViewFeedback.bind(null, record),
+      },
+    ];
+    if (record.bpmStatus == '1' || !record.bpmStatus) {
+      actions.push({
+        label: '发起流程',
+        onClick: handleProcess.bind(null, record),
+      });
+    }
+    return actions;
+  }
+  /**
+   * 下拉操作栏
+   */
+  function getDropDownAction(record) {
+    let dropDownAction = [
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      },
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        },
+      },
+      {
+        label: '审批进度',
+        onClick: handlePreviewPic.bind(null, record),
+      },
+      {
+        label: '查询督办流程',
+        onClick: handleQueryProcess.bind(null, record),
+      },
+    ];
+    return dropDownAction;
+  }
+
+  const FLOW_CODE = 'inspect_flow_create_01';
+  const FLOW_NAME = '整改任务';
+  const BUSINESS_TABLE_NAME = 'dq_inspect_task';
+  const FORM_URL = 'dqinspecttask/components/DqInspectTaskBPMForm?showProcessHandle=0&showFeedbackInfo=1';
 
   /**
-   * 提交流程
+   * 发起流程
    */
-  async function handleProcess(record) {
-    let params = {
-      flowCode: 'dev_dq_inspect_task_001',
-      id: record.id,
-      formUrl: 'dqinspecttask/components/DqInspectTaskForm',
-      formUrlMobile: ''
-    }
-    await startProcess(params);
+  function handleProcess(record) {
+    flowScheduleModalRef.value?.open({
+      title: '发起整改任务流程',
+      payload: { record },
+      deptOptions: getDeptOptions(record),
+      showSuoleaderFields: true,
+      isNeedAppro: record.isNeedAppro,
+      supDeptleaderid: record.supDeptleaderid,
+      supDeptleaderName: record.supDeptleaderid_dictText,
+    });
+  }
+
+  /**
+   * 流程调度确认
+   */
+  async function handleFlowScheduleConfirm({ payload, options }) {
+    const record = payload?.record || {};
+
+    const params = {
+      intervalType: options.intervalType,
+      startCount: options.startCount,
+      taskTask: {
+        triggerType: options.triggerType,
+        startTime: options.intervalStartTime,
+        flowCode: FLOW_CODE,
+        formUrl: FORM_URL,
+        flowName: FLOW_NAME,
+        jsonData: { ...record },
+        businessTablename: BUSINESS_TABLE_NAME,
+        businessId: record.id,
+        title: record.improveMeasure || '',
+        content: record.improveMeasure || '',
+        deptId: options.deptId || record.measureResDept || '',
+        deptLeaderId: record.measureResLeader || '',
+      },
+    };
+
+    await startProcessSchedules(params);
+    await saveOrUpdate({ id: record.id, problemId: record.problemId, bpmStatus: '2' }, true);
+    createMessage.success('发起成功');
     handleSuccess();
   }
 
+  /**
+   * 查询督办流程
+   */
+  function handleQueryProcess(record) {
+    businessProcessListModalRef.value?.open({
+      title: '流程列表',
+      businessId: record.id,
+      columns: '',
+    });
+  }
+
+  /**
+   * 解析措施责任部门选项
+   */
+  function getDeptOptions(record) {
+    const deptIds = String(record.measureResDept || '')
+      .split(/[,，]/)
+      .map((s) => s.trim())
+      .filter(Boolean);
+    const deptNames = String(record.measureResDept_dictText || '')
+      .split(/[,，]/)
+      .map((s) => s.trim())
+      .filter(Boolean);
+    return deptIds.map((deptId, index) => ({
+      value: deptId,
+      label: deptNames[index] || deptId,
+    }));
+  }
+
+  /**
+   * 查看反馈
+   */
+  function handleViewFeedback(record) {
+    feedbackViewModalRef.value.open(record.id);
+  }
+
   /**
    * 审批进度
    */
   async function handlePreviewPic(record) {
     bpmPicModal(true, {
-      flowCode: 'dev_dq_inspect_task_001',
+      flowCode: 'inspect_flow_create_01',
       dataId: record.id,
     });
   }
 
-
-
   /* ----------------------以下为原生查询需要添加的-------------------------- */
   const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
-    xs:24,
-    sm:4,
-    xl:6,
-    xxl:4
+    xs: 24,
+    sm: 4,
+    xl: 6,
+    xxl: 4,
   });
   const wrapperCol = reactive({
     xs: 24,
@@ -337,19 +433,20 @@
       margin-bottom: 24px;
       white-space: nowrap;
     }
-    .query-group-cust{
+    .query-group-cust {
       min-width: 100px !important;
     }
-    .query-group-split-cust{
+    .query-group-split-cust {
       width: 30px;
       display: inline-block;
-      text-align: center
+      text-align: center;
     }
-    .ant-form-item:not(.ant-form-item-with-help){
+    .ant-form-item:not(.ant-form-item-with-help) {
       margin-bottom: 16px;
       height: 32px;
     }
-    :deep(.ant-picker),:deep(.ant-input-number){
+    :deep(.ant-picker),
+    :deep(.ant-input-number) {
       width: 100%;
     }
   }