Merge branch 'master' into 'fix_20230811'

Master

See merge request laws-nio/laws-weilai!359

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java

@@ -1272,7 +1272,9 @@ public class ProjectLawsInventoryEOEditServiceImpl {
         params.put("contentEn", contentEn);
         params.put("projectLibraryId", projectLawsInventoryEO.getProjectLibraryId());
         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());
 
         String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -560,7 +560,7 @@
             </span>
             <!--            引用参数-->
             <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 v-else-if='jurisdiction === "homoTH"' class="text-wraning" style='color: red'>
@@ -1685,6 +1685,7 @@
       // 填写人 引用参数 权限
       // 仅仅状态为 待填写 认证工程师退回 可以引用参数
       dreJurisdictionreferenceParameter() {
+        console.log(123)
         this.NotSelectedRowKeysValue = []
         let flag = 1
         if (this.selectedRowKeysValue.length == 0) {
@@ -1692,7 +1693,8 @@
           this.$message.warning(this.$t('selectLeastOne'))
         } else {
           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)
               flag = 0
             }