更新0822

This commit is contained in:
xyc 2025-08-22 16:33:58 +08:00
parent 7fac744129
commit 5bcf163ccd
2 changed files with 64 additions and 144 deletions

View File

@ -41,6 +41,15 @@ export function addUser(data) {
data: data data: data
}) })
} }
// 新增用户
export function insert(data) {
return request({
url: '/base/repair-staff/insert',
method: 'post',
data: data
})
}
// 新增用户 // 新增用户
export function addFolder(data) { export function addFolder(data) {
return request({ return request({
@ -62,8 +71,8 @@ export function permissionAssign(data) {
// 修改用户 // 修改用户
export function updateUser(data) { export function updateUser(data) {
return request({ return request({
url: '/inspectionStaff/update', url: '/base/repair-staff/updateStaff',
method: 'put', method: 'post',
data: data data: data
}) })
} }

View File

@ -40,23 +40,23 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增
</el-button> </el-button>
</el-col> --> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="chooseUser">选择员工 <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="chooseUser">选择员工
</el-button> </el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport">导入--> <!-- <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport">导入-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="1.5">--> <!-- <el-col :span="1.5">-->
<!-- <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"--> <!-- <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"-->
<!-- :loading="exportLoading">导出--> <!-- :loading="exportLoading">导出-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row> </el-row>
@ -127,22 +127,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-if="form.id === undefined" label="员工账号" prop="username">-->
<!-- <el-input v-model="form.username" placeholder="请输入员工账号"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item v-if="form.id === undefined" label="员工密码" prop="password">-->
<!-- <el-input v-model="form.password" placeholder="请输入员工密码" type="password" show-password/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号码" prop="idCard"> <el-form-item label="身份证号码" prop="idCard">
<el-input v-model="form.idCard" placeholder="请输入身份证号码"/> <el-input v-model="form.IdNumber" placeholder="请输入身份证号码"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -151,98 +139,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="学历" prop="educational">
<!-- <el-input v-model="form.educational" placeholder="请输入学历"/>-->
<el-select v-model="form.educational" placeholder="请选择学历">
<el-option
v-for="dict in educationOptions"
:key="dict.label"
:label="dict.label"
:value="dict.label"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="毕业院校" prop="school">
<el-input v-model="form.school" placeholder="请输入毕业院校"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="短号" prop="shortNumber">
<el-input v-model="form.shortNumber" placeholder="请输入短号"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入职时间" prop="joinDate">
<el-date-picker v-model="form.joinDate" type="date" placeholder="请选择入职时间"
value-format="yyyy-MM-dd"/>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="紧急联系人" prop="emergencyContactName">
<el-input v-model="form.emergencyContactName" placeholder="请输入紧急联系人"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="emergencyContactPhone">
<el-input v-model="form.emergencyContactPhone" placeholder="请输入联系电话"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="员工性别">
<el-select v-model="form.sex" placeholder="请选择">
<el-option v-for="dict in sexDictDatas" :key="parseInt(dict.value)" :label="dict.label"
:value="parseInt(dict.value)"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="驾照类型" prop="driverLicenseType">
<el-select
multiple
collapse-tags
v-model="form.driverLicenseTypeArr" placeholder="请选择">
<el-option
v-for="dict in driverLicenseTypeOptions" :key="dict.id" :label="dict.id"
:value="dict.id"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="社保购买日期" prop="socialSecurityBuyDate"> <el-form-item label="社保购买日期" prop="socialSecurityBuyDate">
<el-date-picker v-model="form.socialSecurityBuyDate" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="form.safeDate" type="date" value-format="yyyy-MM-dd"
placeholder="请选择社保购买日期"></el-date-picker> placeholder="请选择社保购买日期"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
<el-form-item label="转正时间" prop="shortNumber"> <el-form-item label="转正时间" prop="shortNumber">
<!-- <el-input v-model="form.probationPeriod" placeholder="请输入试用期"/>--> <!-- <el-input v-model="form.probationPeriod" placeholder="请输入试用期"/>-->
<el-date-picker v-model="form.probationPeriod" type="date" value-format="yyyy-MM-dd" <el-date-picker v-model="form.formalDate" type="date" value-format="yyyy-MM-dd"
placeholder="请选择试用期"></el-date-picker> placeholder="请选择试用期"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="查看附件" v-if="this.form.id"> <el-form-item label="查看附件" v-if="this.form.id">
<div @click="addFolder">点击查看附件</div> <div @click="addFolder">点击查看附件</div>
</el-form-item> </el-form-item>
@ -280,7 +192,7 @@
> >
<el-form ref="roleForm" :model="roleForm" :rules="roleRules"> <el-form ref="roleForm" :model="roleForm" :rules="roleRules">
<el-form-item label="角色" prop="roleIds"> <el-form-item label="角色" prop="roleIds">
<el-select v-model="roleForm.roleIds" multiple placeholder="请选择角色"> <el-select v-model="roleForm.roleIds" multiple placeholder="请选择角色">
<el-option <el-option
v-for="item in postOptions" v-for="item in postOptions"
:key="item.id" :key="item.id"
@ -340,22 +252,10 @@
prop="address" prop="address"
label="地址"> label="地址">
</el-table-column> </el-table-column>
<el-table-column
prop="educational"
label="学历">
</el-table-column>
<el-table-column
prop="school"
label="毕业院校">
</el-table-column>
<el-table-column <el-table-column
prop="mobile" prop="mobile"
label="电话号码"> label="电话号码">
</el-table-column> </el-table-column>
<el-table-column
prop="shortNumber"
label="短号">
</el-table-column>
<el-table-column <el-table-column
prop="joinDate" prop="joinDate"
label="入职日期"> label="入职日期">
@ -376,10 +276,6 @@
prop="emergencyContactPhone" prop="emergencyContactPhone"
label="紧急联系人电话"> label="紧急联系人电话">
</el-table-column> </el-table-column>
<el-table-column
prop="driverLicenseType"
label="驾驶证类型">
</el-table-column>
<el-table-column <el-table-column
prop="remark" prop="remark"
label="备注"> label="备注">
@ -405,7 +301,7 @@ import {
listUser, listUser,
resetUserPwd, resetUserPwd,
getDriverLicenseType, getDriverLicenseType,
updateUser, getPost, permissionAssign, addFolder updateUser, getPost, permissionAssign, addFolder, insert
} from "./api/staff"; } from "./api/staff";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; 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' url: process.env.VUE_APP_BASE_API + '/admin-api/inspectionStaff/import'
}, },
multipleSelection:[], multipleSelection: [],
// //
roleForm: {}, roleForm: {},
// //
@ -521,7 +417,7 @@ export default {
// //
roleRules: { roleRules: {
roleIds: [ roleIds: [
{ required: true, message: "请选择至少一个角色", trigger: "change" }, {required: true, message: "请选择至少一个角色", trigger: "change"},
], ],
}, },
// //
@ -549,7 +445,10 @@ export default {
message: "请输入正确的手机号码", message: "请输入正确的手机号码",
trigger: "blur" trigger: "blur"
} }
] ],
roleIds: [
{required: true, message: "请选择至少一个角色", trigger: "change"},
],
}, },
// //
openRole: false, openRole: false,
@ -609,12 +508,12 @@ export default {
); );
}, },
handleUserSelectSuccess(selectedUsers) { handleUserSelectSuccess(selectedUsers) {
console.log("选择的用户", selectedUsers); console.log("选择的用户", selectedUsers);
this.multipleSelection = selectedUsers; this.multipleSelection = selectedUsers;
// //
this.showSlect = true; this.showSlect = true;
}, },
/** 提交角色选择 */ /** 提交角色选择 */
async submitRoleForm() { async submitRoleForm() {
this.$refs.roleForm.validate(async (valid) => { this.$refs.roleForm.validate(async (valid) => {
if (valid) { if (valid) {
@ -640,7 +539,7 @@ export default {
/** /**
* 选择用户 * 选择用户
**/ **/
chooseUser(){ chooseUser() {
this.$refs["chooseUserRef"].open(); this.$refs["chooseUserRef"].open();
}, },
addFolder() { addFolder() {
@ -660,10 +559,10 @@ export default {
}); });
}, },
// //
filterNode(value, data) { // filterNode(value, data) {
if (!value) return true; // if (!value) return true;
return data.name.indexOf(value) !== -1; // return data.name.indexOf(value) !== -1;
}, // },
// //
handleNodeClick(data) { handleNodeClick(data) {
this.queryParams.postId = data.id; this.queryParams.postId = data.id;
@ -794,7 +693,10 @@ export default {
if (this.form.id !== undefined) { if (this.form.id !== undefined) {
this.form.userId = this.form.id; this.form.userId = this.form.id;
console.log(this.form) console.log(this.form)
updateUser(this.form).then(response => { const data = {
repairStaff: this.form
}
updateUser(data).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
let data = { let data = {
@ -805,16 +707,25 @@ export default {
this.getList(); this.getList();
}); });
} else { } else {
if (this.form.roleIds.length === 0) {
this.$modal.msgError("请选择角色");
return;
}
this.form.username = this.form.mobile this.form.username = this.form.mobile
this.form.password = '123456' 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.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
let data = { let data = {
userId: response.data, userId: response.data,
roleIds: this.form.roleIds roleIds: this.form.roleIds
} }
permissionAssign(data) // permissionAssign(data)
}); });
} }
@ -900,11 +811,11 @@ export default {
console.log('执行') console.log('执行')
this.getList() this.getList()
}, },
handleRemove(file) { // handleRemove(file) {
console.log(file); // console.log(file);
//fileList // //fileList
this.fileList.splice(this.fileList.indexOf(file), 1); // this.fileList.splice(this.fileList.indexOf(file), 1);
}, // },
handlePreview(file) { handlePreview(file) {
console.log(file); console.log(file);
}, },