reactor:流程调整;

src/components/LogicFlow/PropertySetting/task.vue

@@ -303,7 +303,6 @@ onMounted(async () => {
 			default:
 				break;
 		}
-		console.log(form.handlerTypeItemsOrigin, '2');
 	}
 	if ([0, 1, 2].includes(form.handlerType)) {
 		const res: any = await getSelectList(form.handlerType);

src/components/ProcessApproval/index.vue

@@ -308,19 +308,19 @@
 								placeholder="请选择处理人"
 								class="w100"
 								@change="selectHandlers"
-								value-key="id"
+								value-key="key"
 								clearable
 								collapse-tags
 								collapse-tags-tooltip
 							>
-								<el-option v-for="item in state.handlerOptions" :key="item.id" :label="item.name" :value="item" />
+								<el-option v-for="item in state.handlerOptions" :key="item.key" :label="item.value" :value="item" />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" v-if="showMainHandler">
 						<el-form-item label="主办" prop="nextMainHandler" :rules="[{ required: false, message: '请选择主办', trigger: 'change' }]">
 							<el-select v-model="state.ruleForm.nextMainHandler" placeholder="请选择主办" class="w100" filterable>
-								<el-option v-for="item in state.handlerMainOptions" :key="item.id" :label="item.name" :value="item.id" />
+								<el-option v-for="item in state.handlerMainOptions" :key="item.key" :label="item.value" :value="item.key" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -561,7 +561,6 @@ const { userInfos } = storeToRefs(storesUserInfo); // 用户信息
 const showStepsArr = ['延期申请', '甄别申请', '工单重办','新增通知','新增公告']; // 显示步骤条的流程
 const handelArr = ['工单办理','甄别审批']; // 处于办理状态的流程 （如果是汇总节点 需要填写处理人等  办理流程才有期满时间）
 const returnArr = ['工单退回']; // 退回流程 (退回流程不需要展示其他 只需要填写意见和附件即可)
-const formComponents = ref<EmptyArrayType>([]); // 表单组件
 const communicationModeOptions = ref<EmptyArrayType>([]); // 沟通方式
 const timeTypeOptions = ref<EmptyArrayType>([]); // 延期申请单位
 const orderRedoReasonOptions = ref<EmptyArrayType>([]); // 重办理由
@@ -575,9 +574,7 @@ const handleResult = (res: any) => {
 
 
 
-	state.handleId = res.result.id; //流程ID
-	formComponents.value = res.result.components ?? []; // 表单组件
-	console.log(formComponents.value, '21');
+	// state.handleId = res.result.id; //流程ID
 	communicationModeOptions.value = res.result.communicationModeOptions ?? []; // 沟通方式
 	timeTypeOptions.value = res.result.timeTypeOptions ?? []; // 时间单位
 	if (handelArr.includes(state.processType)) {
@@ -597,6 +594,7 @@ const handleResult = (res: any) => {
 		// 下一节点是否只有一个 默认选中第一个
 		state.ruleForm.nextStepCode = state.nextStepOptions[0].key; // 下一节点
     selectNextStep(state.nextStepOptions[0].key); // 查询流程下一节点参数
+
 		isCollect.value = state.nextStepOptions[0].stepType === 3 && handelArr.includes(state.processType); // 是否是汇总节点（汇总需要填入其他参数）
 	} else {
 		state.ruleForm.nextStepCode = '';
@@ -729,6 +727,7 @@ const selectNextStep = (val: any) => {
   const items = state.nextStepOptions.find((item: any) => item.key === val).items;
   console.log(items,'21')
   state.handlerOptions = items ?? [];
+  console.log(state.handlerOptions,'1111')
 	/*const next = state.nextStepOptions.find((item: any) => item.code === val);
 	getNextStepOption(state.handleId, next.code);
 	isCollect.value = next.stepType === 3 && handelArr.includes(state.processType); // 是否是汇总节点（汇总需要填入其他参数）*/
@@ -746,7 +745,7 @@ const selectNextStep = (val: any) => {
 const selectHandlers = () => {
 	ruleFormRef.value?.resetFields('nextMainHandler');
 	if (state.ruleForm.nextHandlers.length > 1) {
-		state.ruleForm.nextMainHandler = state.ruleForm.nextHandlers[0].id;
+		state.ruleForm.nextMainHandler = state.ruleForm.nextHandlers[0].key;
 	}
 };
 const showMainHandler = computed(() => {
@@ -768,8 +767,8 @@ const closeDialog = () => {
 // 重置表单方法
 const restForm = (formEl: FormInstance | undefined) => {
 	if (!formEl) return;
-	state.handlerOptions = [];
-	state.ruleForm.nextHandlers = [];
+	// state.handlerOptions = [];
+	// state.ruleForm.nextHandlers = [];
 	state.ruleForm.opinion = '';
 	delayFormRef.value?.clearValidate();
 	delayFormRef.value?.resetFields();
@@ -848,20 +847,9 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 
 				if (submitObj.nextHandlers && submitObj.nextHandlers.length) {
 					if (submitObj.nextHandlers.length === 1) {
-						submitObj.nextMainHandler = submitObj.nextHandlers[0].id;
+						submitObj.nextMainHandler = submitObj.nextHandlers[0].key;
 					}
 				}
-				submitObj.extension = {
-					applyDelayProvince: submitObj.applyDelayProvince,
-					isSms: submitObj.isSms,
-					timeLimitCount: submitObj.timeLimitCount,
-					timeLimitUnit: submitObj.timeLimitUnit,
-				};
-				Reflect.deleteProperty(submitObj, 'applyDelayProvince');
-				Reflect.deleteProperty(submitObj, 'isSms');
-				Reflect.deleteProperty(submitObj, 'timeLimitCount');
-				Reflect.deleteProperty(submitObj, 'timeLimitUnit');
-
 				switch (state.processType) {
 					case '工单发起':
 						const request = {