diff --git a/app.irbs/src/main/resources/app/irbs/i18n/messages.properties b/app.irbs/src/main/resources/app/irbs/i18n/messages.properties index a1df9e4..5711d9b 100644 --- a/app.irbs/src/main/resources/app/irbs/i18n/messages.properties +++ b/app.irbs/src/main/resources/app/irbs/i18n/messages.properties @@ -1,3 +1,3 @@ application.title=IRBS application.version=$version -application.copyright=Copyright \u00A9 2019\u20132022 +application.copyright=Copyright \u00A9 2019\u20132022 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7f82062..c30c2eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.1 platform_group=io.sc platform_version=8.1.27 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.144 +platform_core_frontend_version=8.1.146 ########################################################### # dependencies version diff --git a/irbs.cust.rating/src/main/java/irbs/cust/rating/enums/RatingStatus.java b/irbs.cust.rating/src/main/java/irbs/cust/rating/enums/RatingStatus.java new file mode 100644 index 0000000..f96f187 --- /dev/null +++ b/irbs.cust.rating/src/main/java/irbs/cust/rating/enums/RatingStatus.java @@ -0,0 +1,14 @@ +package irbs.cust.rating.enums; + +/** + * 评级状态 + */ +public enum RatingStatus { + NOT_ACTIVE, //未生效 + EFFECTIVE, //生效 + EXPIRED, //失效 + TERMINAL, //人工终止 + CANCEL, //撤销 + GXEND //评级更新到期后状态 + ; +} diff --git a/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages.properties b/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages.properties index e69de29..d12a0ec 100644 --- a/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages.properties +++ b/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages.properties @@ -0,0 +1,6 @@ +irbs.cust.rating.enums.RatingStatus.NOT_ACTIVE=\u672A\u751F\u6548 +irbs.cust.rating.enums.RatingStatus.EFFECTIVE=\u751F\u6548 +irbs.cust.rating.enums.RatingStatus.EXPIRED=\u5931\u6548 +irbs.cust.rating.enums.RatingStatus.TERMINAL=\u4EBA\u5DE5\u7EC8\u6B62 +irbs.cust.rating.enums.RatingStatus.CANCEL=\u64A4\u9500 +irbs.cust.rating.enums.RatingStatus.GXEND=\u8BC4\u7EA7\u66F4\u65B0\u5230\u671F\u540E\u72B6\u6001 \ No newline at end of file diff --git a/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages_tw_CN.properties b/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages_tw_CN.properties new file mode 100644 index 0000000..d12a0ec --- /dev/null +++ b/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages_tw_CN.properties @@ -0,0 +1,6 @@ +irbs.cust.rating.enums.RatingStatus.NOT_ACTIVE=\u672A\u751F\u6548 +irbs.cust.rating.enums.RatingStatus.EFFECTIVE=\u751F\u6548 +irbs.cust.rating.enums.RatingStatus.EXPIRED=\u5931\u6548 +irbs.cust.rating.enums.RatingStatus.TERMINAL=\u4EBA\u5DE5\u7EC8\u6B62 +irbs.cust.rating.enums.RatingStatus.CANCEL=\u64A4\u9500 +irbs.cust.rating.enums.RatingStatus.GXEND=\u8BC4\u7EA7\u66F4\u65B0\u5230\u671F\u540E\u72B6\u6001 \ No newline at end of file diff --git a/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages_zh_CN.properties b/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages_zh_CN.properties index e69de29..d12a0ec 100644 --- a/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages_zh_CN.properties +++ b/irbs.cust.rating/src/main/resources/irbs/cust/rating/i18n/messages_zh_CN.properties @@ -0,0 +1,6 @@ +irbs.cust.rating.enums.RatingStatus.NOT_ACTIVE=\u672A\u751F\u6548 +irbs.cust.rating.enums.RatingStatus.EFFECTIVE=\u751F\u6548 +irbs.cust.rating.enums.RatingStatus.EXPIRED=\u5931\u6548 +irbs.cust.rating.enums.RatingStatus.TERMINAL=\u4EBA\u5DE5\u7EC8\u6B62 +irbs.cust.rating.enums.RatingStatus.CANCEL=\u64A4\u9500 +irbs.cust.rating.enums.RatingStatus.GXEND=\u8BC4\u7EA7\u66F4\u65B0\u5230\u671F\u540E\u72B6\u6001 \ No newline at end of file diff --git a/irbs.frontend/src/views/custRating/CustRating.vue b/irbs.frontend/src/views/custRating/CustRating.vue index a9644a4..38c9b39 100644 --- a/irbs.frontend/src/views/custRating/CustRating.vue +++ b/irbs.frontend/src/views/custRating/CustRating.vue @@ -5,7 +5,6 @@ title="客户评级列表" :data-url="Environment.apiContextPath('api/irbs/companyRating')" :sort-no="true" - dense-body :checkbox-selection="false" :query-form-cols-num="4" :query-form-fields="companyRatingGrid.queryFormFields" @@ -14,8 +13,6 @@ :pagination="{ sortBy: 'processStatus', descending: false, - reqPageStart: 1, - rowsPerPage: 20, }" > @@ -24,11 +21,13 @@