merge

src/views/permissions/permission.vue

@@ -92,8 +92,6 @@ const getRolePermission = async function(){
     viewRole.value = collectIds(result.data)
     console.log('result111',viewRole.value);
 }
-
-
 // 编辑用户权限对象
 const permissionEditObj = ref({
   checkedKeys: [],
@@ -724,7 +722,7 @@ const getLists = async function () {
       data: { id: roleId }
     })
     data.value = res.data
-    if(addRole.value.roleId ==null ||addRole.value.roleId ==undefined){
+    if(addRole.value.parentId ==null ||addRole.value.parentId ==undefined){
        data.value = data.value
     }else if (addRole.value.parentId != 2) {
       data.value = data.value.filter(item => item.id !== 9);
@@ -739,11 +737,14 @@ const getLists = async function () {
       if (result.code == 200) {
         if (typeof result.data === 'string' && result.data) {
           addRoleMarket.value = result.data.split(',');
+          addRole.value.market = ''
         } else if (Array.isArray(result.data)) {
           addRoleMarket.value = result.data
+          addRole.value.market = ''
         }
         else {
           addRoleMarket.value = [];
+          addRole.value.market = ''
         }
       } else {
         ElMessage.error('该上级角色无所属地区')
@@ -754,11 +755,14 @@ const getLists = async function () {
     } else {
       if (typeof adminData.value.markets === 'string' && adminData.value.markets) {
         addRoleMarket.value = adminData.value.markets.split(',');
+        addRole.value.market = ''
       } else if (Array.isArray(adminData.value.markets)) {
         addRoleMarket.value = adminData.value.markets
+        addRole.value.market = ''
       }
       else {
         addRoleMarket.value = [];
+        addRole.value.market = ''
       }
     }
 
@@ -1427,17 +1431,17 @@ onMounted(async function () {
         <el-form-item prop="roleName" label="角色名称:" required>
           <el-input v-model="addRole.roleName" placeholder="请输入用户名" style="width: 220px" />
         </el-form-item>
-        <el-form-item prop="market" label="所属地区:" required>
-          <el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 240px" clearable>
-            <el-option v-for="item in addRoleMarket" :key="item" :label="item" :value="item" />
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="parentName" label="上级角色:">
+         <el-form-item prop="parentName" label="上级角色:">
           <el-select v-model="addRole.parentId" placeholder="请选择上级角色" style="width: 220px" @change="getLists" clearable>
             <el-option v-for="item in permissionList" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="market" label="所属地区:" required>
+          <el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 240px" clearable>
+            <el-option v-for="item in addRoleMarket" :key="item" :label="item" :value="item" />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="checkedKeys" label="权限列表:" required>
           <el-tree v-if="data.length > 0" :data="data" show-checkbox node-key="id"
             :props="{ label: 'menuName', children: 'children' }" :checked-keys="addRole.checkedKeys"