diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 6ab58be1f..d66e1e355 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -900,4 +900,16 @@ module.exports = {
systemPrompt:'System Prompt',
loginExpired:'Login Expired',
reportNotUploaded:'Report not uploaded',
+// 认证权限状态
+ 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'
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 3f044af26..b1d1121e7 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -905,4 +905,16 @@ module.exports = {
systemPrompt:'系统提示',
loginExpired:'登录已过期',
reportNotUploaded:'报告未上传',
+// 认证权限状态
+ CollectionInitiated: '待发起收集、',
+ handledInterface: '待工程接口人处理、',
+ ReturnedPerson: '工程接口人退回、',
+ completed: '待填写、',
+ Filledreturn: '填写人退回、',
+ Submitted: '已提交、',
+ ReturnedEngineer: '认证工程师退回、',
+ SynchronizedLibrary: '已同步至上报库、',
+ Statusis: '状态为',
+ toHavePermission: '才有权限',
+ and: '并且'
}
\ No newline at end of file
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 48c714efb..6dd2c077e 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -18,20 +18,17 @@
{{ text.sortOrder }} 查看
-
-
-
-
-
-
-
-
-
-
+
{{ record.dataValue == null? '--': record.dataValue}}
+
+ {{ record.dataValue }}
+
+
+
+ {{ record.dataValue }}
@@ -308,6 +305,9 @@ export default {
this.areaVisible = true
this.getquerySdtList(record)
},
+ dataValueTobeinitiated() {
+ this.$message.warning(this.$t('certifiedEngineer')+this.$t('and')+this.$t('Statusis')+this.$t('CollectionInitiated')+this.$t('ReturnedPerson')+this.$t('alteration')+this.$t('toHavePermission'))
+ },
// 点击工程接口人的详情人员 无权限
ondataValueNot() {
this.$message.warning(this.$t('operatethisbutton'))
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index d5d1ba2c6..6ee45e3a1 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -396,7 +396,7 @@ export default {
if(flag === 1) {
flag = 1
} else {
- this.$message.warning(this.$t('operatethisbutton'))
+ this.$message.warning(this.$t('Statusis')+this.$t('CollectionInitiated')+this.$t('ReturnedPerson')+this.$t('alteration')+this.$t('toHavePermission'))
}
}
// 工程接口人没有权限
@@ -690,12 +690,12 @@ export default {
.then( (res) =>{
console.log(res)
if (res.data.success) {
- _this.$message.success(res.data.result)
+ _this.$message.success(res.data.message)
_this.areaVisible = false
_this.getTableList()
_this.selectedRowKeysValue=[]
}else{
- _this.$message.warning(res.data.result)
+ _this.$message.warning(res.data.message)
}
})
.catch( (error) =>{
diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
index 104eef5c5..42c7ea83d 100644
--- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
+++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
@@ -249,7 +249,7 @@ export default {
let postDate = {
title: this.formData.title,
paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0],
- paramsTemplatePublishVersion: this.version,
+ paramsTemplatePublishVersion: this.selectedRowKeysDate[0].version,
projectId: this.projectId
}
if (this.formData.id) {