From 077617948d36ebf0d86c6dbeef387c327d974937 Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Thu, 23 Jul 2026 15:36:14 +0800
Subject: [PATCH] =?UTF-8?q?style(dqinspecttask):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E5=88=97=E8=A1=A8=E5=88=97=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=86=E7=AE=A1=E6=89=80=E9=A2=86?=
 =?UTF-8?q?=E5=AF=BC=E5=88=97=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../dq/inspectTask/DqInspectTask.data.ts      | 189 +++++++++---------
 .../dq/inspectTask/DqInspectTaskList.vue      |  64 +++---
 2 files changed, 125 insertions(+), 128 deletions(-)

diff --git a/src/views/dq/inspectTask/DqInspectTask.data.ts b/src/views/dq/inspectTask/DqInspectTask.data.ts
index 9dda870..3d54ca2 100644
--- a/src/views/dq/inspectTask/DqInspectTask.data.ts
+++ b/src/views/dq/inspectTask/DqInspectTask.data.ts
@@ -6,106 +6,106 @@ import {JVxeTypes,JVxeColumn} from '/@/components/jeecg/JVxeTable/types'
 import { getWeekMonthQuarterYear } from '/@/utils';
 //列表数据
 export const columns: BasicColumn[] = [
-   {
+  {
     title: '具体问题',
-    align:"center",
+    align: 'center',
     dataIndex: 'problemId',
     customRender: ({ text, record }) => record.problemId_dictText || text,
-   },
-   {
+  },
+  {
     title: '密级',
-    align:"center",
-    dataIndex: 'secretLevel_dictText'
-   },
-   {
+    align: 'center',
+    dataIndex: 'secretLevel_dictText',
+  },
+  {
     title: '整改措施',
-    align:"center",
-    dataIndex: 'improveMeasure'
-   },
-   {
+    align: 'center',
+    dataIndex: 'improveMeasure',
+  },
+  {
     title: '完成时限',
-    align:"center",
+    align: 'center',
     dataIndex: 'deadline',
-    customRender:({text}) =>{
-      text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+    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'
-   },
-   {
+    align: 'center',
+    dataIndex: 'targetNode',
+  },
+  {
     title: '措施责任部门',
-    align:"center",
-    dataIndex: 'measureResDept_dictText'
-   },
-   {
+    align: 'center',
+    dataIndex: 'measureResDept_dictText',
+  },
+  {
+    title: '措施责任领导',
+    align: 'center',
+    dataIndex: 'measureResLeader_dictText',
+  },
+  {
     title: '整改交付成果',
-    align:"center",
-    dataIndex: 'rectificationEvidence'
-   },
-   {
+    align: 'center',
+    dataIndex: 'rectificationEvidence',
+  },
+  {
     title: '成效评价标准',
-    align:"center",
-    dataIndex: 'evaluationCriterion'
-   },
-   {
+    align: 'center',
+    dataIndex: 'evaluationCriterion',
+  },
+  {
     title: '是否需要党群领导审批',
-    align:"center",
-    dataIndex: 'isNeedAppro_dictText'
-   },
-   {
+    align: 'center',
+    dataIndex: 'isNeedAppro_dictText',
+  },
+  {
     title: '党群领导',
-    align:"center",
-    dataIndex: 'supDeptleaderid_dictText'
-   },
-   {
+    align: 'center',
+    dataIndex: 'supDeptleaderid_dictText',
+  },
+  {
     title: '检查情况',
-    align:"center",
-    dataIndex: 'inspectionStatus'
-   },
-   {
+    align: 'center',
+    dataIndex: 'inspectionStatus',
+  },
+  {
     title: '监督意见',
-    align:"center",
-    dataIndex: 'supervisoryOpinion'
-   },
-   {
+    align: 'center',
+    dataIndex: 'supervisoryOpinion',
+  },
+  {
     title: '措施数量',
-    align:"center",
-    dataIndex: 'measureCount'
-   },
-   {
+    align: 'center',
+    dataIndex: 'measureCount',
+  },
+  {
     title: '流程实例ID',
-    align:"center",
-    dataIndex: 'bpmProcessId'
-   },
-   {
+    align: 'center',
+    dataIndex: 'bpmProcessId',
+  },
+  {
     title: '流程状态',
-    align:"center",
-    dataIndex: 'bpmStatus_dictText'
-   },
-   {
+    align: 'center',
+    dataIndex: 'bpmStatus_dictText',
+  },
+  {
     title: '整改状态',
-    align:"center",
-    dataIndex: 'taskStatus'
-   },
-   {
+    align: 'center',
+    dataIndex: 'taskStatus',
+  },
+  {
     title: '督办次数',
-    align:"center",
-    dataIndex: 'superviseCount'
-   },
-   {
+    align: 'center',
+    dataIndex: 'superviseCount',
+  },
+  {
     title: '排序',
-    align:"center",
-    dataIndex: 'sortNo'
-   },
+    align: 'center',
+    dataIndex: 'sortNo',
+  },
 ];
 
 //子表表格配置
@@ -231,21 +231,36 @@ export const ledgerColumns: BasicColumn[] = [
     dataIndex: 'specificName',
     customCell: mergeCell('_specificRowSpan'),
    },
+   {
+    title: '整改措施',
+    align:"center",
+    dataIndex: 'improveMeasure'
+   },
    {
     title: '巡视建议',
     align:"center",
     dataIndex: 'inspectAdvice'
    },
+   {
+    title: '分管所领导',
+    align:"center",
+    dataIndex: 'chargeLeaderId_dictText'
+   },
+   {
+    title: '措施责任部门',
+    align:"center",
+    dataIndex: 'measureResDept_dictText'
+   },
+   {
+    title: '措施责任领导',
+    align:"center",
+    dataIndex: 'measureResDept_dictText'
+   },
    {
     title: '密级',
     align:"center",
     dataIndex: 'secretLevel_dictText'
    },
-   {
-    title: '整改措施',
-    align:"center",
-    dataIndex: 'improveMeasure'
-   },
    {
     title: '完成时限',
     align:"center",
@@ -260,16 +275,6 @@ export const ledgerColumns: BasicColumn[] = [
     align:"center",
     dataIndex: 'targetNode'
    },
-   {
-    title: '措施责任领导',
-    align:"center",
-    dataIndex: 'measureResLeader_dictText'
-   },
-   {
-    title: '措施责任部门',
-    align:"center",
-    dataIndex: 'measureResDept_dictText'
-   },
    {
     title: '整改交付成果',
     align:"center",
diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue
index dd29afa..c25b1fb 100644
--- a/src/views/dq/inspectTask/DqInspectTaskList.vue
+++ b/src/views/dq/inspectTask/DqInspectTaskList.vue
@@ -2,21 +2,24 @@
   <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-form ref="formRef" @keyup.enter="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>
-              <a-input v-model:value="queryParam.improveMeasure" allow-clear />
+          <a-col :lg="6" :md="8" :sm="12">
+            <a-form-item label="整改措施" name="improveMeasure">
+              <JInput v-model:value="queryParam.improveMeasure" type="like" placeholder="请输入整改措施" allow-clear trim @change="reload" />
             </a-form-item>
           </a-col>
-          <a-col :lg="8">
-            <a-form-item name="measureResLeader">
-              <template #label><span title="措施责任领导">措施责任领导</span></template>
-              <SzDeptUserModal v-model:value="queryParam.measureResLeader" placeholder="请选择措施责任领导" />
+          <a-col :lg="6" :md="8" :sm="12">
+            <a-form-item label="分管所领导" name="chargeLeaderId">
+              <DeptRoleUserSelectDropDown v-model:value="queryParam.chargeLeaderId" :deptId="PARTY_COMMITTEE_DEPT_ID" :roleId="CHARGE_LEADER_ROLE_ID" placeholder="请选择分管所领导" allow-clear style="width: 100%" @change="reload" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6">
+          <a-col :lg="6" :md="8" :sm="12">
+            <a-form-item label="措施责任部门" name="measureResDept">
+              <SzSelectDept v-model:value="queryParam.measureResDept" :multiple="true" checkStrictly allow-clear @change="reload" />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="8" :sm="12">
             <a-form-item name="bpmStatus" label="督办状态">
               <a-select v-model:value="bpmStatusFilter" placeholder="请选择" allow-clear @change="handleBpmStatusChange">
                 <a-select-option value="1">未开始</a-select-option>
@@ -25,24 +28,10 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
-            <a-col :lg="8">
-              <a-form-item name="measureResDept">
-                <template #label><span title="措施责任部门">措施责任部门</span></template>
-                <SzSelectDept v-model:value="queryParam.measureResDept" :multiple="true" 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>
+          <a-col :lg="6" :md="8" :sm="12">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" preIcon="ant-design:search-outlined" @click="reload">查询</a-button>
+              <a-button preIcon="ant-design:reload-outlined" style="margin-left: 8px" @click="searchReset">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -117,7 +106,13 @@
         </Dropdown>
       </template>
       <!--字段回显插槽-->
-      <template v-slot:bodyCell="{ column, record, index, text }"> </template>
+      <template v-slot:bodyCell="{ column, record, index, text }">
+        <template v-if="column.dataIndex === 'improveMeasure'">
+          <a-tooltip title="点击查看详情">
+            <a style="font-weight: 500" @click="handleDetail(record)">{{ text }}</a>
+          </a-tooltip>
+        </template>
+      </template>
     </BasicTable>
     <!-- 表单区域 -->
     <DqInspectProgressFeedbackViewModal ref="feedbackViewModalRef" />
@@ -155,8 +150,10 @@
   import { downloadFile } from '/@/utils/common/renderUtils';
   import { useMessage } from '/@/hooks/web/useMessage';
   import Icon from '/@/components/Icon/index';
+  import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
   import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
-  import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserModal.vue';
+  import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
+  import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID } from '/@/constant/supervision';
   import { startProcessSchedules } from '/@/api/common/api';
   import { dateUtil } from '/@/utils/dateUtil';
   import FlowScheduleStartModal from './components/DqInspectTaskFlowScheduleStartModal.vue';
@@ -573,7 +570,6 @@
   }
 
   /* ----------------------以下为原生查询需要添加的-------------------------- */
-  const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
     xs: 24,
     sm: 4,
@@ -616,11 +612,7 @@
     }
   }
 
-  function handleFormJoinChange(key, value) {
-    if (typeof value != 'string') {
-      queryParam[key] = value.join(',');
-    }
-  }
+
 </script>
 <style lang="less" scoped>
   .jeecg-basic-table-form-container {