菜单简化

src/views/knowledge/config/type/component/knowledgeTypeEdit.vue

@@ -66,12 +66,12 @@ const state = reactive<any>({
 	loading: false,
 });
 // 格式化数据  排除自己
-const formatDta = (arr: Array<any>, id: string) => {
+const formatData = (arr: Array<any>, id: string) => {
 	if (!arr) return [];
 	arr.forEach((v: any, i: number) => {
 		if (v.id === id) arr.splice(i, 1);
-		if (v.children?.length) {
-			formatDta(v.children, id);
+		if (v.child && v.child.length) {
+			formatData(v.child, id);
 		}
 	});
 	return arr;
@@ -81,7 +81,7 @@ const openDialog = (row: any, treeData: any) => {
 	typeDetail(row.id).then((res: any) => {
 		state.ruleForm = res.result;
 		state.treeData = JSON.parse(JSON.stringify(treeData));
-		state.treeData = formatDta(state.treeData, row.id);
+		state.treeData = formatData(state.treeData, row.id);
 		state.isShowDialog = true;
 	});
 };

src/views/system/config/dict/component/DickEdit.vue

@@ -72,29 +72,31 @@ const state = reactive<any>({
 	},
 	dictypeList: [],
 	parentData: [],
+	currentId:''
 });
 const ruleFormRef = ref<FormInstance>();
 let loading = ref<boolean>(false);
-// 格式化数据  剔除自己
-const formatDta = (arr: Array<any>, id: string) => {
+// 格式化数据  排除自己
+const formatData = (arr: Array<any>, id: string) => {
 	if (!arr) return [];
 	arr.forEach((v: any, i: number) => {
 		if (v.id === id) arr.splice(i, 1);
-		if (v.children?.length) {
-			formatDta(v.children, id);
+		if (v.children && v.children.length) {
+			formatData(v.children, id);
 		}
 	});
 	return arr;
 };
 // 打开弹窗
 const openDialog = async (row: any, tableData: any) => {
+	state.currentId = row.id ?? ''
 	// 获取详情
 	if (!auth('100602')) ElMessage.warning('抱歉，您没有获取字典对象权限！');
 	else {
 		ruleFormRef.value?.clearValidate();
 		try {
 			const res: any = await Promise.all([getDetail(row.id), dictypeList()]);
-			state.parentData = formatDta(JSON.parse(JSON.stringify(tableData)), row.id);
+			state.parentData = formatData(JSON.parse(JSON.stringify(tableData)), row.id);
 			state.ruleForm = res[0].result;
 			state.dictypeList = res[1].result ?? [];
 			state.isShowDialog = true;
@@ -115,6 +117,7 @@ const onCancel = () => {
 const changeDicType = (val: string) => {
 	getDataByTypeid({ typeid: val }).then((response: any) => {
 		state.parentData = response?.result ?? [];
+		state.parentData = formatData(JSON.parse(JSON.stringify(state.parentData)), state.currentId);
 	});
 };
 // 保存

src/views/system/config/workflow/index.vue

@@ -14,16 +14,10 @@
 						v-show="state.activeName === 'example'"
 					>
 						<el-form-item label="关键字查询" prop="Keyword">
-							<el-input
-								v-model="state.queryParams.Keyword"
-								placeholder="流程标题/流程ID"
-								style="width: 300px"
-								clearable
-								@keyup.enter="getList"
-							/>
+							<el-input v-model="state.queryParams.Keyword" placeholder="流程标题/流程ID" style="width: 300px" clearable @keyup.enter="getList" />
 						</el-form-item>
-						<el-form-item label="业务模块" prop="ModuleId">
-							<el-select v-model="state.queryParams.ModuleId" class="w100" placeholder="请选择业务模块">
+						<el-form-item label="业务模块" prop="ModuleCode">
+							<el-select v-model="state.queryParams.ModuleCode" class="w100" placeholder="请选择业务模块">
 								<el-option v-for="item in state.moduleOptions" :key="item.key" :label="item.value" :value="item.key" />
 							</el-select>
 						</el-form-item>
@@ -153,7 +147,7 @@ interface QueryState {
 		PageIndex: number;
 		PageSize: number;
 		Keyword: string;
-		ModuleId: string;
+		ModuleCode: string;
 	};
 	tableList: Array<any>;
 	loading: boolean;
@@ -169,7 +163,7 @@ const state = reactive(<QueryState>{
 		PageIndex: 1,
 		PageSize: 10,
 		Keyword: '',
-		ModuleId: '',
+		ModuleCode: '',
 	},
 	tableList: [],
 	loading: false,

src/views/system/menu/component/editMenu.vue

@@ -175,7 +175,7 @@ const state = reactive({
 		isFast: false, //是否是快捷入口
 		fastIcon: '', //入口图片
 	},
-	menuData: [], // 上级菜单数据
+	menuData: <any>[], // 上级菜单数据
 	loading: false,
 	imgList: [
 		{
@@ -200,6 +200,17 @@ const state = reactive({
 		},
 	],
 });
+// 格式化数据  排除自己
+const formatData = (arr: Array<any>, id: string) => {
+	if (!arr) return [];
+	arr.forEach((v: any, i: number) => {
+		if (v.id === id) arr.splice(i, 1);
+		if (v.children && v.children.length) {
+			formatData(v.children, id);
+		}
+	});
+	return arr;
+};
 // 获取全部菜单
 const getMenuData = (routes: any) => {
 	const arr: any = [];
@@ -218,6 +229,7 @@ const openDialog = async (row: any) => {
 		try {
 			const res: any = await Promise.all([getMenuList(), getMenuById(row.id)]);
 			state.menuData = getMenuData(res[0].result);
+			state.menuData = formatData(state.menuData, row.id);
 			state.ruleForm = res[1].result;
 			state.isShowDialog = true;
 		} catch (error) {

src/views/system/organize/component/editOrg.vue

@@ -85,12 +85,12 @@ const state = reactive<OrgFormState>({
 	loading: false,
 });
 // 格式化数据  排除自己
-const formatDta = (arr: Array<any>, id: string) => {
+const formatData = (arr: Array<any>, id: string) => {
 	if (!arr) return [];
 	arr.forEach((v: any, i: number) => {
 		if (v.id === id) arr.splice(i, 1);
-		if (v.children?.length) {
-			formatDta(v.children, id);
+		if (v.children && v.children.length) {
+			formatData(v.children, id);
 		}
 	});
 	return arr;
@@ -102,7 +102,7 @@ const openDialog = async (row: any, orgData: any) => {
 		ruleFormRef.value?.resetFields();
 		try {
 			state.orgData = JSON.parse(JSON.stringify(orgData));
-			state.orgData = formatDta(state.orgData, row.id);
+			state.orgData = formatData(state.orgData, row.id);
 			const res: any = await getOrgById(row.id);
 			state.ruleForm = res.result;
 			state.isShowDialog = true;