tangning před 3 roky
rodič
revize
b6ffee06f6
2 změnil soubory, kde provedl 3 přidání a 2 odebrání
  1. 1 0
      src/view/organization/list.vue
  2. 2 2
      src/view/user/index.vue

+ 1 - 0
src/view/organization/list.vue

@@ -240,6 +240,7 @@ export default {
         data.superiorValue = val.deptIdList? val.deptIdList.split(','):''
         data.detail = {
           ...val,
+          deptType:val.deptType.toString()
         };
       } else {
         data.detailType = "新增";

+ 2 - 2
src/view/user/index.vue

@@ -147,7 +147,7 @@
           ></el-cascader>
         </el-form-item>
         <el-form-item label="用户角色" class="roleName mandatory">
-         <com-role :deptId="relationDeptId" v-model="newData.roleId" style="width: 100%" allText="请选择" hideAll :notDefault="true" />
+         <com-role :disabled="!relationDeptId" :deptId="relationDeptId" v-model="newData.roleId" style="width: 100%" allText="请选择" hideAll :notDefault="true" />
         </el-form-item>
         <el-form-item label="用户账号" class="mandatory">
           <el-input
@@ -208,7 +208,7 @@ export default {
         roleId: "",
         maxlevel: 1,
       },
-      searchAttr: { nickName: "", status: "", deptId: "",userName:"" },
+      searchAttr: { nickName: "", status: "", deptId: "",userName:"",departmentId:'' },
     });
     const headList = ref([{ name: "用户管理", value: 2 }]);
     const roleKey = ref({ 'admin': "admin-dept", 'admin-dept': 'admin-ordinary' });