From fc0d28189046555124dd23b1916fdc08f8d7d7b4 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Thu, 28 May 2026 14:55:29 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260527-=E5=B7=A1=E8=A7=86=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=E6=8F=90=E5=8D=87=E5=8F=B0=E8=B4=A6=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=B8=85=E5=8D=95=E5=92=8C=E5=B7=A5=E4=BD=9C=E8=BF=9B?=
 =?UTF-8?q?=E5=B1=95=E5=8F=8D=E9=A6=88=E5=AD=90=E8=A1=A8=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dq/inspectTask/DqInspectTask.api.ts |  81 ++++
 .../dq/inspectTask/DqInspectTask.data.ts      | 207 +++++++++++
 .../dq/inspectTask/DqInspectTaskList.vue      | 323 ++++++++++++++++
 .../components/DqInspectTaskForm.vue          | 349 ++++++++++++++++++
 .../components/DqInspectTaskModal.vue         |  67 ++++
 5 files changed, 1027 insertions(+)
 create mode 100644 src/views/dq/inspectTask/DqInspectTask.api.ts
 create mode 100644 src/views/dq/inspectTask/DqInspectTask.data.ts
 create mode 100644 src/views/dq/inspectTask/DqInspectTaskList.vue
 create mode 100644 src/views/dq/inspectTask/components/DqInspectTaskForm.vue
 create mode 100644 src/views/dq/inspectTask/components/DqInspectTaskModal.vue

diff --git a/src/views/dq/inspectTask/DqInspectTask.api.ts b/src/views/dq/inspectTask/DqInspectTask.api.ts
new file mode 100644
index 0000000..ccedac6
--- /dev/null
+++ b/src/views/dq/inspectTask/DqInspectTask.api.ts
@@ -0,0 +1,81 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/dqinspecttask/dqInspectTask/list',
+  save='/dqinspecttask/dqInspectTask/add',
+  edit='/dqinspecttask/dqInspectTask/edit',
+  deleteOne = '/dqinspecttask/dqInspectTask/delete',
+  deleteBatch = '/dqinspecttask/dqInspectTask/deleteBatch',
+  importExcel = '/dqinspecttask/dqInspectTask/importExcel',
+  exportXls = '/dqinspecttask/dqInspectTask/exportXls',
+  queryDataById = '/dqinspecttask/dqInspectTask/queryById',
+  dqInspectProgressList = '/dqinspecttask/dqInspectTask/queryDqInspectProgressByMainId',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+
+/**
+ * 查询子表数据
+ * @param params
+ */
+export const queryDqInspectProgressListByMainId = (id) => defHttp.get({url: Api.dqInspectProgressList, params:{ id }});
+
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
+
+/**
+* 根据id查询数据
+* @param params
+*/
+export const queryDataById = (id) => defHttp.get({url: Api.queryDataById, params:{ id }});
+
diff --git a/src/views/dq/inspectTask/DqInspectTask.data.ts b/src/views/dq/inspectTask/DqInspectTask.data.ts
new file mode 100644
index 0000000..1d2b894
--- /dev/null
+++ b/src/views/dq/inspectTask/DqInspectTask.data.ts
@@ -0,0 +1,207 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '具体问题ID',
+    align:"center",
+    dataIndex: 'problemId'
+   },
+   {
+    title: '密级',
+    align:"center",
+    dataIndex: 'secretLevel_dictText'
+   },
+   {
+    title: '整改措施',
+    align:"center",
+    dataIndex: 'improveMeasure'
+   },
+   {
+    title: '完成时限',
+    align:"center",
+    dataIndex: 'deadline',
+    customRender:({text}) =>{
+      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+      return text;
+    },
+   },
+   {
+    title: '目标节点',
+    align:"center",
+    dataIndex: 'targetNode'
+   },
+   {
+    title: '措施责任领导',
+    align:"center",
+    dataIndex: 'measureResLeader_dictText'
+   },
+   {
+    title: '措施责任部门',
+    align:"center",
+    dataIndex: 'measureResDept_dictText'
+   },
+   {
+    title: '整改交付成果',
+    align:"center",
+    dataIndex: 'rectificationEvidence'
+   },
+   {
+    title: '成效评价标准',
+    align:"center",
+    dataIndex: 'evaluationCriterion'
+   },
+   {
+    title: '是否需要党群领导审批',
+    align:"center",
+    dataIndex: 'isNeedAppro_dictText'
+   },
+   {
+    title: '党群领导',
+    align:"center",
+    dataIndex: 'supDeptleaderid_dictText'
+   },
+   {
+    title: '检查情况',
+    align:"center",
+    dataIndex: 'inspectionStatus'
+   },
+   {
+    title: '监督意见',
+    align:"center",
+    dataIndex: 'supervisoryOpinion'
+   },
+   {
+    title: '措施数量',
+    align:"center",
+    dataIndex: 'measureCount'
+   },
+   {
+    title: '流程实例ID',
+    align:"center",
+    dataIndex: 'bpmProcessId'
+   },
+   {
+    title: '流程状态',
+    align:"center",
+    dataIndex: 'bpmStatus_dictText'
+   },
+   {
+    title: '整改状态',
+    align:"center",
+    dataIndex: 'taskStatus'
+   },
+   {
+    title: '督办次数',
+    align:"center",
+    dataIndex: 'superviseCount'
+   },
+   {
+    title: '排序',
+    align:"center",
+    dataIndex: 'sortNo'
+   },
+];
+
+//子表表格配置
+export const dqInspectProgressColumns: JVxeColumn[] = [
+    {
+      title: '反馈部门ID',
+      key: 'feedbackDeptId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '反馈部门名称',
+      key: 'feedbackDeptName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '反馈人ID',
+      key: 'feedbackPersonId',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '反馈人姓名',
+      key: 'feedbackPersonName',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '实际完成时间',
+      key: 'actualTime',
+      type: JVxeTypes.datetime,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '工作进展',
+      key: 'workProgress',
+      type: JVxeTypes.input,
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+    {
+      title: '进展状态',
+      key: 'bpmStatus',
+      type: JVxeTypes.select,
+      options:[],
+      dictCode:"feedback_status",
+      width:"200px",
+      placeholder: '请输入${title}',
+      defaultValue:'',
+    },
+  ]
+
+// 高级查询数据
+export const superQuerySchema = {
+  problemId: {title: '具体问题ID',order: 0,view: 'text', type: 'string',},
+  secretLevel: {title: '密级',order: 1,view: 'list', type: 'string',dictCode: 'secret_level',},
+  improveMeasure: {title: '整改措施',order: 2,view: 'text', type: 'string',},
+  deadline: {title: '完成时限',order: 3,view: 'date', type: 'string',},
+  targetNode: {title: '目标节点',order: 4,view: 'text', type: 'string',},
+  measureResLeader: {title: '措施责任领导',order: 5,view: 'sel_user', type: 'string',},
+  measureResDept: {title: '措施责任部门',order: 6,view: 'sel_depart', type: 'string',},
+  rectificationEvidence: {title: '整改交付成果',order: 7,view: 'text', type: 'string',},
+  evaluationCriterion: {title: '成效评价标准',order: 8,view: 'text', type: 'string',},
+  isNeedAppro: {title: '是否需要党群领导审批',order: 9,view: 'radio', type: 'string',dictCode: 'yn',},
+  supDeptleaderid: {title: '党群领导',order: 10,view: 'sel_user', type: 'string',},
+  inspectionStatus: {title: '检查情况',order: 11,view: 'text', type: 'string',},
+  supervisoryOpinion: {title: '监督意见',order: 12,view: 'text', type: 'string',},
+  measureCount: {title: '措施数量',order: 13,view: 'number', type: 'number',},
+  bpmProcessId: {title: '流程实例ID',order: 14,view: 'text', type: 'string',},
+  bpmStatus: {title: '流程状态',order: 15,view: 'list', type: 'string',dictCode: 'super_status',},
+  taskStatus: {title: '整改状态',order: 16,view: 'text', type: 'string',},
+  superviseCount: {title: '督办次数',order: 17,view: 'text', type: 'string',},
+  sortNo: {title: '排序',order: 18,view: 'number', type: 'number',},
+  //子表高级查询
+  dqInspectProgress: {
+    title: '工作进展反馈',
+    view: 'table',
+    fields: {
+        feedbackDeptId: {title: '反馈部门ID',order: 0,view: 'text', type: 'string',},
+        feedbackDeptName: {title: '反馈部门名称',order: 1,view: 'text', type: 'string',},
+        feedbackPersonId: {title: '反馈人ID',order: 2,view: 'text', type: 'string',},
+        feedbackPersonName: {title: '反馈人姓名',order: 3,view: 'text', type: 'string',},
+        actualTime: {title: '实际完成时间',order: 4,view: 'datetime', type: 'string',},
+        workProgress: {title: '工作进展',order: 5,view: 'text', type: 'string',},
+        bpmStatus: {title: '进展状态',order: 6,view: 'list', type: 'string',dictCode: 'feedback_status',},
+    }
+  },
+};
diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue
new file mode 100644
index 0000000..64e8b7f
--- /dev/null
+++ b/src/views/dq/inspectTask/DqInspectTaskList.vue
@@ -0,0 +1,323 @@
+<template>
+  <div class="p-2">
+    <!--查询区域-->
+    <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="measureResLeader">
+              <template #label><span title="措施责任领导">措施责任</span></template>
+              <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">
+            <a-col :lg="6">
+              <a-form-item name="measureResDept">
+                <template #label><span title="措施责任部门">措施责任</span></template>
+                <j-select-dept placeholder="请选择措施责任部门" v-model:value="queryParam.measureResDept" checkStrictly allow-clear />
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+              <a-col :lg="6">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+                <a-button preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--引用表格-->
+   <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-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <DqInspectTaskModal @register="registerModal" @success="handleSuccess"></DqInspectTaskModal>
+      <!-- 审批记录 -->
+      <BpmPictureModal @register="registerBpmModal" />
+  </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 {columns, superQuerySchema} from './DqInspectTask.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} 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';
+
+  const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
+  import { useUserStore } from '/@/store/modules/user';
+  const formRef = ref();
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  const userStore = useUserStore();
+  const { createMessage } = useMessage();
+   //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: 'dq_inspect_task',
+           api: list,
+           columns,
+           canResize:false,
+           useSearchForm: false,
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+           },
+           beforeFetch: async (params) => {
+             return Object.assign(params, queryParam);
+           },
+        },
+        exportConfig: {
+            name:"dq_inspect_task",
+            url: getExportUrl,
+            params: queryParam,
+        },
+        importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+        },
+    })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value},handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  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;
+   }
+
+  /**
+   * 提交流程
+   */
+  async function handleProcess(record) {
+    let params = {
+      flowCode: 'dev_dq_inspect_task_001',
+      id: record.id,
+      formUrl: 'dqinspecttask/components/DqInspectTaskForm',
+      formUrlMobile: ''
+    }
+    await startProcess(params);
+    handleSuccess();
+  }
+
+  /**
+   * 审批进度
+   */
+  async function handlePreviewPic(record) {
+    bpmPicModal(true, {
+      flowCode: 'dev_dq_inspect_task_001',
+      dataId: record.id,
+    });
+  }
+
+
+
+  /* ----------------------以下为原生查询需要添加的-------------------------- */
+  const toggleSearchStatus = ref<boolean>(false);
+  const labelCol = reactive({
+    xs:24,
+    sm:4,
+    xl:6,
+    xxl:4
+  });
+  const wrapperCol = reactive({
+    xs: 24,
+    sm: 20,
+  });
+  /**
+   * 重置
+   */
+  function searchReset() {
+    formRef.value.resetFields();
+    selectedRowKeys.value = [];
+    //刷新数据
+    reload();
+  }
+
+  /**
+   * form点击事件(以逗号分割)
+   * @param key
+   * @param value
+   */
+  function handleFormJoinChange(key, value) {
+    if (typeof value != 'string') {
+      queryParam[key] = value.join(',');
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .jeecg-basic-table-form-container {
+    padding: 0;
+    .table-page-search-submitButtons {
+      display: block;
+      margin-bottom: 24px;
+      white-space: nowrap;
+    }
+    .query-group-cust{
+      min-width: 100px !important;
+    }
+    .query-group-split-cust{
+      width: 30px;
+      display: inline-block;
+      text-align: center
+    }
+    .ant-form-item:not(.ant-form-item-with-help){
+      margin-bottom: 16px;
+      height: 32px;
+    }
+    :deep(.ant-picker),:deep(.ant-input-number){
+      width: 100%;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/dq/inspectTask/components/DqInspectTaskForm.vue b/src/views/dq/inspectTask/components/DqInspectTaskForm.vue
new file mode 100644
index 0000000..76a878d
--- /dev/null
+++ b/src/views/dq/inspectTask/components/DqInspectTaskForm.vue
@@ -0,0 +1,349 @@
+<template>
+  <a-spin :spinning="loading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form v-bind="formItemLayout" name="DqInspectTaskForm" ref="formRef">
+          <a-row>
+						<a-col :span="24">
+							<a-form-item label="具体问题ID" v-bind="validateInfos.problemId" id="DqInspectTaskForm-problemId" name="problemId">
+								<a-input v-model:value="formData.problemId" placeholder="请输入具体问题ID"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="密级" v-bind="validateInfos.secretLevel" id="DqInspectTaskForm-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="24">
+							<a-form-item label="整改措施" v-bind="validateInfos.improveMeasure" id="DqInspectTaskForm-improveMeasure" name="improveMeasure">
+								<a-input v-model:value="formData.improveMeasure" placeholder="请输入整改措施"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="完成时限" v-bind="validateInfos.deadline" id="DqInspectTaskForm-deadline" name="deadline">
+								<a-date-picker placeholder="请选择完成时限"  v-model:value="formData.deadline" value-format="YYYY-MM-DD"  style="width: 100%"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="目标节点" v-bind="validateInfos.targetNode" id="DqInspectTaskForm-targetNode" name="targetNode">
+								<a-input v-model:value="formData.targetNode" placeholder="请输入目标节点"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="措施责任领导" v-bind="validateInfos.measureResLeader" id="DqInspectTaskForm-measureResLeader" name="measureResLeader">
+						<j-select-user v-model:value="formData.measureResLeader"      allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="措施责任部门" v-bind="validateInfos.measureResDept" id="DqInspectTaskForm-measureResDept" name="measureResDept">
+								<j-select-dept v-model:value="formData.measureResDept"       :multiple="true" checkStrictly  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="整改交付成果" v-bind="validateInfos.rectificationEvidence" id="DqInspectTaskForm-rectificationEvidence" name="rectificationEvidence">
+								<a-input v-model:value="formData.rectificationEvidence" placeholder="请输入整改交付成果"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="成效评价标准" v-bind="validateInfos.evaluationCriterion" id="DqInspectTaskForm-evaluationCriterion" name="evaluationCriterion">
+								<a-input v-model:value="formData.evaluationCriterion" placeholder="请输入成效评价标准"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="是否需要党群领导审批" v-bind="validateInfos.isNeedAppro" id="DqInspectTaskForm-isNeedAppro" name="isNeedAppro">
+								<j-dict-select-tag type='radio' v-model:value="formData.isNeedAppro" dictCode="yn" placeholder="请选择是否需要党群领导审批"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="党群领导" v-bind="validateInfos.supDeptleaderid" id="DqInspectTaskForm-supDeptleaderid" name="supDeptleaderid">
+						<j-select-user v-model:value="formData.supDeptleaderid"      allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="检查情况" v-bind="validateInfos.inspectionStatus" id="DqInspectTaskForm-inspectionStatus" name="inspectionStatus">
+								<a-input v-model:value="formData.inspectionStatus" placeholder="请输入检查情况"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="监督意见" v-bind="validateInfos.supervisoryOpinion" id="DqInspectTaskForm-supervisoryOpinion" name="supervisoryOpinion">
+								<a-input v-model:value="formData.supervisoryOpinion" placeholder="请输入监督意见"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="措施数量" v-bind="validateInfos.measureCount" id="DqInspectTaskForm-measureCount" name="measureCount">
+								<a-input-number v-model:value="formData.measureCount" placeholder="请输入措施数量" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="流程实例ID" v-bind="validateInfos.bpmProcessId" id="DqInspectTaskForm-bpmProcessId" name="bpmProcessId">
+								<a-input v-model:value="formData.bpmProcessId" placeholder="请输入流程实例ID"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="流程状态" v-bind="validateInfos.bpmStatus" id="DqInspectTaskForm-bpmStatus" name="bpmStatus">
+								<j-dict-select-tag v-model:value="formData.bpmStatus" dictCode="super_status" placeholder="请选择流程状态"  allow-clear />
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="整改状态" v-bind="validateInfos.taskStatus" id="DqInspectTaskForm-taskStatus" name="taskStatus">
+								<a-input v-model:value="formData.taskStatus" placeholder="请输入整改状态"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="督办次数" v-bind="validateInfos.superviseCount" id="DqInspectTaskForm-superviseCount" name="superviseCount">
+								<a-input v-model:value="formData.superviseCount" placeholder="请输入督办次数"  allow-clear ></a-input>
+							</a-form-item>
+						</a-col>
+						<a-col :span="24">
+							<a-form-item label="排序" v-bind="validateInfos.sortNo" id="DqInspectTaskForm-sortNo" name="sortNo">
+								<a-input-number v-model:value="formData.sortNo" placeholder="请输入排序" style="width: 100%" />
+							</a-form-item>
+						</a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+
+		<!-- 子表单区域 -->
+    <a-tabs v-model:activeKey="activeKey" animated style="overflow:hidden;">
+      <a-tab-pane tab="工作进展反馈" key="dqInspectProgress" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="dqInspectProgressTableRef"
+          :loading="dqInspectProgressTable.loading"
+          :columns="dqInspectProgressTable.columns"
+          :dataSource="dqInspectProgressTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :toolbar="true"/>
+      </a-tab-pane>
+    </a-tabs>
+    <div v-if="showFlowSubmitButton" :span="24" style="width: 100%;text-align: center;margin-top: 10px">
+      <a-button preIcon="ant-design:check-outlined" style="width: 126px" type="primary" @click="submitForm">提 交</a-button>
+    </div>
+  </a-spin>
+</template>
+
+<script lang="ts">
+  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defHttp } from '/@/utils/http/axios';
+  import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
+  import { queryDqInspectProgressListByMainId, queryDataById, saveOrUpdate } from '../DqInspectTask.api';
+  import { JVxeTable } from '/@/components/jeecg/JVxeTable';
+  import {dqInspectProgressColumns} from '../DqInspectTask.data';
+  import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+  import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
+  import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+  import { Form } from 'ant-design-vue';
+  const useForm = Form.useForm;
+
+  export default defineComponent({
+    name: "DqInspectTaskForm",
+    components:{
+      JDictSelectTag,
+      JSelectDept,
+      JSelectUser,
+      JVxeTable,
+			JFormContainer,
+    },
+    props:{
+      formDisabled:{
+        type: Boolean,
+        default: false
+      },
+      formData: { type: Object, default: ()=>{} },
+      formBpm: { type: Boolean, default: true }
+    },
+    emits:['success'],
+    setup(props, {emit}) {
+      const loading = ref(false);
+      const formRef = ref();
+      const dqInspectProgressTableRef = ref();
+      const dqInspectProgressTable = reactive<Record<string, any>>({
+        loading: false,
+        columns: dqInspectProgressColumns,
+        dataSource: []
+      });
+      const activeKey = ref('dqInspectProgress');
+      const formData = reactive<Record<string, any>>({
+        id: '',
+        problemId: '',   
+        secretLevel: '',   
+        improveMeasure: '',   
+        deadline: '',   
+        targetNode: '',   
+        measureResLeader: '',   
+        measureResDept: '',   
+        rectificationEvidence: '',   
+        evaluationCriterion: '',   
+        isNeedAppro: '',   
+        supDeptleaderid: '',   
+        inspectionStatus: '',   
+        supervisoryOpinion: '',   
+        measureCount: undefined,
+        bpmProcessId: '',   
+        bpmStatus: '',   
+        taskStatus: '',   
+        superviseCount: '',   
+        sortNo: undefined,
+        delFlag: '',   
+      });
+
+      //表单验证
+      const validatorRules = reactive({
+      });
+      const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
+      const dbData = {};
+      const formItemLayout = {
+        labelCol: {xs: {span: 24}, sm: {span: 5}},
+        wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      };
+
+      // 表单禁用
+      const disabled = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return false;
+          }else{
+            return true;
+          }
+        }
+        return props.formDisabled;
+      });
+
+      onMounted(()=>{
+        initFormData();
+      });
+      //渲染流程表单数据
+      const queryByIdUrl = '/dqinspecttask/dqInspectTask/queryById';
+      async function initFormData(){
+        if(props.formBpm === true){
+          let params = {id: props.formData.dataId};
+          const row = await defHttp.get({url: queryByIdUrl, params});
+          //设置表单的值
+          Object.keys(row).map(k => {
+            formData[k] = row[k];
+          });
+          //子表数据
+          const dqInspectProgressDataList = await queryDqInspectProgressListByMainId(row['id']);
+          dqInspectProgressTable.dataSource = [...dqInspectProgressDataList];
+        }
+      }
+      // 是否显示提交按钮
+      const showFlowSubmitButton = computed(()=>{
+        if(props.formBpm === true){
+          if(props.formData.disabled === false){
+            return true
+          }
+        }
+        return false
+      });
+      
+
+      function add() {
+        resetFields();
+        dqInspectProgressTable.dataSource = [];
+      }
+
+      async function edit(row) {
+        //主表数据
+        await queryMainData(row.id);
+        //子表数据
+        const dqInspectProgressDataList = await queryDqInspectProgressListByMainId(row['id']);
+        dqInspectProgressTable.dataSource = [...dqInspectProgressDataList];
+      }
+
+      async function queryMainData(id) {
+        const row = await queryDataById(id);
+        resetFields();
+        const tmpData = {};
+        Object.keys(formData).forEach((key) => {
+          if(row.hasOwnProperty(key)){
+            tmpData[key] = row[key]
+          }
+        })
+        //赋值
+        Object.assign(formData,tmpData);
+      }
+
+      const {getSubFormAndTableData, transformData} = useValidateAntFormAndTable(activeKey, {
+        'dqInspectProgress': dqInspectProgressTableRef,
+      });
+
+      async function getFormData() {
+        try {
+          // 触发表单验证
+          await validate();
+        } catch ({ errorFields }) {
+          if (errorFields) {
+            const firstField = errorFields[0];
+            if (firstField) {
+              formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+            }
+          }
+          return Promise.reject(errorFields);
+        }
+        return transformData(toRaw(formData))
+      }
+
+      async function submitForm() {
+        const mainData = await getFormData();
+        const subData = await getSubFormAndTableData();
+        const values = Object.assign({}, dbData, mainData, subData);
+        console.log('表单提交数据', values)
+        const isUpdate = values.id ? true : false
+        await saveOrUpdate(values, isUpdate);
+        //关闭弹窗
+        emit('success');
+      }
+      
+      function setFieldsValue(values) {
+        if(values){
+          Object.keys(values).map(k=>{
+            formData[k] = values[k];
+          });
+        }
+      }
+
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+
+
+      return {
+        dqInspectProgressTableRef,
+        dqInspectProgressTable,
+        validatorRules,
+        validateInfos,
+        activeKey,
+        loading,
+        formData,
+        setFieldsValue,
+        handleFormChange,
+        formItemLayout,
+        disabled,
+        showFlowSubmitButton,
+        getFormData,
+        submitForm,
+        add,
+        edit,
+        formRef,
+      }
+    }
+  });
+</script>
+<style lang="less" scoped>
+  .ant-tabs-tabpane.sub-one-form {
+    max-height: 340px;
+    overflow: auto;
+  }
+</style>
diff --git a/src/views/dq/inspectTask/components/DqInspectTaskModal.vue b/src/views/dq/inspectTask/components/DqInspectTaskModal.vue
new file mode 100644
index 0000000..ef8a89f
--- /dev/null
+++ b/src/views/dq/inspectTask/components/DqInspectTaskModal.vue
@@ -0,0 +1,67 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="800" @ok="handleSubmit">
+    <dq-inspect-task-form ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></dq-inspect-task-form>
+  </BasicModal>
+</template>
+
+<script lang="ts">
+  import { ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import DqInspectTaskForm from './DqInspectTaskForm.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  const { createMessage } = useMessage();
+  export default {
+    name: "TestCgMainVxeModal",
+    components:{
+      BasicModal,
+      DqInspectTaskForm
+    },
+    emits:['register','success'],
+    setup(_p, {emit}){
+      const formComponent = ref()
+      const isUpdate = ref(true);
+      const formDisabled = ref(false);
+      const title = ref('')
+
+      //表单赋值
+      const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        formDisabled.value = !data?.showFooter;
+        title.value = data?.isUpdate ? (unref(formDisabled) ? '详情' : '编辑') : '新增';
+        if (unref(isUpdate)) {
+          formComponent.value.edit(data.record)
+        }else{
+          formComponent.value.add()
+        }
+      });
+
+      function handleSubmit() {
+        formComponent.value.submitForm();
+      }
+
+      function submitSuccess(){
+        emit('success');
+        closeModal();
+      }
+      return {
+        registerModal,
+        title,
+        formComponent,
+        formDisabled,
+        handleSubmit,
+        submitSuccess,
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>
\ No newline at end of file