修改bug

src/views/system/user/extend.vue

@@ -37,11 +37,20 @@
           </el-col>
         </el-row>
         <el-row  >
+  
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
-            <el-form-item  label="所属部门" prop="deptId">
-              <tree-select style="width: 217px;" v-model="formData.deptId"  :options="deptList" :show-count="true" :normalizer="tenantIdnormalizer" placeholder="所属部门"> </tree-select>
+            <el-form-item  label="所属部门"  prop="deptId">
+              <el-select style="width: 217px;" v-model="formData.deptId" placeholder="请选择">
+        <el-option
+                v-for="dict in dict.type.sys_department_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+              </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
             <el-form-item  label="责任职务"  prop="duties">
               <el-select style="width: 217px;" v-model="formData.duties" placeholder="请选择">
@@ -199,15 +208,15 @@ import {extendUserInformation} from "@/api/system/information";
 export default {
   props: [],
   components: {TreeSelect},
-  dicts:['sys_highest_education',"sys_work_type","sys_duties","sys_education_type"],
+  dicts:['sys_highest_education',"sys_work_type","sys_duties","sys_education_type",'sys_department_type'],
   data() {
     return {
       //基础信息key
       infoKeys:[
-        {label:'用户姓名',key:'username'},
-        {label:'姓名',key:'name'},
+        {label:'用户名称',key:'username'},
+        {label:'用户昵称',key:'name'},
         {label:'工号',key:'jobNumber'},
-        {label:'部门',key:'orgName'},
+      //  {label:'部门',key:'orgName'},
         {label:'手机',key:'phone'},
         // {label:'性别',key:'gender'},
         // {label:'状态',key:'isLock'},
@@ -443,7 +452,6 @@ export default {
         getDeptTreeList() {
       deptTreeList().then(response => {
         this.deptList = response.data;
-        console.log(response.data,11111111)
         this.defaultKeys = response.data[0];
       });
     },
@@ -451,7 +459,6 @@ export default {
       this.orgloading = true;
       let dat = { orgId: this.$route.params.id };
       listOrgPhysicalDefenseConstruction(dat).then((data) => {
-        // console.log(data);
         this.constructionList = data.rows;
         this.orgloading = false;
       });

src/views/system/user/index.vue

@@ -18,8 +18,8 @@
             <el-input v-model="queryParams.phone" placeholder="请输入手机号码" clearable style="width: 240px"
               @keyup.enter.native="handleQuery" />
           </el-form-item>
-          <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+          <el-form-item label="状态" prop="isLock">
+            <el-select v-model="queryParams.isLock" placeholder="用户状态" clearable style="width: 240px">
               <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
                 :value="dict.value" />
             </el-select>
@@ -176,7 +176,7 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item v-if="!form.id" label="用户名称" prop="name">
+            <el-form-item v-if="!form.id" label="用户名称" prop="username">
               <el-input v-model="form.username" placeholder="请输入用户名称" maxlength="30" />
             </el-form-item>
           </el-col>
@@ -444,7 +444,8 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
+        isLock: "0"
       };
       this.resetForm("form");
     },