From 05462c57881923a57f60da5029deb0d33825dd6a Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 11 Aug 2022 17:35:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/externalReports/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 5c19aec74..9ae72b965 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -42,10 +42,10 @@
                     </span>
                     <template #overlay v-if='manager'>
                       <a-menu  @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
-                        <a-menu-item key="1" @click="orgAdd" v-has="'externalReports:folder'">{{$t('Addingfolder')}}</a-menu-item>
-                        <a-menu-item key="4" @click="orgAdds" v-has="'externalReports:folder'" v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
-                        <a-menu-item key="2" @click="orgEdit" v-has="'externalReports:folder'">{{$t('Editfolder')}}</a-menu-item>
-                        <a-menu-item key="3" @click="orgDelete" v-has="'externalReports:folder'">{{$t('Deletefolders')}}</a-menu-item>
+                        <a-menu-item key="1" @click="orgAdd" >{{$t('Addingfolder')}}</a-menu-item>
+                        <a-menu-item key="4" @click="orgAdds"  v-if="deleteNode">{{$t('Addingsubfolders')}}</a-menu-item>
+                        <a-menu-item key="2" @click="orgEdit" >{{$t('Editfolder')}}</a-menu-item>
+                        <a-menu-item key="3" @click="orgDelete" >{{$t('Deletefolders')}}</a-menu-item>
 
                       </a-menu>
                     </template>
@@ -191,7 +191,7 @@
                               :title="$t('Foldername')">{{$t('Foldername')}}</span>
                       </div>
                       <a-form-model-item prop="folderName" style='width: 72%'>
-                        <a-input v-model="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" />
+                        <a-input v-model.trim="form.folderName" :min="1" :max="100" style='width: 130%' class="box-input add-input" :placeholder="$t('PleaseEnter')+$t('Foldername')" />
                       </a-form-model-item>
                     </div>
                   </a-col>
@@ -240,7 +240,7 @@
                                 :title="$t('Folderorder')">{{$t('Folderorder')}}</span>
                         </div>
                         <a-form-model-item class="itemModel"  prop="orderId">
-                          <a-input-number v-model="form.orderId" :min="1" :max="9999" class="box-input add-input"
+                          <a-input-number v-model.trim="form.orderId" :min="1" :max="9999" class="box-input add-input"
                                           :placeholder="$t('PleaseEnter')+$t('Folderorder')" :formatter="limitNumber"
                                           :parser="limitNumber" />
                           <!--                <a-input-number v-model="rowCount" :min="1" :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />-->

From b5ce6372fc2870b310071c73df4473259acc60c7 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 11 Aug 2022 17:46:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +-
 .../ParameterItemCollectionList.vue           | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 47cb21884..91e4e0dfd 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -610,7 +610,7 @@ module.exports = {
   deliverableTemplate: 'Deliverable Template',
   entryName: 'Project Name',
   targetMarket: 'Target Market',
-  projectStatus: 'Development',
+  projectStatus: 'Project Status',
   StudioEngineer: 'R&H Studio',
   CertificationTime: 'Certification Time',
   NTplatform: 'NT Platform',
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index c99675027..27e096bb4 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -670,11 +670,11 @@
     mounted() {
       this.GetgetLoginUserType()
       console.log(this.currentPersonRole)
-      // setTimeout(() => {
-      //   if (this.currentPersonRole == 'dre') {
-      //     this.handlePreservation()
-      //   }
-      // }, 10000)
+      setTimeout(() => {
+        if (this.currentPersonRole == 'dre') {
+          this.handlePreservation()
+        }
+      }, 10000)
       // this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
       this.paramsManifest = this.$route.query
       // document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
@@ -1334,11 +1334,11 @@
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 this.textLoading = false
               }
-              // setTimeout(() => {
-              //   if (this.currentPersonRole == 'dre') {
-              //     this.handlePreservation()
-              //   }
-              // }, 10000)
+              setTimeout(() => {
+                if (this.currentPersonRole == 'dre') {
+                  this.handlePreservation()
+                }
+              }, 10000)
             } else {
               if (num && num == 1) {
                 _this.$message.warning(_this.$t('operationFailed'))