fix: 修复 审批 & 退出清空

src/layout/components/Header/components/Avatar.vue

@@ -28,7 +28,7 @@ import useStore from '@/store'
 import { useRoute, useRouter } from 'vue-router'
 
 import { ElMessageBox } from 'element-plus'
-const { setting, app, user } = useStore()
+const { setting, app, user /*, flow*/ } = useStore()
 const router = useRouter()
 const route = useRoute()
 const userInfo = computed(() => {
@@ -43,6 +43,8 @@ function logout() {
 		cancelButtonText: '取消',
 		type: 'warning'
 	}).then(() => {
+		// flow.$reset()
+		localStorage.clear()
 		user.logout().then(() => {
 			router.push(`/login?redirect=${route.fullPath}`)
 		})

src/store/modules/flow.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 
 // 审核条目
 export const useFlowStore = defineStore({
-	id: 'azd_flow',
+	id: 'flow',
 	state: () => {
 		return {
 			storeInfoName: '',
@@ -28,7 +28,7 @@ export const useFlowStore = defineStore({
 			modelContent: '', // 流程模型定义JSON内容
 			// processForm: {}, // 流程定义表单
 			processForm: '{}', // 流程定义表单
-			local_processForm: {},
+			businessForm: {},
 			processSetting: {
 				allowRevocation: true, // 允许撤销审批中的申请
 				allowRevocationDay: true, // 允许撤销指定天内通过的审批

src/views/flow/create/business.vue

@@ -54,7 +54,7 @@ const { tagsView } = useStore()
 const router = useRouter()
 const route = useRoute()
 const flowStore = useFlowStore()
-const { categoryId, formId, processId, processIcon, processKey, processName, remark, modelContent, local_processForm, processSetting } = storeToRefs(flowStore)
+const { categoryId, formId, processId, processIcon, processKey, processName, remark, modelContent, businessForm, processSetting } = storeToRefs(flowStore)
 
 const compRefs = ref() // 实例化子组件
 const cache_components = ref({})
@@ -115,7 +115,7 @@ const submitHandler = async () => {
 		processName: processName.value,
 		remark: remark.value,
 		processId: processId.value,
-		processForm: JSON.stringify(local_processForm.value),
+		businessForm: JSON.stringify(businessForm.value),
 		modelContent: JSON.stringify({
 			key: processKey.value,
 			name: processName.value,
@@ -194,7 +194,7 @@ const getCurrentProcessDetailEv = () => {
 			remark.value = res.remark
 			let nodeConfig = JSON.parse(res.modelContent).nodeConfig
 			modelContent.value = JSON.stringify(nodeConfig)
-			local_processForm.value = JSON.parse(res.processForm) || {}
+			businessForm.value = JSON.parse(res.businessForm || '{}') || {}
 			// flowStore.setProcessForm(processForm)
 			flowStore.setProcessSetting(res.processSetting)
 			// 默认执行一次保存

src/views/flow/create/components/BasicInfo.vue

@@ -44,7 +44,7 @@ const rules = {
 			trigger: 'blur'
 		}
 	],
-	local_processForm: [
+	businessForm: [
 		{
 			required: true,
 			validator: (rule, value, callback) => {
@@ -180,10 +180,10 @@ defineExpose({
 				<el-form-item label="名称" prop="processName">
 					<el-input v-model="flowInfo.processName" clearable maxlength="15"></el-input>
 				</el-form-item>
-				<el-form-item v-if="from === 'business'" prop="local_processForm">
-					<SelectProcessForm v-model="flowInfo.local_processForm" />
-					<el-input class="hidden" :model-value="flowInfo.local_processForm.formId" />
-					<el-input class="hidden" :model-value="flowInfo.local_processForm.formName" />
+				<el-form-item v-if="from === 'business'" prop="businessForm">
+					<SelectProcessForm v-model="flowInfo.businessForm" />
+					<el-input class="hidden" :model-value="flowInfo.businessForm.formId" />
+					<el-input class="hidden" :model-value="flowInfo.businessForm.formName" />
 				</el-form-item>
 				<el-form-item label="说明" prop="remark">
 					<el-input v-model="flowInfo.remark" type="textarea" clearable></el-input>

src/views/flow/create/index.vue

@@ -48,7 +48,7 @@ const { tagsView } = useStore()
 const router = useRouter()
 const route = useRoute()
 const flowStore = useFlowStore()
-const { categoryId, processId, processIcon, processKey, processName, remark, modelContent, local_processForm, processSetting } = storeToRefs(flowStore)
+const { categoryId, processId, processIcon, processKey, processName, remark, modelContent, processForm, processSetting } = storeToRefs(flowStore)
 const compRefs = ref() // 实例化子组件
 const cache_components = ref({})
 const componentsArr = [
@@ -113,7 +113,7 @@ const submitHandler = async () => {
 		processName: processName.value,
 		remark: remark.value,
 		processId: processId.value,
-		processForm: JSON.stringify(local_processForm.value),
+		processForm: processForm.value,
 		modelContent: JSON.stringify({
 			key: processKey.value,
 			name: processName.value,
@@ -192,9 +192,7 @@ const getCurrentProcessDetailEv = () => {
 			remark.value = res.remark
 			let nodeConfig = JSON.parse(res.modelContent).nodeConfig
 			modelContent.value = JSON.stringify(nodeConfig)
-			local_processForm.value = JSON.parse(res.processForm) || {}
-			// processForm.value = JSON.parse(res.processForm) || {}
-			// flowStore.setProcessForm(processForm)
+			processForm.value = res.processForm
 			flowStore.setProcessSetting(res.processSetting)
 			// 默认执行一次保存
 			const _refs = compRefs.value