From 2df71ba366018ff6a6ac2c1b9798617729b7645f Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 28 Jul 2022 14:04:53 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listEditModel.vue              | 14 +++++------
 .../components/listOfRegulations.vue          | 25 +++++++++++++++----
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 38f185c66..ea5608dd6 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -31,7 +31,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="title">
                 <a-input class="box-input"
-                         :disabled="true"
+                         :disabled="formInline.roleCodeIndex == 0 ? false : true"
                          v-model="formInline.title"
                          :placeholder="$t('PleaseEnter')+$t('title')"/>
               </a-form-model-item>
@@ -994,7 +994,7 @@
         // } else if (row.designInitiator == 0) {
         //   this.designInitiatorList = res.result.studioPersonList || []
         // } else if (!row.designInitiator || row.designInitiator == '') {
-          this.designInitiatorList = res.result.allPersonList || []
+        this.designInitiatorList = res.result.allPersonList || []
         // }
         //设计符合性确认-责任人
         // if (row.designDuty == 1) {
@@ -1006,7 +1006,7 @@
         // } else if (row.designInitiator == 0) {
         //   this.designDutyList = res.result.studioPersonList || []
         // } else if (!row.designDuty || row.designDuty == '') {
-          this.designDutyList = res.result.allPersonList || []
+        this.designDutyList = res.result.allPersonList || []
         // }
         //prehomo确认-发起人
         // if (row.prehomoInitiator == 1) {
@@ -1018,7 +1018,7 @@
         // } else if (row.designInitiator == 0) {
         //   this.prehomoInitiatorList = res.result.studioPersonList || []
         // } else if (!row.prehomoInitiator || row.prehomoInitiator == '') {
-          this.prehomoInitiatorList = res.result.allPersonList || []
+        this.prehomoInitiatorList = res.result.allPersonList || []
         // }
         //prehomo确认-责任人
         // if (row.prehomoDuty == 1) {
@@ -1030,7 +1030,7 @@
         // } else if (row.designInitiator == 0) {
         //   this.prehomoDutyList = res.result.studioPersonList || []
         // } else if (!row.prehomoDuty || row.prehomoDuty == '') {
-          this.prehomoDutyList = res.result.allPersonList || []
+        this.prehomoDutyList = res.result.allPersonList || []
         // }
         //验证符合性确认-发起人
         // if (row.verifyInitiator == 1) {
@@ -1042,7 +1042,7 @@
         // } else if (row.designInitiator == 0) {
         //   this.verifyInitiatorList = res.result.studioPersonList || []
         // } else if (!row.verifyInitiator || row.verifyInitiator == '') {
-          this.verifyInitiatorList = res.result.allPersonList || []
+        this.verifyInitiatorList = res.result.allPersonList || []
         // }
         //验证符合性确认-责任人
         // if (row.verifyDuty == 1) {
@@ -1054,7 +1054,7 @@
         // } else if (row.designInitiator == 0) {
         //   this.verifyDutyList = res.result.studioPersonList || []
         // } else if (!row.verifyDuty || row.verifyDuty == '') {
-          this.verifyDutyList = res.result.allPersonList || []
+        this.verifyDutyList = res.result.allPersonList || []
         // }
         callback()
       },
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index d23200165..6a69c579a 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -169,6 +169,11 @@
         </div>
       </div>
       <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px">
+        <div @click="handleExport" v-has="'projectLawsInventory:exportData'" v-if="isRoleSwitching"
+             class="operator-text">
+          <a-icon type="export" :rotate="-90"/>
+          {{ $t('export') }}
+        </div>
         <div class="operator-text" @click="submitClick(0)" v-if="isRoleSwitching">
           <a-icon type="check-circle"/>
           {{ $t('submit') }}
@@ -1061,11 +1066,21 @@
         }
       },
       handleExport() {
+        let roleCodeIndex
+        if (this.isDisplay) {
+          roleCodeIndex = 0
+        } else {
+          roleCodeIndex = 4
+        }
+        if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
+          roleCodeIndex = 0
+        }
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         let query = {
           ...this.queryParam,
           ids: selectedRowKeys.join(','),
           ...this.queryParamQuery,
+          roleCode:roleCodeIndex,
           projectLibraryId: this.$route.query.id
         }
         downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect)
@@ -1733,7 +1748,7 @@
                 } else if (!dataSource[i].designDueDate) {
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeadlineEmpty') } < /div>)
                   continue
-                }else if (!dataSource[i].designDeliverableType) {
+                } else if (!dataSource[i].designDeliverableType) {
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('confirmationOfDesignConformity') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                   continue
                 }
@@ -1751,7 +1766,7 @@
                 } else if (!dataSource[i].prehomoDueDate) {
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeadlineEmpty') } < /div>)
                   continue
-                }else if (!dataSource[i].prehomoDeliverableType) {
+                } else if (!dataSource[i].prehomoDeliverableType) {
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('PrehomoConfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                   continue
                 }
@@ -1769,7 +1784,7 @@
                 } else if (!dataSource[i].verifyDueDate) {
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeadlineEmpty') } < /div>)
                   continue
-                }else if (!dataSource[i].verifyDeliverableType) {
+                } else if (!dataSource[i].verifyDeliverableType) {
                   this.rowKeysWarningList.push( < div > { dataSource[i].serialNumber + this.$t('verificationAndConformityconfirmation') + this.$t('theDeliveryTypeCannotBeEmpty') } < /div>)
                   continue
                 }
@@ -1864,7 +1879,7 @@
                 _this.getRowKeys(selectedRowKeys, 2, function() {
                   _this.visibleComment = true
                   _this.formInlineComment = {}
-                  _this.$nextTick(()=>{
+                  _this.$nextTick(() => {
                     _this.$refs.ruleFormComment.clearValidate()
                   })
                 })
@@ -1886,7 +1901,7 @@
               })
             }
             let query = {
-              commentContent: this.$t('For')+content.join(',') + this.$t('markedRejection')+'：' + this.formInlineComment.commentContent,
+              commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent,
               projectLibraryId: this.$route.query.id
             }
             this.confirmLoadingComment = true

From 464117f59dbfef268167701ac2ef391feda8974c Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 28 Jul 2022 14:24:34 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLawsInventoryEOServiceImpl.java       | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 75a6367f5..82664d081 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
@@ -3630,6 +3630,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			queryWrapper.in("id",Arrays.asList(projectLawsInventoryEO.getIds().split(",")));
 		}
 		queryWrapper.orderByDesc("create_time");
+
+		int isProjectRole = Integer.parseInt(projectLawsInventoryEO.getRoleCode());
+		if(isProjectRole != Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.MANAGER.getValue())
+				&& isProjectRole != Integer.parseInt(ProjectRoleEnum.ADMIN.getValue())){
+			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			queryWrapper.and(q ->{
+				q.eq("regulation_owner_id",currentUser.getId()).
+						or().eq("homologation_engineer_id",currentUser.getId());
+			});
+		}
 		//导出的数据
 		dataList = this.list(queryWrapper);
 

From fd4bbbfc65fce41821f5d9bd52385f2b0ef2cb06 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 28 Jul 2022 14:56:07 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=81=E6=8A=8A=E6=96=87=E6=A1=A3=E5=BA=93?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEid=E6=B7=BB=E5=8A=A0=E8=BF=9B=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

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 82664d081..15c79a89f 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
@@ -4632,6 +4632,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			projectLawsInventoryEO.setRegion(collect.get(0).getRegion());//适用地区
 			projectLawsInventoryEO.setImplementTime(collect.get(0).getImplementTime());//在产车实施日期
 			projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());//新车实施日期
+			projectLawsInventoryEO.setStandId(collect.get(0).getId());//新车实施日期
 		}
 	}
 

From bdf6d89e5487781ff05004c7c1b2d3d750e179e7 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 28 Jul 2022 15:01:05 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95-?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8E=E6=96=87=E6=A1=A3=E5=BA=93=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=BB=91=E5=AE=9A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 0fb3ca0d2..2faae8a76 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -1501,6 +1501,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(collect.get(0).getShi4Yong4Fan4Wei2());
 				dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime());
 				dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());
+				dummyInventoryInfoEO.setBussDocumentLibraryId(collect.get(0).getId());
 			}
 		}
 	}

From bf7ec3b3f7f7b2bbc0eca4de160e22f35a95566b Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 29 Jul 2022 11:34:27 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/documentTools/virtualList/components/editModel.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 482b97ace..408eff413 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -31,7 +31,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="title">
                 <a-input class="box-input"
-                         :disabled="true"
+                         :disabled="false"
                          v-model="formInline.title"
                          :placeholder="$t('PleaseEnter')+$t('title')"/>
               </a-form-model-item>