From e2954170c0d4dc696bc1a4c5242d7346f6473099 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Mon, 24 Jun 2024 11:12:23 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=92=8C=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standard/modules/TreeNodeModal.vue | 5 ++ .../nonmatchItem/NonmatchItemList.vue | 16 ++++- .../RegulatoryComplianceAssessmentList.vue | 19 +++++- .../modules/AssessmentLookModal.vue | 53 ++++++++-------- .../MarketRegulationsDetailPage.vue | 60 ++++++++++--------- .../MarketRegulationsFormPage.vue | 60 ++++++++++++------- .../MarketRegulationsList.vue | 24 ++++---- .../modules/MarketRegulationsModal.vue | 54 ++++++++--------- 8 files changed, 169 insertions(+), 122 deletions(-) diff --git a/src/views/enterpriseStandardLibrary/standard/modules/TreeNodeModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/TreeNodeModal.vue index 2713145..c213725 100644 --- a/src/views/enterpriseStandardLibrary/standard/modules/TreeNodeModal.vue +++ b/src/views/enterpriseStandardLibrary/standard/modules/TreeNodeModal.vue @@ -16,6 +16,11 @@ :maxLength="50" v-decorator.trim="[ 'nodeName', validatorRules.nodeName ]" /> + + + diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue index bfaee34..213245a 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue @@ -145,7 +145,7 @@ import { kkFilePreview } from '@/utils/kkFilePreview' import { downloadFile, getFileAccessHttpUrl } from '@/api/manage' import JTable from '@/components/jero/JTable' import { ACCESS_TOKEN } from '@/store/mutation-types' -import { RectificationState } from '../../../enums/commonEnums' +import { RectificationState, StandardSource } from '../../../enums/commonEnums' import NonmatchItemCloseModal from './modules/NonmatchItemCloseModal' import NonmatchItemLookModal from './modules/NonmatchItemLookModal' import { queryDepartTreeList } from '../../../api/api' @@ -317,7 +317,19 @@ export default { } }, toDetail (record) { - + let path = '' + // 需要先判断是哪种标准 + if (record.source === StandardSource.FOREIGN.value) { + path = '/standardRegulationLibrary/DomesticStandardDetail' + } else if (record.source === StandardSource.ENTERPRISE.value) { + path = '/enterpriseStandardLibrary/enterpriseStandardDetail' + } + this.$openPageNewSheet({ + path: path, + query: { + id: record.standardId + } + }) }, // 批量关闭 batchClose () { diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue index d4cd837..8efeb31 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue @@ -39,7 +39,7 @@ + v-model="queryParam.valuationTime" /> @@ -99,6 +99,7 @@ import JTable from '@/components/jero/JTable' import { JeroListMixin } from '@/mixins/JeroListMixin' import AssessmentLookModal from './modules/AssessmentLookModal' +import { StandardSource } from '../../../enums/commonEnums' export default { name: 'RegulatoryComplianceAssessmentList', @@ -132,7 +133,7 @@ export default { title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.dateOfEvaluation'), align: 'center', width: 180, - dataIndex: 'dateOfEvaluation', + dataIndex: 'valuationTime', scopedSlots: { customRender: 'text' } }, { @@ -159,7 +160,19 @@ export default { }, methods: { toDetail (record) { - + let path = '' + // 需要先判断是哪种标准 + if (record.source === StandardSource.FOREIGN.value) { + path = '/standardRegulationLibrary/DomesticStandardDetail' + } else if (record.source === StandardSource.ENTERPRISE.value) { + path = '/enterpriseStandardLibrary/enterpriseStandardDetail' + } + this.$openPageNewSheet({ + path: path, + query: { + id: record.standardId + } + }) }, // 查看 handleLook (record) { diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue index 0ace6f2..9407f37 100644 --- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue +++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue @@ -17,7 +17,7 @@ + v-model="queryParam.termNumber"> @@ -26,7 +26,7 @@ + v-model="queryParam.model"> @@ -35,7 +35,7 @@ + v-model="queryParam.result"> @@ -44,7 +44,7 @@ + v-model="queryParam.userName"> @@ -76,10 +76,9 @@ - {{ global.emptyLine }} - +
@@ -146,21 +145,21 @@ export default { title: this.$t('clauseNo'), align: 'center', width: 180, - dataIndex: 'clauseNo', + dataIndex: 'termNumber', scopedSlots: { customRender: 'text' } }, { // 条款内容 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.clauseContent'), align: 'center', width: 180, - dataIndex: 'clauseContent', + dataIndex: 'termContent', scopedSlots: { customRender: 'text' } }, { // 车型 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.vehicleType'), align: 'center', width: 180, - dataIndex: 'vehicleType', + dataIndex: 'model', scopedSlots: { customRender: 'text' } }, { // 车型状态 @@ -174,77 +173,77 @@ export default { title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.responsibleDepartment'), align: 'center', width: 180, - dataIndex: 'responsibleDepartment', + dataIndex: 'authDept', scopedSlots: { customRender: 'text' } }, { // 评估人 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.appraiser'), align: 'center', width: 180, - dataIndex: 'appraiser', + dataIndex: 'userId_dictText', scopedSlots: { customRender: 'text' } }, { // 评估结果 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.evaluationResult'), align: 'center', width: 180, - dataIndex: 'evaluationResult', + dataIndex: 'result', scopedSlots: { customRender: 'text' } }, { // 不满足要求的现状 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.theStatusNotMeetRequirements'), align: 'center', width: 180, - dataIndex: 'theStatusNotMeetRequirements', + dataIndex: 'unsatisfyRequire', scopedSlots: { customRender: 'text' } }, { // 整改方案 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.rectificationPlan'), align: 'center', width: 180, - dataIndex: 'rectificationPlan', + dataIndex: 'correctionSolution', scopedSlots: { customRender: 'text' } }, { // 整改周期 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.rectificationCycle'), align: 'center', width: 180, - dataIndex: 'rectificationCycle', + dataIndex: 'correctionCycle', scopedSlots: { customRender: 'text' } }, { // 整改费用 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.rectificationCost'), align: 'center', width: 180, - dataIndex: 'rectificationCost', + dataIndex: 'correctionCost', scopedSlots: { customRender: 'text' } }, { // 与其他项目共用性 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.sharedWithOtherProjects'), align: 'center', width: 180, - dataIndex: 'sharedWithOtherProjects', + dataIndex: 'commonality', scopedSlots: { customRender: 'text' } }, { // 共用后本项目所需费用 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.costOfThisItemAfterSharing'), align: 'center', width: 180, - dataIndex: 'costOfThisItemAfterSharing', + dataIndex: 'commonalityCost', scopedSlots: { customRender: 'text' } }, { // 备注 title: this.$t('remarks'), align: 'center', width: 180, - dataIndex: 'remarks', + dataIndex: 'remark', scopedSlots: { customRender: 'text' } }, { // 佐证材料 title: this.$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.supportingMaterial'), align: 'center', width: 180, - dataIndex: 'supportingMaterial', + dataIndex: 'material', scopedSlots: { customRender: 'file' } } ], @@ -277,7 +276,7 @@ export default { }, previewFile (record) { // 截取文件后缀名 - const fileSuffix = record.fileId_dictText ? record.fileId_dictText.split('.')[record.fileId_dictText.split('.').length - 1].toLowerCase() : '' + const fileSuffix = record.material_dictText ? record.material_dictText.split('.')[record.material_dictText.split('.').length - 1].toLowerCase() : '' const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix.toLowerCase() === tt) // 判断是否为可预览格式的文件 if (!canPreview) { @@ -286,10 +285,10 @@ export default { }) return } - const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.fileId}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.fileId_dictText}` + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${record.material}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${record.material_dictText}` // 图片预览,使用自己添加的组件 if (canPreview && FILE_TYPE_IMGS.includes(fileSuffix)) { - this.imageUrl = getFileAccessHttpUrl(record.fileId) + this.imageUrl = getFileAccessHttpUrl(record.material) // 获取viewer实例 const viewer = this.$el.querySelector('.image').$viewer // 调用show方法进行显示预览图 @@ -299,7 +298,7 @@ export default { } // pdf预览 if (canPreview && FILE_TYPE_PDF.includes(fileSuffix)) { - const url = previewPdf(record.fileId) + const url = previewPdf(record.material) window.open(url) return } @@ -309,7 +308,7 @@ export default { // 下载 handleDownload (record) { // 下载文件 - downloadFile(`/sys/common/download/${record.fileId}`, record.fileId_dictText) + downloadFile(`/sys/common/download/${record.material}`, record.material_dictText) }, handleCancel () { this.close() diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue index 02905b6..c9252d5 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue @@ -5,27 +5,27 @@ - {{ model.countryRegion }} + {{ model.country }} - {{ model.listNumber }} + {{ model.manifestNo }} - {{ model.listName }} + {{ model.mainfestName }} - {{ model.drivingPosition }} + {{ model.drivePosition }} - {{ model.securityClass }} + {{ model.securityLevel_dictText }} @@ -107,6 +107,7 @@ import FileEcho from '../../../components/FileEcho' import { JeroListMixin } from '../../../mixins/JeroListMixin' import { getMarketRegulationListById } from '../../../api/standardRegulationLibraryApi' import JTable from '../../../components/jero/JTable' +import { StandardSource } from '../../../enums/commonEnums' export default { name: 'MarketRegulationsDetailPage', @@ -151,21 +152,21 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'), align: 'center', width: 180, - dataIndex: 'newProductionVehicleImplementationDate', + dataIndex: 'newProductImplDate', scopedSlots: { customRender: 'text' } }, { // 新认证车实施日期 title: this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate'), align: 'center', width: 180, - dataIndex: 'newCertifiedVehicleImplementationDate', + dataIndex: 'newAuthImplDate', scopedSlots: { customRender: 'text' } }, { // 注册日期 title: this.$t('standardRegulationLibrary.marketListField.dateOfRegistration'), align: 'center', width: 180, - dataIndex: 'dateOfRegistration', + dataIndex: 'registrationDate', scopedSlots: { customRender: 'text' } }, { // 适用国家/地区 @@ -179,7 +180,7 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.applicableVehicleType'), align: 'center', width: 180, - dataIndex: 'applicableVehicleType', + dataIndex: 'applicableVehicle', scopedSlots: { customRender: 'text' } }, { // 认证对象 @@ -193,14 +194,14 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.certifiedDeliverables'), align: 'center', width: 180, - dataIndex: 'certifiedDeliverables', + dataIndex: 'certifyTheDeliverables', scopedSlots: { customRender: 'text' } }, { // 类型 title: this.$t('standardRegulationLibrary.marketListField.type'), align: 'center', width: 180, - dataIndex: 'type', + dataIndex: 'stanardClass', scopedSlots: { customRender: 'text' } }, { // 动力类型 @@ -214,57 +215,50 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.mainControlDepartment'), align: 'center', width: 180, - dataIndex: 'mainControlDepartment', + dataIndex: 'mainDept', scopedSlots: { customRender: 'text' } }, { // 主控部门专业模块 title: this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule'), align: 'center', width: 180, - dataIndex: 'masterControlDepartmentProfessionalModule', + dataIndex: 'mainDeptProfMode', scopedSlots: { customRender: 'text' } }, { // 关联部门 title: this.$t('standardRegulationLibrary.marketListField.relatedDepartment'), align: 'center', width: 180, - dataIndex: 'relatedDepartment', + dataIndex: 'associateDept', scopedSlots: { customRender: 'text' } }, { // 关联部门专业模块 title: this.$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules'), align: 'center', width: 180, - dataIndex: 'associateDepartmentSpecializedModules', + dataIndex: 'associateDeptProfMode', scopedSlots: { customRender: 'text' } }, { // 批量限制 title: this.$t('standardRegulationLibrary.marketListField.batchRestriction'), align: 'center', width: 180, - dataIndex: 'batchRestriction', + dataIndex: 'batchLimit', scopedSlots: { customRender: 'text' } }, { // 自动驾驶等级 title: this.$t('standardRegulationLibrary.marketListField.automaticDrivingLevel'), align: 'center', width: 180, - dataIndex: 'automaticDrivingLevel', + dataIndex: 'autopilotLevel', scopedSlots: { customRender: 'text' } }, { // 要求类型 title: this.$t('standardRegulationLibrary.marketListField.requirementType'), align: 'center', width: 180, - dataIndex: 'requirementType', + dataIndex: 'requireType', scopedSlots: { customRender: 'text' } - }, - { - title: this.$t('operation'), - scopedSlots: { customRender: 'action' }, - align: 'center', - fixed: 'right', - width: 170 } ], disableMixinCreated: true @@ -275,7 +269,7 @@ export default { this.filters.ids = this.$route.query.ids } if (this.$route.query.versionNumber) { - this.filters.versionNumber = this.$route.query.versionNumber + this.filters.manifestVersion = this.$route.query.versionNumber } this.initData() }, @@ -293,7 +287,19 @@ export default { }) }, toDetail (record) { - + let path = '' + // 需要先判断是哪种标准 + if (record.source === StandardSource.FOREIGN.value) { + path = '/standardRegulationLibrary/DomesticStandardDetail' + } else if (record.source === StandardSource.ENTERPRISE.value) { + path = '/enterpriseStandardLibrary/enterpriseStandardDetail' + } + this.$openPageNewSheet({ + path: path, + query: { + id: record.standardId + } + }) } } } diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue index bc14b8f..7f45f57 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue @@ -13,7 +13,7 @@ - @@ -26,7 +26,7 @@ + v-decorator="['manifestNo', validatorRules.manifestNo]" /> @@ -46,7 +46,7 @@ - @@ -56,7 +56,7 @@ - @@ -101,7 +101,7 @@ - + { return '-' + parseInt(Math.random() * 10000 + 1, 10) @@ -280,7 +281,7 @@ export default { }, validatorRules: { // 国家/地区 - countryRegion: { + country: { rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('standardRegulationLibrary.marketRegulationsList.countryRegion') @@ -288,7 +289,7 @@ export default { validateTrigger: 'change' }, // 清单编号 - listNumber: { + manifestNo: { rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('standardRegulationLibrary.marketRegulationsList.listNumber') @@ -296,7 +297,7 @@ export default { validateTrigger: 'blur' }, // 驾驶位置 - drivingPosition: { + drivePosition: { rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('standardRegulationLibrary.marketRegulationsList.drivingPosition') @@ -340,21 +341,21 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'), align: 'center', width: 180, - dataIndex: 'newProductionVehicleImplementationDate', + dataIndex: 'newProductImplDate', scopedSlots: { customRender: 'text' } }, { // 新认证车实施日期 title: this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate'), align: 'center', width: 180, - dataIndex: 'newCertifiedVehicleImplementationDate', + dataIndex: 'newAuthImplDate', scopedSlots: { customRender: 'text' } }, { // 注册日期 title: this.$t('standardRegulationLibrary.marketListField.dateOfRegistration'), align: 'center', width: 180, - dataIndex: 'dateOfRegistration', + dataIndex: 'registrationDate', scopedSlots: { customRender: 'text' } }, { // 适用国家/地区 @@ -368,7 +369,7 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.applicableVehicleType'), align: 'center', width: 180, - dataIndex: 'applicableVehicleType', + dataIndex: 'applicableVehicle', scopedSlots: { customRender: 'text' } }, { // 认证对象 @@ -382,14 +383,14 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.certifiedDeliverables'), align: 'center', width: 180, - dataIndex: 'certifiedDeliverables', + dataIndex: 'certifyTheDeliverables', scopedSlots: { customRender: 'text' } }, { // 类型 title: this.$t('standardRegulationLibrary.marketListField.type'), align: 'center', width: 180, - dataIndex: 'type', + dataIndex: 'stanardClass', scopedSlots: { customRender: 'text' } }, { // 动力类型 @@ -403,49 +404,49 @@ export default { title: this.$t('standardRegulationLibrary.marketListField.mainControlDepartment'), align: 'center', width: 180, - dataIndex: 'mainControlDepartment', + dataIndex: 'mainDept', scopedSlots: { customRender: 'text' } }, { // 主控部门专业模块 title: this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule'), align: 'center', width: 180, - dataIndex: 'masterControlDepartmentProfessionalModule', + dataIndex: 'mainDeptProfMode', scopedSlots: { customRender: 'text' } }, { // 关联部门 title: this.$t('standardRegulationLibrary.marketListField.relatedDepartment'), align: 'center', width: 180, - dataIndex: 'relatedDepartment', + dataIndex: 'associateDept', scopedSlots: { customRender: 'text' } }, { // 关联部门专业模块 title: this.$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules'), align: 'center', width: 180, - dataIndex: 'associateDepartmentSpecializedModules', + dataIndex: 'associateDeptProfMode', scopedSlots: { customRender: 'text' } }, { // 批量限制 title: this.$t('standardRegulationLibrary.marketListField.batchRestriction'), align: 'center', width: 180, - dataIndex: 'batchRestriction', + dataIndex: 'batchLimit', scopedSlots: { customRender: 'text' } }, { // 自动驾驶等级 title: this.$t('standardRegulationLibrary.marketListField.automaticDrivingLevel'), align: 'center', width: 180, - dataIndex: 'automaticDrivingLevel', + dataIndex: 'autopilotLevel', scopedSlots: { customRender: 'text' } }, { // 要求类型 title: this.$t('standardRegulationLibrary.marketListField.requirementType'), align: 'center', width: 180, - dataIndex: 'requirementType', + dataIndex: 'requireType', scopedSlots: { customRender: 'text' } }, { @@ -497,7 +498,7 @@ export default { return { ...item, uid: uidGenerator() } }))) this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'countryRegion', 'listNumber', 'customName', 'drivingPosition', 'securityClass', 'listDeclaration', 'attach')) + this.form.setFieldsValue(pick(this.model, 'country', 'manifestNo', 'customName', 'drivePosition', 'securityLevel', 'listDeclaration', 'attach')) }) } }).finally(() => { @@ -726,6 +727,21 @@ export default { } }) }, + toDetail (record) { + let path = '' + // 需要先判断是哪种标准 + if (record.source === StandardSource.FOREIGN.value) { + path = '/standardRegulationLibrary/DomesticStandardDetail' + } else if (record.source === StandardSource.ENTERPRISE.value) { + path = '/enterpriseStandardLibrary/enterpriseStandardDetail' + } + this.$openPageNewSheet({ + path: path, + query: { + id: record.standardId + } + }) + }, // 编辑 handleEdit (record) { this.$refs.marketRegulationsModal.title = this.$t('edit') diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue index 6503f5d..6daf106 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue @@ -10,7 +10,7 @@ + v-model="queryParam.manifestNo"> @@ -19,7 +19,7 @@ + v-model="queryParam.mainfestName"> @@ -28,7 +28,7 @@ @@ -39,7 +39,7 @@ @@ -128,42 +128,42 @@ export default { title: this.$t('standardRegulationLibrary.marketRegulationsList.countryRegion'), align: 'center', width: 180, - dataIndex: 'countryRegion', + dataIndex: 'country', scopedSlots: { customRender: 'text' } }, { // 清单编号 title: this.$t('standardRegulationLibrary.marketRegulationsList.listNumber'), align: 'center', width: 180, - dataIndex: 'listNumber', + dataIndex: 'manifestNo', scopedSlots: { customRender: 'toDetail' } }, { // 清单名称 title: this.$t('standardRegulationLibrary.marketRegulationsList.listName'), align: 'center', width: 180, - dataIndex: 'listName', + dataIndex: 'mainfestName', scopedSlots: { customRender: 'toDetail' } }, { // 驾驶位置 title: this.$t('standardRegulationLibrary.marketRegulationsList.drivingPosition'), align: 'center', width: 180, - dataIndex: 'drivingPosition', + dataIndex: 'drivePosition', scopedSlots: { customRender: 'text' } }, { // 清单版本 title: this.$t('standardRegulationLibrary.marketRegulationsList.listVersion'), align: 'center', width: 180, - dataIndex: 'listVersion', + dataIndex: 'manifestVersion', scopedSlots: { customRender: 'text' } }, { // 发布时间 title: this.$t('standardRegulationLibrary.marketRegulationsList.releaseTime'), align: 'center', width: 180, - dataIndex: 'releaseTime', + dataIndex: 'releaseDate', scopedSlots: { customRender: 'text' } }, { // 作者 @@ -177,7 +177,7 @@ export default { title: this.$t('standardRegulationLibrary.marketRegulationsList.listState'), align: 'center', width: 180, - dataIndex: 'listState', + dataIndex: 'manifestStatus', scopedSlots: { customRender: 'text' } }, { @@ -196,7 +196,7 @@ export default { has: '', // 已发布状态不显示发布按钮?? show: (record) => { - return record.listState !== ListState.RELEASED.value + return record.manifestStatus !== ListState.RELEASED.value } }, // 编辑 diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue index 7b8b5d4..3bffe20 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue @@ -37,22 +37,22 @@ + v-decorator.trim="[ 'stanardClass', validatorRules.stanardClass ]" /> + v-decorator.trim="[ 'newProductImplDate', validatorRules.newProductImplDate ]" /> + v-decorator.trim="[ 'newAuthImplDate', validatorRules.newAuthImplDate ]" /> + v-decorator.trim="[ 'registrationDate', validatorRules.registrationDate ]" /> @@ -70,37 +70,37 @@ + v-decorator.trim="[ 'certifyTheDeliverables', validatorRules.certifyTheDeliverables ]" /> + v-decorator.trim="[ 'mainDept', validatorRules.mainDept ]" /> + v-decorator.trim="[ 'mainDeptProfMode', validatorRules.mainDeptProfMode ]" /> + v-decorator.trim="[ 'associateDept', validatorRules.associateDept ]" /> + v-decorator.trim="[ 'associateDeptProfMode', validatorRules.associateDeptProfMode ]" /> + v-decorator.trim="[ 'applicableVehicle', validatorRules.applicableVehicle ]" /> @@ -112,19 +112,19 @@ + v-decorator.trim="[ 'batchLimit', validatorRules.batchLimit ]" /> + v-decorator.trim="[ 'autopilotLevel', validatorRules.autopilotLevel ]" /> + v-decorator.trim="[ 'requireType', validatorRules.requireType ]" /> @@ -182,7 +182,7 @@ export default { validateTrigger: 'blur' }, // 新生产车实施日期 - newProductionVehicleImplementationDate: { + newProductImplDate: { rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate') @@ -190,7 +190,7 @@ export default { validateTrigger: 'change' }, // 新认证车实施日期 - newCertifiedVehicleImplementationDate: { + newAuthImplDate: { rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate') @@ -198,7 +198,7 @@ export default { validateTrigger: 'change' }, // 注册日期 - dateOfRegistration: { + registrationDate: { rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.marketListField.dateOfRegistration') @@ -222,7 +222,7 @@ export default { validateTrigger: 'change' }, // 主控部门 - mainControlDepartment: { + mainDept: { rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.marketListField.mainControlDepartment') @@ -230,7 +230,7 @@ export default { validateTrigger: 'change' }, // 主控部门专业模块 - masterControlDepartmentProfessionalModule: { + mainDeptProfMode: { rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule') @@ -238,7 +238,7 @@ export default { validateTrigger: 'change' }, // 适用车型 - applicableVehicleType: { + applicableVehicle: { rules: [{ required: true, message: this.$t('pleaseSelect') + this.$t('standardRegulationLibrary.marketListField.applicableVehicleType') @@ -266,11 +266,9 @@ export default { this.model = Object.assign({}, record) this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'standardNumber', 'standardName', 'standardEnglishName', - 'type', 'newProductionVehicleImplementationDate', 'newCertifiedVehicleImplementationDate', - 'dateOfRegistration', 'applicableCountryRegion', 'authenticationObject', 'certifiedDeliverables', - 'mainControlDepartment', 'masterControlDepartmentProfessionalModule', 'relatedDepartment', - 'associateDepartmentSpecializedModules', 'applicableVehicleType', 'dynamicType', 'batchRestriction', - 'automaticDrivingLevel', 'requirementType')) + 'stanardClass', 'newProductImplDate', 'newAuthImplDate', 'registrationDate', 'applicableCountryRegion', + 'authenticationObject', 'certifyTheDeliverables', 'mainDept', 'mainDeptProfMode', 'associateDept', + 'associateDeptProfMode', 'applicableVehicle', 'dynamicType', 'batchLimit', 'autopilotLevel', 'requireType')) }) }, // 选择标准改变 @@ -284,11 +282,9 @@ export default { const result = res.result this.$nextTick(() => { this.form.setFieldsValue(pick(result, 'standardNumber', 'standardName', 'standardEnglishName', - 'type', 'newProductionVehicleImplementationDate', 'newCertifiedVehicleImplementationDate', - 'dateOfRegistration', 'applicableCountryRegion', 'authenticationObject', 'certifiedDeliverables', - 'mainControlDepartment', 'masterControlDepartmentProfessionalModule', 'relatedDepartment', - 'associateDepartmentSpecializedModules', 'applicableVehicleType', 'dynamicType', 'batchRestriction', - 'automaticDrivingLevel', 'requirementType')) + 'stanardClass', 'newProductImplDate', 'newAuthImplDate', 'registrationDate', 'applicableCountryRegion', + 'authenticationObject', 'certifyTheDeliverables', 'mainDept', 'mainDeptProfMode', 'associateDept', + 'associateDeptProfMode', 'applicableVehicle', 'dynamicType', 'batchLimit', 'autopilotLevel', 'requireType')) }) } }).finally(() => {