diff --git a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue index ea93a78..b7caf5e 100644 --- a/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue +++ b/src/views/hiddenDangerManagement/hazardRectificationManagement/extensionRequestApproval/index.vue @@ -259,7 +259,7 @@ export default { let title = '整改回传' if (type === 1) { isApprove = true - title = '隐患整改审批' + title = '延期申请审批' } else if (type === 2) { isRectify = true title = '整改回传' diff --git a/src/views/pro/apply/supervisorEnterApply.vue b/src/views/pro/apply/supervisorEnterApply.vue index 1ea1ddd..154373d 100644 --- a/src/views/pro/apply/supervisorEnterApply.vue +++ b/src/views/pro/apply/supervisorEnterApply.vue @@ -1487,7 +1487,7 @@ export default { personType: jsonData[i][6] === '监理负责人' ? '1' : '2', sex: jsonData[i][2] === '男' ? '0' : '1', } - const isDuplicate = this.excelData.some(item => item.arg5 === rowData.arg5) + const isDuplicate = this.excelData.some(item => item.arg5 && item.arg5 === rowData.arg5) if (isDuplicate) { this.errorPhone.push(rowData.arg5) } diff --git a/src/views/pro/supervisor/admission/index.vue b/src/views/pro/supervisor/admission/index.vue index e70165f..0d36f4c 100644 --- a/src/views/pro/supervisor/admission/index.vue +++ b/src/views/pro/supervisor/admission/index.vue @@ -397,6 +397,7 @@ export default { }, //重置按钮 resetQuery() { + this.queryParams.consName = undefined this.loading = true this.resetForm('personQueryForm') this.handleQuery() diff --git a/src/views/pro/supervisorPersonManage/addPersonnel.vue b/src/views/pro/supervisorPersonManage/addPersonnel.vue index 90edebb..f47e567 100644 --- a/src/views/pro/supervisorPersonManage/addPersonnel.vue +++ b/src/views/pro/supervisorPersonManage/addPersonnel.vue @@ -152,6 +152,9 @@ 确 定 取 消 +