diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1169203..127a746 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,25 +2,14 @@ - - - - - - - - - - - - + + + - - - - + + @@ -161,10 +150,10 @@ - + - + @@ -176,65 +165,65 @@ - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + @@ -244,10 +233,10 @@ - + - + diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index 96bd6c5..dfc3f9c 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,7 +1,7 @@ #for tests only ! -#Mon Aug 12 13:58:32 CST 2024 +#Wed Aug 14 13:16:40 CST 2024 jco.client.lang=ZH -jco.client.passwd=vAHHLPyr/O(DD#l(USpypoVFsBd}{mL?hFwfR/oNp/RvS,LI +jco.client.passwd=654321 jco.client.sysnr=00 jco.destination.pool_capacity=10 jco.client.client=800 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java index d59fb1d..0b76e23 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/authorize/AuthorizeController.java @@ -194,7 +194,7 @@ public class AuthorizeController extends BaseController if(StringUtils.isEmpty(doa_id)){ authorize.setDoaId(UUID.fastUUID().toString()); - String doaCode = authorizeService.getCode("ZGYS"); + String doaCode = authorizeService.getCode("TBWTS"); authorize.setDoaCode(doaCode); if(doaJlRoleFlag){ 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 c0d96f3..6bf95fd 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/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties index b7a47f7..49e2544 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 08:35:46 CST 2024 +#Wed Aug 14 10:59:04 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-admin diff --git a/ruoyi-admin/target/ruoyi-admin.jar b/ruoyi-admin/target/ruoyi-admin.jar index 5e64c9d..27fbb5a 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar and b/ruoyi-admin/target/ruoyi-admin.jar differ diff --git a/ruoyi-admin/target/ruoyi-admin.jar.original b/ruoyi-admin/target/ruoyi-admin.jar.original index b2ede6d..f419304 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar.original and b/ruoyi-admin/target/ruoyi-admin.jar.original differ diff --git a/ruoyi-common/target/maven-archiver/pom.properties b/ruoyi-common/target/maven-archiver/pom.properties index d9cd07b..de540be 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 08:35:29 CST 2024 +#Wed Aug 14 10:58:49 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-common diff --git a/ruoyi-common/target/ruoyi-common-3.8.7.jar b/ruoyi-common/target/ruoyi-common-3.8.7.jar index 51d9453..9f8db9e 100644 Binary files a/ruoyi-common/target/ruoyi-common-3.8.7.jar and b/ruoyi-common/target/ruoyi-common-3.8.7.jar differ diff --git a/ruoyi-framework/target/maven-archiver/pom.properties b/ruoyi-framework/target/maven-archiver/pom.properties index 06f0bf6..5a3fd59 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 08:35:38 CST 2024 +#Wed Aug 14 10:58:56 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-framework diff --git a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar index b00f913..7885609 100644 Binary files a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar and b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar differ diff --git a/ruoyi-generator/target/maven-archiver/pom.properties b/ruoyi-generator/target/maven-archiver/pom.properties index 7822861..0ebafa7 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 08:35:40 CST 2024 +#Wed Aug 14 10:58:58 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-generator diff --git a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar index 7362fcf..55daa1b 100644 Binary files a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar and b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar differ diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.xml index b10a74b..3aa572d 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/OAExpensesMapper.xml @@ -7,8 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select q.exp_id as expId,q.exp_code as expCode,sq.exp_id oaExpId,sq.state,sq.remark from expenses q inner join ( - select t.exp_id,t.exp_code,t.state,t.remark,t.exp_vice_president_approved from ( - select a.exp_id,a.exp_code,a.state,a.remark,a.exp_vice_president_approved, row_number() over(partition by exp_code order by create_time desc) rw + select t.exp_id,t.exp_code,t.state,t.remark from ( + select a.exp_id,a.exp_code,a.state,a.remark, row_number() over(partition by exp_code order by create_time desc) rw from sys_oa_expenses a where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0' ) t where t.rw = 1 diff --git a/ruoyi-quartz/target/classes/mapper/quartz/OAExpensesMapper.xml b/ruoyi-quartz/target/classes/mapper/quartz/OAExpensesMapper.xml index b10a74b..3aa572d 100644 --- a/ruoyi-quartz/target/classes/mapper/quartz/OAExpensesMapper.xml +++ b/ruoyi-quartz/target/classes/mapper/quartz/OAExpensesMapper.xml @@ -7,8 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select q.exp_id as expId,q.exp_code as expCode,sq.exp_id oaExpId,sq.state,sq.remark from expenses q inner join ( - select t.exp_id,t.exp_code,t.state,t.remark,t.exp_vice_president_approved from ( - select a.exp_id,a.exp_code,a.state,a.remark,a.exp_vice_president_approved, row_number() over(partition by exp_code order by create_time desc) rw + select t.exp_id,t.exp_code,t.state,t.remark from ( + select a.exp_id,a.exp_code,a.state,a.remark, row_number() over(partition by exp_code order by create_time desc) rw from sys_oa_expenses a where a.triggerflag = '1' and a.state in ('2','3') and a.isFinish = '0' ) t where t.rw = 1 diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index e88b28e..1460475 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 08:35:39 CST 2024 +#Wed Aug 14 10:58:58 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-quartz diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar index e12db94..8eb3705 100644 Binary files a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar and b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar differ diff --git a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml index 58fa59e..6b71268 100644 --- a/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/expenses/ExpensesMapper.xml @@ -85,6 +85,7 @@ and u.nick_name like concat('%', #{expSalesmanName}, '%') and exp_request_remark like concat('%', #{expRequestRemark}, '%') and exp_approval_status = #{expApprovalStatus} + and exp_bid_area = #{expBidArea} and exp_dispatch_status = #{expDispatchStatus} and exp_receive_user_id = #{expReceiveUserId} diff --git a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml index 58fa59e..6b71268 100644 --- a/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml +++ b/ruoyi-system/target/classes/mapper/expenses/ExpensesMapper.xml @@ -85,6 +85,7 @@ and u.nick_name like concat('%', #{expSalesmanName}, '%') and exp_request_remark like concat('%', #{expRequestRemark}, '%') and exp_approval_status = #{expApprovalStatus} + and exp_bid_area = #{expBidArea} and exp_dispatch_status = #{expDispatchStatus} and exp_receive_user_id = #{expReceiveUserId} diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 79dc9a1..75c7564 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Aug 14 08:35:33 CST 2024 +#Wed Aug 14 10:58:53 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index 60d823a..aab6139 100644 Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ diff --git a/ruoyi-ui/src/views/authorize/authorize/index.vue b/ruoyi-ui/src/views/authorize/authorize/index.vue index 2afeb58..12ae7f6 100644 --- a/ruoyi-ui/src/views/authorize/authorize/index.vue +++ b/ruoyi-ui/src/views/authorize/authorize/index.vue @@ -350,7 +350,7 @@ - + - + @@ -828,7 +828,9 @@ 投标信息 历史记录 - 保存 + + 保存 + @@ -1661,6 +1663,7 @@ export default { } //投标办所有人 并且是OA审批中 时 不可编辑 if(checkRole(['BID','BID_BSZZY','BID_ZHGLY'])&&"1"==bidOaApprovalStatus){ + this.ywyDis = true; this.tbDis = true; } diff --git a/ruoyi-ui/src/views/expenses/expenses/index.vue b/ruoyi-ui/src/views/expenses/expenses/index.vue index 6eb7c7f..7c5d91a 100644 --- a/ruoyi-ui/src/views/expenses/expenses/index.vue +++ b/ruoyi-ui/src/views/expenses/expenses/index.vue @@ -442,7 +442,7 @@ - 财务凭证 + 财务凭证(先保存再上传)