Forráskód Böngészése

reactor:延期审批调整;

zhangchong 2 hete
szülő
commit
5054dbcc15

+ 1 - 1
src/layout/navBars/breadcrumb/ybTel.vue

@@ -1550,7 +1550,7 @@ const clickOnDuty = (formEl: FormInstance | undefined) => {
 	formEl.validate((valid: boolean) => {
 		if (!valid) return;
 		state.loading = true;
-		let request = {};
+		let request:EmptyObjectType = {};
 		if (AppConfigInfo.value.isNeedTelNo && AppConfigInfo.value.isTelNeedVerify) {
 			// 需要分机和密码
 			request = {

+ 0 - 1
src/views/business/delay/components/Delay-audit-batch.vue

@@ -892,7 +892,6 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 			delayId: delayId.value,
 			isPass: state.ruleForm.isPass,
 		};
-		console.log(request);
 		delayBatchApprove(request)
 			.then((res: any) => {
 				emit('updateList');

+ 19 - 4
src/views/business/delay/components/Delay-audit.vue

@@ -150,15 +150,14 @@
 <script setup lang="ts" name="discernDetail">
 import { computed, defineAsyncComponent, reactive, ref } from 'vue';
 import { formatDate } from '@/utils/formatTime';
-import { discernApproveParams, screenDetail } from '@/api/business/discern';
 import { transformFile } from '@/utils/tools';
-import { ElMessage, FormInstance } from 'element-plus';
+import { ElMessage, ElNotification, FormInstance } from 'element-plus';
 import { workflowNext, workflowReject, workflowTraces } from '@/api/system/workflow';
 import { commonEnum } from '@/utils/constants';
 import { useAppConfig } from '@/stores/appConfig';
 import { storeToRefs } from 'pinia';
 import other from '@/utils/other';
-import { delayApproveModify, delayApproveParams, delayDetail } from '@/api/business/delay';
+import { delayApproveModify, delayApproveParams, delayBatchApprove, delayDetail } from '@/api/business/delay';
 
 const AnnexList = defineAsyncComponent(() => import('@/components/AnnexList/index.vue')); // 附件列表
 const CommonAdvice = defineAsyncComponent(() => import('@/components/CommonAdvice/index.vue')); // 常用意见
@@ -367,6 +366,22 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 		if (!valid) return;
 		state.loading = true;
 		let submitObj = other.deepClone(state.ruleForm);
+
+		const request = {
+			nextWorkflow: submitObj,
+			files: handleFiles.value,
+			delayId: [currentRow.value.id],
+			isPass: state.ruleForm.isPass,
+		};
+		delayBatchApprove(request)
+			.then(() => {
+				afterSubmit('updateList', true);
+			})
+			.catch((err: any) => {
+				console.log(err, 'err');
+				afterSubmit('updateList');
+			});
+		/*
 		if (state.ruleForm.isPass) {
 			// 审批通过 下一步
 			workflowNext({ ...submitObj, reviewResult: 1, files: handleFiles.value })
@@ -391,7 +406,7 @@ const onSubmit = (formEl: FormInstance | undefined) => {
 				.catch(() => {
 					afterSubmit('updateList');
 				});
-		}
+		}*/
 	});
 };
 defineExpose({