diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6328fd9e6..a043b7605 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1949,4 +1949,5 @@ module.exports = { Pendingapproval:'To be approved', lock:'lock', datacannotbeedited:'This data cannot be edited', + Rematchornot:'Rematch or not', } \ 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 bcff0bd3a..445fa392b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3905,4 +3905,5 @@ module.exports = { Pendingapproval:'待审批', lock:'锁定', datacannotbeedited:'该数据不能进行编辑', + Rematchornot:'是否重新匹配', } \ No newline at end of file diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue index 673724913..899d339e8 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue @@ -899,6 +899,9 @@ export default { } }, mounted() { + if(this.$route.query.vehicleTypeCode){ + this.vehicleTypeCode = this.$route.query.vehicleTypeCode + } getAction('/ota/otaManageApplyEO/getCarList', {}).then((res) => { if (res.success) { this.typeList = res.result @@ -939,8 +942,6 @@ export default { }, searchReset() { this.queryParam = {} - this.$route.query.serialNumber = '' - this.$route.query.flowStatus = '' this.pageNo = 1 this.getList() }, @@ -1011,7 +1012,7 @@ export default { } let exportName = name + ' ' + dateName + '.xlsx' let query = { - exportName: this.$route.query.infoNumber + ' ' + dateName, + exportName: exportName, idList: this.selectedRowKeys.join(','), } diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 080bbc79f..e61d0533f 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -474,6 +474,7 @@ this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.$emit('addModelList') + this.vdrClick() } else { this.$message.warning(res.message) this.confirmLoading = false @@ -482,6 +483,19 @@ } }) }, + // 跳转vdr + vdrClick(){ + let _this = this + this.$confirm({ + content: _this.$t('Rematchornot') + 'VDR', + onOk() { + let newUrl = _this.$router.resolve({ + path:'otaAuthentication', + }) + window.open(newUrl.href, '_blank') + } + }) + }, handleInput(value) { this.$nextTick(() => { this.formInline = { ...this.formInline } diff --git a/jero-web/src/views/projectManagement/components/otastatus.vue b/jero-web/src/views/projectManagement/components/otastatus.vue index 95ac9dfcb..078ab189c 100644 --- a/jero-web/src/views/projectManagement/components/otastatus.vue +++ b/jero-web/src/views/projectManagement/components/otastatus.vue @@ -36,7 +36,7 @@