From 5b60845329b21a5d5898338868d87096d37d6120 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 21 Jun 2022 10:20:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectRelatedPersonnelServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 0a1fe46f2..e15738e30 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -506,7 +506,13 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 				nowFile.delete();
 			}
 			nowFile.mkdirs();
-			HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板");
+			String excelName = "";
+			if(CutEnum.CN.getValue().equals(cut)){
+				excelName = "相关人员名单";
+			}else{
+				excelName = "Personal List";
+			}
+			HSSFSheet sheet = workbook.createSheet(excelName);
 			sheet.setDefaultColumnWidth(16);//列宽
 			HSSFCellStyle cellStyle = workbook.createCellStyle();
 			cellStyle.setWrapText(true);//自动换行

From 1ecb2e3baa5b69bb586179f17a701dff9232853f Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 21 Jun 2022 10:29:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95--?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0(=E5=88=97=E8=A1=A8=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=80=82=E7=94=A8=E5=9C=B0=E5=8C=BA)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../document/service/impl/BussDocumentLibraryEOServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index f77224154..529525ec7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -5621,6 +5621,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         fieldListQuery.add("title");
         fieldListQuery.add("title_en");
         fieldListQuery.add("state");
+        fieldListQuery.add("region");
         fieldListQuery.add("technology_territory");
         fieldListQuery.add("xin1_che1_xing2_shi2_shi1_ri4_qi1");
         fieldListQuery.add("implement_time");

From d634fde92d1c2502514b3f3da1c6f4b621938eff Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 21 Jun 2022 10:40:30 +0800
Subject: [PATCH 3/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

---
 .../dashboard/components/customContent.vue    | 23 +++++----
 .../virtualList/components/editModel.vue      | 48 +++++++++++++++++++
 .../components/virtualListDetails.vue         | 24 ++++++++--
 .../certificationProgressEchart.vue           |  8 ++--
 .../components/deliverableStatusEchart.vue    | 10 ++--
 5 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/jero-web/src/views/dashboard/components/customContent.vue b/jero-web/src/views/dashboard/components/customContent.vue
index ff021373d..57feafe6c 100644
--- a/jero-web/src/views/dashboard/components/customContent.vue
+++ b/jero-web/src/views/dashboard/components/customContent.vue
@@ -1,18 +1,19 @@
 <template>
   <div class="customContent-box">
-    <div style="display: inline-block">
-      <div class="box-content-top">
-        <div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
-          <img :src="item.iconPath" class="img" alt="">
-          <div class="text" :title="item.iconName">{{item.iconName}}</div>
-        </div>
+    <div class="box-content-top">
+      <div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index"
+           @click="urlClick(item)">
+        <img :src="item.iconPath" class="img" alt="">
+        <div class="text" :title="item.iconName">{{item.iconName}}</div>
       </div>
-      <div class="box-content" @click="customClick()" style=";margin-top: 0;float: right">
+      <div class="box-content" @click="customClick()" style=";margin-top: 0;">
         <img src="../../../assets/zdy.png" class="img" alt="">
         <div class="text">{{$t('custom')}}</div>
       </div>
     </div>
+    <div class="box-content-right">
 
+    </div>
     <a-modal
       :title="$t('custom')"
       :width="1180"
@@ -174,11 +175,12 @@
   .customContent-box {
     width: 100%;
     text-align: center;
+    overflow: hidden;
 
     .box-content-top {
       max-width: calc(100% - 130px);
       display: inline-block;
-      overflow: hidden;
+      overflow: auto;
       white-space: nowrap;
     }
 
@@ -249,4 +251,9 @@
     margin-top: 10px;
     margin-bottom: 30px;
   }
+
+  .box-content-right {
+    display: inline-block;
+    overflow: hidden;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
index 66adb0a07..c01ff108f 100644
--- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue
@@ -373,6 +373,22 @@
             </div>
           </a-col>
         </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-text" :prop="'designRemark'">
+                <a-textarea
+                  style="width: 100%"
+                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
+                  v-model="formInline.designRemark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <div class="header-text">
           &nbsp;{{$t('PrehomoConfirmation')}}
         </div>
@@ -456,6 +472,22 @@
             </div>
           </a-col>
         </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">
+                <a-textarea
+                  style="width: 100%"
+                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
+                  v-model="formInline.prehomoRemark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
         <div class="header-text">
           &nbsp;{{$t('verificationAndConformityconfirmation')}}
         </div>
@@ -538,6 +570,22 @@
             </div>
           </a-col>
         </a-row>
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
+              </div>
+              <a-form-model-item class="itemModel-text" :prop="'verifyRemark'">
+                <a-textarea
+                  style="width: 100%"
+                  :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
+                  v-model="formInline.verifyRemark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
       </a-form-model>
     </a-spin>
     <div class="drawer-bootom-button">
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 464eca645..4360d9c48 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -424,7 +424,6 @@
 
           {
             title: this.$t('confirmationOfDesignConformity'),
-            width: 540,
             children: [
               {
                 // TODO 未按要求实现，该列分为上下行，上行显示交付物类型，下行显示交付物模板名称，且交付物模板名称点击可下载。其他2个流程同理
@@ -448,12 +447,18 @@
                 width: 180,
                 ellipsis: true,
                 align: 'center'
+              },
+              {
+                title: this.$t('descriptionDeliverables'),
+                dataIndex: 'designRemark',
+                align: 'center',
+                width: 220,
+                ellipsis: true
               }
             ]
           },
           {
             title: this.$t('PrehomoConfirmation'),
-            width: 540,
             children: [
               {
                 title: this.$t('Deliverables'),
@@ -476,12 +481,18 @@
                 width: 180,
                 ellipsis: true,
                 align: 'center'
+              },
+              {
+                title: this.$t('descriptionDeliverables'),
+                dataIndex: 'prehomoRemark',
+                align: 'center',
+                width: 220,
+                ellipsis: true
               }
             ]
           },
           {
             title: this.$t('verificationAndConformityconfirmation'),
-            width: 540,
             children: [
               {
                 title: this.$t('Deliverables'),
@@ -504,6 +515,13 @@
                 width: 180,
                 align: 'center',
                 ellipsis: true
+              },
+              {
+                title: this.$t('descriptionDeliverables'),
+                dataIndex: 'verifyRemark',
+                align: 'center',
+                width: 220,
+                ellipsis: true
               }
             ]
           },
diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
index 70ddc668d..f52b7cc03 100644
--- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
@@ -102,7 +102,7 @@
                 name: this.$t('notInvolved'),
                 status: res.certificationProgress
               })
-              color.push('#9DB9D4')
+              color.push('#707486')
               this.dataSource[0].notInvolved = res.certificationProgressCount
             } else if (res.certificationProgress == 'Not start') {
               data.push({
@@ -110,7 +110,7 @@
                 name: this.$t('toBeStarted'),
                 status: res.certificationProgress
               })
-              color.push('#FDB033')
+              color.push('#00B3BE')
               this.dataSource[0].toBeStarted = res.certificationProgressCount
             } else if (res.certificationProgress == 'In progress') {
               data.push({
@@ -118,7 +118,7 @@
                 name: this.$t('inProgress'),
                 status: res.certificationProgress
               })
-              color.push('#FF8543')
+              color.push('#FDA71C')
               this.dataSource[0].inProgress = res.certificationProgressCount
             } else if (res.certificationProgress == 'Test failed') {
               data.push({
@@ -134,7 +134,7 @@
                 name: this.$t('experimentPassed'),
                 status: res.certificationProgress
               })
-              color.push('#2F8DF3')
+              color.push('#26BD4B')
               this.dataSource[0].experimentPassed = res.certificationProgressCount
             }
           })
diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
index 31a91e2a7..03fdd8c9e 100644
--- a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
+++ b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
@@ -124,35 +124,35 @@
                   name: this.$t('toBeConfirmed'),
                   status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
                 })
-                color.push('#37CED1')
+                color.push('#00B3BE')
               } else if (res.designFlowTaskStatus == 'Compliance' || res.prehomoFlowTaskStatus == 'Compliance' || res.verifyFlowTaskStatus == 'Compliance') {
                 data.push({
                   value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
                   name: this.$t('accord'),
                   status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
                 })
-                color.push('#2F8DF3')
+                color.push('#26BD4B')
               } else if (res.designFlowTaskStatus == 'Non-Compliance' || res.prehomoFlowTaskStatus == 'Non-Compliance' || res.verifyFlowTaskStatus == 'Non-Compliance') {
                 data.push({
                   value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
                   name: this.$t('nonConformity'),
                   status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
                 })
-                color.push('#FF8543')
+                color.push('#E83030')
               } else if (res.designFlowTaskStatus == 'To be tracked' || res.prehomoFlowTaskStatus == 'To be tracked' || res.verifyFlowTaskStatus == 'To be tracked') {
                 data.push({
                   value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
                   name: this.$t('Tracked'),
                   status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
                 })
-                color.push('#FDB033')
+                color.push('#FDA71C')
               } else if (res.designFlowTaskStatus == 'NA' || res.prehomoFlowTaskStatus == 'NA' || res.verifyFlowTaskStatus == 'NA') {
                 data.push({
                   value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
                   name: this.$t('notInvolved'),
                   status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
                 })
-                color.push('#9DB9D4')
+                color.push('#707486')
               } else if (res.designFlowTaskStatus == 'Termination of task' || res.prehomoFlowTaskStatus == 'Termination of task' || res.verifyFlowTaskStatus == 'Termination of task') {
                 data.push({
                   value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,