diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index d8636703c..41480baf8 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1142,4 +1142,7 @@ module.exports = {
comparisonResults:'Comparison results',
Published:'Published',
initiateComparison:'Initiate comparison',
+ translationLanguage:'Translation language',
+ translationResults:'Translation results',
+ conversionTime:'Conversion time',
}
\ 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 15bbd4c33..98f362d10 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1146,4 +1146,7 @@ module.exports = {
comparisonResults:'对比结果',
Published:'已发布',
initiateComparison:'发起对比',
+ translationLanguage:'翻译语言',
+ translationResults:'翻译结果',
+ conversionTime:'转换时间',
}
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
index 7ddf2723d..0eb59c342 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
@@ -230,7 +230,15 @@
},
methods: {
CurrentStandard() {
-
+ let query = {
+ firstInitiation: '2',
+ whetherTobring: '1'
+ }
+ let newUrl = this.$router.resolve({
+ path: '/evaluationInitiationProcess',
+ query: query
+ })
+ window.open(newUrl.href, '_blank')
},
onSelectChange(value) {
this.selectedRowKeys = value
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
index cde7e8ce8..8d83206c5 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -81,7 +81,7 @@
dataSource: [],
url: {
list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list',
- exportData:'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip',
+ exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip'
},
selectedRowKeys: [],
loading: false,
@@ -114,7 +114,15 @@
},
methods: {
CurrentStandard() {
-
+ let query = {
+ firstInitiation: '2',
+ whetherTobring: '2'
+ }
+ let newUrl = this.$router.resolve({
+ path: '/evaluationInitiationProcess',
+ query: query
+ })
+ window.open(newUrl.href, '_blank')
},
onSelectChange(value) {
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index e5d051ce9..b89247abf 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -5,34 +5,37 @@
/>
-
+
-
-
-
-
+
+
@@ -238,6 +241,7 @@
},
searchParmes: {},
selectedRowKeysRecord: [],
+ whetherDisplay: false,
columns: [
{
title: this.$t('standard'),
@@ -293,6 +297,11 @@
} else {
this.isTrue = false
}
+ if (this.$route.query.firstInitiation == '1') {
+ this.whetherDisplay = true
+ } else {
+ this.whetherDisplay = false
+ }
eventBUs.$on('searchQuery', search => {
Object.keys(search).forEach(res => {
if (search[res] instanceof Array) {
@@ -454,7 +463,9 @@
value.startTime = startTime
value.flowStatus = 'Underway'
value.taskAffirmDueDate = value.endTime
- value.lawsTechnologyEvaluationId = this.getUUID()
+ if (!value.lawsTechnologyEvaluationId){
+ value.lawsTechnologyEvaluationId = this.getUUID()
+ }
value.regulationOwnerId = this.userInfo().id
value.regulationOwnerName = this.userInfo().username
Object.keys(value).forEach(res => {
@@ -474,14 +485,14 @@
query = {
type: 6,
...value,
- firstInitiation:"1",
+ firstInitiation: this.$route.query.firstInitiation,
msg: JSON.stringify({ itemList: dataList }).replace(/\"/g, '\'')
}
} else {
query = {
type: 6,
...value,
- firstInitiation:"1",
+ firstInitiation: this.$route.query.firstInitiation,
msg: JSON.stringify({ evaluators: value.evaluators }).replace(/\"/g, '\'')
}
}
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index a91cd38f5..f0d7db090 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -339,6 +339,7 @@
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.visible = false
+ this.formInline.firstInitiation = '1'
let newUrl = this.$router.resolve({
path: '/evaluationInitiationProcess',
query: this.formInline
@@ -365,9 +366,12 @@
let newUrl = this.$router.resolve({
path: '/evaluationResultsWhole',
query: {
- id:row.id,
- processBackground:row.processBackground,
- serialNumber:row.serialNumber
+ id: row.id,
+ processBackground: row.processBackground,
+ serialNumber: row.serialNumber,
+ title: row.title,
+ technologyTerritory: row.technologyTerritory,
+ standId: row.standId
}
})
window.open(newUrl.href, '_blank')
@@ -375,9 +379,12 @@
let newUrl = this.$router.resolve({
path: '/evaluationResultsClause',
query: {
- id:row.id,
- processBackground:row.processBackground,
- serialNumber:row.serialNumber
+ id: row.id,
+ processBackground: row.processBackground,
+ serialNumber: row.serialNumber,
+ title: row.title,
+ technologyTerritory: row.technologyTerritory,
+ standId: row.standId
}
})
window.open(newUrl.href, '_blank')
diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue
index 034141af2..9038af696 100644
--- a/jero-web/src/views/documentTools/documentComparison/index.vue
+++ b/jero-web/src/views/documentTools/documentComparison/index.vue
@@ -73,7 +73,7 @@
{{$t('comparisonResults')}}
- {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
+ {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
{{$t('edit')}}
{{$t('delete')}}
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
new file mode 100644
index 000000000..28593c4e6
--- /dev/null
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -0,0 +1,330 @@
+
+
+
+
+
+
+
+
+ {{$t('standard')}}
+
+
+
+
+
+
+
+ {{$t('title')}}
+
+
+
+
+
+
+
+ {{$t('releaseSituation')}}
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ {{$t('query')}}
+ {{$t('reset')}}
+
+
+
+
+
+
+
+
+ {{$t('initiateComparison')}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 50832f377..73f000e8c 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -1180,12 +1180,12 @@
selectedRowKeysValue.push(res)
}
})
+ console.log(selectedRowKeysValue)
for (let i = 0; i < selectedRowKeysValue.length; i++) {
let postDateobj = {}
let itemIn = Object.keys(selectedRowKeysValue[i])
for (let j = 0; j < itemIn.length; j++) {
- if (itemIn[j] !== 'sdt') {
- console.log(selectedRowKeysValue[i][itemIn[j]])
+ if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
@@ -1244,7 +1244,7 @@
let postDateobj = {}
let itemIn = Object.keys(selectedRowKeysValue[i])
for (let j = 0; j < itemIn.length; j++) {
- if (itemIn[j] !== 'sdt') {
+ if (itemIn[j] !== 'sdt' && selectedRowKeysValue[i][itemIn[j]].list) {
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {