zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 修改光芯bug

This commit is contained in:
TianyangZhang 2026-05-15 17:08:30 +08:00
parent 8d9b58c537
commit 5e9c9b2e29
1 changed files with 128 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
src/views/hrm/empcontract_form.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<el-container> <el-container>
<el-main class="nopadding"> <el-main class="nopadding">
<el-form label-width="100px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'"> <el-form label-width="120px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
<el-form-item label="申请部门" required> <el-form-item label="申请部门" required>
<el-cascader <el-cascader
v-model="formData.dept_need" v-model="formData.dept_need"
@ -12,40 +12,57 @@
style="width: 220px" style="width: 220px"
></el-cascader> ></el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="员工信息" required> <!-- 新增模式：多选员工 -->
<template v-if="localMode === 'add'">
<el-form-item label="选择员工" required>
<xtSelect <xtSelect
v-model="formData.employee" v-model="selectedIds"
:apiObj="$API.hrm.employee.list" :apiObj="$API.hrm.employee.list"
v-model:label="formData.employee_name" :multiple="true"
@change="handleChange" @change="handleEmpChange"
style="width: 230px" style="width: 400px"
:tableWidth="650"
> >
<el-table-column prop="name" label="姓名"></el-table-column> <el-table-column prop="name" label="姓名" width="80"></el-table-column>
<el-table-column prop="belong_dept_name" label="部门"></el-table-column> <el-table-column prop="belong_dept_name" label="部门" width="120"></el-table-column>
<el-table-column prop="post_name" label="岗位"></el-table-column> <el-table-column prop="post_name" label="岗位" width="100"></el-table-column>
<el-table-column prop="start_date" label="入职日期" width="110"></el-table-column>
<el-table-column prop="contract_end_date" label="合同结束日期" width="120"></el-table-column>
</xtSelect> </xtSelect>
</el-form-item> </el-form-item>
<el-form-item label="性别"> <el-form-item v-if="selectedEmps.length > 0">
<el-input v-model="formData.gender" disabled style="width: 230px"></el-input> <el-table :data="selectedEmps" border size="small" style="width: 100%;" max-height="250">
<el-table-column type="index" label="#" width="40"></el-table-column>
<el-table-column prop="name" label="姓名" width="80"></el-table-column>
<el-table-column prop="gender" label="性别" width="50"></el-table-column>
<el-table-column prop="belong_dept_name" label="部门" width="120"></el-table-column>
<el-table-column prop="post_name" label="岗位" width="100"></el-table-column>
<el-table-column prop="start_date" label="入职日期" width="110"></el-table-column>
<el-table-column prop="contract_end_date" label="合同结束日期" width="120"></el-table-column>
<el-table-column label="操作" width="60">
<template #default="scope">
<el-button type="danger" text size="small" @click="removeEmp(scope.$index)">移除</el-button>
</template>
</el-table-column>
</el-table>
<div style="margin-top: 4px; color: #909399; font-size: 12px;">共选择 {{ selectedEmps.length }} 人</div>
</el-form-item> </el-form-item>
<el-form-item label="身份证号"> </template>
<el-input v-model="formData.id_number" disabled style="width: 230px"></el-input> <!-- 查看模式：显示变更人员列表 -->
</el-form-item> <template v-else>
<el-form-item label="手机号"> <el-form-item label="变更人员">
<el-input v-model="formData.phone" disabled style="width: 230px"></el-input> <el-tag type="warning" effect="plain" style="margin-right: 8px;" v-if="batchEmployees.length > 0">共 {{ batchEmployees.length }} 人</el-tag>
</el-form-item> <el-table :data="batchEmployees" border size="small" style="width: 100%; margin-top: 4px;" max-height="300">
<el-form-item label="岗位"> <el-table-column type="index" label="#" width="40"></el-table-column>
<el-input v-model="formData.post_name" disabled style="width: 230px"></el-input> <el-table-column prop="employee_name" label="姓名" width="80"></el-table-column>
</el-form-item> <el-table-column prop="dept_name" label="部门" width="120"></el-table-column>
<el-form-item label="部门"> <el-table-column prop="post_name" label="岗位" width="100"></el-table-column>
<el-input v-model="formData.dept_name" disabled style="width: 230px"></el-input> <el-table-column prop="join_date" label="入职日期" width="110"></el-table-column>
</el-form-item> <el-table-column prop="end_contract" label="合同结束日期" width="120"></el-table-column>
<el-form-item label="入职日期"> </el-table>
<el-input v-model="formData.join_date" disabled style="width: 230px"></el-input>
</el-form-item>
<el-form-item label="合同结束日期">
<el-input v-model="formData.end_contract" disabled style="width: 230px"></el-input>
</el-form-item> </el-form-item>
</template>
<el-divider>变更信息</el-divider>
<el-form-item label="合同变更次数"> <el-form-item label="合同变更次数">
<el-input-number <el-input-number
v-model="formData.counts" v-model="formData.counts"
@ -105,12 +122,13 @@
ref="ticketd_b" ref="ticketd_b"
></ticketd_b> ></ticketd_b>
<el-button <el-button
v-if="localMode!='show'" v-if="localMode=='add'"
type="primary" type="primary"
style="margin-right: 4px;" style="margin-right: 4px;"
@click="handleSave" @click="handleSave"
:loading="saveLoading" :loading="saveLoading"
>提交审批</el-button> :disabled="selectedEmps.length === 0"
>提交审批 ({{ selectedEmps.length }} 人)</el-button>
</el-footer> </el-footer>
</el-main> </el-main>
<el-aside width="20%" v-if="formData.ticket_"> <el-aside width="20%" v-if="formData.ticket_">
@ -125,7 +143,7 @@ import ticketd from '@/views/wf/ticketd.vue';
import { genTree } from "@/utils/verificate"; import { genTree } from "@/utils/verificate";
export default { export default {
name: 'EnpContractForm', name: 'EmpContractForm',
components: { components: {
ticketd_b, ticketd_b,
ticketd ticketd
@ -144,21 +162,15 @@ export default {
return { return {
formData: { formData: {
dept_need: "", dept_need: "",
employee: "",
employee_name: "",
gender: "",
id_number: "",
phone: "",
post_name: "",
dept_name: "",
join_date: "",
end_contract: "",
counts: 0, counts: 0,
plan_renewal: "", plan_renewal: "",
normal_renewal: "", normal_renewal: "",
change_date: null, change_date: null,
change_reason: "", change_reason: "",
}, },
selectedIds: [],
selectedEmps: [],
batchEmployees: [],
ticket_data: {}, ticket_data: {},
localMode: this.mode, localMode: this.mode,
saveLoading: false, saveLoading: false,
@ -192,6 +204,19 @@ export default {
try { try {
let res = await this.$API.hrm.empcontract.item.req(this.t_id); let res = await this.$API.hrm.empcontract.item.req(this.t_id);
this.formData = res; this.formData = res;
// 加载同批次的员工列表
if (res.batch_employees && res.batch_employees.length > 0) {
this.batchEmployees = res.batch_employees;
} else {
// 单条记录兼容
this.batchEmployees = [{
employee_name: res.employee_name,
post_name: res.post_name,
dept_name: res.dept_name,
join_date: res.join_date,
end_contract: res.end_contract,
}];
}
if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) { if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
this.localMode = "edit"; this.localMode = "edit";
} }
@ -203,11 +228,17 @@ export default {
let res = await this.$API.system.dept.list.req({ page: 0 }); let res = await this.$API.system.dept.list.req({ page: 0 });
this.group = genTree(res); this.group = genTree(res);
}, },
handleEmpChange(rows) {
this.selectedEmps = rows || [];
},
removeEmp(index) {
this.selectedEmps.splice(index, 1);
this.selectedIds = this.selectedEmps.map(e => e.id);
},
handleDel() { handleDel() {
this.$confirm(`确定删除吗？`, "提示", { this.$confirm(`确定删除吗？`, "提示", {
type: "warning", type: "warning",
}) }).then(() => {
.then(()=>{
this.$API.hrm.empcontract.delete.req(this.formData.id).then(res => { this.$API.hrm.empcontract.delete.req(this.formData.id).then(res => {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.$emit('success'); this.$emit('success');
@ -215,39 +246,32 @@ export default {
}) })
}, },
async handleSave() { async handleSave() {
if (this.localMode == "add") { if (!this.formData.dept_need) {
this.$message.warning("请选择申请部门");
return;
}
if (this.selectedEmps.length === 0) {
this.$message.warning("请选择员工");
return;
}
this.saveLoading = true;
try { try {
console.log('formData', this.formData); const batchData = this.selectedEmps.map(emp => ({
let res = await this.$API.hrm.empcontract.create.req(this.formData); employee: emp.id,
this.$message.success("提交成功"); dept_need: this.formData.dept_need,
this.$emit('success', this.localMode); counts: this.formData.counts,
plan_renewal: this.formData.plan_renewal,
normal_renewal: this.formData.normal_renewal,
change_date: this.formData.change_date,
change_reason: this.formData.change_reason,
}));
await this.$API.hrm.empcontract.create.req(batchData);
this.$message.success(`提交成功，共 ${this.selectedEmps.length} 人`);
this.$emit('success', 'add');
} catch (error) { } catch (error) {
console.error('提交申请失败:', error); console.error('提交失败:', error);
throw error; } finally {
} this.saveLoading = false;
} else if (this.localMode == "edit") {
this.$message.error("不支持编辑");
}
},
handleChange(obj) {
if (obj) {
this.formData.employee_name = obj.name;
this.formData.gender = obj.gender;
this.formData.id_number = obj.id_number;
this.formData.phone = obj.phone;
this.formData.post_name = obj.post_name;
this.formData.dept_name = obj.belong_dept_name;
this.formData.join_date = obj.start_date;
this.formData.end_contract = obj.contract_end_date;
} else {
this.formData.employee_name = "";
this.formData.gender = "";
this.formData.id_number = "";
this.formData.phone = "";
this.formData.post_name = "";
this.formData.dept_name = "";
this.formData.join_date = "";
this.formData.end_contract = "";
} }
}, },
} }