sz-team/supervision-test-frontend-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/20260622

Browse Source
This commit is contained in:
wsm
2026-06-22 14:39:35 +08:00
parent c017a7b48e 6628b68b4c
commit f8fc49fec2
12 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/semri/process/FlowScheduleStartModal.vue
+3 -2
View File
@@ -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() {
src/components/semri/process/FlowScheduleStartModalForBG.vue
+3 -2
View File
@@ -52,8 +52,8 @@
<a-form-item label="所办领导">
<DeptRoleUserSelectRadioGroup
v-model:value="formData.supDeptleaderid"
deptId="2044677604785229826"
roleId="2044680793306591234"
:deptId="SUOBAN_DEPT_ID"
:roleId="MEASURE_RES_LEADER_ROLE_ID"
:disabled="String(formData.isNeedAppro) !== '1'"
/>
</a-form-item>
@@ -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 {
src/constant/supervision/index.ts
+17
View File
@@ -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';
src/views/bg/bgpartymatter/components/BgPartymatterForm.vue
+3 -2
View File
@@ -99,8 +99,8 @@
<!-- <j-select-user v-model:value="formData.supDeptleaderid" allow-clear />-->
<DeptRoleUserSelectRadioGroup
v-model:value="formData.supDeptleaderid"
deptId="2044677604785229826"
roleId="2044680793306591234"
:deptId="SUOBAN_DEPT_ID"
:roleId="MEASURE_RES_LEADER_ROLE_ID"
/>
</a-form-item>
</a-col>
@@ -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({
src/views/bg/bqtakepulse/components/BgTakepulseForm.vue
+7 -2
View File
@@ -143,8 +143,8 @@
<a-form-item label="所办领导" v-bind="validateInfos.supDeptleaderid" id="BgTakepulseForm-supDeptleaderid" name="supDeptleaderid">
<DeptRoleUserSelectRadioGroup
v-model:value="formData.supDeptleaderid"
deptId="2044677604785229826"
roleId="2044680793306591234"
:deptId="SUP_LEADER_DEPT_ID"
:roleId="SUP_LEADER_ROLE_ID"
/>
</a-form-item>
</a-col>
@@ -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<Record<string, any>>({
@@ -396,6 +399,8 @@
disabled,
showSupDeptLeader,
showFlowSubmitButton,
SUP_LEADER_DEPT_ID,
SUP_LEADER_ROLE_ID,
getFormData,
submitForm,
add,
src/views/bg/xispeak/components/BgXiSpeakBPMForm.vue
+3 -2
View File
@@ -138,8 +138,8 @@
<a-form-item label="督导领导列表" name="sdwLeaderList">
<DeptRoleUserSelectRadioGroup
v-model:value="mainForm.sdwLeaderList"
deptId="2044677562460508161"
roleId="2044676455280570370"
:deptId="PARTY_COMMITTEE_DEPT_ID"
:roleId="SDW_LEADER_ROLE_ID"
:disabled="mainDisabled"
/>
</a-form-item>
@@ -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();
src/views/bg/xispeak/components/BgXiSpeakForm.vue
+1 -3
View File
@@ -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;
src/views/dq/inspectProblem/DqInspectProblemList.vue
+5
View File
@@ -91,6 +91,11 @@
columns,
canResize:false,
useSearchForm: false,
pagination: {
current: 1,
pageSize: 12,
pageSizeOptions: ['12', '24', '36'],
},
isTreeTable: true,
customRow: (record) => {
return {
src/views/dq/inspectTask/DqInspectTaskList.vue
+5
View File
@@ -127,6 +127,11 @@
columns: ledgerColumns,
canResize: false,
useSearchForm: false,
pagination: {
current: 1,
pageSize: 12,
pageSizeOptions: ['12', '24', '36'],
},
actionColumn: {
width: 240,
fixed: 'right',
src/views/dq/inspectTask/components/DqInspectTaskBPMForm.vue
+3 -2
View File
@@ -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,
src/views/dq/inspectTask/components/DqInspectTaskFlowScheduleStartModal.vue
+1 -3
View File
@@ -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;
src/views/dq/inspectTask/components/DqInspectTaskForm.vue
+5 -4
View File
@@ -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();