修改

src/api/system/user.js

@@ -37,29 +37,28 @@ export function addUser(data) {
     }
   })
 }
+// 修改用户
+// export function updateUser(data) {
+//   return request({
+//     url: '/system/user/update',
+//     method: 'put',
+//     data: data
+//   })
+// }
+
 // 修改用户
 export function updateUser(data) {
+  data = Qs.stringify(data)
   return request({
     url: '/system/user/update',
     method: 'put',
-    data: data
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
   })
 }
 
-// 修改用户
-// 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/store/modules/permission.js

@@ -22,8 +22,12 @@ const permission = {
         getInfo().then(res => {
           const accessedRoutes = filterAsyncRouter(res.data.menus[0].children)
           console.log('进来了', accessedRoutes)
-          // 获取菜单结构后把首页的showFather改为false从而达到不显示首页目录的效果
-          res.data.menus[0].children[0].showFather = 'false'
+          // 获取菜单结构后把(首页)的showFather改为false从而达到不显示首页目录的效果
+          for (let i = 0, l = res.data.menus[0].children.length; i < l; i++) {
+            if (res.data.menus[0].children[i].path === '/entry') {
+              res.data.menus[0].children[i].showFather = 'false'
+            }
+          }
           if (accessedRoutes[0]) {
             const firstChild = getFirstChild(accessedRoutes[0])
             accessedRoutes.push({ path: '*', redirect: '/404', hidden: true })

src/views/system/role/index.vue

@@ -168,8 +168,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.page"
+      :limit.sync="queryParams.rows"
       @pagination="getList"
     />
 
@@ -198,7 +198,7 @@
           <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
         </el-form-item>
         <el-form-item  class="labelHeight" label="角色状态" prop="flag">
-          <div slot="label" class="labelClass">
+          <div slot="label" class="labelClassRequired">
             <div class="labelName">角色状态</div>
             <div class="labelName">Role Status</div>
           </div>
@@ -210,7 +210,7 @@
             >{{ dict.dictLabel }}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item  class="labelHeight" label="菜单权限" prop="flag">
+        <el-form-item  class="labelHeight" label="菜单权限" prop="menuIds">
           <div slot="label" class="labelClass">
             <div class="labelName">菜单权限</div>
             <div class="labelName">Menu Limit</div>
@@ -397,8 +397,8 @@ export default {
       tOptions: [],
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         roleName: undefined,
         roleKey: undefined,
         flag: undefined
@@ -419,6 +419,9 @@ export default {
         ],
         roleSort: [
           { required: true, message: '请输入角色排序', trigger: 'blur' }
+        ],
+        flag: [
+          { required: true, message: '请选择角色状态', trigger: 'blur' }
         ]
       },
       deptOptions: []
@@ -565,7 +568,7 @@ export default {
     },
     /** 查询按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.page = 1
       this.getList()
     },
     /** 重置按钮操作 */

src/views/system/user/index.vue

@@ -244,8 +244,8 @@
         <pagination
           v-show="total>0"
           :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.rows"
           @pagination="getList"
         />
       </el-col>
@@ -307,7 +307,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.businessId == undefined" class="labelHeight" label="工号" prop="username">
+            <el-form-item class="labelHeight" label="工号" prop="username">
               <div slot="label" class="labelClassRequired">
                 <div class="labelName">工号</div>
                 <div class="labelName">B/N</div>
@@ -317,7 +317,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item class="labelHeight" label="身份证号" prop="idNumber">
-              <div slot="label" class="labelClassRequired">
+              <div slot="label" class="labelClass">
                 <div class="labelName">身份证号</div>
                 <div class="labelName">ID Number</div>
               </div>
@@ -373,7 +373,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item class="labelHeight" v-if="form.businessId == undefined" label="状态" prop="flag">
+            <el-form-item v-if="form.businessId == undefined" class="labelHeight" label="状态" prop="flag">
               <div slot="label" class="labelClass">
                 <div class="labelName">状态</div>
                 <div class="labelName">Status</div>
@@ -693,8 +693,8 @@ export default {
       },
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         username: undefined,
         email: undefined,
         phone: undefined,
@@ -751,11 +751,11 @@ export default {
           },
           { validator: phone, trigger: 'blur' }
         ],
-        idNumber: [
-          { required: true, message: '请输入身份证号', trigger: 'blur' },
-          { min: 18, max: 18, message: '长度18字符', trigger: 'blur' },
-          { validator: idNumber, trigger: 'blur' }
-        ]
+        // idNumber: [
+        //   { required: true, message: '请输入身份证号', trigger: 'blur' },
+        //   { min: 18, max: 18, message: '长度18字符', trigger: 'blur' },
+        //   { validator: idNumber, trigger: 'blur' }
+        // ]
       },
       userInfoLoading: false,
       userImportLoading: false,
@@ -966,9 +966,13 @@ export default {
       getUser(userId).then(response => {
         this.open = true
         this.form = response.data
+        if (this.form.nltStartDate) {
+          this.form.nltStartDate = this.form.nltStartDate.substring(0, 10)
+        }
         if (response.data.roleIds !== null) {
           this.$set(this.form, 'roleList', response.data.roleIds.split(',').map(num => { return Number(num) }))
         }
+        console.log('详情', this.form)
         // if (this.form.deptId) {
         //   this.form.deptId = this.form.deptId.split(',')
         // }
@@ -1017,6 +1021,7 @@ export default {
         if (valid) {
           // this.form.deptId = this.form.deptId.join(',')
           if (this.form.businessId !== undefined) {
+            console.log('form', this.form)
             updateUser(this.form).then(response => {
               this.$message({
                 message: '修改成功',