diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b19f977..9c89dbf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,54 +2,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + + + + @@ -174,45 +135,45 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -259,10 +220,10 @@ - + - + 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 652986c..beae17f 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/bid/BidController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class index 2b6da89..6301d96 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.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 17a2b09..0b85bb7 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-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class index 0260899..e91699f 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/AuthorizeTask.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class index 6a93a75..bc616be 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/BidTask.class differ diff --git a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class index a09681b..5d02a73 100644 Binary files a/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class and b/ruoyi-quartz/target/classes/com/ruoyi/quartz/task/ZgysTask.class differ diff --git a/ruoyi-ui/src/views/authorize/authorize/index.vue b/ruoyi-ui/src/views/authorize/authorize/index.vue index 002aec3..78057cb 100644 --- a/ruoyi-ui/src/views/authorize/authorize/index.vue +++ b/ruoyi-ui/src/views/authorize/authorize/index.vue @@ -496,14 +496,15 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - doaCode: null, - doaSalesmanName: null, - doaProject: null, - doaCustomerName: null, - doaAuthorizer: null, - doaAuthorizationDuration: null, + doaNumber: null, doaPowerAttorneyPurpose: null, + doaSalesmanName: null, + doaAuthorizer: null, + doaCustomerName: null, + doaProject: null, doaApprovalStatus: null, + doaStandardizer: null, + daterangeDoaAuthorizationDuration: null, }, // 表单参数 form: {}, diff --git a/ruoyi-ui/src/views/bid/bid/index.vue b/ruoyi-ui/src/views/bid/bid/index.vue index d5a89e8..057b130 100644 --- a/ruoyi-ui/src/views/bid/bid/index.vue +++ b/ruoyi-ui/src/views/bid/bid/index.vue @@ -1319,11 +1319,15 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - bidCode: null, - bidOpeningDate: null, - bidTenderingUnit: null, - bidProject: null, + bidNumber: null, + bidSalesmanName: null, bidAuthorizedRepresentative: null, + daterangeBidOpeningDate: null, + bidTenderingUnit: null, + bidAgency: null, + bidProject: null, + bidStatus: null, + bidZbr: null, bidApprovalStatus: null, }, // 表单参数 @@ -1432,6 +1436,9 @@ export default { }; }, created() { + this.queryParams.orderByColumn = "a.bid_code";//查询字段是表格中字段名字 + this.queryParams.isAsc = "desc";//动态取值排序顺序 + this.getList(); this.getVersionList(); }, diff --git a/ruoyi-ui/src/views/zgys/zgys/index.vue b/ruoyi-ui/src/views/zgys/zgys/index.vue index c2ddbbd..b6fe496 100644 --- a/ruoyi-ui/src/views/zgys/zgys/index.vue +++ b/ruoyi-ui/src/views/zgys/zgys/index.vue @@ -470,12 +470,15 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - pqCode: null, + pqNumber: null, pqSalesmanName: null, pqCustomerName: null, pqProject: null, - pqBidWinningStatus: null, - pqArchiving: null, + daterangePqOpeningDate: null, + pqAuthorizedRepresentative: null, + pqApprovalStatus: null, + pqIllustrate: null, + pqZbr: null, }, // 表单参数 form: {},