修改单用户多岗位

ruoyi-ui/src/api/custom/commision.js

@@ -19,10 +19,11 @@ export function detailCommision(query) {
 }
 
 // 查询业务提成比例详细
-export function getCommision(ruleId) {
+export function getCommision(ruleId, postId) {
   return request({
     url: '/custom/commision/' + ruleId,
-    method: 'get'
+    method: 'get',
+    params: {postId}
   })
 }
 

ruoyi-ui/src/api/system/user.js

@@ -1,127 +1,127 @@
-import request from '@/utils/request'
-import { praseStrEmpty } from "@/utils/ruoyi";
-
-// 查询用户列表
-export function listUser(query) {
-  return request({
-    url: '/system/user/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询用户详细
-export function getUser(userId) {
-  return request({
-    url: '/system/user/' + praseStrEmpty(userId),
-    method: 'get'
-  })
-}
-
-// 新增用户
-export function addUser(data) {
-  return request({
-    url: '/system/user',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改用户
-export function updateUser(data) {
-  return request({
-    url: '/system/user',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除用户
-export function delUser(userId) {
-  return request({
-    url: '/system/user/' + userId,
-    method: 'delete'
-  })
-}
-
-// 导出用户
-export function exportUser(query) {
-  return request({
-    url: '/system/user/export',
-    method: 'get',
-    params: query
-  })
-}
-
-// 用户密码重置
-export function resetUserPwd(userId, password) {
-  const data = {
-    userId,
-    password
-  }
-  return request({
-    url: '/system/user/resetPwd',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户状态修改
-export function changeUserStatus(userId, status) {
-  const data = {
-    userId,
-    status
-  }
-  return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询用户个人信息
-export function getUserProfile() {
-  return request({
-    url: '/system/user/profile',
-    method: 'get'
-  })
-}
-
-// 修改用户个人信息
-export function updateUserProfile(data) {
-  return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
-  })
-}
-
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
-  return request({
-    url: '/system/user/profile/updatePwd',
-    method: 'put',
-    params: data
-  })
-}
-
-// 用户头像上传
-export function uploadAvatar(data) {
-  return request({
-    url: '/system/user/profile/avatar',
-    method: 'post',
-    data: data
-  })
-}
-
-// 下载用户导入模板
-export function importTemplate() {
-  return request({
-    url: '/system/user/importTemplate',
-    method: 'get'
-  })
-}
+import request from '@/utils/request'
+import { praseStrEmpty } from "@/utils/ruoyi";
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(userId) {
+  return request({
+    url: '/system/user/' + praseStrEmpty(userId),
+    method: 'get'
+  })
+}
+
+// 新增用户
+export function addUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户
+export function delUser(userId) {
+  return request({
+    url: '/system/user/' + userId,
+    method: 'delete'
+  })
+}
+
+// 导出用户
+export function exportUser(query) {
+  return request({
+    url: '/system/user/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 用户密码重置
+export function resetUserPwd(userId, password) {
+  const data = {
+    userId,
+    password
+  }
+  return request({
+    url: '/system/user/resetPwd',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户状态修改
+export function changeUserStatus(userId, status) {
+  const data = {
+    userId,
+    status
+  }
+  return request({
+    url: '/system/user/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询用户个人信息
+export function getUserProfile() {
+  return request({
+    url: '/system/user/profile',
+    method: 'get'
+  })
+}
+
+// 修改用户个人信息
+export function updateUserProfile(data) {
+  return request({
+    url: '/system/user/profile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 用户密码重置
+export function updateUserPwd(oldPassword, newPassword) {
+  const data = {
+    oldPassword,
+    newPassword
+  }
+  return request({
+    url: '/system/user/profile/updatePwd',
+    method: 'put',
+    params: data
+  })
+}
+
+// 用户头像上传
+export function uploadAvatar(data) {
+  return request({
+    url: '/system/user/profile/avatar',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下载用户导入模板
+export function importTemplate() {
+  return request({
+    url: '/system/user/importTemplate',
+    method: 'get'
+  })
+}

ruoyi-ui/src/views/custom/commision/config/index.vue

@@ -274,7 +274,7 @@
         listCommision(this.queryParams).then(response => {
           this.commisionList = response.rows.reduce((arr, cur, idx, oriArr) => {
             for (let i = 0; i < arr.length; i++) {
-              if (arr[i].some(e => e.userId === cur.userId)) {
+              if (arr[i].some(e => e.userId === cur.userId && e.postId === cur.postId)) {
                 arr[i].push(cur);
                 break;
               } else if (i === arr.length - 1) {
@@ -370,7 +370,7 @@
       handleUpdate(row) {
         this.reset();
         const ruleId = row.ruleId || this.ids
-        getCommision(ruleId).then(response => {
+        getCommision(ruleId, row.postId).then(response => {
           this.form = response.data;
           this.userIdOptions = this.options[this.form.postId];
           this.open = true;

ruoyi-ui/src/views/system/user/index.vue

@@ -19,10 +19,10 @@
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px"
                       @keyup.enter.native="handleQuery"/>
           </el-form-item>
-<!--          <el-form-item label="手机号码" prop="phonenumber">-->
-<!--            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small"-->
-<!--                      style="width: 240px" @keyup.enter.native="handleQuery"/>-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="手机号码" prop="phonenumber">-->
+          <!--            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small"-->
+          <!--                      style="width: 240px" @keyup.enter.native="handleQuery"/>-->
+          <!--          </el-form-item>-->
           <el-form-item label="状态" prop="status">
             <el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
               <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel"
@@ -71,7 +71,7 @@
           <el-table-column label="用户账号" align="center" prop="userName" :show-overflow-tooltip="true"/>
           <el-table-column label="用户名称" align="center" prop="nickName" :show-overflow-tooltip="true"/>
           <el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true"/>
-<!--          <el-table-column label="手机号码" align="center" prop="phonenumber" width="120"/>-->
+          <!--          <el-table-column label="手机号码" align="center" prop="phonenumber" width="120"/>-->
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
@@ -118,18 +118,18 @@
             </el-form-item>
           </el-col>
         </el-row>
-<!--        <el-row>-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="手机号码" prop="phonenumber">-->
-<!--              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="邮箱" prop="email">-->
-<!--              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="手机号码" prop="phonenumber">-->
+        <!--              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="邮箱" prop="email">-->
+        <!--              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户账号" prop="userName">
@@ -164,7 +164,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="岗位">
-              <el-select v-model="form.postId" placeholder="请选择">
+              <el-select v-model="form.postIds" multiple placeholder="请选择">
                 <el-option v-for="item in postOptions"
                            :key="item.postId"
                            :label="item.postName"
@@ -509,7 +509,7 @@
       submitForm: function () {
         this.$refs["form"].validate((valid) => {
           if (valid) {
-            this.form.postId && (this.form.postIds = [this.form.postId]);
+            // this.form.postId && (this.form.postIds = [this.form.postId]);
             this.form.roleId && (this.form.roleIds = [this.form.roleId]);
             // console.log(this.form)
             if (this.form.userId != undefined) {