Selaa lähdekoodia

reactor:发起重办和发起特提字段调整;

zhangchong 9 kuukautta sitten
vanhempi
commit
314e34af4c

+ 6 - 4
src/views/business/countersign/index.vue

@@ -150,6 +150,7 @@ import { useRouter } from 'vue-router';
 import { countersignBase, countersignData } from '@/api/query/countersign';
 import { storeToRefs } from 'pinia';
 import { useUserInfo } from '@/stores/userInfo';
+import {baseData, getOrgListByUser} from "@/api/system/organize";
 // 引入组件
 const OrderDetail = defineAsyncComponent(() => import('@/components/OrderDetail/index.vue')); // 工单详情
 const AuditRecord = defineAsyncComponent(() => import('@/components/AuditRecord/index.vue')); // 流程明细
@@ -294,10 +295,11 @@ const onRecord = (row) => {
 // 查询基础信息
 const baseInfo = async () => {
 	try {
-		const { result } = await countersignBase();
-		state.acceptTypeOptions = result.acceptTypeOptions;
-		state.channelOptions = result.channelOptions;
-		state.counterSignTypeOptions = result.counterSignType;
+    const [orgRes, baseRes] = await Promise.all([getOrgListByUser(), countersignBase()]);
+		state.acceptTypeOptions = baseRes.result.acceptTypeOptions;
+		state.channelOptions = baseRes.result.channelOptions;
+		state.counterSignTypeOptions = baseRes.result.counterSignType;
+    state.orgsOptions = orgRes.result ?? [];
 	} catch (e) {
 		console.log(e);
 	}

+ 2 - 0
src/views/business/publish/component/Order-redo.vue

@@ -119,6 +119,7 @@ const state = reactive<any>({
 		timeLimit: null,
 		orgs: [],
 		nextHandlers: [],
+    stepType:null
 	},
 	orderDetail: {}, // 工单详情
 });
@@ -175,6 +176,7 @@ const selectNextCode = (val: any) => {
 	state.ruleForm.businessType = next.businessType;
 	state.ruleForm.flowDirection = next.flowDirection;
 	state.ruleForm.handlerType = next.handlerType;
+  state.ruleForm.stepType = next.stepType;
 	handlerOptions.value = handlerOptions.value.map((item: any) => {
 		return {
 			value: {

+ 3 - 0
src/views/business/special/components/Special-apply-order.vue

@@ -113,6 +113,7 @@ const state = reactive<any>({
 		timeLimitUnit: 2, // 期满时间单位
 		alterTime: true, // 是否修改期满时间
 		nextHandlers: [], // 办理对象
+    stepType:null
 	},
 	orderDetail: {}, // 工单详情
 	workflowId: null, // 工作流id
@@ -160,6 +161,7 @@ const close = () => {
 const stores = useUserInfo();
 const { userInfos } = storeToRefs(stores);
 const selectTrace = (val: any, choose?: boolean) => {
+
 	const next = steps.value.find((item) => item.key === val);
 	if (choose) state.ruleForm.nextStepCode = val;
 	state.ruleForm.nextStepName = next?.value;
@@ -168,6 +170,7 @@ const selectTrace = (val: any, choose?: boolean) => {
 	state.ruleForm.handlerType = next.handlerType;
 	ruleFormRef.value?.resetFields('nextHandlers');
 	stepsItems.value = next?.items ?? [];
+  state.ruleForm.stepType = next.stepType;
 	stepsItems.value = stepsItems.value.map((item: any) => {
 		return {
 			value: {