feat(inspectTask): 独立发起流程弹窗,替换党群领导审批组件
从共享 FlowScheduleStartModal 复制为独立组件,将"是否所党委审批/所党委领导" 替换为"是否需要党群领导审批/党群领导",使用 DeptRoleUserSelectRadioGroup 组件,并用 v-show 避免切换时重复请求接口。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -104,7 +104,7 @@
|
|||||||
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
|
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
|
||||||
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
|
import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
|
||||||
import { startProcessSchedules } from '/@/api/common/api';
|
import { startProcessSchedules } from '/@/api/common/api';
|
||||||
import FlowScheduleStartModal from '/src/components/semri/process/FlowScheduleStartModal.vue';
|
import FlowScheduleStartModal from './components/DqInspectTaskFlowScheduleStartModal.vue';
|
||||||
import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
|
import BusinessProcessListModal from '/src/components/semri/process/BusinessProcessListModal.vue';
|
||||||
|
|
||||||
const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
|
const [registerBpmModal, { openModal: bpmPicModal }] = useModal();
|
||||||
|
|||||||
@@ -0,0 +1,235 @@
|
|||||||
|
<template>
|
||||||
|
<j-modal :title="title" :width="720" :visible="visible" @ok="handleOk" @cancel="handleCancel" cancelText="取消">
|
||||||
|
<a-form :model="formData" :label-col="{ style: { width: '120px' } }" :wrapper-col="{ span: 16 }">
|
||||||
|
<a-form-item label="发起类型">
|
||||||
|
<a-radio-group v-model:value="formData.triggerMode">
|
||||||
|
<a-radio value="immediate">立即发起</a-radio>
|
||||||
|
<a-radio value="recurring">重复发起</a-radio>
|
||||||
|
</a-radio-group>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item v-if="deptOptions.length" label="牵头部门">
|
||||||
|
<a-select
|
||||||
|
v-model:value="formData.deptIds"
|
||||||
|
mode="multiple"
|
||||||
|
:options="deptOptions"
|
||||||
|
placeholder="请选择牵头部门"
|
||||||
|
allow-clear
|
||||||
|
style="width: 100%"
|
||||||
|
:getPopupContainer="(node) => node?.parentNode"
|
||||||
|
/>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item v-if="showDeadlineField" label="事项截止时间">
|
||||||
|
<a-date-picker
|
||||||
|
v-model:value="formData.deadline"
|
||||||
|
valueFormat="YYYY-MM-DD"
|
||||||
|
placeholder="请选择事项截止时间"
|
||||||
|
style="width: 100%"
|
||||||
|
:getPopupContainer="(node) => node?.parentNode"
|
||||||
|
/>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<template v-if="showSuoleaderFields">
|
||||||
|
<a-form-item label="党群领导是否审批">
|
||||||
|
<j-switch v-model:value="formData.isNeedAppro" />
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item v-show="formData.isNeedAppro === '1'" label="党群领导">
|
||||||
|
<DeptRoleUserSelectRadioGroup
|
||||||
|
v-model:value="formData.supDeptleaderid"
|
||||||
|
:deptId="PARTY_MASSES_DEPT_ID"
|
||||||
|
:roleId="MEASURE_RES_LEADER_ROLE_ID"
|
||||||
|
/>
|
||||||
|
</a-form-item>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template v-if="formData.triggerMode === 'recurring'">
|
||||||
|
<a-form-item label="重复周期">
|
||||||
|
<JDictSelectTag
|
||||||
|
v-model:value="formData.intervalType"
|
||||||
|
dictCode="sup_interval_type"
|
||||||
|
placeholder="重复周期"
|
||||||
|
:getPopupContainer="(node) => node?.parentNode"
|
||||||
|
/>
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item label="重复次数">
|
||||||
|
<a-input-number v-model:value="formData.startCount" :min="1" :precision="0" placeholder="重复次数" style="width: 100%" />
|
||||||
|
</a-form-item>
|
||||||
|
|
||||||
|
<a-form-item label="重复开始日期">
|
||||||
|
<a-date-picker
|
||||||
|
v-model:value="formData.intervalStartTime"
|
||||||
|
show-time
|
||||||
|
valueFormat="YYYY-MM-DD HH:mm:ss"
|
||||||
|
placeholder="重复开始日期"
|
||||||
|
style="width: 100%"
|
||||||
|
:getPopupContainer="(node) => node?.parentNode"
|
||||||
|
/>
|
||||||
|
</a-form-item>
|
||||||
|
</template>
|
||||||
|
</a-form>
|
||||||
|
|
||||||
|
<template #footer>
|
||||||
|
<a-button @click="handleCancel">取消</a-button>
|
||||||
|
<a-button type="primary" @click="handleOk">提交</a-button>
|
||||||
|
</template>
|
||||||
|
</j-modal>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts" setup>
|
||||||
|
import { reactive, ref } from 'vue';
|
||||||
|
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 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';
|
||||||
|
|
||||||
|
interface ModalPayload {
|
||||||
|
title?: string;
|
||||||
|
payload?: Record<string, any>;
|
||||||
|
deptOptions?: DeptOption[];
|
||||||
|
showSuoleaderFields?: boolean;
|
||||||
|
isNeedAppro?: string | number;
|
||||||
|
supDeptleaderid?: string | string[];
|
||||||
|
supDeptleaderName?: string;
|
||||||
|
showDeadlineField?: boolean;
|
||||||
|
deadline?: string | Date;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface DeptOption {
|
||||||
|
label: string;
|
||||||
|
value: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const emit = defineEmits(['confirm']);
|
||||||
|
const { createMessage } = useMessage();
|
||||||
|
|
||||||
|
const title = ref('发起流程');
|
||||||
|
const visible = ref(false);
|
||||||
|
const contextData = ref<Record<string, any>>({});
|
||||||
|
const deptOptions = ref<DeptOption[]>([]);
|
||||||
|
const showSuoleaderFields = ref(false);
|
||||||
|
const showDeadlineField = ref(false);
|
||||||
|
|
||||||
|
const formData = reactive({
|
||||||
|
triggerMode: 'immediate',
|
||||||
|
intervalType: undefined as number | string | undefined,
|
||||||
|
startCount: undefined as number | undefined,
|
||||||
|
intervalStartTime: undefined as string | undefined,
|
||||||
|
deptIds: [] as string[],
|
||||||
|
isNeedAppro: '0',
|
||||||
|
supDeptleaderid: '' as string | string[],
|
||||||
|
deadline: undefined as string | undefined,
|
||||||
|
});
|
||||||
|
|
||||||
|
function resetForm() {
|
||||||
|
formData.triggerMode = 'immediate';
|
||||||
|
formData.intervalType = undefined;
|
||||||
|
formData.startCount = undefined;
|
||||||
|
formData.intervalStartTime = undefined;
|
||||||
|
formData.deptIds = [];
|
||||||
|
formData.isNeedAppro = '0';
|
||||||
|
formData.supDeptleaderid = '';
|
||||||
|
formData.deadline = undefined;
|
||||||
|
deptOptions.value = [];
|
||||||
|
showSuoleaderFields.value = false;
|
||||||
|
showDeadlineField.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeDeptOptions(options: DeptOption[] = []) {
|
||||||
|
const optionMap = new Map<string, DeptOption>();
|
||||||
|
options.forEach((item) => {
|
||||||
|
const value = String(item?.value || '').trim();
|
||||||
|
if (!value || optionMap.has(value)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
optionMap.set(value, {
|
||||||
|
value,
|
||||||
|
label: item?.label || value,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return Array.from(optionMap.values());
|
||||||
|
}
|
||||||
|
|
||||||
|
function normalizeDeadlineValue(value?: string | Date) {
|
||||||
|
if (!value) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
if (typeof value === 'string') {
|
||||||
|
return value.length >= 10 ? value.substring(0, 10) : value;
|
||||||
|
}
|
||||||
|
const year = value.getFullYear();
|
||||||
|
const month = String(value.getMonth() + 1).padStart(2, '0');
|
||||||
|
const day = String(value.getDate()).padStart(2, '0');
|
||||||
|
return `${year}-${month}-${day}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function open(data: ModalPayload = {}) {
|
||||||
|
resetForm();
|
||||||
|
title.value = data.title || '发起流程';
|
||||||
|
contextData.value = data.payload || {};
|
||||||
|
deptOptions.value = normalizeDeptOptions(data.deptOptions || []);
|
||||||
|
formData.deptIds = deptOptions.value.map((item) => item.value);
|
||||||
|
showSuoleaderFields.value = !!data.showSuoleaderFields;
|
||||||
|
formData.isNeedAppro = String(data.isNeedAppro ?? '0');
|
||||||
|
formData.supDeptleaderid = data.supDeptleaderid || '';
|
||||||
|
showDeadlineField.value = !!data.showDeadlineField;
|
||||||
|
formData.deadline = normalizeDeadlineValue(data.deadline);
|
||||||
|
visible.value = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleCancel() {
|
||||||
|
visible.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleOk() {
|
||||||
|
if (formData.triggerMode === 'recurring') {
|
||||||
|
if (!formData.intervalType) {
|
||||||
|
createMessage.warning('Please select interval type');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!formData.startCount) {
|
||||||
|
createMessage.warning('Please input repeat count');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!formData.intervalStartTime) {
|
||||||
|
createMessage.warning('Please select start time');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (deptOptions.value.length && !formData.deptIds.length) {
|
||||||
|
createMessage.warning('请选择责任部门');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (showDeadlineField.value && !formData.deadline) {
|
||||||
|
createMessage.warning('请选择事项截止时间');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
emit('confirm', {
|
||||||
|
payload: contextData.value,
|
||||||
|
options: {
|
||||||
|
triggerType: formData.triggerMode === 'recurring' ? 2 : 1,
|
||||||
|
intervalType: formData.triggerMode === 'recurring' ? Number(formData.intervalType) : undefined,
|
||||||
|
startCount: formData.triggerMode === 'recurring' ? Number(formData.startCount) : undefined,
|
||||||
|
intervalStartTime: formData.triggerMode === 'recurring' ? formData.intervalStartTime : undefined,
|
||||||
|
deptId: formData.deptIds.join(','),
|
||||||
|
deptIds: [...formData.deptIds],
|
||||||
|
isNeedAppro: showSuoleaderFields.value ? formData.isNeedAppro : undefined,
|
||||||
|
supDeptleaderid: showSuoleaderFields.value ? (String(formData.isNeedAppro) === '1' ? formData.supDeptleaderid : '') : undefined,
|
||||||
|
deadline: showDeadlineField.value ? formData.deadline : undefined,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
handleCancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
defineExpose({
|
||||||
|
open,
|
||||||
|
});
|
||||||
|
</script>
|
||||||
Reference in New Issue
Block a user