用户管理接口调整

src/views/SystemManage/UserManage.vue

@@ -16,7 +16,7 @@
         <div class="label">姓名：</div>
         <el-input
           class="search-info"
-          v-model="searchParams.truename"
+          v-model="searchParams.name"
           placeholder="请输入姓名"
         />
       </div>
@@ -24,7 +24,7 @@
         <div class="label">用户组：</div>
         <el-input
           class="search-info"
-          v-model="searchParams.groupname"
+          v-model="searchParams.userGroupId"
           placeholder="请输入用户组名"
         />
       </div>
@@ -32,7 +32,7 @@
         <div class="label">单位代码：</div>
         <el-input
           class="search-info"
-          v-model="searchParams.unitcode"
+          v-model="searchParams.unitCode"
           placeholder="请输入单位代码"
         />
       </div>
@@ -40,7 +40,7 @@
         <div class="label">角色：</div>
         <el-input
           class="search-info"
-          v-model="searchParams.roleName"
+          v-model="searchParams.roleId"
           placeholder="请输入角色"
         />
       </div>
@@ -56,8 +56,6 @@
     </div>
     <div class="operation">
       <div class="btn1" @click="batch">批量操作</div>
-      <div class="clear-btn" @click="adduser">adduser</div>
-      <div class="clear-btn" @click="searchuser">searchuser</div>
       <div class="btns">
         <div class="btn1" @click="delMore()">删除</div>
         <div class="add" @click="open">
@@ -99,16 +97,16 @@
         </el-table-column>
         <el-table-column prop="username" label="用户名" :width="width1">
         </el-table-column>
-        <el-table-column prop="truename" label="姓名" :width="width1">
+        <el-table-column prop="name" label="姓名" :width="width1">
         </el-table-column>
-        <el-table-column prop="policemanid" label="警号" :width="width2">
+        <el-table-column prop="policeNumber" label="警号" :width="width2">
         </el-table-column>
-        <el-table-column prop="group" label="用户组" :width="width3">
+        <el-table-column prop="userGroupId" label="用户组" :width="width3">
         </el-table-column>
-        <el-table-column prop="unitname" label="所属单位" :width="width5">
+        <el-table-column prop="unitName" label="所属单位" :width="width5">
         </el-table-column>
         <el-table-column
-          prop="roleName"
+          prop="roleNames"
           label="角色"
           :width="width4"
           show-overflow-tooltip
@@ -116,23 +114,23 @@
           <template slot-scope="scope">
             <div
               class="tags"
-              v-for="item in scope.row.roleName &&
-                scope.row.roleName.split(',')"
+              v-for="item in scope.row.roleNames &&
+                scope.row.roleNames.split(',')"
             >
               {{ item }}
             </div>
           </template>
         </el-table-column>
         <el-table-column
-          prop="groupid_list"
+          prop="permissionNames"
           label="权限"
           :width="width5"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
             <div
-              v-for="(item, index) in scope.row.permissionname &&
-                scope.row.permissionname.split(',')"
+              v-for="(item, index) in scope.row.permissionNames &&
+                scope.row.permissionNames.split(',')"
             >
               {{ index > 0 ? "/" : "" }}
               {{ item }}
@@ -141,12 +139,12 @@
         </el-table-column>
         <el-table-column prop="status" label="启用状态" :width="width1">
           <template slot-scope="scope">
-            <div v-if="scope.row.status === '0'" class="circle-red"></div>
-            <div v-if="scope.row.status === '1'" class="circle-blue"></div>
+            <div v-if="scope.row.status === 0" class="circle-red"></div>
+            <div v-if="scope.row.status === 1" class="circle-blue"></div>
             {{
-              scope.row.status === "0"
+              scope.row.status === 0
                 ? "停用"
-                : scope.row.status === "1"
+                : scope.row.status === 1
                 ? "启用"
                 : "无状态"
             }}
@@ -217,25 +215,25 @@
               v-model="addFormParams.username"
             ></el-input>
           </el-form-item>
-          <el-form-item class="info-item" label="姓名:" prop="truename">
+          <el-form-item class="info-item" label="姓名:" prop="name">
             <el-input
               placeholder="请输入姓名"
               class="input-info"
-              v-model="addFormParams.truename"
+              v-model="addFormParams.name"
             ></el-input>
           </el-form-item>
-          <el-form-item class="info-item" label="所属单位代码:" prop="unitcode">
+          <el-form-item class="info-item" label="所属单位代码:" prop="unitCode">
             <el-input
               placeholder="请输入所属单位"
               class="input-info"
-              v-model="addFormParams.unitcode"
+              v-model="addFormParams.unitCode"
             ></el-input>
           </el-form-item>
-          <el-form-item class="info-item" label="用户警号:" prop="policemanid">
+          <el-form-item class="info-item" label="用户警号:" prop="policeNumber">
             <el-input
               placeholder="请输入用户警号"
               class="input-info"
-              v-model="addFormParams.policemanid"
+              v-model="addFormParams.policeNumber"
             ></el-input>
           </el-form-item>
           <el-form-item class="info-item" label="密码:" prop="password">
@@ -254,31 +252,31 @@
               v-model="addFormParams.okpassword"
             ></el-input>
           </el-form-item>
-          <el-form-item class="info-item" label="手机号码:" prop="telphone">
+          <el-form-item class="info-item" label="手机号码:" prop="phoneNumber">
             <el-input
               placeholder="请输入手机号码"
               class="input-info"
-              v-model="addFormParams.telphone"
+              v-model="addFormParams.phoneNumber"
             ></el-input>
           </el-form-item>
           <el-form-item class="info-item" label="加入用户组:">
             <el-input
               placeholder="请选择用户组"
               class="input-info"
-              v-model="addFormParams.group"
+              v-model="addFormParams.userGroupId"
             ></el-input>
           </el-form-item>
           <el-form-item class="info-item" label="加入角色:">
             <el-input
               placeholder="请选择角色"
               class="input-info"
-              v-model="addFormParams.role"
+              v-model="addFormParams.roleId"
             ></el-input>
           </el-form-item>
           <el-form-item class="info-item" label="启用状态:" prop="status">
             <el-radio-group class="input-info" v-model="addFormParams.status">
-              <el-radio :label="'1'">启用</el-radio>
-              <el-radio :label="'0'">停用</el-radio>
+              <el-radio :label="1">启用</el-radio>
+              <el-radio :label="0">停用</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item class="addbtns">
@@ -365,8 +363,8 @@
           </el-form-item>
           <el-form-item class="info-item" label="启用状态:" prop="status">
             <el-radio-group class="input-info" v-model="editFormParams.status">
-              <el-radio :label="'1'">启用</el-radio>
-              <el-radio :label="'0'">停用</el-radio>
+              <el-radio :label="1">启用</el-radio>
+              <el-radio :label="0">停用</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item class="addbtns">
@@ -511,17 +509,28 @@ export default {
       height: 480,
       // 新增对象
       addFormParams: {
-        username: "", //用户名
-        password: "1", //密码
-        okpassword: "1", // 确认密码
-        truename: "", //用户真实姓名
-        policemanid: "A1111", //警号
-        telphone: "17323245432", //用户电话
-        unitcode: "3700000", //单位代码
-        unitname: "北京市海淀区公安局分局", //单位名称
-        group: "", // 用户组
-        role: "", // 角色
-        status: "1" // 启用状态
+        username: "",
+        phoneNumber: "",
+        password: "",
+        okpassword: "",
+        policeNumber: "",
+        unitName: "长沙",
+        unitCode: "",
+        name: "",
+        status: 1,
+        userGroupId: null,
+        roleId: null
+        // username: "", //用户名
+        // password: "1", //密码
+        // okpassword: "1", // 确认密码
+        // truename: "", //用户真实姓名
+        // policemanid: "A1111", //警号
+        // telphone: "17323245432", //用户电话
+        // unitcode: "3700000", //单位代码
+        // unitname: "北京市海淀区公安局分局", //单位名称
+        // group: "", // 用户组
+        // role: "", // 角色
+        // status: "1" // 启用状态
       },
       editFormParams: {
         userId: "",
@@ -547,23 +556,23 @@ export default {
         username: [
           { validator: validateUsername, trigger: "blur", required: true }
         ], //用户名
-        truename: [
+        name: [
           { validator: validateTruename, trigger: "blur", required: true }
         ], //用户真实姓名
-        policemanid: [
+        policeNumber: [
           { validator: validatePolicemanid, trigger: "blur", required: true }
         ], //警号
-        telphone: [
+        phoneNumber: [
           { validator: validateTelphone, trigger: "blur", required: true }
         ], //用户电话
-        unitcode: [
+        unitCode: [
           { validator: validateUnitcode, trigger: "blur", required: true }
         ], //单位代码
-        unitname: [
+        unitName: [
           { validator: validateUnitname, trigger: "blur", required: true }
         ], //单位名称
-        group: [{ validator: validatePass, trigger: "blur" }], // 用户组
-        role: [{ validator: validatePass, trigger: "blur" }], // 角色
+        userGroupId: [{ validator: validatePass, trigger: "blur" }], // 用户组
+        roleId: [{ validator: validatePass, trigger: "blur" }], // 角色
         status: [{ validator: validateStatus, trigger: "blur", required: true }] // 启用状态
       },
       editrules: {
@@ -636,70 +645,24 @@ export default {
     }
   },
   methods: {
-    adduser() {
-      var user = {
-        username: "2021",
-        phoneNumber: "15806613121",
-        password: "2021",
-        policeNumber: "223",
-        unitName: "长沙",
-        unitCode: "123",
-        name: "王明光",
-        status: 1,
-        userGroupId: 1,
-        roleId: 1
-      };
-      this.$axios.post("/system/users", user).then(res => {
-        console.info(res);
-      });
-    },
-    searchuser() {
-      this.$axios.get("/system/users").then(res => {
-        console.info(res);
-      });
-    },
     // 新增
     submitForm(formName) {
       this.$refs.addFormParams.validate(valid => {
         console.log(valid);
         if (valid) {
-          console.info("addFormParams=====>", this.addFormParams);
-          var user = new URLSearchParams();
-          user.append("username", this.addFormParams.username);
-          user.append("truename", this.addFormParams.truename);
-          user.append("unitname", this.addFormParams.unitname);
-          user.append("unitcode", this.addFormParams.unitcode);
-          user.append("password", this.addFormParams.password);
-          user.append("policemanid", this.addFormParams.policemanid);
-          user.append("telphone", this.addFormParams.telphone);
-          user.append("usergroup", this.searchParams.usergroup); // 警号
-          user.append("role", this.addFormParams.role);
-          user.append("status", this.addFormParams.status);
-          user.append("groupid_coll", "");
-          user.append("groupid_list", "");
-          user.append("groupid_edit", "");
-          user.append("groupid_admin", "");
-          console.info("user========>", user);
-          this.$axios
-            .post("/login/user/saveuser", user)
-            .then(res => {
-              if (res.data.message === "用户名已存在,请修改用户名!") {
-                this.$message.error(res.data.message);
-              } else {
+          this.$axios.post("/system/users", this.addFormParams).then(res => {
             console.info(res);
+            if (res.data === "成功") {
+              this.$message.error(res.data);
               this.isShowAddUserDialog = false;
               this.isShowAddUserDialogBg = false;
-                this.$message.success(res.data.message);
-                this.search();
             }
-            })
-            .catch(failResponse => {});
+          });
         } else {
           console.log("error submit!!");
           return false;
         }
       });
-      // console.info(this.$refs[this.$refs[formName]]);
     },
     // 编辑
     submitEditForm(formName) {
@@ -764,30 +727,10 @@ export default {
     },
     search() {
       console.info("搜索用户列表");
-      var user = new URLSearchParams();
-      user.append("username", this.searchParams.username);
-      user.append("truename", this.searchParams.truename);
-      user.append("roleName", this.searchParams.roleName);
-      user.append("unitcode", this.searchParams.unitcode);
-      user.append("permissionname", this.searchParams.permissionname);
-      user.append("groupname", this.searchParams.groupname);
-      user.append("page", this.searchParams.page.page);
-      user.append("total", this.searchParams.page.total);
-      // todo 多条件筛选
-      this.$axios
-        .post("/login/user/queryUserList", user)
-        .then(res => {
-          this.tableData = res.data.data;
-          this.searchParams.page.total = res.data.total;
-          this.searchParams.page.page = res.data.page;
-          this.searchParams.page.count = res.data.count;
-          this.$message.success(res.message);
-        })
-        .catch(failResponse => {});
-
-      // 做查询时 user.append("page","1");
-      // user.append("total","20");这两个参数必填
-      // 修改删除时，userid必填
+      this.$axios.get("/system/users").then(res => {
+        console.info(res);
+        this.tableData = res.data;
+      });
     },
 
     // 清除所有选项
@@ -834,15 +777,14 @@ export default {
       (this.addFormParams.username = ""), //用户名
         (this.addFormParams.password = ""), //密码
         (this.addFormParams.okpassword = ""), // 确认密码
-        (this.addFormParams.truename = ""), //用户真实姓名
-        (this.addFormParams.policemanid = ""), //警号
-        (this.addFormParams.telphone = ""), //用户电话
-        (this.addFormParams.unitcode = ""), //单位代码
-        (this.addFormParams.unitname = ""), //单位名称
-        (this.addFormParams.group = ""), // 用户组
-        (this.addFormParams.role = ""), // 角色
-        (this.addFormParams.status = "1"); // 启用状态
-      // this.resetForm("addFormParams");
+        (this.addFormParams.name = ""), //用户真实姓名
+        (this.addFormParams.policeNumber = ""), //警号
+        (this.addFormParams.phoneNumber = ""), //用户电话
+        (this.addFormParams.unitCode = ""), //单位代码
+        (this.addFormParams.unitName = "长沙"), //单位名称
+        (this.addFormParams.userGroupId = ""), // 用户组
+        (this.addFormParams.roleId = ""), // 角色
+        (this.addFormParams.status = 1); // 启用状态
     },
     // 打开编辑弹窗
     openedit(id) {