This commit is contained in:
BianLzhaoMin 2025-08-18 17:12:11 +08:00
parent dcd781bbe4
commit 4d894bb3cf
3 changed files with 60 additions and 9 deletions

View File

@ -272,6 +272,8 @@
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
clearable clearable
maxlength="11"
show-word-limit
placeholder="请输入手机号码" placeholder="请输入手机号码"
v-model="keyInfoForm.phone" v-model="keyInfoForm.phone"
/> />
@ -307,6 +309,7 @@
label-width="140px" label-width="140px"
ref="contractInfoFormRef" ref="contractInfoFormRef"
:model="contractInfoForm" :model="contractInfoForm"
:rules="contractInfoFormRules"
:disabled="isEditContract && formType === 2" :disabled="isEditContract && formType === 2"
> >
<TitleTip <TitleTip
@ -357,6 +360,8 @@
<el-form-item label="合同编号" prop="contractCode"> <el-form-item label="合同编号" prop="contractCode">
<el-input <el-input
clearable clearable
maxlength="50"
show-word-limit
placeholder="请输入合同编号" placeholder="请输入合同编号"
v-model="contractInfoForm.contractCode" v-model="contractInfoForm.contractCode"
/> />
@ -417,6 +422,8 @@
<el-form-item label="工资核定标准" prop="wageCriterion"> <el-form-item label="工资核定标准" prop="wageCriterion">
<el-input <el-input
clearable clearable
maxlength="10"
show-word-limit
placeholder="请输入工资核定标准" placeholder="请输入工资核定标准"
v-model="contractInfoForm.wageCriterion" v-model="contractInfoForm.wageCriterion"
/> />
@ -498,6 +505,8 @@
<el-form-item label="银行卡号" prop="bankCardCode"> <el-form-item label="银行卡号" prop="bankCardCode">
<el-input <el-input
clearable clearable
maxlength="19"
show-word-limit
placeholder="请输入银行卡号" placeholder="请输入银行卡号"
v-model="salaryCardInfoForm.bankCardCode" v-model="salaryCardInfoForm.bankCardCode"
/> />
@ -507,6 +516,8 @@
<el-form-item label="银行名称" prop="bankName"> <el-form-item label="银行名称" prop="bankName">
<el-input <el-input
clearable clearable
maxlength="30"
show-word-limit
placeholder="请输入银行名称" placeholder="请输入银行名称"
v-model="salaryCardInfoForm.bankName" v-model="salaryCardInfoForm.bankName"
/> />
@ -537,6 +548,8 @@
<el-form-item label="银行支行名称" prop="bankBranchName"> <el-form-item label="银行支行名称" prop="bankBranchName">
<el-input <el-input
clearable clearable
maxlength="50"
show-word-limit
placeholder="请输入银行支行名称" placeholder="请输入银行支行名称"
v-model="salaryCardInfoForm.bankBranchName" v-model="salaryCardInfoForm.bankBranchName"
/> />
@ -582,6 +595,19 @@ export default {
UploadFileFormData, UploadFileFormData,
}, },
data() { data() {
const validateContractStartDate = (rule, value, callback) => {
if (value >= this.contractInfoForm.contractStopDate) {
callback(new Error('合同签订日期不能大于合同终止日期'))
}
callback()
}
const validateContractStopDate = (rule, value, callback) => {
if (value <= this.contractInfoForm.contractStartDate) {
callback(new Error('合同终止日期不能小于合同签订日期'))
}
callback()
}
return { return {
// //
idCardReaderForm: { idCardReaderForm: {
@ -806,13 +832,13 @@ export default {
{ {
required: true, required: true,
trigger: 'blur', trigger: 'blur',
message: '请输入入场工程', message: '请选择入场工程',
}, },
], ],
postId: [ postId: [
{ {
required: true, required: true,
trigger: 'change', trigger: 'blur',
message: '请选择工种', message: '请选择工种',
}, },
], ],
@ -820,7 +846,7 @@ export default {
{ {
required: true, required: true,
trigger: 'blur', trigger: 'blur',
message: '请输入入场分包', message: '请选择入场分包',
}, },
], ],
phone: [ phone: [
@ -839,7 +865,23 @@ export default {
{ {
required: true, required: true,
trigger: 'blur', trigger: 'blur',
message: '请输入入场班组', message: '请选择入场班组',
},
],
},
//
contractInfoFormRules: {
contractStartDate: [
{
validator: validateContractStartDate,
trigger: 'blur',
},
],
contractStopDate: [
{
validator: validateContractStopDate,
trigger: 'blur',
}, },
], ],
}, },
@ -1046,6 +1088,14 @@ export default {
} }
}) })
}) })
this.$refs.contractInfoFormRef.validate(
(valid) => {
if (!valid) {
reject(new Error('合同信息未完善'))
}
},
)
} }
if (status_2 === 'partial') { if (status_2 === 'partial') {

View File

@ -216,13 +216,13 @@ export default {
this.isExitUpload = type this.isExitUpload = type
const { const {
name, name,
idNumber, id,
proId,
proName, proName,
subName, subName,
teamName, idNumber,
id,
workerId, workerId,
proId, teamName,
} = data } = data
this.exitFormData = { this.exitFormData = {

View File

@ -118,7 +118,8 @@ export default {
onHandleConfirmAddOrEditFun() { onHandleConfirmAddOrEditFun() {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
if (this.isExitUpload === 1) { if (this.isExitUpload === 1) {
const { id, workerId, fileList } = this.personExitFormData const { id, workerId, fileList, proId } =
this.personExitFormData
const params = { const params = {
id, id,
proId, proId,