From 53828f7f8dde1f22bf443584170e1e8717b88c51 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 8 Jul 2022 16:57:48 +0800
Subject: [PATCH 1/3] =?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

---
 jero-web/src/components/uploadFile/file.vue   | 23 ++++++++++---------
 .../components/listOfRegulations.vue          |  8 +++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue
index 1bd779cc5..fab54f96b 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -191,17 +191,18 @@
         let index1 = fileName.lastIndexOf('.')
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
-        if (fileSuffix === '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
-        } else if (fileSuffix === '.docx') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-          window.open(url, '_blank')
-        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
-          window.open(url, '_blank')
-        } else {
-          downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
-        }
+        downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+        // if (fileSuffix === '.pdf') {
+        //   window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
+        // } else if (fileSuffix === '.docx') {
+        //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+        //   window.open(url, '_blank')
+        // } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+        //   let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+        //   window.open(url, '_blank')
+        // } else {
+        //   downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.id })
+        // }
       }
     }
   }
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 9fa9c6282..e5ee987c5 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -128,10 +128,6 @@
               <a-icon type="delete"/>
               {{ $t('BatchDelete') }}
             </div>
-            <div class="operator-text-title" @click="bringInRelevantPersonnelClick">
-              <a-icon type="user"/>
-              {{ $t('bringInRelevantPersonnel') }}
-            </div>
             <div class="operator-text-title" @click="ExportReportClick">
               <a-icon type="export"/>
               {{ $t('ExportReport') }}
@@ -149,6 +145,10 @@
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
+        <div class="operator-text" @click="bringInRelevantPersonnelClick">
+          <a-icon type="user"/>
+          {{ $t('bringInRelevantPersonnel') }}
+        </div>
         <div @click="transferClick" class="operator-text">
           <a-icon type="profile"/>
           {{ $t('Transfer') }}

From 4975ae5352110e0f14a46b74c12a8d6308ec5f4f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 17:06:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DummyInventoryInfoEOServiceImpl.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 57067a3bf..0fb3ca0d2 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
@@ -726,16 +726,16 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 				explain = "填写说明\n" +
 						"1.导入数据从第四行开始\n" +
 						"2.所有带*号的字段必须填写\n"+
-						"3.认证类型,认证级别,实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
-						"4.责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
+						"3.实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"4.认证类型,认证级别,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
 						"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
 						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
 			}else{
 				explain = "Filling explanation\n" +
 						"1.Import data starts at the fourth line\n" +
 						"2.All fields marked with * must be filled in\n"+
-						"3.Certification Type,Certification Level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
-						"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
+						"3.Implementation category,Type of deliverables,Initiator,Person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"4.Certification Type,Certification Level,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
 						"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
 						"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
 			}

From 5fd17f391ef09b2e5cc61ac763f56b46900dfc29 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 8 Jul 2022 17:12:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 1cda303ff..3917a5532 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
@@ -3308,16 +3308,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				explain = "填写说明\n" +
 						"1.导入数据从第四行开始\n" +
 						"2.所有带*号的字段必须填写\n"+
-						"3.认证类型,认证级别,实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
-						"4.责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
+						"3.实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"4.认证类型,认证级别,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
 						"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
 						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
 			}else{
 				explain = "Filling explanation\n" +
 						"1.Import data starts at the fourth line\n" +
 						"2.All fields marked with * must be filled in\n"+
-						"3.Certification type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
-						"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
+						"3.Usage,Type of deliverables,Initiator,Person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"4.Certification type,Certification Level,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
 						"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
 						"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
 			}