yxk-20260707

党委会、所务会增加分管所领导字段

src/views/bg/bgpartymatter/BgPartymatter.data.ts

@@ -67,6 +67,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'isImportant_dictText'
   },
+  {
+    title: '分管所领导',
+    align:"center",
+    dataIndex: 'manageSuoleader_dictText'
+  },
   {
     title: '主办部门',
     align:"center",
@@ -190,14 +195,15 @@ export const superQuerySchema = {
   matterCode: {title: '事项目录编码',order: 6,view: 'text', type: 'string',},
   noticeNumber: {title: '抄告单编号',order: 7,view: 'text', type: 'string',},
   isImportant: {title: '是否为三重一大决策',order: 8,view: 'list', type: 'string', dictCode: 'yn',},
-  responDeptid: {title: '责任部门',order: 9,view: 'sel_depart', type: 'string',},
+  manageSuoleader: {title: '分管所领导',order: 9,view: 'sel_user', type: 'string',},
-  actualExect: {title: '实际执行情况',order: 10,view: 'text', type: 'string',},
+  responDeptid: {title: '责任部门',order: 10,view: 'sel_depart', type: 'string',},
-  bpmStatus: {title: '完成状态',order: 11,view: 'text', type: 'string',},
+  actualExect: {title: '实际执行情况',order: 11,view: 'text', type: 'string',},
-  superviseCount: {title: '督办次数',order: 12,view: 'text', type: 'string',},
+  bpmStatus: {title: '完成状态',order: 12,view: 'text', type: 'string',},
-  deadline: {title: '要求完成日期',order: 13,view: 'date', type: 'string',},
+  superviseCount: {title: '督办次数',order: 13,view: 'text', type: 'string',},
-  urgencyLevel: {title: '是否急件',order: 14,view: 'list', type: 'string', dictCode: 'yn',},
+  deadline: {title: '要求完成日期',order: 14,view: 'date', type: 'string',},
-  isNeedAppro: {title: '是否需要所办领导审批',order: 15,view: 'switch', type: 'string',},
+  urgencyLevel: {title: '是否急件',order: 15,view: 'list', type: 'string', dictCode: 'yn',},
-  supDeptleaderid: {title: '所办领导',order: 16,view: 'sel_user', type: 'string',},
+  isNeedAppro: {title: '是否需要所办领导审批',order: 16,view: 'switch', type: 'string',},
-  isNeedSuoleader: {title: '是否抄送所领导',order: 17,view: 'switch', type: 'string',},
+  supDeptleaderid: {title: '所办领导',order: 17,view: 'sel_user', type: 'string',},
-  suoleaderid: {title: '抄送所领导',order: 18,view: 'sel_user', type: 'string',},
+  isNeedSuoleader: {title: '是否抄送所领导',order: 18,view: 'switch', type: 'string',},
+  suoleaderid: {title: '抄送所领导',order: 19,view: 'sel_user', type: 'string',},
 };

src/views/bg/bgpartymatter/components/BgPartymatterBPMForm.vue

@@ -69,6 +69,17 @@
                 <j-dict-select-tag v-model:value="mainForm.isImportant" :disabled="mainDisabled" dictCode="yn" 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="responDeptid">
                 <j-select-dept
@@ -236,6 +247,11 @@
   import BgPartymatterBPMFeedbackModal from './BgPartymatterBPMFeedbackModal.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 { isDisabledAuth, hasPermission, initBpmFormData} = usePermission();
 
   const props = defineProps({
@@ -296,6 +312,7 @@
     matterCode: '',
     noticeNumber: '',
     isImportant: '',
+    manageSuoleader: '',
     responDeptid: '',
     assistDeptid: '',
     actualExect: '',

src/views/bg/bgpartymatter/components/BgPartymatterForm.vue

@@ -34,11 +34,21 @@
 								<a-input v-model:value="formData.title" placeholder="请输入事项名称"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
-						<a-col :xs="24" :md="12">
+						<a-col :xs="24" :md="24">
-							<a-form-item label="会议决议" v-bind="validateInfos.content" id="BgPartymatterForm-content" name="content">
+							<a-form-item label="会议决议" v-bind="validateInfos.content" id="BgPartymatterForm-content" name="content" :labelCol="wideLabelCol" :wrapperCol="wideWrapperCol">
-								<a-textarea v-model:value="formData.content" :rows="4" placeholder="请输入会议决议" />
+								<a-textarea v-model:value="formData.content" :rows="4" placeholder="请输入会议决议" style="width: 100%" />
 							</a-form-item>
 						</a-col>
+            <a-col :xs="24" :md="12">
+              <a-form-item label="分管所领导" v-bind="validateInfos.manageSuoleader" id="BgPartymatterForm-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.matterCode" id="BgPartymatterForm-matterCode" name="matterCode">
 								<a-input v-model:value="formData.matterCode" placeholder="请输入事项目录编码"  allow-clear ></a-input>
@@ -157,8 +167,15 @@
   import { Form } from 'ant-design-vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import DeptRoleUserSelectRadioGroup from "/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue";
-import { SUOBAN_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervision';
+  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';
   import SzSelectDept from "@/components/Form/src/jeecg/components/SzSelectDept.vue";
+  import DeptRoleUserSelectDropDown
+    from "@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue";
 
   const props = defineProps({
     formDisabled: { type: Boolean, default: false },
@@ -179,6 +196,7 @@ import { SUOBAN_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervis
     matterCode: '',
     noticeNumber: '',
     isImportant: '',
+    manageSuoleader: '',
     responDeptid: '',
     assistDeptid: '',
     actualExect: '',