Эх сурвалжийг харах

reactor:宜宾新增办理的临时保存功能;

zhangchong 6 сар өмнө
parent
commit
19826f92a1

+ 5 - 2
src/components/ProcessAudit/ZGProcess.vue

@@ -465,11 +465,11 @@
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
-				<el-text type="danger" class="mr15" tag="b" v-if="!returnArr.includes(state.processType)"
+				<el-text type="danger" class="mr15" tag="b" v-if="showTempSave"
 					>温馨提示:临时保存只保存{{ state.inputPlaceholder }}</el-text
 				>
 				<el-button @click="closeDialog" class="default-button">取消</el-button>
-				<el-button type="primary" @click="handleTempSave" :loading="state.loading" v-if="handelArr.includes(state.processType)">临时保存</el-button>
+				<el-button type="primary" @click="handleTempSave" :loading="state.loading" v-if="showTempSave">临时保存</el-button>
 				<template v-if="seatTopaidan || seatToOrgOne">
 					<el-popconfirm title="确定当前工单为中心直办件?" v-if="!state.ruleForm.isForwarded" @confirm="onSubmit(ruleFormRef)" width="230">
 						<template #reference>
@@ -570,6 +570,9 @@ const handelArr = ['工单办理','工单代办','工单受理']; // 处于办
 const returnArr = ['工单退回']; // 退回流程 (退回流程不需要展示其他 只需要填写意见和附件即可)
 const appConfigStore = useAppConfig();
 const { AppConfigInfo } = storeToRefs(appConfigStore); // 系统配置信息
+const showTempSave = computed(()=>{ // 是否显示临时办理
+	return ['工单办理','工单代办','工单受理'].includes(state.processType)
+})
 // 打开弹窗
 const openDialog = async (val: any) => {
 	console.log(val);

+ 17 - 7
src/components/ProcessAudit/index.vue

@@ -434,15 +434,13 @@
 								<annex-list :name="state.annexName" :businessId="state.orderDetail.id" :classify="state.classify" v-model:format="handleFiles" />
 							</el-form-item>
 						</el-col>
-						<el-col v-if="isOverdueTips" :span="24">
-							<el-alert type="warning" show-icon title="注意"> 该工单属于超期状态,若符合延期要求,请延期通过后办结,是否继续办理 </el-alert>
-						</el-col>
 					</template>
 				</template>
 			</el-row>
 		</el-form>
 		<template #footer>
 			<span class="dialog-footer">
+				<el-text type="danger" class="mr15" tag="b" v-if="showTempSave">温馨提示:临时保存只保存{{ state.inputPlaceholder }}</el-text>
 				<el-button @click="closeDialog" class="default-button">取 消</el-button>
 				<el-button type="primary" @click="handleTempSave" :loading="state.loading" v-if="showTempSave">临时保存</el-button>
 				<el-button
@@ -455,6 +453,17 @@
 				<el-button class="default-button" @click="onNext" :loading="state.loading" v-if="activeStep === 0 && showStepsArr.includes(state.processType)"
 					>下一步</el-button
 				>
+				<el-popconfirm
+					title="该工单属于超期状态,若符合延期要求,请延期通过后办结,是否继续办理?"
+					v-if="isOverdueTips"
+					@confirm="onSubmit(ruleFormRef)"
+					width="300"
+				>
+						<template #reference>
+							<el-button type="primary" :loading="state.loading">办理</el-button>
+						</template>
+					</el-popconfirm>
+					<el-button type="primary" @click="onSubmit(ruleFormRef)" :loading="state.loading" v-else>办理</el-button>
 				<el-button type="primary" @click="onSubmit(ruleFormRef)" :loading="state.loading" v-if="activeStep === 1">办理</el-button>
 			</span>
 		</template>
@@ -559,9 +568,10 @@ const returnArr = ['工单退回', '甄别退回', '延期退回', '终止退回
 const auditArr = ['甄别审批', '延期审批', '知识审批', '终止审批']; // 审批流程 (审批流程需要选择是否通过和下一环节)
 const appConfigStore = useAppConfig();
 const { AppConfigInfo } = storeToRefs(appConfigStore); // 系统配置信息
-const showTempSave = computed(()=>{ // 是否显示临时办理
-	return ['工单办理','工单代办','工单受理'].includes(state.processType)
-})
+const showTempSave = computed(() => {
+	// 是否显示临时办理
+	return ['工单办理', '工单代办', '工单受理'].includes(state.processType);
+});
 const timeType = ref<EmptyArrayType>([]); // 延期申请单位
 const screenTypeOptions = ref<EmptyArrayType>([]); // 甄别类型
 const screenType = ref(null); // 甄别类型  自贡甄别特殊需求
@@ -698,7 +708,7 @@ const canStartCountersign = ref<boolean>(false); // 是否可以发起会签
 const isMainHandlerShow = ref<boolean>(false); // 是否展示主办人
 const currentParams = ref<EmptyObjectType>({}); // 当前获取到的参数(当前节点信息)
 const handleResult = (res: any) => {
-	currentParams.value = res.result;// 当前获取到的参数(当前节点信息)
+	currentParams.value = res.result; // 当前获取到的参数(当前节点信息)
 	state.nextStepOptions = res.result.steps; //办理对象选择内容
 	canReject.value = res.result.canReject ?? false; // 是否可以驳回
 	timeTypeOptions.value = res.result.timeTypeOptions ?? []; // 办理时限申请单位