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

Merge branch 'master' into 'fix_20230811'

Browse Source 
Master

See merge request laws-nio/laws-weilai!359
This commit is contained in:
高嵩
2023-08-16 03:08:24 +00:00
parent 61161f44a8 0555b22410
commit c71e75132a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java
+3 -1
View File
@@ -1272,7 +1272,9 @@ public class ProjectLawsInventoryEOEditServiceImpl {
params.put("contentEn", contentEn); params.put("contentEn", contentEn);
params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId()); params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId());
params.put("endTime", endTime); params.put("endTime", endTime);
params.put("userIdList", userIdList); List<String> userIdListArr = new ArrayList<>();
userIdListArr.add(userIdList);
params.put("userIdList", userIdListArr);
params.put("serialNumbers", projectLawsInventoryEO.getSerialNumber()); params.put("serialNumbers", projectLawsInventoryEO.getSerialNumber());
String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+4 -2
View File
@@ -560,7 +560,7 @@
</span> </span>
<!-- 引用参数--> <!-- 引用参数-->
<span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning"> <span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning">
'{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}' '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'{{$t('or')}}'{{$t('alteration')}}'
</span> </span>
<!-- 退回--> <!-- 退回-->
<span v-else-if='jurisdiction === "homoTH"' class="text-wraning" style='color: red'> <span v-else-if='jurisdiction === "homoTH"' class="text-wraning" style='color: red'>
@@ -1685,6 +1685,7 @@
// 填写人 引用参数 权限 // 填写人 引用参数 权限
// 仅仅状态为 待填写 认证工程师退回 可以引用参数 // 仅仅状态为 待填写 认证工程师退回 可以引用参数
dreJurisdictionreferenceParameter() { dreJurisdictionreferenceParameter() {
console.log(123)
this.NotSelectedRowKeysValue = [] this.NotSelectedRowKeysValue = []
let flag = 1 let flag = 1
if (this.selectedRowKeysValue.length == 0) { if (this.selectedRowKeysValue.length == 0) {
@@ -1692,7 +1693,8 @@
this.$message.warning(this.$t('selectLeastOne')) this.$message.warning(this.$t('selectLeastOne'))
} else { } else {
this.selectedRowKeysValue.forEach((item, index) => { this.selectedRowKeysValue.forEach((item, index) => {
if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') { if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled'
&& item.state !== 'Rejected by homo engineer' && item.state !== '变更' && item.state !== 'Modify') {
this.NotSelectedRowKeysValue.push(item) this.NotSelectedRowKeysValue.push(item)
flag = 0 flag = 0
} }