diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b6b4a62..823247e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,101 +2,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + @@ -196,11 +109,11 @@ - - + + - + @@ -210,70 +123,71 @@ - - + + - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -282,10 +196,10 @@ - + - + @@ -294,16 +208,20 @@ - + - - - + + + - + + + + + diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class index bedec58..d36ab83 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/authorize/AuthorizeController.class differ diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class index 5cabb9a..0f46a76 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/zgys/ZgysController.class differ diff --git a/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java b/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java index 0c3c865..f97d295 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java +++ b/ruoyi-system/src/main/java/com/ruoyi/authorize/domain/Authorize.java @@ -134,6 +134,10 @@ public class Authorize extends BaseEntity @DataName(name = "副总审批状态",readConverterExp="0=待提交,1=审批中,2=已完成,3=已驳回") private String doaOaApprovalStatus; + /** OA反馈说明 */ + @DataName(name = "OA反馈说明") + private String doaOaRemark; + /** 提交经理审批(0-待提交 1-已提交) */ @DataName(name = "提交经理审批",readConverterExp="0=待提交,1=已提交") private String doaJlApprovalStatus; @@ -361,6 +365,9 @@ public class Authorize extends BaseEntity { return doaApprovalStatus; } + public String getDoaOaRemark() { return doaOaRemark; } + + public void setDoaOaRemark(String doaOaRemark) { this.doaOaRemark = doaOaRemark; } public void setDoaOaApprovalStatus(String doaOaApprovalStatus) { this.doaOaApprovalStatus = doaOaApprovalStatus; diff --git a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml index adde604..d3c8b07 100644 --- a/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/authorize/AuthorizeMapper.xml @@ -33,7 +33,8 @@ - + + @@ -52,7 +53,7 @@ a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone, a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose, a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved, - a.doa_approval_status, a.doa_oa_approval_status, a.doa_jl_approval_status, + a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.doa_jl_approval_status, a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time from authorize a @@ -88,22 +89,22 @@ doa_number, doa_salesman_code, doa_salesman_bm, - doa_salesman_name, + doa_salesman_name, doa_salesman_dept_id, doa_salesman_dept_name, - doa_salesman_phone, - doa_project, + doa_salesman_phone, + doa_project, doa_customer_bm, - doa_customer_name, + doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, - doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, + doa_authorizer, + doa_authorizer_phone, + doa_authorizer_identification_number, doa_authorization_duration, - doa_power_attorney_purpose, - doa_format, + doa_power_attorney_purpose, + doa_format, doa_remark, doa_rejection_reasons, doa_standardizer, @@ -111,7 +112,8 @@ doa_vice_president_approved, doa_approval_status, doa_oa_approval_status, - doa_jl_approval_status, + doa_oa_remark, + create_by, create_time, update_by, @@ -123,22 +125,22 @@ #{doaNumber}, #{doaSalesmanCode}, #{doaSalesmanBm}, - #{doaSalesmanName}, + #{doaSalesmanName}, #{doaSalesmanDeptId}, #{doaSalesmanDeptName}, - #{doaSalesmanPhone}, - #{doaProject}, + #{doaSalesmanPhone}, + #{doaProject}, #{doaCustomerBm}, - #{doaCustomerName}, + #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, - #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, + #{doaAuthorizer}, + #{doaAuthorizerPhone}, + #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, - #{doaPowerAttorneyPurpose}, - #{doaFormat}, + #{doaPowerAttorneyPurpose}, + #{doaFormat}, #{doaRemark}, #{doaRejectionReasons}, #{doaStandardizer}, @@ -146,7 +148,8 @@ #{doaVicePresidentApproved}, #{doaApprovalStatus}, #{doaOaApprovalStatus}, - #{doaJlApprovalStatus}, + #{doaOaRemark}, + #{createBy}, #{createTime}, #{updateBy}, @@ -157,58 +160,58 @@ insert into sys_oa_authorize - user_id, - department_id, - submission_time, + user_id, + department_id, + submission_time, doa_id, doa_code, - doa_salesman_name, - doa_salesman_phone, - doa_project, - doa_customer_name, + doa_salesman_name, + doa_salesman_phone, + doa_project, + doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, - doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, + doa_authorizer, + doa_authorizer_phone, + doa_authorizer_identification_number, doa_authorization_duration, - doa_power_attorney_purpose, - doa_format, + doa_power_attorney_purpose, + doa_format, doa_remark, doa_standardizer, doa_archiving, doa_vice_president_approved, create_time, - file_address, - isFinish, + file_address, + isFinish, - #{userId}, - #{departmentId}, - #{submissionTime}, + #{userId}, + #{departmentId}, + #{submissionTime}, #{doaId}, #{doaCode}, - #{doaSalesmanName}, - #{doaSalesmanPhone}, - #{doaProject}, - #{doaCustomerName}, + #{doaSalesmanName}, + #{doaSalesmanPhone}, + #{doaProject}, + #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, - #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, + #{doaAuthorizer}, + #{doaAuthorizerPhone}, + #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, - #{doaPowerAttorneyPurpose}, - #{doaFormat}, + #{doaPowerAttorneyPurpose}, + #{doaFormat}, #{doaRemark}, #{doaStandardizer}, #{doaArchiving}, #{doaVicePresidentApproved}, #{createTime}, - #{fileAddress}, - #{isFinish}, + #{fileAddress}, + #{isFinish}, @@ -219,22 +222,22 @@ doa_number = #{doaNumber}, doa_salesman_code = #{doaSalesmanCode}, doa_salesman_bm = #{doaSalesmanBm}, - doa_salesman_name = #{doaSalesmanName}, + doa_salesman_name = #{doaSalesmanName}, doa_salesman_dept_id = #{doaSalesmanDeptId}, doa_salesman_dept_name = #{doaSalesmanDeptName}, - doa_salesman_phone = #{doaSalesmanPhone}, - doa_project = #{doaProject}, + doa_salesman_phone = #{doaSalesmanPhone}, + doa_project = #{doaProject}, doa_customer_bm = #{doaCustomerBm}, - doa_customer_name = #{doaCustomerName}, + doa_customer_name = #{doaCustomerName}, doa_owner_unit = #{doaOwnerUnit}, doa_generalcontract_unit = #{doaGeneralcontractUnit}, doa_subcontract_unit = #{doaSubcontractUnit}, - doa_authorizer = #{doaAuthorizer}, - doa_authorizer_phone = #{doaAuthorizerPhone}, - doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber}, + doa_authorizer = #{doaAuthorizer}, + doa_authorizer_phone = #{doaAuthorizerPhone}, + doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber}, doa_authorization_duration = #{doaAuthorizationDuration}, - doa_power_attorney_purpose = #{doaPowerAttorneyPurpose}, - doa_format = #{doaFormat}, + doa_power_attorney_purpose = #{doaPowerAttorneyPurpose}, + doa_format = #{doaFormat}, doa_remark = #{doaRemark}, doa_rejection_reasons = #{doaRejectionReasons}, doa_standardizer = #{doaStandardizer}, @@ -242,7 +245,8 @@ doa_vice_president_approved = #{doaVicePresidentApproved}, doa_approval_status = #{doaApprovalStatus}, doa_oa_approval_status = #{doaOaApprovalStatus}, - doa_jl_approval_status = #{doaJlApprovalStatus}, + doa_oa_remark = #{doaOaRemark}, + create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, diff --git a/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class b/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class index 02cc711..b241e30 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class and b/ruoyi-system/target/classes/com/ruoyi/authorize/domain/Authorize.class differ diff --git a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml index adde604..5cc981f 100644 --- a/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml +++ b/ruoyi-system/target/classes/mapper/authorize/AuthorizeMapper.xml @@ -34,6 +34,8 @@ + + @@ -52,7 +54,7 @@ a.doa_owner_unit, a.doa_generalcontract_unit, a.doa_subcontract_unit, a.doa_authorizer, a.doa_authorizer_phone, a.doa_authorizer_identification_number, a.doa_authorization_duration, a.doa_power_attorney_purpose, a.doa_format, a.doa_remark, a.doa_rejection_reasons, a.doa_standardizer, a.doa_archiving, a.doa_vice_president_approved, - a.doa_approval_status, a.doa_oa_approval_status, a.doa_jl_approval_status, + a.doa_approval_status, a.doa_oa_approval_status, a.doa_oa_remark, a.doa_jl_approval_status, a.create_by, u.nick_name create_name, a.create_time, a.update_by, a.update_time from authorize a @@ -88,22 +90,22 @@ doa_number, doa_salesman_code, doa_salesman_bm, - doa_salesman_name, + doa_salesman_name, doa_salesman_dept_id, doa_salesman_dept_name, - doa_salesman_phone, - doa_project, + doa_salesman_phone, + doa_project, doa_customer_bm, - doa_customer_name, + doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, - doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, + doa_authorizer, + doa_authorizer_phone, + doa_authorizer_identification_number, doa_authorization_duration, - doa_power_attorney_purpose, - doa_format, + doa_power_attorney_purpose, + doa_format, doa_remark, doa_rejection_reasons, doa_standardizer, @@ -112,6 +114,8 @@ doa_approval_status, doa_oa_approval_status, doa_jl_approval_status, + doa_oa_remark, + create_by, create_time, update_by, @@ -123,22 +127,22 @@ #{doaNumber}, #{doaSalesmanCode}, #{doaSalesmanBm}, - #{doaSalesmanName}, + #{doaSalesmanName}, #{doaSalesmanDeptId}, #{doaSalesmanDeptName}, - #{doaSalesmanPhone}, - #{doaProject}, + #{doaSalesmanPhone}, + #{doaProject}, #{doaCustomerBm}, - #{doaCustomerName}, + #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, - #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, + #{doaAuthorizer}, + #{doaAuthorizerPhone}, + #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, - #{doaPowerAttorneyPurpose}, - #{doaFormat}, + #{doaPowerAttorneyPurpose}, + #{doaFormat}, #{doaRemark}, #{doaRejectionReasons}, #{doaStandardizer}, @@ -147,6 +151,8 @@ #{doaApprovalStatus}, #{doaOaApprovalStatus}, #{doaJlApprovalStatus}, + #{doaOaRemark}, + #{createBy}, #{createTime}, #{updateBy}, @@ -157,58 +163,58 @@ insert into sys_oa_authorize - user_id, - department_id, - submission_time, + user_id, + department_id, + submission_time, doa_id, doa_code, - doa_salesman_name, - doa_salesman_phone, - doa_project, - doa_customer_name, + doa_salesman_name, + doa_salesman_phone, + doa_project, + doa_customer_name, doa_owner_unit, doa_generalcontract_unit, doa_subcontract_unit, - doa_authorizer, - doa_authorizer_phone, - doa_authorizer_identification_number, + doa_authorizer, + doa_authorizer_phone, + doa_authorizer_identification_number, doa_authorization_duration, - doa_power_attorney_purpose, - doa_format, + doa_power_attorney_purpose, + doa_format, doa_remark, doa_standardizer, doa_archiving, doa_vice_president_approved, create_time, - file_address, - isFinish, + file_address, + isFinish, - #{userId}, - #{departmentId}, - #{submissionTime}, + #{userId}, + #{departmentId}, + #{submissionTime}, #{doaId}, #{doaCode}, - #{doaSalesmanName}, - #{doaSalesmanPhone}, - #{doaProject}, - #{doaCustomerName}, + #{doaSalesmanName}, + #{doaSalesmanPhone}, + #{doaProject}, + #{doaCustomerName}, #{doaOwnerUnit}, #{doaGeneralcontractUnit}, #{doaSubcontractUnit}, - #{doaAuthorizer}, - #{doaAuthorizerPhone}, - #{doaAuthorizerIdentificationNumber}, + #{doaAuthorizer}, + #{doaAuthorizerPhone}, + #{doaAuthorizerIdentificationNumber}, #{doaAuthorizationDuration}, - #{doaPowerAttorneyPurpose}, - #{doaFormat}, + #{doaPowerAttorneyPurpose}, + #{doaFormat}, #{doaRemark}, #{doaStandardizer}, #{doaArchiving}, #{doaVicePresidentApproved}, #{createTime}, - #{fileAddress}, - #{isFinish}, + #{fileAddress}, + #{isFinish}, @@ -219,22 +225,22 @@ doa_number = #{doaNumber}, doa_salesman_code = #{doaSalesmanCode}, doa_salesman_bm = #{doaSalesmanBm}, - doa_salesman_name = #{doaSalesmanName}, + doa_salesman_name = #{doaSalesmanName}, doa_salesman_dept_id = #{doaSalesmanDeptId}, doa_salesman_dept_name = #{doaSalesmanDeptName}, - doa_salesman_phone = #{doaSalesmanPhone}, - doa_project = #{doaProject}, + doa_salesman_phone = #{doaSalesmanPhone}, + doa_project = #{doaProject}, doa_customer_bm = #{doaCustomerBm}, - doa_customer_name = #{doaCustomerName}, + doa_customer_name = #{doaCustomerName}, doa_owner_unit = #{doaOwnerUnit}, doa_generalcontract_unit = #{doaGeneralcontractUnit}, doa_subcontract_unit = #{doaSubcontractUnit}, - doa_authorizer = #{doaAuthorizer}, - doa_authorizer_phone = #{doaAuthorizerPhone}, - doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber}, + doa_authorizer = #{doaAuthorizer}, + doa_authorizer_phone = #{doaAuthorizerPhone}, + doa_authorizer_identification_number = #{doaAuthorizerIdentificationNumber}, doa_authorization_duration = #{doaAuthorizationDuration}, - doa_power_attorney_purpose = #{doaPowerAttorneyPurpose}, - doa_format = #{doaFormat}, + doa_power_attorney_purpose = #{doaPowerAttorneyPurpose}, + doa_format = #{doaFormat}, doa_remark = #{doaRemark}, doa_rejection_reasons = #{doaRejectionReasons}, doa_standardizer = #{doaStandardizer}, @@ -243,6 +249,8 @@ doa_approval_status = #{doaApprovalStatus}, doa_oa_approval_status = #{doaOaApprovalStatus}, doa_jl_approval_status = #{doaJlApprovalStatus}, + doa_oa_remark = #{doaOaRemark}, + create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, diff --git a/ruoyi-ui/src/views/authorize/authorize/index.vue b/ruoyi-ui/src/views/authorize/authorize/index.vue index 4f754dc..8f18d8e 100644 --- a/ruoyi-ui/src/views/authorize/authorize/index.vue +++ b/ruoyi-ui/src/views/authorize/authorize/index.vue @@ -61,10 +61,10 @@ /> - + @@ -197,11 +197,6 @@ - - - - - @@ -332,9 +327,16 @@ - + - + + + + + + + + @@ -404,9 +406,7 @@ 保 存 提 交 - + 提交至OA 驳回 @@ -465,7 +465,7 @@ export default { 'PeopleSelect': PeopleSelect, 'ChangeRecord':ChangeRecord }, - dicts: ['doa_approval_status', 'doa_oa_approval_status', 'doa_jl_approval_status', 'doa_power_attorney_purpose', 'doa_format', 'doa_archiving'], + dicts: ['doa_approval_status', 'doa_oa_approval_status', 'doa_power_attorney_purpose', 'doa_format', 'doa_archiving'], data() { return { // 遮罩层 @@ -623,7 +623,7 @@ export default { doaVicePresidentApproved: null, doaApprovalStatus: null, doaOaApprovalStatus: null, - doaJlApprovalStatus: null, + doaOaRemark: null, createBy: null, createTime: null, updateBy: null,