diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index d8798f0aa..5351e4d84 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -271,13 +271,15 @@
},
getData(){
let otaIdT=localStorage.getItem('otaIdT')
+ console.log('!!!',otaIdT);
if(otaIdT==null){
otaIdT=''
}
- if(localStorage.getItem('otaId') == null){
- return
- }else{
- getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
+ let otaId=localStorage.getItem('otaId')
+ if(otaId==null){
+ otaId=''
+ }
+ getAction('/ota/otaBaCxJbxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
if(res.code == 200){
this.form=res.result
if(res.result.dllx1 == null ){
@@ -290,7 +292,6 @@
}
})
- }
},
next(){
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index 5a29207a6..43302b99b 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -30,7 +30,11 @@
:triggerChange="false"/>
- {{$t('uploadattachment')}}
+
+ {{ (record.zmcl === 'null' || record.zmcl === '' ||
+ record.zmcl == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
+ }}
+
@@ -63,6 +67,7 @@ import ImportFile from '@/components/ImportFileData/index'
dataSource: [
{
key: '1',
+ zmcl:'',
aspect: this.$t('upgradepacketprotectionmeasures'),
safetymeasure: this.$t('authenticityandintegrityprotectionmechanism'),
relevantverification: 'havemeasures',
@@ -71,6 +76,7 @@ import ImportFile from '@/components/ImportFileData/index'
},
{
key: '2',
+ zmcl:'',
aspect: this.$t('otaupgradedsecuritymeasuresforvehicles'),
safetymeasure: this.$t('failsafmechanism'),
relevantverification: 'havemeasures',
@@ -80,6 +86,7 @@ import ImportFile from '@/components/ImportFileData/index'
{
key: '3',
aspect: '',
+ zmcl:'',
safetymeasure: this.$t('vehiclesafetyMeasuresafterUpgradefailure'),
relevantverification: 'havemeasures',
certifyingmaterials:'',
@@ -88,6 +95,7 @@ import ImportFile from '@/components/ImportFileData/index'
{
key: '4',
aspect: '',
+ zmcl:'',
safetymeasure: this.$t('informationsecuritymechanism'),
relevantverification: 'havemeasures',
certifyingmaterials:'',
@@ -160,11 +168,13 @@ import ImportFile from '@/components/ImportFileData/index'
pageSize: 10,
pageNo: 1,
total: 0,
- queryParam: {}
+ type:'',
+ queryParam: {},
+ fileList: {},
}
},
mounted() {
- this.getList()
+ // this.getList()
this.getData()
},
methods: {
@@ -180,13 +190,32 @@ import ImportFile from '@/components/ImportFileData/index'
getAction('/ota/otaBaCxAqcs/queryByOtaId',{otaIdT:otaIdT,otaId:localStorage.getItem('otaId')}).then(res=>{
if(res.code == 200){
this.dataSource[0].info = Number(res.result.bhjz)
- this.dataSource[1].info =Number(res.result.fsxjz)
- this.dataSource[2].info= Number(res.result.sjsbcs)
- this.dataSource[3].info=Number(res.result.xxaqjz)
+ this.dataSource[1].info =Number(res.result.fsxjz)
+ this.dataSource[2].info= Number(res.result.sjsbcs)
+ this.dataSource[3].info=Number(res.result.xxaqjz)
+ this.fileList.uploadName = res.result.zmclList
+ this.fileList.certifyingmaterials = this.$t('viewFile')
+ this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
+ this.$forceUpdate()
+ this.loading = false
}
})
},
+ uploadSuccess(data) {
+ let attIdList = []
+ if (data && data.length > 0) {
+ data.map(item => {
+ attIdList.push({
+ id: item.id,
+ fileName: item.fileName
+ })
+ })
+ }
+ /** 赋值给当前对应的表单文件 */
+ this.fileList.uploadName = attIdList
+ this.fileList.certifyingmaterials = this.$t('viewFile')
+ },
click(value){
this.fileList = value
console.log(this.fileList)
@@ -196,20 +225,6 @@ import ImportFile from '@/components/ImportFileData/index'
this.$refs.uploadFile.visible = true
},
- uploadSuccess(data) {
- let attIdList = []
- if (data && data.length > 0) {
- data.map(item => {
- attIdList.push({
- id:item.id,
- fileName:item.fileName
- })
- })
- }
- /** 赋值给当前对应的表单文件 */
- this.fileList.uploadName = attIdList
- this.fileList.certifyingmaterials = this.$t('viewFile')
- },
getList() {
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
Object.keys(queryParam).forEach(val => {
@@ -222,7 +237,7 @@ import ImportFile from '@/components/ImportFileData/index'
pageSize: this.pageSize,
...queryParam
}
- this.loading = true
+ // this.loading = true
getAction(this.url.list, query).then((res) => {
if (res.success) {
if (res.result.current > 1 && res.result.records.length == 0) {
@@ -243,6 +258,7 @@ import ImportFile from '@/components/ImportFileData/index'
obj.fsxjz= this.dataSource[1].info
obj.sjsbcs = this.dataSource[2].info
obj.xxaqjz = this.dataSource[3].info
+ obj.zmclList = this.fileList.uploadName
postAction('/ota/otaBaCxAqcs/add',obj).then(res =>{
console.log(res);
})
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
index cec918278..335b566a8 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
@@ -221,6 +221,13 @@ export default {
this.dataSource[7].relevantverification=Number(res.result.sjsbaq)
this.dataSource[8].relevantverification=Number(res.result.sjgg)
this.dataSource[9].relevantverification=Number(res.result.sjzt)
+ this.fileList.uploadName = res.result.zmclList
+ this.$nextTick(() => {
+ this.fileList.certifyingmaterials = this.$t('viewFile')
+ })
+ this.fileList.certifyingmaterials = this.$t('viewFile')
+ console.log(this.fileList)
+ this.$refs.uploadFile.perentHandleFunc(this.fileList.uploadName)
this.$forceUpdate()
})
@@ -281,6 +288,7 @@ export default {
obj.sjsbaq = this.dataSource[7].relevantverification
obj.sjgg = this.dataSource[8].relevantverification
obj.sjzt = this.dataSource[9].relevantverification
+ obj.zmclList = this.fileList.uploadName
postAction('/ota/otaBaCxZxsjyq/add', obj).then(res => {
console.log(res);
})
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
index db43ddfe5..03eca8753 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
@@ -14,11 +14,11 @@
-
+ *
{{$t('recordstatus')}}
-
+
-
+ *
{{$t('filingtime')}}
-
+
1){
this.$message.warning(this.$t('OnlyOneSelected'))
}else{
- localStorage.removeItem('otaIdt')
+ localStorage.removeItem('otaIdT')
localStorage.removeItem('otaId')
- localStorage.setItem('otaIdt',this.selectedRowKeys[0])
- this.$router.push({
+ localStorage.setItem('otaIdT',this.selectedRowKeys[0])
+ if(localStorage.getItem('otaIdT')!=null){
+ this.$router.push({
path: '/vehicleinformation',
query: {}
})
+ }
+
}
}