WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改文档库分享改订阅

Browse Source
This commit is contained in:
gaosong
2023-11-18 13:27:32 +08:00
parent e4a2ad5a56
commit 13f034fb98
5 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+1 -1
View File
@@ -163,7 +163,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
}
}
@ApiOperation(value = "参数清单-更新模板更新参数", notes = "参数清单-更新模板更新参数")
@ApiOperation(value = "参数清单-更新模板", notes = "参数清单-更新模板更新参数")
@PostMapping(value = "/updateModel")
public Result<?> updateModel(String mid, String version,String cid) {
boolean isSuccess = paramsManifestEOService.updateModel(mid,version, cid);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+6
View File
@@ -9408,12 +9408,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
}else if (StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| StringUtils.equals(projectLawsInventoryEO.getDesignFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())) {
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getDesignDueDate())){
return Result.error("编号："+projectLawsInventoryEO.getSerialNumber()+"的设计符合性交付日期不能为空！");
}
projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
}
if(StringUtils.equals(projectLawsInventoryEO.getVerifyDeliverableType(),naType)){
projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.UNINVOLVED.getValue());
}else if (StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| StringUtils.equals(projectLawsInventoryEO.getVerifyFlowStatus(), ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())) {
if(ObjectUtils.isEmpty(projectLawsInventoryEO.getVerifyDueDate())){
return Result.error("编号："+projectLawsInventoryEO.getSerialNumber()+"的验证符合性交付日期不能为空！");
}
projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
}
projectLawsInventoryEO.setInventoryAffirmDueDate(endTime);
jero-web/src/views/documentManage/library/docDetail/index.vue
+37 -9
View File
@@ -42,17 +42,23 @@
</div>
<div @click="CollectionClick({'collectFlag':collectFlag,'id':documentId})"
v-has="'bussLog:collect'" class="operator-text-text"
:title="$t('Collection')">
:title="collectFlag == '1' ? $t('CancelCollection') : $t('Collection')">
<a-icon class="icon" type="star" />
{{ collectFlag == '1' ? $t('CancelCollection') : $t('Collection') }}
</div>
<div @click="shareClick" v-has="'bussLog:share'" class="operator-text-text"
:title="$t('share')">
<a-icon type="share-alt" />
{{ $t('share') }}
</div>
<!-- <div @click="shareClick" v-has="'bussLog:share'" class="operator-text-text"-->
<!-- :title="$t('share')">-->
<!-- <a-icon type="share-alt" />-->
<!-- {{ $t('share') }}-->
<!-- </div>-->
<div @click="subscribeClick({'subscribeFlag':subscribeFlag,'id':documentId})"
v-has="'bussLog:subscribe'" class="operator-text-text"
:title="subscribeFlag == '1' ? $t('CancelSubscribe') : $t('subscribe')">
<a-icon type="pushpin" />
{{ subscribeFlag == '1' ? $t('CancelSubscribe') : $t('subscribe') }}
</div>
</div>
</div>
<div style="margin-top: 68px;background: #fff" class="detail-box">
@@ -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;
}
jero-web/src/views/projectManagement/components/listEditModel.vue
+6 -6
View File
@@ -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'
}
],
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+1 -1
View File
@@ -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