From b6dd7cd59f5668f8a7578f4d3d12f927e421674d Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Wed, 17 Sep 2025 15:09:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=BB=9F=E8=AE=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- .../person-entry/add-or-edit-form.vue | 15 +- .../contract-witness-upload.vue | 11 +- .../wage-count/components/companyCount.vue | 177 ++++++++++++ .../wage-count/components/dataFilter.vue | 64 +++++ .../wage-count/components/projectCount.vue | 257 ++++++++++++++++++ .../wage-count/components/subCompanyCount.vue | 177 ++++++++++++ .../wage-count/components/subCount.vue | 255 +++++++++++++++++ .../wage-count/components/wage-details.vue | 60 ++++ .../synthesize-query/wage-count/index.vue | 240 +--------------- 10 files changed, 1025 insertions(+), 233 deletions(-) create mode 100644 src/views/synthesize-query/wage-count/components/companyCount.vue create mode 100644 src/views/synthesize-query/wage-count/components/dataFilter.vue create mode 100644 src/views/synthesize-query/wage-count/components/projectCount.vue create mode 100644 src/views/synthesize-query/wage-count/components/subCompanyCount.vue create mode 100644 src/views/synthesize-query/wage-count/components/subCount.vue create mode 100644 src/views/synthesize-query/wage-count/components/wage-details.vue diff --git a/.env.production b/.env.production index f4ee254..13a6e72 100644 --- a/.env.production +++ b/.env.production @@ -6,4 +6,4 @@ ENV = 'production' VUE_APP_ENV = 'production' # 实名制管理系统/生产环境 -VUE_APP_BASE_API = '/hd-realname/prod-api' +VUE_APP_BASE_API = '/hd-real-name' diff --git a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue index 0579152..c58a71b 100644 --- a/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue +++ b/src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue @@ -1068,12 +1068,25 @@ export default { this.$refs.salaryCardInfoFormRef.validate( async (valid4) => { if (valid4) { - const fieldsToCheck_1 = [ + let fieldsToCheck_1 = [ 'contractCode', // 合同编号 'wageCriterion', // 工资核定标准 'contractStopDate', // 合同终止日期 'contractStartDate', // 合同签订日期 ] + + if ( + this.contractInfoForm + .contractTermType === + '以完成一定工作为期限的合同' + ) { + fieldsToCheck_1 = + fieldsToCheck_1.filter( + (item) => + item !== + 'contractStopDate', + ) + } const fieldsToCheck_2 = [ 'bankName', // 银行名称 'bankCardCode', // 银行卡号 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 412502b..37169e8 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 @@ -273,12 +273,21 @@ export default { // 检查表单状态 checkFormStatus() { // 检查图片是否有上传(排除附件) - const fieldsList = [ + let fieldsList = [ 'contractCode', // 合同编号 'wageCriterion', // 工资核定标准 'contractStopDate', // 合同终止日期 'contractStartDate', // 合同签订日期 ] + + if ( + this.contractInfoForm.contractTermType === + '以完成一定工作为期限的合同' + ) { + fieldsList = fieldsList.filter( + (item) => item !== 'contractStopDate', + ) + } const imageFieldsToCheck = this.contractImageList.slice(0, -1) // 排除最后一个附件 // 检查字段是否全部为空或全部有值 diff --git a/src/views/synthesize-query/wage-count/components/companyCount.vue b/src/views/synthesize-query/wage-count/components/companyCount.vue new file mode 100644 index 0000000..5a3f44f --- /dev/null +++ b/src/views/synthesize-query/wage-count/components/companyCount.vue @@ -0,0 +1,177 @@ + + + + + + + + 公司统计 + + + + + + + + + + + + + + + diff --git a/src/views/synthesize-query/wage-count/components/dataFilter.vue b/src/views/synthesize-query/wage-count/components/dataFilter.vue new file mode 100644 index 0000000..7700fba --- /dev/null +++ b/src/views/synthesize-query/wage-count/components/dataFilter.vue @@ -0,0 +1,64 @@ + + + + 数据筛选 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/synthesize-query/wage-count/components/projectCount.vue b/src/views/synthesize-query/wage-count/components/projectCount.vue new file mode 100644 index 0000000..0a40482 --- /dev/null +++ b/src/views/synthesize-query/wage-count/components/projectCount.vue @@ -0,0 +1,257 @@ + + + + + + + + 工程统计 + + + + + + + + + + + 查询 + + + 重置 + + + 导出 + + + + + + + + + + + + + + + + + + diff --git a/src/views/synthesize-query/wage-count/components/subCompanyCount.vue b/src/views/synthesize-query/wage-count/components/subCompanyCount.vue new file mode 100644 index 0000000..8647d96 --- /dev/null +++ b/src/views/synthesize-query/wage-count/components/subCompanyCount.vue @@ -0,0 +1,177 @@ + + + + + + + + 分公司统计 + + + + + + + + + + + + + + + diff --git a/src/views/synthesize-query/wage-count/components/subCount.vue b/src/views/synthesize-query/wage-count/components/subCount.vue new file mode 100644 index 0000000..f2fa4e3 --- /dev/null +++ b/src/views/synthesize-query/wage-count/components/subCount.vue @@ -0,0 +1,255 @@ + + + + + + + + 分包统计 + + + + + + + + + + + 查询 + + + 重置 + + + 导出 + + + + + + + + + + + + + + + + + + diff --git a/src/views/synthesize-query/wage-count/components/wage-details.vue b/src/views/synthesize-query/wage-count/components/wage-details.vue new file mode 100644 index 0000000..244642a --- /dev/null +++ b/src/views/synthesize-query/wage-count/components/wage-details.vue @@ -0,0 +1,60 @@ + + + + + 工资统计 + (已归档工资) + + + + + + + + + + + + diff --git a/src/views/synthesize-query/wage-count/index.vue b/src/views/synthesize-query/wage-count/index.vue index 6f6ad98..756076e 100644 --- a/src/views/synthesize-query/wage-count/index.vue +++ b/src/views/synthesize-query/wage-count/index.vue @@ -1,239 +1,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 即将上线 - 敬请期待... - - + + + + - -
敬请期待...