From 916de26495779c4dcda4006e6b06f597e5ec73f3 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Thu, 29 Aug 2024 23:54:05 +0800
Subject: [PATCH] update code

---
 .../src/main/resources/application.yml        |  2 +-
 yanzhu-ui/src/views/system/user/index.vue     | 70 ++++++++++++++++---
 yanzhu-ui/vue.config.js                       |  4 +-
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/yanzhu-admin/src/main/resources/application.yml b/yanzhu-admin/src/main/resources/application.yml
index 1b946db..583172f 100644
--- a/yanzhu-admin/src/main/resources/application.yml
+++ b/yanzhu-admin/src/main/resources/application.yml
@@ -19,7 +19,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: prod
+    active: druid
   # 文件上传
   servlet:
     multipart:
diff --git a/yanzhu-ui/src/views/system/user/index.vue b/yanzhu-ui/src/views/system/user/index.vue
index a96b48f..c06b317 100644
--- a/yanzhu-ui/src/views/system/user/index.vue
+++ b/yanzhu-ui/src/views/system/user/index.vue
@@ -115,9 +115,9 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false"
+    <el-dialog :title="title" v-if="open" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false"
       :close-on-press-escape="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" class="user-edit-form">
         <el-row>
           <el-col :span="24">
             <el-form-item label="用户名" prop="userName">
@@ -158,8 +158,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="角色" prop="roleId">
-              <el-select v-model="form.roleId" placeholder="请选择角色">
+            <el-form-item label="角色" prop="roleIds">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
                   :disabled="item.status == 1"></el-option>
               </el-select>
@@ -346,7 +346,7 @@ export default {
           this.form.deptId=undefined;
         },400);
       }else{        
-        debugger
+        /*
         if(a.data.level==1){//公司
           this.roleOptions=this.oldRoleOptions.filter(d=>{
             return d.roleName=="公司管理员"||d.roleName=="普通角色";
@@ -366,7 +366,8 @@ export default {
           this.roleOptions=this.oldRoleOptions.filter(d=>{
             return roles.indexOf(d.roleId)>=0;
           });
-        }
+        }*/
+        this.roleOptions=this.oldRoleOptions.map(d=>d);
 
       }
     },
@@ -468,6 +469,30 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.rules={
+        userName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '用户昵称长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" },          
+        ],
+        phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],       
+        roleIds: [
+        { required: true, message: "请选择角色", trigger: "blur" },
+        ]
+      };
       getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
@@ -478,7 +503,27 @@ export default {
       });
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {      
+    handleUpdate(row) {    
+      this.rules={
+        userName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '用户昵称长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        deptId: [
+          { required: true, message: "归属部门不能为空", trigger: "blur" },          
+        ],
+        phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ],          
+        roleId: [
+        { required: true, message: "请选择角色", trigger: "blur" },
+        ]
+      };
       this.reset();
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
@@ -532,7 +577,7 @@ export default {
     submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.roleIds=[this.form.roleId];
+          //this.form.roleIds=[this.form.roleId];
           this.form.nickName=this.form.userName;
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
@@ -594,4 +639,11 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
+<style lang="scss">
+.user-edit-form{
+  .el-select{
+    width:100%;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/yanzhu-ui/vue.config.js b/yanzhu-ui/vue.config.js
index 497a0ba..4a060a1 100644
--- a/yanzhu-ui/vue.config.js
+++ b/yanzhu-ui/vue.config.js
@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        //target: `http://localhost:8080${process.env.VUE_APP_BASE_API}`,
-        target: `http://62.234.3.186${process.env.VUE_APP_BASE_API}`,
+        target: `http://localhost:8080${process.env.VUE_APP_BASE_API}`,
+        //target: `http://62.234.3.186${process.env.VUE_APP_BASE_API}`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''