diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 68eb6e659..a112514e2 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -894,6 +894,7 @@ module.exports = {
designComplianceReview: 'Design Compliance Confirmation',
preHomeConfirmation: 'Pre-Homo Confirmation',
verificationComplianceReview: 'Validation Compliance Confirmation',
+ verificationComplianceExamine:'Verification compliance examine',
Deployment: 'Deploy',
pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 80aea7039..4fde5dc19 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -910,6 +910,7 @@ module.exports = {
designComplianceReview: '设计符合性确认',
preHomeConfirmation: 'Pre-Homo确认',
verificationComplianceReview: '验证符合性确认',
+ verificationComplianceExamine:'验证符合性审查',
pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据',
pleaseConformityVerification: '请补全验证符合性确认的数据',
diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 5ac5ad696..9fe25a81e 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -8,7 +8,7 @@
rowKey="id"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:pagination="false"
- :scroll="{x: '100%',y:'calc(100vh - 330px)'}"
+ :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 330px)'} : {x: '100%'}"
:data-source="dataSource"
:loading="loading"
@change="tableOnChange"
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index dac7607bd..874f7835b 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -23,25 +23,25 @@
style="margin-bottom: 20px"
>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
index b538c61fc..e6ed49fe3 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
@@ -13,6 +13,7 @@
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
index 0519e66a3..8f4b044d5 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -22,6 +22,7 @@
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 8199c7a35..3a72352db 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -23,42 +23,42 @@
style="margin-bottom: 20px"
>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index fb73175b7..ab30dab77 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -41,7 +41,7 @@
@@ -52,7 +52,7 @@
@@ -77,7 +77,7 @@
{{$t('producttrademark')}}
-
+
@@ -88,7 +88,7 @@
{{$t('productname')}}
-
+
@@ -99,7 +99,7 @@
{{$t('productModel')}}
-
+
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index d0274ca19..3295454ca 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -23,6 +23,7 @@
@@ -37,6 +38,7 @@
@@ -51,6 +53,7 @@
@@ -65,6 +68,7 @@
@@ -79,6 +83,7 @@
@@ -93,6 +98,7 @@
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index c70335a05..e8a778c32 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -39,6 +39,7 @@
:disabled="disabled"
class="box-input"
:placeholder="$t('pleaseEnter')"
+ :title='form.qymc'
v-model="form.qymc">
@@ -55,6 +56,7 @@
@@ -88,6 +90,7 @@
@@ -104,6 +107,7 @@
@@ -120,6 +124,7 @@
@@ -137,6 +142,7 @@
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index a5ee70c8c..4149a596b 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -14,7 +14,7 @@
size="middle"
:loading="loading"
:pagination="false"
- :scroll="{x: '100%',y:'calc(100vh - 140px)'}"
+ :scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 140px)'} : {x: '100%'}"
rowKey="id"
bordered
:data-source="dataSource"
@@ -59,26 +59,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -366,7 +366,7 @@ import ImportFile from '@/components/ImportFileData/index'
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
-
+
})
},
last(){
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
index 4e307f165..2a74c0dcf 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
@@ -218,7 +218,7 @@
{{$t('fillincontent')}}
-
+
@@ -244,22 +244,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -902,7 +902,7 @@ export default {
// item=Number(item)
// }
// })
- this.query=res.result.bj
+ this.query=res.result.bj==null?{}:res.result.bj
}
})
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index 42f9581cf..2ea022b96 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -43,37 +43,37 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index 181c85c0a..ed8dc8238 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -94,7 +94,29 @@
'To be tracked': 'trackedClass',
'NA': 'NAClass'
},
- regulatoryCertificationTaskPlanList: [
+ verifyList: [
+ {
+ status: '1',
+ name: this.$t('initiatingProcess')
+ },
+ {
+ status: '1',
+ name: this.$t('Taskresponsibilityrecognition')
+ },
+ {
+ status: '1',
+ name: this.$t('verificationComplianceReview')
+ },
+ {
+ status: '2',
+ name: this.$t('verificationComplianceExamine')
+ },
+ {
+ status: '3',
+ name: this.$t('missionAccomplished')
+ }
+ ],
+ designList: [
{
status: '1',
name: this.$t('initiatingProcess')
@@ -116,6 +138,7 @@
name: this.$t('missionAccomplished')
}
],
+ regulatoryCertificationTaskPlanList: [],
columns: [
{
title: this.$t('Operator'),
@@ -168,6 +191,7 @@
}
},
mounted() {
+ console.log(this.queryProject)
this.getList()
},
methods: {
@@ -180,6 +204,11 @@
if (res.success) {
this.dataSource = res.result || []
if (this.dataSource.length > 0) {
+ if (this.queryProject.flowType == 4) {
+ this.regulatoryCertificationTaskPlanList = this.verifyList
+ } else {
+ this.regulatoryCertificationTaskPlanList = this.designList
+ }
let taskData = this.dataSource[this.dataSource.length - 1]
if (this.queryProject.TaskKey == 'fqlc') {
this.regulatoryCertificationTaskPlanList.forEach(val => {
@@ -211,6 +240,8 @@
val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) {
val.status = '2'
+ } else if (val.name == this.$t('verificationComplianceReview')) {
+ val.status = '2'
} else {
val.status = '3'
}
@@ -227,6 +258,10 @@
val.status = '1'
} else if (val.name == this.$t('designComplianceReviewAdmin')) {
val.status = '1'
+ } else if (val.name == this.$t('verificationComplianceReview')) {
+ val.status = '1'
+ } else if (val.name == this.$t('verificationComplianceExamine')) {
+ val.status = '1'
} else {
val.status = '1'
}
@@ -239,8 +274,12 @@
val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) {
val.status = '1'
+ } else if (val.name == this.$t('verificationComplianceReview')) {
+ val.status = '1'
} else if (val.name == this.$t('designComplianceReviewAdmin')) {
val.status = '2'
+ } else if (val.name == this.$t('verificationComplianceExamine')) {
+ val.status = '2'
} else {
val.status = '3'
}