diff --git a/src/views/repair/staff/api/staff.js b/src/views/repair/staff/api/staff.js
index 0e51c85..73ce7d4 100644
--- a/src/views/repair/staff/api/staff.js
+++ b/src/views/repair/staff/api/staff.js
@@ -41,6 +41,15 @@ export function addUser(data) {
data: data
})
}
+
+// 新增用户
+export function insert(data) {
+ return request({
+ url: '/base/repair-staff/insert',
+ method: 'post',
+ data: data
+ })
+}
// 新增用户
export function addFolder(data) {
return request({
@@ -62,8 +71,8 @@ export function permissionAssign(data) {
// 修改用户
export function updateUser(data) {
return request({
- url: '/inspectionStaff/update',
- method: 'put',
+ url: '/base/repair-staff/updateStaff',
+ method: 'post',
data: data
})
}
diff --git a/src/views/repair/staff/index.vue b/src/views/repair/staff/index.vue
index e6e336a..bb94176 100644
--- a/src/views/repair/staff/index.vue
+++ b/src/views/repair/staff/index.vue
@@ -40,23 +40,23 @@
-
+
选择员工
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -127,22 +127,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -151,98 +139,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
点击查看附件
@@ -280,7 +192,7 @@
>
-
+
-
-
-
-
-
-
@@ -376,10 +276,6 @@
prop="emergencyContactPhone"
label="紧急联系人电话">
-
-
@@ -405,7 +301,7 @@ import {
listUser,
resetUserPwd,
getDriverLicenseType,
- updateUser, getPost, permissionAssign, addFolder
+ updateUser, getPost, permissionAssign, addFolder, insert
} from "./api/staff";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -482,7 +378,7 @@ export default {
// 上传的地址
url: process.env.VUE_APP_BASE_API + '/admin-api/inspectionStaff/import'
},
- multipleSelection:[],
+ multipleSelection: [],
// 角色表单数据
roleForm: {},
//图片
@@ -521,7 +417,7 @@ export default {
// 角色表单验证规则
roleRules: {
roleIds: [
- { required: true, message: "请选择至少一个角色", trigger: "change" },
+ {required: true, message: "请选择至少一个角色", trigger: "change"},
],
},
// 表单校验
@@ -549,7 +445,10 @@ export default {
message: "请输入正确的手机号码",
trigger: "blur"
}
- ]
+ ],
+ roleIds: [
+ {required: true, message: "请选择至少一个角色", trigger: "change"},
+ ],
},
// 是否显示弹出层（角色权限）
openRole: false,
@@ -609,12 +508,12 @@ export default {
);
},
handleUserSelectSuccess(selectedUsers) {
- console.log("选择的用户", selectedUsers);
- this.multipleSelection = selectedUsers;
- // 打开选择角色弹窗
- this.showSlect = true;
- },
- /** 提交角色选择 */
+ console.log("选择的用户", selectedUsers);
+ this.multipleSelection = selectedUsers;
+ // 打开选择角色弹窗
+ this.showSlect = true;
+ },
+ /** 提交角色选择 */
async submitRoleForm() {
this.$refs.roleForm.validate(async (valid) => {
if (valid) {
@@ -640,7 +539,7 @@ export default {
/**
* 选择用户
**/
- chooseUser(){
+ chooseUser() {
this.$refs["chooseUserRef"].open();
},
addFolder() {
@@ -660,10 +559,10 @@ export default {
});
},
// 筛选节点
- filterNode(value, data) {
- if (!value) return true;
- return data.name.indexOf(value) !== -1;
- },
+ // filterNode(value, data) {
+ // if (!value) return true;
+ // return data.name.indexOf(value) !== -1;
+ // },
// 节点单击事件
handleNodeClick(data) {
this.queryParams.postId = data.id;
@@ -794,7 +693,10 @@ export default {
if (this.form.id !== undefined) {
this.form.userId = this.form.id;
console.log(this.form)
- updateUser(this.form).then(response => {
+ const data = {
+ repairStaff: this.form
+ }
+ updateUser(data).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
let data = {
@@ -805,16 +707,25 @@ export default {
this.getList();
});
} else {
+ if (this.form.roleIds.length === 0) {
+ this.$modal.msgError("请选择角色");
+ return;
+ }
this.form.username = this.form.mobile
this.form.password = '123456'
- addUser(this.form).then(response => {
+ console.log(this.form)
+ const data = {
+ repairStaffs: [this.form],
+ roleIds: this.form.roleIds
+ }
+ insert(data).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
let data = {
userId: response.data,
roleIds: this.form.roleIds
}
- permissionAssign(data)
+ // permissionAssign(data)
});
}
@@ -900,11 +811,11 @@ export default {
console.log('执行')
this.getList()
},
- handleRemove(file) {
- console.log(file);
- //在fileList中删除附件
- this.fileList.splice(this.fileList.indexOf(file), 1);
- },
+ // handleRemove(file) {
+ // console.log(file);
+ // //在fileList中删除附件
+ // this.fileList.splice(this.fileList.indexOf(file), 1);
+ // },
handlePreview(file) {
console.log(file);
},