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 9bc081e..1254c7b 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 @@ -1444,7 +1444,10 @@ export default { (item) => item.value === val, ).label - this.getTeamSelectList({ subId: val }) + this.getTeamSelectList({ + subId: val, + proId: this.keyInfoForm.proId, + }) }, // 入场班组选择 onChangeTeamId(val) { diff --git a/src/views/synthesize-query/person-count/detail/components/attInfo.vue b/src/views/synthesize-query/person-count/detail/components/attInfo.vue index 443d8d6..213efe4 100644 --- a/src/views/synthesize-query/person-count/detail/components/attInfo.vue +++ b/src/views/synthesize-query/person-count/detail/components/attInfo.vue @@ -214,6 +214,8 @@ export default { '/bmw/workerStatistics/exportWorkerEinDayRecordDetail', { workerId: this.workerId, + subId: this.subId, + proId: this.proId, }, '考勤信息.xlsx', ) diff --git a/src/views/synthesize-query/person-count/index.vue b/src/views/synthesize-query/person-count/index.vue index af1a7dc..c1da522 100644 --- a/src/views/synthesize-query/person-count/index.vue +++ b/src/views/synthesize-query/person-count/index.vue @@ -71,7 +71,7 @@ export default { this.download( '/bmw/workerStatistics/exportWorkerStatisticsTable', { - // ...queryParams, + ...queryParams, }, '人员统计.xlsx', ) diff --git a/src/views/synthesize-query/sub-count/index.vue b/src/views/synthesize-query/sub-count/index.vue index 0d96e5a..cd7b738 100644 --- a/src/views/synthesize-query/sub-count/index.vue +++ b/src/views/synthesize-query/sub-count/index.vue @@ -74,7 +74,7 @@ export default { this.download( '/bmw/subStatistics/exportProStatisticsTable', { - // ...queryParams, + ...queryParams, }, '分包统计.xlsx', ) diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue b/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue index 15ca1a7..dcdbfcc 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue @@ -288,7 +288,8 @@ export default { } }) - const reg = /^[0-7]\d*(\.\d{1,2})?$/ + const reg = + /^[0-7]\d{0,7}(\.\d{1,2})?$|^8\d{0,7}(\.\d{1,2})?$|^9\d{0,7}(\.\d{1,2})?$|^[1-9]\d{0,8}(\.\d{1,2})?$/ const valid = validData.every((item) => { return ( reg.test(item.deductMoney) && reg.test(item.actualMoney) @@ -296,7 +297,7 @@ export default { }) if (!valid) { this.$modal.msgError( - '代扣/代缴、实发工资金额必须为数字且最多两位小数', + '代扣/代缴、实发工资金额必须为数字且最多两位小数,并且不能超过99999999.99', ) this.isEdit = true return false @@ -325,13 +326,18 @@ export default { onIptChange(value, prop, index, label) { // 增加一个正则校验 要求必须是大于等于0的并且是两位小数点的金额 - const reg = /^[0-7]\d*(\.\d{1,2})?$/ + const reg = + /^[0-7]\d{0,7}(\.\d{1,2})?$|^8\d{0,7}(\.\d{1,2})?$|^9\d{0,7}(\.\d{1,2})?$|^[1-9]\d{0,8}(\.\d{1,2})?$/ const inputRef = `${index}-${prop}Ref` const inputElement = this.$refs[inputRef] if (!reg.test(value)) { // this.$message.error('请输入正确的金额') - this.$modal.msgError(`第${index + 1}行${label}金额输入错误`) + this.$modal.msgError( + `第${ + index + 1 + }行${label}金额输入错误,金额必须为数字且最多两位小数,并且不能超过99999999.99`, + ) // this.columnData[index][prop] = 0 // 修改输入框的值为0