From 804b69572ed8195f012005c5ac9183b5c6f2bc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= <zhaoweigeng@wodcloud.com>
Date: Mon, 14 Nov 2022 14:47:48 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E8=8F=9C=E5=8D=95=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E4=B8=8B=E7=BA=A7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/main/develop/menu/index.vue                 | 4 ++--
 src/page/main/develop/menu/menu-form.vue             | 2 +-
 src/page/main/system/organization/org-user/index.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/page/main/develop/menu/index.vue b/src/page/main/develop/menu/index.vue
index 0353ec5..cd27ed0 100644
--- a/src/page/main/develop/menu/index.vue
+++ b/src/page/main/develop/menu/index.vue
@@ -300,7 +300,7 @@ const fileAction = (val,data,parent,disabled=false) => {
     let newChild = {
       menu_name: "新菜单", // 菜单名称
       menu_id: 'new' + state.newMenuId, // 菜单id，用于新增后选中
-      menu_type: !parent ? 0 : parent.menu_type == 0 ? 0 : parent.menu_type == 1 ? 1 : 2, // 新增本级的类型
+      menu_type: !parent ? 0 : parent.menu_type == 0 ? 0 : 2, // 新增本级的类型
       dict_group_id: parent ? parent.dict_group_id : "", // 父级的分组 有则继承，无则自选
       state: 1, // 启用状态
       menu_url: "", // 路径
@@ -320,7 +320,7 @@ const fileAction = (val,data,parent,disabled=false) => {
     let newChild = {
       menu_name: "新菜单",
       menu_id: 'new' + state.newMenuId,
-      menu_type: data.menu_type == 0 ? 0 : data.menu_type == 1 ? 1 : 2,
+      menu_type: data.menu_type == 0 ? 0 : 2,
       dict_group_id: data.dict_group_id,
       state: 1,
       menu_url: "",
diff --git a/src/page/main/develop/menu/menu-form.vue b/src/page/main/develop/menu/menu-form.vue
index 707e828..e698dfa 100644
--- a/src/page/main/develop/menu/menu-form.vue
+++ b/src/page/main/develop/menu/menu-form.vue
@@ -14,7 +14,7 @@
     <el-form-item label="类型" prop="menu_type" v-if="!topLevel">
       <el-radio-group v-model="menuForm.menu_type" :disabled="radioDisabled">
         <el-radio :label="0" :disabled="typeDisFlag != 0">目录</el-radio>
-        <el-radio :label="1" :disabled="typeDisFlag == 2">菜单</el-radio>
+        <el-radio :label="1" :disabled="typeDisFlag != 2 && typeDisFlag != 0">菜单</el-radio>
         <el-radio :label="2">子页面</el-radio>
       </el-radio-group>
     </el-form-item>
diff --git a/src/page/main/system/organization/org-user/index.vue b/src/page/main/system/organization/org-user/index.vue
index a35c5e9..949ff6b 100644
--- a/src/page/main/system/organization/org-user/index.vue
+++ b/src/page/main/system/organization/org-user/index.vue
@@ -201,7 +201,7 @@ const getDetail = () => {
 
                     orgPersonRef.value.setForm({
                         contact_name: form.contact_name,
-                        document_type: form.document_type,
+                        document_type: form.document_type ? form.document_type : "",
                         document_number: form.document_number,
                         contact_email: form.contact_email,
                         remark: form.remark,
-- 
2.26.0