Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/system/user/extend.vue

@@ -39,7 +39,7 @@
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <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"
+                <el-option v-for="dict in dict.type.department_name" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
             </el-form-item>

src/views/system/user/index.vue

@@ -35,18 +35,19 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
+            <el-form-item label="管理人员" prop="isLock">
+              <el-switch v-model="queryParams.onlyManager" active-text="是" @change="handleQuery">
+              </el-switch>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
             <!-- <el-form-item label="创建时间">
             <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
               range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item> -->
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-              <span style="margin-left: 50px;">只显示管理人员:</span>
-              <el-switch v-model="queryParams.onlyManager" active-text="是">
-              </el-switch>
 
-            </el-form-item>
           </el-form>
 
           <!--    按纽    -->