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

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-04-14 14:12:10 +08:00
parent 69c524d139 7a257f731b
commit 43302b1eae
4 changed files with 29 additions and 18 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/service/impl/ParamsCollectManifestEOServiceImpl.java
+18 -9
View File
@@ -2309,7 +2309,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",userIdList);
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_BACK.getValue(),params,null);
@@ -2330,7 +2331,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",sdtIdList);
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
feishuService.sendMessageHomoParameterCollection(TemplateInfoEnum2.HOMO_PARAMETER_COLLECTION_BACK.getValue(),params,null);
@@ -2417,7 +2419,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",userIdList);
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("dueDate","");
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
@@ -2655,7 +2658,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("dueDate",sdf.format(deadline));
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
@@ -2830,7 +2834,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("dueDate",sdf.format(deadline));
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
@@ -6800,7 +6805,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",userIdList);
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("dueDate","");
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
@@ -6936,7 +6942,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("dueDate",sdf.format(deadline));
@@ -6998,7 +7005,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
params.put("dueDate",sdf.format(deadline));
@@ -7052,7 +7060,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
params.put("userIdList",Arrays.asList(sysUser.getId().split(",")));
params.put("projectCn",projectInfo.getProjectName());
params.put("projectEn",projectInfo.getProjectNameEn());
params.put("initiator",currentUser.getUsername());
params.put("initiatorCn",currentUser.getUsername());
params.put("initiatorEn",currentUser.getUsername());
params.put("dueDate",sdf.format(deadline));
params.put("back_url_cn",hrefFeishuCn);
params.put("back_url_en",hrefFeishuEn);
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1785,4 +1785,5 @@ module.exports = {
onlyDesignComplianceConfirmationSelected:'Only data with a design compliance confirmation process status of task to be confirmed, result to be submitted, or verification compliance confirmation process status of task to be confirmed, result to be submitted can be selected',
oneThePersonnelMustBeSelected:'One of the personnel must be selected',
pleaseSelectRegulatoryCurrentLogin:'Please select Regulatory Engineer as the data for the current login',
cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas',
}
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1887,4 +1887,5 @@ module.exports = {
onlyDesignComplianceConfirmationSelected:'只能选择设计符合性确认流程状态为任务待确认、结果待提交或验证符合性确认流程状态为任务待确认、结果待提交的数据',
oneThePersonnelMustBeSelected:'必须选择其中一个人员',
pleaseSelectRegulatoryCurrentLogin:'请选择法规工程师为当前登录人的数据',
cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人',
}
jero-web/src/views/projectManagement/components/batSetting.vue
+9 -9
View File
@@ -100,7 +100,7 @@
:title="$t('engineeringInterfacePerson')">{{$t('engineeringInterfacePerson')}}</span>
</div>
<a-form-model-item class="itemModel" prop="designDutyId">
<a-select :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
<a-select :placeholder="$t('cannotSetResponsibilityAreas')"
class="box-input"
allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -382,13 +382,13 @@
if (res.success) {
this.regulatoryEngineerList = res.result.lawEngineerList || [] //法规工程师
this.engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] //工程接口人
if (this.regulatoryEngineerList.length == 1) {
this.formInline.regulationOwnerId = this.regulatoryEngineerList[0].value
}
if (this.engineeringInterfacePersonList.length == 1) {
this.formInline.engineeringInterfacePerson = this.engineeringInterfacePersonList[0].value
}
this.formInline = {...this.formInline}
// if (this.regulatoryEngineerList.length == 1) {
// this.formInline.regulationOwnerId = this.regulatoryEngineerList[0].value
// }
// if (this.engineeringInterfacePersonList.length == 1) {
// this.formInline.engineeringInterfacePerson = this.engineeringInterfacePersonList[0].value
// }
// this.formInline = {...this.formInline}
}
})
},
@@ -405,7 +405,7 @@
this.$nextTick(() => {
this.ids = data || []
this.formInline = {}
if (content) {
if (content && code == '0') {
this.formInline.dutyTerritory = content.dutyTerritory
this.queryPersonByProject(content)
}