Merge remote-tracking branch 'origin/1.0' into 1.0

src/api/system/dept.js

@@ -155,4 +155,12 @@ export function transformDept(data) {
   })
 }
 
+// 17.查询所属部门
+export function listAllDept(query) {
+  return request({
+    url: '/system/dept/listAll',
+    method: 'get',
+    params: query
+  })
+}
 

src/views/system/role/index.vue

@@ -73,7 +73,8 @@
     <div style="padding:5px 10px">
       <div class="tableTitle">角色管理列表</div>
       <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
-        <el-table-column type="index" label="角色编号" width="120" />
+        <el-table-column type="index" label="序号" width="50" />
+        <el-table-column label="角色编号" prop="number"></el-table-column>
         <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.roleName || '-' }}
@@ -96,7 +97,7 @@
         </el-table-column>
         <el-table-column label="更新时间" :show-overflow-tooltip="true" align="center" prop="createTime">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">

src/views/system/user/index.vue

@@ -12,6 +12,36 @@
             style="width: 150px"
           />
         </el-form-item>
+        <el-form-item label="所属单位" prop="belongDeptId">
+          <el-select v-model="queryParams.belongDeptId" filterable placeholder="请选择"  style="width: 150px">
+            <el-option
+              v-for="(item,index) in deptList"
+              :key="index"
+              :label="item.deptName"
+              :value="item.businessId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="手机号" prop="phone">
+          <el-input
+            v-model="queryParams.phone"
+            placeholder="手机号"
+            clearable
+            :maxlength="30"
+            size="small"
+            style="width: 150px"
+          />
+        </el-form-item>
+        <el-form-item label="角色" prop="roleId">
+          <el-select v-model="queryParams.roleId" placeholder="请选择"  style="width: 150px">
+            <el-option
+              v-for="item in options"
+              :key="item.businessId"
+              :label="item.roleName"
+              :value="item.businessId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="状态" prop="flag">
           <el-select
             v-model="queryParams.flag"
@@ -45,40 +75,42 @@
             @click="resetQuery"
           >{{ commonField.resetName }}</el-button>
         </el-form-item>
-        <el-form-item style="float: right">
-<!--          <el-button-->
-<!--            :class="commonField.addClass"-->
-<!--            :type="commonField.typePrimary"-->
-<!--            @click="handleTest"-->
-<!--          >图片预览测试</el-button>-->
-          <!--          //新增按钮-->
-          <el-button
-            v-hasPermi="hasAddPerm"
-            :class="commonField.addClass"
-            :type="commonField.typePrimary"
-            :icon="commonField.addIcon"
-            :size="commonField.smallSize"
-            @click="handleAdd"
-          >{{ commonField.addName }}</el-button>
-          <!--          //导入按钮-->
-          <el-button
-            v-hasPermi="hasImportPerm"
-            :class="commonField.importClass"
-            :type="commonField.typeWarning"
-            :icon="commonField.importIcon"
-            :size="commonField.smallSize"
-            @click="handleImport"
-          >{{ commonField.importName }}</el-button>
-          <!--          //导出-->
-          <el-button
-            v-hasPermi="hasExportPerm"
-            :class="commonField.exportClass"
-            :type="commonField.typeSuccess"
-            :icon="commonField.exportIcon"
-            :size="commonField.smallSize"
-            @click="handleExport"
-          >{{ commonField.exportName }}</el-button>
-        </el-form-item>
+        <div style="text-align: end;">
+          <el-form-item>
+            <!--          <el-button-->
+            <!--            :class="commonField.addClass"-->
+            <!--            :type="commonField.typePrimary"-->
+            <!--            @click="handleTest"-->
+            <!--          >图片预览测试</el-button>-->
+            <!--          //新增按钮-->
+            <el-button
+              v-hasPermi="hasAddPerm"
+              :class="commonField.addClass"
+              :type="commonField.typePrimary"
+              :icon="commonField.addIcon"
+              :size="commonField.smallSize"
+              @click="handleAdd"
+            >{{ commonField.addName }}</el-button>
+            <!--          //导入按钮-->
+            <el-button
+              v-hasPermi="hasImportPerm"
+              :class="commonField.importClass"
+              :type="commonField.typeWarning"
+              :icon="commonField.importIcon"
+              :size="commonField.smallSize"
+              @click="handleImport"
+            >{{ commonField.importName }}</el-button>
+            <!--          //导出-->
+            <el-button
+              v-hasPermi="hasExportPerm"
+              :class="commonField.exportClass"
+              :type="commonField.typeSuccess"
+              :icon="commonField.exportIcon"
+              :size="commonField.smallSize"
+              @click="handleExport"
+            >{{ commonField.exportName }}</el-button>
+          </el-form-item>
+        </div>
       </el-form>
     </div>
     <div style="padding:5px 10px">
@@ -89,11 +121,13 @@
           :data="userList"
         >
           <el-table-column type="index" label="序号" width="90" />
-<!--          <el-table-column label="用户类型" prop="username" :show-overflow-tooltip="true">-->
-<!--            <template slot-scope="scope">-->
-<!--              {{ scope.row.username || '-' }}-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <el-table-column label="用户类型" prop="identity" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+             <span v-if="scope.row.identity === 1">管理员</span>
+             <span v-if="scope.row.identity === 2">单位用户</span>
+             <span v-if="scope.row.identity === 3">个人用户</span>
+            </template>
+          </el-table-column>
           <el-table-column label="登录名" prop="username" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               {{ scope.row.username || '-' }}
@@ -104,11 +138,11 @@
               {{ scope.row.name || '-' }}
             </template>
           </el-table-column>
-<!--          <el-table-column label="所属单位" prop="username" :show-overflow-tooltip="true">&ndash;&gt;-->
-            <!--            <template slot-scope="scope">-->
-            <!--              {{ scope.row.username || '-' }}-->
-            <!--            </template>-->
-            <!--          </el-table-column>-->
+          <el-table-column label="所属单位" prop="deptName" :show-overflow-tooltip="true">-->
+            <template slot-scope="scope">
+              {{ scope.row.deptName || '-' }}
+            </template>
+          </el-table-column>
           <el-table-column label="手机号" prop="phone" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               {{ scope.row.phone || '-' }}
@@ -180,6 +214,20 @@
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="用户类型" prop="identity">
+              <el-select v-model="form.identity" placeholder="请选择用户类型" style="width: 100%" >
+                <el-option
+                  v-for="(item,index) in userTypeList"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="form.businessId == undefined" label="登录名" prop="username">
@@ -250,20 +298,20 @@
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-row>-->
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="部门" prop="postId">-->
-<!--              <treeSelect-->
-<!--                v-model="form.deptId"-->
-<!--                :disable-branch-nodes="true"-->
-<!--                :options="deptChildren"-->
-<!--                :show-count="true"-->
-<!--                placeholder="请选择归属部门"-->
-<!--                @input="changeValue"-->
-<!--              />-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="所属单位" prop="postId">
+              <treeSelect
+                v-model="form.deptId"
+                :disable-branch-nodes="true"
+                :options="deptChildren"
+                :show-count="true"
+                placeholder="请选择所属单位"
+                @input="changeValue"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="角色" prop="postId">
@@ -396,7 +444,7 @@ import {
   // userLoginManage
 } from '@/api/system/user'
 import { getToken } from '@/utils/auth'
-import { treeSelect } from '@/api/system/dept'
+import { listAllDept, treeSelect } from '@/api/system/dept'
 import TreeSelect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { getListRole } from '@/api/system/role'
@@ -421,6 +469,21 @@ export default {
       callback()
     }
     return {
+      userTypeList: [
+        {
+          label: '管理员',
+          value: '1'
+        },
+        {
+          label: '单位用户',
+          value: '2'
+        },
+        {
+          label: '个人用户',
+          value: '3'
+        }
+      ],
+      deptList: [],
       initialImgPreviewIndex: 0, // 预览打开看到的图片下标
       imagePreviewUrls: [], // 预览图片的下标
       showImgViewer: false,
@@ -606,6 +669,7 @@ export default {
     // 分页参数初始化为{"page":1,"rows":10}，如需自定义分页参数，自行修改
     this.queryParams = JSON.parse(getDataCache(this.$route.path)) // 获取存储的筛选项
     this.getList() // 列表查询
+    this.getDeptList()
     this.getTreeSelect() // 查询部门下拉树结构
     this.getRole() // 查询角色下拉
     // this.getConfigKey('sys.user.initPassword').then(response => {
@@ -613,6 +677,14 @@ export default {
     // })
   },
   methods: {
+    // 获取所有部门信息
+    getDeptList() {
+      listAllDept().then(res => {
+        if (res.code === 200) {
+          this.deptList = res.data
+        }
+      })
+    },
     handlePictureCardPreview(file) {
       const index = this.imagePreviewUrls.indexOf(file.url)
       if (index >= 0) {