修改

src/api/system/role.js

@@ -8,6 +8,14 @@ export function listRole(query) {
     params: query
   })
 }
+// 查询角色信息select
+export function roleSelect(query) {
+  return request({
+    url: '/system/role/listAll',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询角色详细
 export function getRole(businessId) {

src/api/system/user.js

@@ -37,21 +37,29 @@ export function addUser(data) {
     }
   })
 }
-
 // 修改用户
 export function updateUser(data) {
-  const businessId = data.businessId
-  data = Qs.stringify(data)
   return request({
-    url: '/system/user/update/' + businessId,
+    url: '/system/user/update',
     method: 'put',
-    data: data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
+    data: data
   })
 }
 
+// 修改用户
+// export function updateUser(data) {
+//   const businessId = data.businessId
+//   data = Qs.stringify(data)
+//   return request({
+//     url: '/system/user/update/' + businessId,
+//     method: 'put',
+//     data: data,
+//     headers: {
+//       'Content-Type': 'application/x-www-form-urlencoded'
+//     }
+//   })
+// }
+
 // 删除用户
 export function delUser(userId) {
   return request({

src/views/system/dept/index.vue

@@ -75,6 +75,12 @@
             <div>Dept Name</div>
           </template>
         </el-table-column>
+        <el-table-column align="center" :show-overflow-tooltip="true" prop="deptCode" label="部门编码" width="260">
+          <template slot="header">
+            <div>部门编码</div>
+            <div>Dept Number</div>
+          </template>
+        </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="orderNum" align="center" width="200">
           <template slot="header">
             <div>排序</div>
@@ -187,6 +193,15 @@
               <el-input v-model.trim="form.deptName" placeholder="请输入部门名称" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门编码" prop="deptCode">
+              <div slot="label" class="labelClass">
+                <div>部门编码</div>
+                <div>Dept Number</div>
+              </div>
+              <el-input v-model.trim="form.deptCode" placeholder="请输入部门编码" maxlength="20" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="部门排序" prop="orderNum">
               <div slot="label" style="position: relative;bottom: 17px" class="labelClass">
@@ -389,6 +404,7 @@ export default {
         parentId: undefined,
         deptName: undefined,
         orderNum: undefined,
+        deptCode: undefined,
         leader: undefined,
         phone: undefined,
         email: undefined,

src/views/system/dict/data.vue

@@ -76,13 +76,13 @@
           @click="handleDelete"
         >删除 Delete
         </el-button>
-        <el-button
-          v-has-permi="['sys:dict:export']"
-          type="warning"
-          size="mini"
-          @click="handleExport"
-        >导出 Export
-        </el-button>
+<!--        <el-button-->
+<!--          v-has-permi="['sys:dict:export']"-->
+<!--          type="warning"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--        >导出 Export-->
+<!--        </el-button>-->
         <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
       </div>
       <div class="mb12 font-small-bold">字典参数列表</div>

src/views/system/dict/index.vue

@@ -102,12 +102,12 @@
           @click="handleDelete"
         >删除 Delete
         </el-button>
-        <el-button
-          v-hasPermi="['sys:dict:export']"
-          type="success"
-          size="small"
-          @click="handleExport"
-        >导出 Export</el-button>
+<!--        <el-button-->
+<!--          v-hasPermi="['sys:dict:export']"-->
+<!--          type="success"-->
+<!--          size="small"-->
+<!--          @click="handleExport"-->
+<!--        >导出 Export</el-button>-->
       </div>
       <div class="mb12 font-small-bold" style="margin: 0 0 12px 0;font-size: 14px">字典管理列表</div>
       <el-table v-loading="loading" border :data="typeList" @selection-change="handleSelectionChange">

src/views/system/user/index.vue

@@ -12,10 +12,10 @@
         <!--            style="width: 150px"-->
         <!--          />-->
         <!--        </el-form-item>-->
-        <el-form-item label="登录名" prop="username">
+        <el-form-item label="工号" prop="username">
           <div slot="label" class="labelClass">
-            <div>登录名</div>
-            <div>LoginName</div>
+            <div>工号</div>
+            <div>B/N</div>
           </div>
           <el-input
             v-model="queryParams.username"
@@ -130,32 +130,59 @@
           </el-table-column>
           <el-table-column align="center" prop="username" width="120" :show-overflow-tooltip="true">
             <template slot="header">
-              <div>登录名</div>
-              <div>Login Name</div>
+              <div>工号</div>
+              <div>B/N</div>
             </template>
             <template slot-scope="scope">
               {{ scope.row.username || '-' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" width="130" prop="userType" :show-overflow-tooltip="true">
+          <el-table-column align="center" width="120" prop="phone" :show-overflow-tooltip="true">
             <template slot="header">
-              <div>用户类型</div>
-              <div>Customer Type</div>
+              <div>手机号</div>
+              <div>Phone Number</div>
             </template>
             <template slot-scope="scope">
-              {{ scope.row.name || '-' }}
+              {{ scope.row.phone || '-' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" width="120" prop="phone" :show-overflow-tooltip="true">
+          <el-table-column align="center" prop="nltBz" :show-overflow-tooltip="true">
             <template slot="header">
-              <div>手机号</div>
-              <div>Phone Number</div>
+              <div>班组</div>
+              <div>Group</div>
             </template>
             <template slot-scope="scope">
-              {{ scope.row.phone || '-' }}
+              {{ scope.row.nltBz || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="nltLw" :show-overflow-tooltip="true">
+            <template slot="header">
+              <div>劳务</div>
+              <div>Labour</div>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.nltLw || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="nltPosition" :show-overflow-tooltip="true">
+            <template slot="header">
+              <div>职位</div>
+              <div>Position</div>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.nltPosition || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="nltStartDate" :show-overflow-tooltip="true">
+            <template slot="header">
+              <div>入职日期</div>
+              <div>Start Date</div>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.nltStartDate || '-' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="flag">
+          <el-table-column align="center" width="100" prop="flag">
             <template slot="header">
               <div>状态</div>
               <div>State</div>
@@ -170,7 +197,7 @@
               />
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" align="center" prop="createDate" width="160">
+          <el-table-column :show-overflow-tooltip="true" align="center" prop="createDate">
             <template slot="header">
               <div>创建时间</div>
               <div>Build Time</div>
@@ -228,12 +255,12 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
+            <el-form-item label="姓名" prop="name">
               <div slot="label" class="labelClass">
-                <div>用户昵称</div>
-                <div>User Nickname</div>
+                <div>姓名</div>
+                <div>Name</div>
               </div>
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" />
+              <el-input v-model="form.name" placeholder="请输入用户昵称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -280,41 +307,67 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.businessId == undefined" class="labelHeight" label="登录名" prop="username">
+            <el-form-item v-if="form.businessId == undefined" class="labelHeight" label="工号" prop="username">
               <div slot="label" style="position: relative;bottom: 17px" class="labelClass">
-                <div>登录名</div>
-                <div>Login Name</div>
+                <div>工号</div>
+                <div>B/N</div>
               </div>
               <el-input v-model="form.username" placeholder="请输入登录名" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.businessId == undefined" class="labelHeight" label="用户密码" prop="password">
-              <div slot="label" style="position: relative;bottom: 17px" class="labelClass">
-                <div>用户密码</div>
-                <div>User Password</div>
+            <el-form-item label="身份证号" prop="idNumber">
+              <div slot="label" class="labelClass">
+                <div>身份证号</div>
+                <div>ID Number</div>
               </div>
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" />
+              <el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户类型" prop="name">
+            <el-form-item class="labelHeight" label="班组" prop="nltBz">
               <div slot="label" class="labelClass">
-                <div>用户类型</div>
-                <div>User Type</div>
+                <div>班组</div>
+                <div>Group</div>
               </div>
-              <el-input v-model.trim="form.name" placeholder="请输入用户类型" />
+              <el-input v-model="form.nltBz" placeholder="请输入班组" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="身份证号" prop="idNumber">
+            <el-form-item label="劳务" prop="nltLw">
               <div slot="label" class="labelClass">
-                <div>身份证号</div>
-                <div>ID Number</div>
+                <div>劳务</div>
+                <div>Labour</div>
               </div>
-              <el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
+              <el-input v-model.trim="form.nltLw" placeholder="请输入劳务" maxlength="18" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item class="labelHeight" label="职位" prop="nltBz">
+              <div slot="label" class="labelClass">
+                <div>职位</div>
+                <div>Position</div>
+              </div>
+              <el-input v-model="form.nltPosition" placeholder="请输入职位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入职日期" prop="nltStartDate">
+              <div slot="label" class="labelClass">
+                <div>入职日期</div>
+                <div>Start Date</div>
+              </div>
+              <el-date-picker
+                v-model.trim="form.nltStartDate"
+                type="date"
+                style="width: 100%"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择入职日期"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -334,31 +387,58 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="部门" prop="postId">-->
+<!--              <div slot="label" class="labelClass">-->
+<!--                <div>部门</div>-->
+<!--                <div>Dept</div>-->
+<!--              </div>-->
+<!--              <el-cascader-->
+<!--                v-model="form.deptId"-->
+<!--                style="width: 100%"-->
+<!--                clearable-->
+<!--                :show-all-levels="false"-->
+<!--                :options="deptTreeData"-->
+<!--                placeholder="请选择部门"-->
+<!--                :props="{-->
+<!--                  multiple: true,-->
+<!--                  checkStrictly: true,-->
+<!--                  expandTrigger: 'hover',-->
+<!--                  value: 'id',-->
+<!--                  label: 'label',-->
+<!--                  children: 'children' }"-->
+<!--              />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="部门" prop="postId">
-              <div slot="label" class="labelClass">
-                <div>部门</div>
-                <div>Dept</div>
-              </div>
-              <el-cascader
+        <el-col :span="24">
+          <el-form-item label="部门：" prop="parentId">
+            <treeSelect
               v-model="form.deptId"
-                clearable
-                :show-all-levels="false"
-                :options="deptTreeData"
-                placeholder="请选择部门"
-                :props="{
-                  multiple: true,
-                  checkStrictly: true,
-                  expandTrigger: 'hover',
-                  value: 'id',
-                  label: 'label',
-                  children: 'children' }"
+              :disable-branch-nodes="false"
+              :options="deptOptions"
+              :show-count="true"
+              placeholder="请选择归属部门"
+              @input="changeValue"
             />
           </el-form-item>
         </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="角色：" prop="roleList">
+              <el-select v-model="form.roleList" multiple placeholder="请选择角色">
+                <el-option
+                  v-for="(item,index) in roleOptions"
+                  :key="index"
+                  :label="item.roleName"
+                  :value="item.businessId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -462,6 +542,7 @@ import {
 } from '@/api/system/user'
 import { getToken } from '@/utils/auth'
 import { getChildrenDept, treeselect } from '@/api/system/dept'
+import { roleSelect } from '@/api/system/role'
 import TreeSelect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
@@ -567,7 +648,11 @@ export default {
       deptChildren: [],
       // 表单参数
       form: {
-        deptId: [],
+        roleList: [],
+        nltStartDate: '',
+        nltPosition: '',
+        nltLw: '',
+        nltBz: '',
         username: '',
         phone: '',
         email: '',
@@ -605,7 +690,6 @@ export default {
         username: undefined,
         email: undefined,
         phone: undefined,
-        nickName: undefined,
         idNumber: undefined,
         userType: undefined,
         allowLogin: undefined,
@@ -618,10 +702,10 @@ export default {
         username: [
           { required: true, message: '请输入登录名', trigger: 'blur' }
         ],
-        nickName: [
-          { required: false, message: '请输入用户昵称', trigger: 'blur' },
-          { validator: trueGroupName, message: '请输入正确的用户昵称' }
-        ],
+        // nickName: [
+        //   { required: false, message: '请输入用户昵称', trigger: 'blur' },
+        //   { validator: trueGroupName, message: '请输入正确的用户昵称' }
+        // ],
         deptId: [
           { required: false, message: '请输入归属部门', trigger: 'blur' }
         ],
@@ -695,6 +779,7 @@ export default {
     }
     this.getDeptChild()
     this.getList()
+    this.getRoleSelect()
     this.getTreeSelect()
     // this.getConfigKey('sys.user.initPassword').then(response => {
     //   this.initPassword = response.msg
@@ -731,6 +816,12 @@ export default {
         }
       })
     },
+    /** 查询角色下拉框 */
+    getRoleSelect() {
+      roleSelect().then(response => {
+        this.roleOptions = response.data
+      })
+    },
     /** 查询子部门 */
     getChildrenDept(userId) {
       getChildrenDept(userId).then(response => {
@@ -789,7 +880,8 @@ export default {
         phone: undefined,
         username: undefined,
         userType: undefined,
-        nickName: undefined,
+        roleList: undefined,
+        name: undefined,
         password: undefined,
         idNumber: undefined,
         email: undefined,
@@ -866,9 +958,12 @@ export default {
       getUser(userId).then(response => {
         this.open = true
         this.form = response.data
-        if (this.form.deptId) {
-          this.form.deptId = this.form.deptId.split(',')
+        if (response.data.roleIds !== null) {
+          this.$set(this.form, 'roleList', response.data.roleIds.split(',').map(num => { return Number(num) }))
         }
+        // if (this.form.deptId) {
+        //   this.form.deptId = this.form.deptId.split(',')
+        // }
         this.title = '修改'
       })
       // this.getChildrenDept(userId)
@@ -912,7 +1007,7 @@ export default {
     submitForm() {
       this.$refs['form'].validate(valid => {
         if (valid) {
-          this.form.deptId = this.form.deptId.join(',')
+          // this.form.deptId = this.form.deptId.join(',')
           if (this.form.businessId !== undefined) {
             updateUser(this.form).then(response => {
               this.$message({