From 6628b68b4ce8afb5bdba3e2c68d945ce4bef2652 Mon Sep 17 00:00:00 2001
From: new_new_new <8454518+new-twice@user.noreply.gitee.com>
Date: Mon, 22 Jun 2026 06:38:19 +0000
Subject: [PATCH] =?UTF-8?q?!51=20refactor:=20=E6=8F=90=E5=8F=96=E9=83=A8?=
=?UTF-8?q?=E9=97=A8=E8=A7=92=E8=89=B2ID=E5=B8=B8=E9=87=8F=E5=88=B0?=
=?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Merge branch 'master' of gitee.com:sz_30/supervision-vue into feature/20260518
* refactor: 提取部门角色ID常量到统一配置文件
* Merge branch 'master' into feature/20260518
* feat(inspectTask): 独立发起流程弹窗，替换党群领导审批组件
* style(inspectProgress): 进展表单对齐BPM表单样式
* style(xispeak): 反馈表单对齐BPM表单样式
* perf(xispeak): 反馈统计查询由逐条请求改为批量接口
* refactor(xispeak): BPM表单和巡视整改表单牵头部门组件替换为SzSelectDept
* style(xispeak): 优化查询表单布局并替换牵头部门选人组件
---
.../semri/process/FlowScheduleStartModal.vue | 5 +++--
.../process/FlowScheduleStartModalForBG.vue | 5 +++--
src/constant/supervision/index.ts | 17 +++++++++++++++++
.../components/BgPartymatterForm.vue | 5 +++--
.../bqtakepulse/components/BgTakepulseForm.vue | 9 +++++++--
.../bg/xispeak/components/BgXiSpeakBPMForm.vue | 5 +++--
.../bg/xispeak/components/BgXiSpeakForm.vue | 4 +---
.../dq/inspectProblem/DqInspectProblemList.vue | 5 +++++
src/views/dq/inspectTask/DqInspectTaskList.vue | 5 +++++
.../components/DqInspectTaskBPMForm.vue | 5 +++--
.../DqInspectTaskFlowScheduleStartModal.vue | 4 +---
.../components/DqInspectTaskForm.vue | 9 +++++----
12 files changed, 56 insertions(+), 22 deletions(-)
create mode 100644 src/constant/supervision/index.ts
diff --git a/src/components/semri/process/FlowScheduleStartModal.vue b/src/components/semri/process/FlowScheduleStartModal.vue
index 9b937bd..0b08f90 100644
--- a/src/components/semri/process/FlowScheduleStartModal.vue
+++ b/src/components/semri/process/FlowScheduleStartModal.vue
@@ -99,6 +99,7 @@
import JModal from '/src/components/Modal/src/JModal/JModal.vue';
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
+import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervision';
import SzUserSelectByDeptRoleSecurityModal from '/src/components/semri/userComponent/modal/SzUserSelectByDeptRoleSecurityModal.vue';
import { SearchOutlined } from '@ant-design/icons-vue';
import { getUserList } from '/src/api/common/api';
@@ -134,8 +135,8 @@
// 所党委领导选人弹窗
const sdwLeaderModalOpen = ref(false);
const supDeptleaderName = ref('');
- const sdwLeaderDeptId = ref('2044677562460508161');
- const sdwLeaderRoleId = ref('2044676455280570370');
+ const sdwLeaderDeptId = ref(PARTY_COMMITTEE_DEPT_ID);
+ const sdwLeaderRoleId = ref(SDW_LEADER_ROLE_ID);
const sdwLeaderSecurityValue = ref(5);
function openSdwLeaderModal() {
diff --git a/src/components/semri/process/FlowScheduleStartModalForBG.vue b/src/components/semri/process/FlowScheduleStartModalForBG.vue
index 09bae3e..ad113de 100644
--- a/src/components/semri/process/FlowScheduleStartModalForBG.vue
+++ b/src/components/semri/process/FlowScheduleStartModalForBG.vue
@@ -52,8 +52,8 @@
@@ -99,6 +99,7 @@
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
+import { SUOBAN_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervision';
import { useMessage } from '/src/hooks/web/useMessage';
interface ModalPayload {
diff --git a/src/constant/supervision/index.ts b/src/constant/supervision/index.ts
new file mode 100644
index 0000000..1a5cd95
--- /dev/null
+++ b/src/constant/supervision/index.ts
@@ -0,0 +1,17 @@
+/** 所党委 */
+export const PARTY_COMMITTEE_DEPT_ID = '2044677562460508161';
+
+/** 党群 */
+export const PARTY_MASSES_DEPT_ID = '2044677628281720834';
+
+/** 所办 */
+export const SUOBAN_DEPT_ID = '2044677604785229826';
+
+/** 所党委领导 */
+export const SDW_LEADER_ROLE_ID = '2044676455280570370';
+
+/** 措施责任领导 / 党群领导 */
+export const MEASURE_RES_LEADER_ROLE_ID = '2044680793306591234';
+
+/** 分管所领导 */
+export const CHARGE_LEADER_ROLE_ID = '2062794430936240130';
diff --git a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
index 6beb8f5..1590f7c 100644
--- a/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
+++ b/src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
@@ -99,8 +99,8 @@
@@ -157,6 +157,7 @@
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 SzSelectDept from "@/components/Form/src/jeecg/components/SzSelectDept.vue";
const props = defineProps({
diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue b/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
index fc75634..11ec92a 100644
--- a/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
+++ b/src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
@@ -143,8 +143,8 @@
@@ -172,6 +172,7 @@
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';
const useForm = Form.useForm;
export default defineComponent({
@@ -195,6 +196,8 @@
},
emits:['success'],
setup(props, {emit}) {
+ const SUP_LEADER_DEPT_ID = SUOBAN_DEPT_ID;
+ const SUP_LEADER_ROLE_ID = MEASURE_RES_LEADER_ROLE_ID;
const loading = ref(false);
const formRef = ref();
const formData = reactive>({
@@ -396,6 +399,8 @@
disabled,
showSupDeptLeader,
showFlowSubmitButton,
+ SUP_LEADER_DEPT_ID,
+ SUP_LEADER_ROLE_ID,
getFormData,
submitForm,
add,
diff --git a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
index 06c5a00..6eb96c5 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
@@ -138,8 +138,8 @@
@@ -283,6 +283,7 @@
import BgXiSpeakBPMFeedbackModal from './BgXiSpeakBPMFeedbackModal.vue';
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
+import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervision';
const { isDisabledAuth, hasPermission, initBpmFormData } = usePermission();
const userStore = useUserStore();
diff --git a/src/views/bg/xispeak/components/BgXiSpeakForm.vue b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
index 67025f5..6290f67 100644
--- a/src/views/bg/xispeak/components/BgXiSpeakForm.vue
+++ b/src/views/bg/xispeak/components/BgXiSpeakForm.vue
@@ -133,9 +133,7 @@ import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { usePermission } from '/@/hooks/web/usePermission';
-
-const PARTY_COMMITTEE_DEPT_ID = '2044677562460508161';
-const SDW_LEADER_ROLE_ID = '2044676455280570370';
+import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervision';
const { initBpmFormData } = usePermission();
const useForm = Form.useForm;
diff --git a/src/views/dq/inspectProblem/DqInspectProblemList.vue b/src/views/dq/inspectProblem/DqInspectProblemList.vue
index ed357ee..8852845 100644
--- a/src/views/dq/inspectProblem/DqInspectProblemList.vue
+++ b/src/views/dq/inspectProblem/DqInspectProblemList.vue
@@ -91,6 +91,11 @@
columns,
canResize:false,
useSearchForm: false,
+ pagination: {
+ current: 1,
+ pageSize: 12,
+ pageSizeOptions: ['12', '24', '36'],
+ },
isTreeTable: true,
customRow: (record) => {
return {
diff --git a/src/views/dq/inspectTask/DqInspectTaskList.vue b/src/views/dq/inspectTask/DqInspectTaskList.vue
index d15663c..29f8f44 100644
--- a/src/views/dq/inspectTask/DqInspectTaskList.vue
+++ b/src/views/dq/inspectTask/DqInspectTaskList.vue
@@ -127,6 +127,11 @@
columns: ledgerColumns,
canResize: false,
useSearchForm: false,
+ pagination: {
+ current: 1,
+ pageSize: 12,
+ pageSizeOptions: ['12', '24', '36'],
+ },
actionColumn: {
width: 240,
fixed: 'right',
diff --git a/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue b/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue
index bf95e52..6d1b825 100644
--- a/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue
+++ b/src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue
@@ -244,6 +244,7 @@ import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserMod
import { saveBpmForm, setProcessVariable, specificProblemOptions } from '../DqInspectTask.api';
import { list as progressList, deleteOne as progressDelete } from '../../inspectProgress/DqInspectProgress.api';
import { usePermission } from '/@/hooks/web/usePermission';
+import { PARTY_COMMITTEE_DEPT_ID, SDW_LEADER_ROLE_ID } from '/@/constant/supervision';
import TaskHandleInnerContent from '/@/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue';
import DqInspectTaskBPMFeedbackModal from './DqInspectTaskBPMFeedbackModal.vue';
import SUploadFile from '/@/components/semri/fileComponent/SUploadFile.vue';
@@ -439,8 +440,8 @@ import SzDeptUserModal from '/@/components/semri/deptUserComponent/SzDeptUserMod
const res = await defHttp.get({
url: '/sys/user/queryUserRoleComponentData',
params: {
- departId: '2044677562460508161',
- roleId: '2044676455280570370',
+ departId: PARTY_COMMITTEE_DEPT_ID,
+ roleId: SDW_LEADER_ROLE_ID,
searchSecurityLevel: 5,
pageNo: 1,
pageSize: 999,
diff --git a/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue b/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue
index f3e19c2..431f8b5 100644
--- a/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue
+++ b/src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue
@@ -85,9 +85,7 @@
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
import DeptRoleUserSelectRadioGroup from '/@/components/semri/userComponent/DeptRoleUserSelectRadioGroup.vue';
import { useMessage } from '/src/hooks/web/useMessage';
-
- const PARTY_MASSES_DEPT_ID = '2044677628281720834';
- const MEASURE_RES_LEADER_ROLE_ID = '2044680793306591234';
+import { PARTY_MASSES_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervision';
interface ModalPayload {
title?: string;
diff --git a/src/views/dq/inspectTask/components/DqInspectTaskForm.vue b/src/views/dq/inspectTask/components/DqInspectTaskForm.vue
index e3c2ea5..9d80a1a 100644
--- a/src/views/dq/inspectTask/components/DqInspectTaskForm.vue
+++ b/src/views/dq/inspectTask/components/DqInspectTaskForm.vue
@@ -174,6 +174,7 @@ import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { Form } from 'ant-design-vue';
import DeptRoleUserSelectDropDown from '@/components/semri/userComponent/DeptRoleUserSelectDropDown.vue';
+import { PARTY_COMMITTEE_DEPT_ID, CHARGE_LEADER_ROLE_ID as _CHARGE_LEADER_ROLE_ID, PARTY_MASSES_DEPT_ID as _PARTY_MASSES_DEPT_ID, MEASURE_RES_LEADER_ROLE_ID as _MEASURE_RES_LEADER_ROLE_ID } from '/@/constant/supervision';
const useForm = Form.useForm;
export default defineComponent({
@@ -197,10 +198,10 @@ import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
},
emits: ['success'],
setup(props, { emit }) {
- const CHARGE_LEADER_DEPT_ID = '2044677562460508161';
- const CHARGE_LEADER_ROLE_ID = '2062794430936240130';
- const PARTY_MASSES_DEPT_ID = '2044677628281720834';
- const MEASURE_RES_LEADER_ROLE_ID = '2044680793306591234';
+ const CHARGE_LEADER_DEPT_ID = PARTY_COMMITTEE_DEPT_ID;
+ const CHARGE_LEADER_ROLE_ID = _CHARGE_LEADER_ROLE_ID;
+ const PARTY_MASSES_DEPT_ID = _PARTY_MASSES_DEPT_ID;
+ const MEASURE_RES_LEADER_ROLE_ID = _MEASURE_RES_LEADER_ROLE_ID;
const loading = ref(false);
const formRef = ref();