diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index bf8446f3f..739c6cbf6 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -70,12 +70,13 @@ >{{queryForm.vehiclePlatform}}
- RXSWIN - RXSWIN + - RXSWIN{{$t('detailedList')}} + + RXSWIN{{$t('detailedList')}}
diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 6b4686004..98265426f 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -54,10 +54,10 @@ v-model="queryParam.version"> - - {{ item.key }} + :label="item" + :value="item"> + + {{ item }} @@ -78,7 +78,7 @@
-
+
{{$t('submit')}}
diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue index e00bcc754..fdded68ee 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -41,31 +41,31 @@ v-model="queryParam.rxswin">
- - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -132,7 +132,7 @@ export default { { title: this.$t('standard'), align: 'left', - dataIndex: 'standard', + dataIndex: 'serialNumber', ellipsis: true, sorter:true, width: 170 @@ -148,7 +148,7 @@ export default { { title: 'RXSWIN', align: 'left', - dataIndex: 'RXSWIN', + dataIndex: 'rxswin', ellipsis: true, sorter:true, width: 170 @@ -156,75 +156,12 @@ export default { { title: this.$t('Correspondingversion'), align: 'left', - dataIndex: 'Correspondingversion', + dataIndex: 'version', ellipsis: true, sorter:true, width: 170 }, ], - fieldList: [ - { - type: 'string', - value: 'subtitle', - text: this.$t('subtitle') - }, - { - type: '', - value: 'region', - text: this.$t('zoneOfApplication'), - dictCode: 'region'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - { - type: 'string', - value: 'correspondingStandard', - text: this.$t('correspondingStandard') - }, - { - type: '', - value: 'implementType', - text: this.$t('implementationCategory'), - dictCode: 'implement_type'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - { - type: 'date', - value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', - text: this.$t('ImplementationDate') - }, - { - type: 'date', - value: 'implementTime', - text: this.$t('vehicleInProductionDate') - }, - { - type: '', - value: 'attestationType', - text: this.$t('certificationType'), - dictCode: 'attestation_type'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - { - type: '', - value: 'attestationRank', - text: this.$t('certificationLevel'), - dictCode: 'attestation_rank'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - { - type: 'string', - value: 'applicableSupplement', - text: this.$t('applicableSupplement') - }, - { - type: 'string', - value: 'wvtaId', - text: 'WVTA ID' - }, - { - type: '', - value: 'dutyTerritory', - text: this.$t('areaOfResponsibility'), - dictCode: 'duty_territory'//只要 dictCode 有值,无论 type 是什么,都显示为字典下拉框 - }, - - ], dataList: [], content: [], loading: false, @@ -304,18 +241,19 @@ export default { if (res.success) { this.confirmLoading = false // this.$message.success(this.$t('OperationSuccessful')) - if(res.result.flag == 'YES'){ + if(res.result == 'YES'){ let _this = this this.$confirm({ content: _this.$t('AlreadyExists'), onOk() { - geteAction('/project/projectRxswinEO/addBatch', { - ids: this.selectedRowKeys.join(','), + getAction('/project/projectRxswinEO/addBatch', { + ids: selectedRowKeys.join(','), flag:'YES', - projectId: this.projectId, + projectId: _this.projectId, }).then((res) => { if (res.success) { - _this.$message.success(this.$t('OperationSuccessful')) + _this.$message.success(_this.$t('OperationSuccessful')) + _this.visible = false _this.$emit('transferListFormHomo') } else { _this.$message.warning(res.message) @@ -323,6 +261,7 @@ export default { }) }, onCancel() { + this.visible = false _this.$emit('transferListFormHomo') } })