From 9102c2e692e77b27d4f69f6782c49b6ee2ac5db0 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Mon, 27 Jun 2022 19:15:15 +0800
Subject: [PATCH] [update]

---
 jero-web/src/common/lang/en-us.js             | 16 +++++-----
 jero-web/src/common/lang/zh-cn.js             | 18 +++++------
 .../src/components/tableCollection/index.vue  | 31 ++++++++++++++++++-
 .../dialog/ProjectCollectionParameters.vue    |  2 +-
 4 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 056aa9e83..287db8dc8 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -933,14 +933,14 @@ module.exports = {
   reportNotUploaded: 'Report not uploaded',
   position: 'position',
 //  认证权限状态
-  CollectionInitiated: 'Collection to be initiated、',
-  handledInterface: 'To be handled by the project interface、',
-  ReturnedPerson: 'Returned by project contact person、',
-  completed: 'To be completed、',
-  Filledreturn: 'Filled by return、',
-  Submitted: 'Submitted、',
-  ReturnedEngineer: 'Returned by Certification Engineer、',
-  SynchronizedLibrary: 'Synchronized to the upper reporting Library、',
+  CollectionInitiated: 'Collection to be initiated',
+  handledInterface: 'To be handled by the project interface',
+  ReturnedPerson: 'Returned by project contact person',
+  completed: 'To be completed',
+  Filledreturn: 'Filled by return',
+  Submitted: 'Submitted',
+  ReturnedEngineer: 'Returned by Certification Engineer',
+  SynchronizedLibrary: 'Synchronized to the upper reporting Library',
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
   and: 'and',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 796b7d3ca..5c6e9c49b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -738,7 +738,7 @@ module.exports = {
 
   ParameteItemCollectionList: '参数项收集清单',
   Areyousureparameteritems: '确认提交所选参数项嘛?',
-  Theselectedconfiguration: '参数清单中参数项均为 待发起收集或变更时，才能添加配置',
+  Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时，才能添加配置',
   theCurrent: '此数据当前状态为',
   thisbuttonCompleted: '当状态为"已完成"时，才可操作此按钮',
   Frozenstatus: '冻结状态,仅可以查看',
@@ -939,14 +939,14 @@ module.exports = {
   reportNotUploaded: '报告未上传',
   position: '职位',
 //  认证权限状态
-  CollectionInitiated: '待发起收集、',
-  handledInterface: '待工程接口人处理、',
-  ReturnedPerson: '工程接口人退回、',
-  completed: '待填写、',
-  Filledreturn: '填写人退回、',
-  Submitted: '已提交、',
-  ReturnedEngineer: '认证工程师退回、',
-  SynchronizedLibrary: '已同步至上报库、',
+  CollectionInitiated: '待发起收集',
+  handledInterface: '待工程接口人处理',
+  ReturnedPerson: '工程接口人退回',
+  completed: '待填写',
+  Filledreturn: '填写人退回',
+  Submitted: '已提交',
+  ReturnedEngineer: '认证工程师退回',
+  SynchronizedLibrary: '已同步至上报库',
   Statusis: '状态为',
   toHavePermission: '才有权限',
   and: '并且',
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 7eb789666..383d55a84 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -474,7 +474,36 @@
             //     }
             //   })
             // })
-            this.dataSource = res.result
+            let tt = []
+            if(this.currentPersonRole !== 'dre') {
+              res.result.forEach((Obj) => {
+                Object.keys(Obj).forEach((item) => {
+                  if(Obj[item] instanceof Object && Obj[item].controlType !== undefined){
+                    Obj[item].list.forEach((itemLi) => {
+                      itemLi.isLock = 1
+                      if(itemLi.type === 'pull_more'){
+                        itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+                      }
+                    })
+                  }
+                })
+                tt.push(Obj)
+              })
+            } else {
+              res.result.forEach((Obj) => {
+                Object.keys(Obj).forEach((item) => {
+                  if(Obj[item] instanceof Object && Obj[item].controlType !== undefined){
+                    Obj[item].list.forEach((itemLi) => {
+                      if(itemLi.type === 'pull_more'){
+                        itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+                      }
+                    })
+                  }
+                })
+                tt.push(Obj)
+              })
+            }
+            this.dataSource = tt
             this.total = res.result.total
             this.selectedRowKeys = []
             this.selectedRowrowValue = []
diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
index ed106d350..b4104eaaa 100644
--- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
+++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue
@@ -131,7 +131,7 @@ export default {
       formData: {},
       rules: {
         title: [
-          { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
+          { required: true, message: this.$t('PleaseEnter')+this.$t('title'), trigger: 'blur' }
         ]
       },
       areaTable: [],