From 5b54557b5c54e8e47903b19a27d6ee6c0f6e3280 Mon Sep 17 00:00:00 2001
From: ye1023 <12588209+ye1023@user.noreply.gitee.com>
Date: Tue, 7 Jul 2026 14:48:51 +0800
Subject: [PATCH] =?UTF-8?q?yxk-20260707=20=E6=8A=8A=E6=8A=8A=E8=84=89?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=AE=A1=E6=89=80=E9=A2=86=E5=AF=BC?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bg/bqtakepulse/BgTakepulse.data.ts  | 44 +++++++++++--------
 .../components/BgTakepulseBPMForm.vue         | 17 +++++++
 .../components/BgTakepulseForm.vue            | 22 +++++++++-
 3 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/src/views/bg/bqtakepulse/BgTakepulse.data.ts b/src/views/bg/bqtakepulse/BgTakepulse.data.ts
index ca16076..35f1998 100644
--- a/src/views/bg/bqtakepulse/BgTakepulse.data.ts
+++ b/src/views/bg/bqtakepulse/BgTakepulse.data.ts
@@ -41,6 +41,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'content'
    },
+   {
+    title: '分管所领导',
+    align:"center",
+    dataIndex: 'manageSuoleader_dictText'
+   },
    {
     title: '责任领导',
     align:"center",
@@ -234,25 +239,26 @@ export const superQuerySchema = {
   proposer: {title: '提出人',order: 5,view: 'sel_user', type: 'string',},
   title: {title: '意见主题',order: 6,view: 'text', type: 'string',},
   content: {title: '具体意见',order: 7,view: 'textarea', type: 'string',},
-  suoleader: {title: '责任领导',order: 8,view: 'sel_user', type: 'string',},
-  responDeptid: {title: '牵头部门',order: 9,view: 'sel_depart', type: 'string',},
-  assistDeptid: {title: '协办部门',order: 10,view: 'sel_depart', type: 'string',},
-  implementDeptid: {title: '落实部门',order: 11,view: 'text', type: 'string',},
-  isAdopt: {title: '是否采纳',order: 12,view: 'switch', type: 'string',},
-  measure: {title: '落实措施/解释说明',order: 13,view: 'textarea', type: 'string',},
-  measureNumber: {title: '措施数量',order: 14,view: 'number', type: 'number',},
-  achievement: {title: '成果形式',order: 15,view: 'textarea', type: 'string',},
-  deadline: {title: '要求完成日期',order: 16,view: 'date', type: 'string',},
-  remark: {title: '备注',order: 17,view: 'text', type: 'string',},
-  actualExect: {title: '执行情况',order: 18,view: 'textarea', type: 'string',},
-  actualTime: {title: '实际完成时间',order: 19,view: 'datetime', type: 'string',},
-  proposerConfirm: {title: '提出人确认',order: 20,view: 'text', type: 'string',},
-  bpmStatus: {title: '完成状态',order: 21,view: 'list', type: 'string',dictCode: 'super_status',},
-  actSt: {title: '调整落实措施及执行情况',order: 22,view: 'textarea', type: 'string',},
-  superviseCount: {title: '督办次数',order: 23,view: 'text', type: 'string',},
-  urgencyLevel: {title: '紧急程度',order: 24,view: 'text', type: 'string',},
-  isNeedAppro: {title: '是否需要所办领导审批',order: 25,view: 'switch', type: 'string',},
-  supDeptleaderid: {title: '所办领导',order: 26,view: 'sel_user', type: 'string',},
+  manageSuoleader: {title: '分管所领导',order: 8,view: 'sel_user', type: 'string',},
+  suoleader: {title: '责任领导',order: 9,view: 'sel_user', type: 'string',},
+  responDeptid: {title: '牵头部门',order: 10,view: 'sel_depart', type: 'string',},
+  assistDeptid: {title: '协办部门',order: 11,view: 'sel_depart', type: 'string',},
+  implementDeptid: {title: '落实部门',order: 12,view: 'text', type: 'string',},
+  isAdopt: {title: '是否采纳',order: 13,view: 'switch', type: 'string',},
+  measure: {title: '落实措施/解释说明',order: 14,view: 'textarea', type: 'string',},
+  measureNumber: {title: '措施数量',order: 15,view: 'number', type: 'number',},
+  achievement: {title: '成果形式',order: 16,view: 'textarea', type: 'string',},
+  deadline: {title: '要求完成日期',order: 17,view: 'date', type: 'string',},
+  remark: {title: '备注',order: 18,view: 'text', type: 'string',},
+  actualExect: {title: '执行情况',order: 19,view: 'textarea', type: 'string',},
+  actualTime: {title: '实际完成时间',order: 20,view: 'datetime', type: 'string',},
+  proposerConfirm: {title: '提出人确认',order: 21,view: 'text', type: 'string',},
+  bpmStatus: {title: '完成状态',order: 22,view: 'list', type: 'string',dictCode: 'super_status',},
+  actSt: {title: '调整落实措施及执行情况',order: 23,view: 'textarea', type: 'string',},
+  superviseCount: {title: '督办次数',order: 24,view: 'text', type: 'string',},
+  urgencyLevel: {title: '紧急程度',order: 25,view: 'text', type: 'string',},
+  isNeedAppro: {title: '是否需要所办领导审批',order: 26,view: 'switch', type: 'string',},
+  supDeptleaderid: {title: '所办领导',order: 27,view: 'sel_user', type: 'string',},
   //子表高级查询
   bgTakepulseFeedback: {
     title: '执行情况反馈',
diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue b/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue
index f33b5aa..2480938 100644
--- a/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue
+++ b/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue
@@ -59,6 +59,17 @@
                 <j-select-user v-model:value="mainForm.proposer" :disabled="mainDisabled" allow-clear />
               </a-form-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-item label="分管所领导" name="manageSuoleader">
+                <DeptRoleUserSelectDropDown
+                  v-model:value="mainForm.manageSuoleader"
+                  :deptId="CHARGE_LEADER_DEPT_ID"
+                  :roleId="CHARGE_LEADER_ROLE_ID"
+                  :disabled="mainDisabled"
+                  placeholder="请选择分管所领导"
+                />
+              </a-form-item>
+            </a-col>
             <a-col :span="12">
               <a-form-item label="责任领导" name="suoleader">
                 <j-select-user v-model:value="mainForm.suoleader" :disabled="mainDisabled" allow-clear />
@@ -263,6 +274,11 @@
   import BgTakepulseBPMFeedbackModal from './BgTakepulseBPMFeedbackModal.vue';
   import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
   import SzDeptUserModal from "@/components/semri/deptUserComponent/SzDeptUserModal.vue";
+  import DeptRoleUserSelectDropDown from '/@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
+  import {
+    PARTY_COMMITTEE_DEPT_ID as CHARGE_LEADER_DEPT_ID,
+    CHARGE_LEADER_ROLE_ID,
+  } from '/@/constant/supervision';
 
   const { initBpmFormData } = usePermission();
 
@@ -318,6 +334,7 @@
     proposer: '',
     title: '',
     content: '',
+    manageSuoleader: '',
     suoleader: '',
     responDeptid: '',
     assistDeptid: '',
diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue b/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
index 11ec92a..4c5ceec 100644
--- a/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
+++ b/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
@@ -47,6 +47,16 @@
 								<a-textarea v-model:value="formData.content" :rows="4" placeholder="请输入具体意见" />
 							</a-form-item>
 						</a-col>
+            <a-col :xs="24" :md="12">
+              <a-form-item label="分管所领导" v-bind="validateInfos.manageSuoleader" id="BgTakepulseForm-manageSuoleader" name="manageSuoleader">
+                <DeptRoleUserSelectDropDown
+                  v-model:value="formData.manageSuoleader"
+                  :deptId="CHARGE_LEADER_DEPT_ID"
+                  :roleId="CHARGE_LEADER_ROLE_ID"
+                  placeholder="请选择分管所领导"
+                />
+              </a-form-item>
+            </a-col>
 						<a-col :xs="24" :md="12">
 							<a-form-item label="责任领导" v-bind="validateInfos.suoleader" id="BgTakepulseForm-suoleader" name="suoleader">
                 <sz-dept-user-modal
@@ -172,13 +182,20 @@
   import DeptRoleUserSelectRadioGroup
     from "@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue";
   import SzDeptUserModal from "@/components/semri/deptUserComponent/SzDeptUserModal.vue";
-import { SUOBAN_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervision';
+  import DeptRoleUserSelectDropDown from "@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue";
+  import {
+    SUOBAN_DEPT_ID,
+    MEASURE_RES_LEADER_ROLE_ID,
+    PARTY_COMMITTEE_DEPT_ID as CHARGE_LEADER_DEPT_ID,
+    CHARGE_LEADER_ROLE_ID,
+  } from '/@/constant/supervision';
   const useForm = Form.useForm;
 
   export default defineComponent({
     name: "BgTakepulseForm",
     components:{
       SzDeptUserModal,
+      DeptRoleUserSelectDropDown,
       DeptRoleUserSelectRadioGroup,
       JDictSelectTag,
       JSwitch,
@@ -210,6 +227,7 @@ import { SUOBAN_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervis
         proposer: '',
         title: '',
         content: '',
+        manageSuoleader: '',
         suoleader: '',
         responDeptid: '',
         assistDeptid: '',
@@ -399,6 +417,8 @@ import { SUOBAN_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervis
         disabled,
         showSupDeptLeader,
         showFlowSubmitButton,
+        CHARGE_LEADER_DEPT_ID,
+        CHARGE_LEADER_ROLE_ID,
         SUP_LEADER_DEPT_ID,
         SUP_LEADER_ROLE_ID,
         getFormData,