Prechádzať zdrojové kódy

reactor:取消页面退出登录重定向;流程选择办理对象唯一值修改为key;

zhangchong 1 rok pred
rodič
commit
aefe56a827

+ 2 - 2
src/components/ProcessAudit/index.vue

@@ -216,7 +216,7 @@
 									collapse-tags
 									collapse-tags-tooltip
 									filterable
-									value-key="value"
+									value-key="key"
 									@change="selectHandlers"
 								/>
 							</el-form-item>
@@ -292,7 +292,7 @@
 								collapse-tags
 								collapse-tags-tooltip
 								filterable
-								value-key="value"
+								value-key="key"
 								@change="selectHandlers"
 							/>
 						</el-form-item>

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

@@ -53,7 +53,7 @@
                     collapse-tags
                     collapse-tags-tooltip
                     filterable
-                    value-key="value"
+                    value-key="key"
                 />
               </el-form-item>
             </el-col>

+ 1 - 1
src/views/business/special/components/Special-apply.vue

@@ -37,7 +37,7 @@
                   collapse-tags
                   collapse-tags-tooltip
                   filterable
-                  value-key="value"
+                  value-key="key"
               />
 						</el-form-item>
 					</el-col>

+ 1 - 1
src/views/business/special/components/Special-audit.vue

@@ -91,7 +91,7 @@
 										collapse-tags
 										collapse-tags-tooltip
 										filterable
-										value-key="value"
+										value-key="key"
 									/>
 								</el-form-item>
 							</el-col>

+ 3 - 2
src/views/login/component/Account.vue

@@ -144,7 +144,7 @@ const signInSuccess = (isNoPower: boolean | undefined) => {
 		// 初始化登录成功时间问候语
 		let currentTimeInfo = currentTime.value;
 		// 登录成功,跳到转首页
-		// 如果是复制粘贴的路径,非首页/登录页,那么登录成功后重定向到对应的路径中
+		/*// 如果是复制粘贴的路径,非首页/登录页,那么登录成功后重定向到对应的路径中
 		if (route.query?.redirect) {
 			router.push({
 				path: <string>route.query?.redirect,
@@ -152,7 +152,8 @@ const signInSuccess = (isNoPower: boolean | undefined) => {
 			});
 		} else {
 			router.push('/');
-		}
+		}*/
+		router.push('/');
 		// 设置登录成功后的时间问候语
 		Cookie.set('userName', state.ruleForm.username);
 		// 登录成功提示

+ 10 - 16
src/views/system/dataAuth/component/Data-auth-add.vue

@@ -11,14 +11,7 @@
 	>
 		<el-form :model="state.ruleForm" label-width="90px" ref="ruleFormRef">
 			<el-form-item label="数据表" prop="table" :rules="[{ required: true, message: '请选择数据表', trigger: 'change' }]">
-        <el-select-v2
-            v-model="state.ruleForm.table"
-            :options="state.tableData"
-            placeholder="请选择数据表"
-            class="w100"
-            filterable
-            value-key="value"
-        />
+				<el-select-v2 v-model="state.ruleForm.table" :options="state.tableData" placeholder="请选择数据表" class="w100" filterable value-key="key" />
 			</el-form-item>
 			<el-form-item label="可见等级" prop="accessLevel" :rules="[{ required: true, message: '请选择可见等级', trigger: 'change' }]">
 				<el-select v-model="state.ruleForm.accessLevel" placeholder="请选择可见等级" class="w100" filterable>
@@ -64,14 +57,15 @@ const openDialog = async (accessLevelOptions: any) => {
 	state.accessLevelOptions = accessLevelOptions;
 	const res: any = await dataAuthList();
 	state.tableData = res.result ?? [];
-  state.tableData = state.tableData.map((item: any) => {
-    return {
-      value: {
-        ...item,
-      },
-      label: item.value,
-    };
-  })
+	state.tableData = state.tableData.map((item: any) => {
+		return {
+			value: {
+				...item,
+			},
+			label: item.value,
+			key: item.key,
+		};
+	});
 	state.dialogVisible = true;
 };
 // 关闭弹窗

+ 2 - 1
src/views/system/dataAuth/component/Data-auth-edit.vue

@@ -11,7 +11,7 @@
 	>
 		<el-form :model="state.ruleForm" label-width="90px" ref="ruleFormRef">
 			<el-form-item label="数据表" prop="table" :rules="[{ required: true, message: '请选择数据表', trigger: 'change' }]">
-				<el-select-v2 v-model="state.ruleForm.table" :options="state.tableData" placeholder="请选择数据表" class="w100" filterable value-key="value"/>
+				<el-select-v2 v-model="state.ruleForm.table" :options="state.tableData" placeholder="请选择数据表" class="w100" filterable value-key="key" />
 			</el-form-item>
 			<el-form-item label="可见等级" prop="accessLevel" :rules="[{ required: true, message: '请选择可见等级', trigger: 'change' }]">
 				<el-select v-model="state.ruleForm.accessLevel" placeholder="请选择可见等级" class="w100" filterable>
@@ -64,6 +64,7 @@ const openDialog = async (row: any, accessLevelOptions: any) => {
 				...item,
 			},
 			label: item.value,
+			key: item.key,
 		};
 	});
 	state.ruleForm.table = {