From 13f034fb98ba084b708294407c64d3f9c37dcd54 Mon Sep 17 00:00:00 2001 From: gaosong Date: Sat, 18 Nov 2023 13:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=BA=93?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=94=B9=E8=AE=A2=E9=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsManifestEOController.java | 2 +- .../ProjectLawsInventoryEOServiceImpl.java | 6 +++ .../library/docDetail/index.vue | 46 +++++++++++++++---- .../components/listEditModel.vue | 12 ++--- .../components/listOfRegulations.vue | 2 +- 5 files changed, 51 insertions(+), 17 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 14c8158b0..fc2056eed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -163,7 +163,7 @@ public class ParamsManifestEOController extends JeroController updateModel(String mid, String version,String cid) { boolean isSuccess = paramsManifestEOService.updateModel(mid,version, cid); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 73101fb79..e89f930a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -9408,12 +9408,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl
+ :title="collectFlag == '1' ? $t('CancelCollection') : $t('Collection')"> {{ collectFlag == '1' ? $t('CancelCollection') : $t('Collection') }}
-
- - {{ $t('share') }} -
+ + + + + +
+ + {{ subscribeFlag == '1' ? $t('CancelSubscribe') : $t('subscribe') }} +
@@ -466,6 +472,28 @@ export default { } }) }, + subscribeClick(val){ + let _this = this + this.$confirm({ + content: val.subscribeFlag == 0 || !val.subscribeFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'), + onOk() { + let url = '' + if (val.subscribeFlag == 0 || !val.subscribeFlag) { + url = 'document/bussDocumentLibraryEO/addSubscribe' + } else { + url = 'document/bussDocumentLibraryEO/cancelSubscribe' + } + getAction(url, { id: val.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getWdkCollectAndSubscribeInfoByUser() + } else { + _this.$message.warning(_this.$t('operationFailed')) + } + }) + } + }) + }, CollectionClick(val) { let _this = this this.$confirm({ @@ -959,14 +987,14 @@ body { font-weight: 400; color: #040B29; display: inline-block; - width: 130px; + max-width: 130px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; text-align: center; height: 40px; - border: 1px solid #CED0D8; - border-radius: 4px; + //border: 1px solid #CED0D8; + //border-radius: 4px; line-height: 40px; padding: 0 5px; } diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index dac7d0fda..4664b8487 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -758,22 +758,22 @@ ], designRemark: [ { - max: 300, - message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 1000, + message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), trigger: 'blur' } ], verifyRemark: [ { - max: 300, - message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 1000, + message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), trigger: 'blur' } ], prehomoRemark: [ { - max: 300, - message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 1000, + message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3a222b72d..6538bf28a 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -2997,7 +2997,7 @@ this.confirmLoading = false this.getList() } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) this.confirmLoading = false } let that = this