From c554fe36abe58f021b6af2a138a331eb2ffe97f2 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 11 Sep 2025 16:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sub-base-info/add-or-edit-form.vue | 10 +- .../person-entry/add-or-edit-form.vue | 151 ++++++++++-------- .../contract-witness-upload.vue | 46 +++--- .../wage-card-witness/wage-card-upload.vue | 88 +++++----- 4 files changed, 165 insertions(+), 130 deletions(-) diff --git a/src/views/basic-manage/sub-manage/sub-base-info/add-or-edit-form.vue b/src/views/basic-manage/sub-manage/sub-base-info/add-or-edit-form.vue index a5fcc6a..88fad6c 100644 --- a/src/views/basic-manage/sub-manage/sub-base-info/add-or-edit-form.vue +++ b/src/views/basic-manage/sub-manage/sub-base-info/add-or-edit-form.vue @@ -32,6 +32,7 @@ + + - + - + - + @@ -412,7 +412,7 @@ style="width: 100%" value-format="yyyy-MM-dd" placeholder="请选择合同签订日期" - v-model="contractInfoForm.contractStartDate" + v-model.trim="contractInfoForm.contractStartDate" /> @@ -423,7 +423,7 @@ style="width: 100%" value-format="yyyy-MM-dd" placeholder="请选择合同终止日期" - v-model="contractInfoForm.contractStopDate" + v-model.trim="contractInfoForm.contractStopDate" /> @@ -447,7 +447,7 @@ maxlength="10" show-word-limit placeholder="请输入工资核定标准" - v-model="contractInfoForm.wageCriterion" + v-model.trim="contractInfoForm.wageCriterion" /> @@ -462,7 +462,7 @@ :multiple="true" :is-detail="formType === 2 && isEditContract" uploadTip="身份证、银行卡扫描件,承诺书、劳动合同或用工协议扫描件" - :file-list.sync="contractImageList[5].fileList" + :file-list.sync="contractImageList[1].fileList" :file-type="[ 'jpg', 'png', @@ -505,13 +505,13 @@ v-for="item in bankImageList" > @@ -531,7 +531,7 @@ maxlength="19" show-word-limit placeholder="请输入银行卡号" - v-model="salaryCardInfoForm.bankCardCode" + v-model.trim="salaryCardInfoForm.bankCardCode" /> @@ -542,20 +542,44 @@ maxlength="30" show-word-limit placeholder="请输入银行名称" - v-model="salaryCardInfoForm.bankName" + v-model.trim="salaryCardInfoForm.bankName" /> - + + + + + + + + + + + + + - - - - + @@ -701,6 +715,7 @@ export default { bankName: '', // 银行名称 bankCardCode: '', // 银行卡号 bankBranchName: '', // 银行支行名称 + bankIdentifierCode: '', // 银行联号 }, // 合同附件 @@ -711,30 +726,30 @@ export default { name: 'contract', title: '人员手持合同照', }, - { - type: 2, - fileList: [], - name: 'contract', - title: '工作内容页', - }, - { - type: 3, - fileList: [], - name: 'contract', - title: '薪酬约定页', - }, - { - type: 4, - fileList: [], - name: 'contract', - title: '本人签名页', - }, - { - type: 5, - fileList: [], - name: 'contract', - title: '其他照片', - }, + // { + // type: 2, + // fileList: [], + // name: 'contract', + // title: '工作内容页', + // }, + // { + // type: 3, + // fileList: [], + // name: 'contract', + // title: '薪酬约定页', + // }, + // { + // type: 4, + // fileList: [], + // name: 'contract', + // title: '本人签名页', + // }, + // { + // type: 5, + // fileList: [], + // name: 'contract', + // title: '其他照片', + // }, { type: 6, title: '附件', @@ -751,24 +766,24 @@ export default { name: 'wageCard', title: '手持银行卡、承诺书', }, - { - type: 2, - fileList: [], - name: 'wageCard', - title: '银行卡照片', - }, - { - type: 3, - fileList: [], - name: 'wageCard', - title: '个人工资卡承诺书', - }, - { - type: 4, - fileList: [], - name: 'wageCard', - title: '其它照片', - }, + // { + // type: 2, + // fileList: [], + // name: 'wageCard', + // title: '银行卡照片', + // }, + // { + // type: 3, + // fileList: [], + // name: 'wageCard', + // title: '个人工资卡承诺书', + // }, + // { + // type: 4, + // fileList: [], + // name: 'wageCard', + // title: '其它照片', + // }, { type: 5, title: '附件', @@ -1064,6 +1079,7 @@ export default { 'bankName', // 银行名称 'bankCardCode', // 银行卡号 'bankBranchName', // 银行支行名称 + 'bankIdentifierCode', // 银行联号 ] const status_1 = this.checkFormStatus( @@ -1505,13 +1521,14 @@ export default { // 工资卡信息 if (bmWorkerWageCard && Object.keys(bmWorkerWageCard).length > 0) { - const { bankCardCode, bankName, bankBranchName, id } = + const { bankCardCode, bankName, bankBranchName, id, bankIdentifierCode } = bmWorkerWageCard this.salaryCardInfoForm = { id, bankName, bankCardCode, bankBranchName, + bankIdentifierCode, } bmWorkerWageCard.files.forEach((i) => { diff --git a/src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue b/src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue index 9319546..412502b 100644 --- a/src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue +++ b/src/views/construction-person/red-green-light-mange/contract-witness/contract-witness-upload.vue @@ -18,14 +18,14 @@ :key="item.title" > @@ -121,7 +121,7 @@ :file-size="20" :multiple="true" uploadTip="身份证、银行卡扫描件,承诺书、劳动合同或用工协议扫描件" - :file-list.sync="contractImageList[5].fileList" + :file-list.sync="contractImageList[1].fileList" :file-type="[ 'jpg', 'png', @@ -241,26 +241,26 @@ export default { fileList: [], title: '人员手持合同照', }, - { - type: 2, - fileList: [], - title: '工作内容页', - }, - { - type: 3, - fileList: [], - title: '薪酬约定页', - }, - { - type: 4, - fileList: [], - title: '本人签名页', - }, - { - type: 5, - fileList: [], - title: '其他照片', - }, + // { + // type: 2, + // fileList: [], + // title: '工作内容页', + // }, + // { + // type: 3, + // fileList: [], + // title: '薪酬约定页', + // }, + // { + // type: 4, + // fileList: [], + // title: '本人签名页', + // }, + // { + // type: 5, + // fileList: [], + // title: '其他照片', + // }, { type: 6, title: '附件', diff --git a/src/views/construction-person/red-green-light-mange/wage-card-witness/wage-card-upload.vue b/src/views/construction-person/red-green-light-mange/wage-card-witness/wage-card-upload.vue index 49c294f..f8a086d 100644 --- a/src/views/construction-person/red-green-light-mange/wage-card-witness/wage-card-upload.vue +++ b/src/views/construction-person/red-green-light-mange/wage-card-witness/wage-card-upload.vue @@ -29,14 +29,14 @@ :key="item.title" > @@ -74,21 +74,13 @@ - - + @@ -104,6 +96,27 @@ + + + + + + + @@ -150,6 +163,7 @@ export default { bankCardCode: '', // 银行卡号 bankName: '', // 银行名称 bankBranchName: '', // 银行支行名称 + bankIdentifierCode: '', // 银行联号 }, bankImageList: [ @@ -159,24 +173,24 @@ export default { name: 'bank', fileList: [], }, - { - title: '银行卡照片', - type: 2, - name: 'bank', - fileList: [], - }, - { - title: '个人工资卡承诺书', - type: 3, - name: 'bank', - fileList: [], - }, - { - title: '其它照片', - type: 4, - name: 'bank', - fileList: [], - }, + // { + // title: '银行卡照片', + // type: 2, + // name: 'bank', + // fileList: [], + // }, + // { + // title: '个人工资卡承诺书', + // type: 3, + // name: 'bank', + // fileList: [], + // }, + // { + // title: '其它照片', + // type: 4, + // name: 'bank', + // fileList: [], + // }, { title: '附件', type: 5, @@ -209,6 +223,7 @@ export default { 'bankCardCode', // 银行卡号 'bankName', // 银行名称 'bankBranchName', // 银行支行名称 + 'bankIdentifierCode', // 银行联号 ] const imageFieldsToCheck = this.bankImageList.slice(0, -1) // 排除最后一个附件 @@ -398,7 +413,7 @@ export default { ) if (res && Object.keys(res).length > 0) { - const { id, files, bankName, bankCardCode, bankBranchName } = + const { id, files, bankName, bankCardCode, bankBranchName, bankIdentifierCode } = res this.salaryCardInfoForm = { @@ -406,6 +421,7 @@ export default { bankName, bankCardCode, bankBranchName, + bankIdentifierCode, } if (files && files.length > 0) {