QR/laws_chery_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 市场法规清单和法规符合性评估库字段修改

Browse Source
This commit is contained in:
lideqin
2024-06-24 11:12:23 +08:00
parent 2b64ec293c
commit e2954170c0
8 changed files with 169 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/enterpriseStandardLibrary/standard/modules/TreeNodeModal.vue
+5
View File
@@ -16,6 +16,11 @@
:maxLength="50"
v-decorator.trim="[ 'nodeName', validatorRules.nodeName ]" />
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.nodeOrder')">
<a-input-number style="width: 100%"
:placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.nodeOrder')"
v-decorator="['nodeOrder', validatorRules.nodeOrder]" />
</a-form-item>
</a-form>
</a-spin>
src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+14 -2
View File
@@ -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 () {
src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
+16 -3
View File
@@ -39,7 +39,7 @@
<a-range-picker
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
v-model="queryParam.dateOfEvaluation" />
v-model="queryParam.valuationTime" />
</a-form-item>
</a-col>
</template>
@@ -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) {
src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
+26 -27
View File
@@ -17,7 +17,7 @@
<a-form-item :label="$t('clauseNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
:placeholder="$t('pleaseEnter') + $t('clauseNo')"
v-model="queryParam.clauseNo">
v-model="queryParam.termNumber">
</a-input>
</a-form-item>
</a-col>
@@ -26,7 +26,7 @@
<a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.vehicleType')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
:placeholder="$t('pleaseEnter') + $t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.vehicleType')"
v-model="queryParam.vehicleType">
v-model="queryParam.model">
</a-input>
</a-form-item>
</a-col>
@@ -35,7 +35,7 @@
<a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.evaluationResult')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
:placeholder="$t('pleaseEnter') + $t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.evaluationResult')"
v-model="queryParam.evaluationResult">
v-model="queryParam.result">
</a-input>
</a-form-item>
</a-col>
@@ -44,7 +44,7 @@
<a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.responsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree-select
tree-node-filter-prop="title"
v-model="queryParam.responsibleDepartment"
v-model="queryParam.authDept"
:maxTagCount="1"
allowClear
:getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -64,7 +64,7 @@
<a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.appraiser')" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input
:placeholder="$t('pleaseEnter') + $t('regulatoryComplianceAssessmentDatabase.assessmentLibrary.appraiser')"
v-model="queryParam.appraiser">
v-model="queryParam.userName">
</a-input>
</a-form-item>
</a-col>
@@ -76,10 +76,9 @@
</a-form>
</div>
<j-table
<a-table
ref="table"
rowKey="id"
:can-drag="true"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -95,7 +94,7 @@
<div v-else class="table-text">{{ global.emptyLine }}</div>
</a-tooltip>
</template>
</j-table>
</a-table>
<!-- 预览图片的容器 -->
<div id="images">
@@ -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()
src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
+33 -27
View File
@@ -5,27 +5,27 @@
<!-- 国家/地区 -->
<a-col :span="12">
<label>{{ $t('standardRegulationLibrary.marketRegulationsList.countryRegion') }}</label>
<span>{{ model.countryRegion }}</span>
<span>{{ model.country }}</span>
</a-col>
<!-- 清单编号 -->
<a-col :span="12">
<label>{{ $t('standardRegulationLibrary.marketRegulationsList.listNumber') }}</label>
<span>{{ model.listNumber }}</span>
<span>{{ model.manifestNo }}</span>
</a-col>
<!-- 清单名称 -->
<a-col :span="12">
<label>{{ $t('standardRegulationLibrary.marketRegulationsList.listName') }}</label>
<span>{{ model.listName }}</span>
<span>{{ model.mainfestName }}</span>
</a-col>
<!-- 驾驶位置 -->
<a-col :span="12">
<label>{{ $t('standardRegulationLibrary.marketRegulationsList.drivingPosition') }}</label>
<span>{{ model.drivingPosition }}</span>
<span>{{ model.drivePosition }}</span>
</a-col>
<!-- 密级 -->
<a-col :span="12">
<label>{{ $t('standardRegulationLibrary.marketRegulationsList.securityClass') }}</label>
<span>{{ model.securityClass }}</span>
<span>{{ model.securityLevel_dictText }}</span>
</a-col>
<!-- 清单说明 -->
<a-col :span="12">
@@ -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
}
})
}
}
}
src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+38 -22
View File
@@ -13,7 +13,7 @@
<a-form-item :labelCol="labelCol"
:wrapperCol="wrapperCol"
:label="$t('standardRegulationLibrary.marketRegulationsList.countryRegion')">
<j-dict-select-tag v-decorator="['countryRegion', validatorRules.countryRegion]"
<j-dict-select-tag v-decorator="['country', validatorRules.country]"
dict-code="market_state"
:placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.countryRegion')" />
</a-form-item>
@@ -26,7 +26,7 @@
<a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listNumber')"
:maxLength="200"
disabled
v-decorator="['listNumber', validatorRules.listNumber]" />
v-decorator="['manifestNo', validatorRules.manifestNo]" />
</a-form-item>
</a-col>
</a-row>
@@ -46,7 +46,7 @@
<a-form-item :labelCol="labelCol"
:wrapperCol="wrapperCol"
:label="$t('standardRegulationLibrary.marketRegulationsList.drivingPosition')">
<j-dict-select-tag v-decorator="['drivingPosition', validatorRules.drivingPosition]"
<j-dict-select-tag v-decorator="['drivePosition', validatorRules.drivePosition]"
dict-code="driving_position"
:placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')" />
</a-form-item>
@@ -56,7 +56,7 @@
<a-form-item :labelCol="lineLabelCol"
:wrapperCol="lineWrapperCol"
:label="$t('standardRegulationLibrary.marketRegulationsList.securityClass')">
<j-dict-select-tag v-decorator="['securityClass']"
<j-dict-select-tag v-decorator="['securityLevel']"
dict-code="security_class"
:placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.securityClass')" />
</a-form-item>
@@ -101,7 +101,7 @@
</a-form-item>
</a-col>
<!-- 清单名称 -->
<!-- 标准名称 -->
<a-col :md="6" :sm="8">
<a-form-item :label="$t('standardName')">
<j-input
@@ -213,6 +213,7 @@ import Vue from 'vue'
import { ACCESS_TOKEN, TENANT_ID } from '../../../store/mutation-types'
import { downloadFile } from '../../../api/manage'
import HistoryVersionModal from './modules/HistoryVersionModal'
import store from '@/store'
const uidGenerator = () => {
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')
src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsList.vue
+12 -12
View File
@@ -10,7 +10,7 @@
<a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.listNumber')">
<j-input
:placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listNumber')"
v-model="queryParam.listNumber"></j-input>
v-model="queryParam.manifestNo"></j-input>
</a-form-item>
</a-col>
@@ -19,7 +19,7 @@
<a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.listName')">
<j-input
:placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listName')"
v-model="queryParam.listName"></j-input>
v-model="queryParam.mainfestName"></j-input>
</a-form-item>
</a-col>
@@ -28,7 +28,7 @@
<a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.countryRegion')">
<j-dict-select-tag
:placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.countryRegion')"
v-model="queryParam.countryRegion"
v-model="queryParam.country"
dict-code="market_state"></j-dict-select-tag>
</a-form-item>
</a-col>
@@ -39,7 +39,7 @@
<a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.drivingPosition')">
<j-dict-select-tag
:placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')"
v-model="queryParam.drivingPosition"
v-model="queryParam.drivePosition"
dict-code="driving_position"></j-dict-select-tag>
</a-form-item>
</a-col>
@@ -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
}
},
// 编辑
src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
+25 -29
View File
@@ -37,22 +37,22 @@
<j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.type')"
disabled
dict-code="type"
v-decorator.trim="[ 'type', validatorRules.type ]" />
v-decorator.trim="[ 'stanardClass', validatorRules.stanardClass ]" />
</a-form-item>
<!-- 新生产车实施日期 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate')">
<j-multiple-date-picker :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate')"
v-decorator.trim="[ 'newProductionVehicleImplementationDate', validatorRules.newProductionVehicleImplementationDate ]" />
v-decorator.trim="[ 'newProductImplDate', validatorRules.newProductImplDate ]" />
</a-form-item>
<!-- 新认证车实施日期 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate')">
<j-multiple-date-picker :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate')"
v-decorator.trim="[ 'newCertifiedVehicleImplementationDate', validatorRules.newCertifiedVehicleImplementationDate ]" />
v-decorator.trim="[ 'newAuthImplDate', validatorRules.newAuthImplDate ]" />
</a-form-item>
<!-- 注册日期 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.dateOfRegistration')">
<j-multiple-date-picker :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.dateOfRegistration')"
v-decorator.trim="[ 'dateOfRegistration', validatorRules.dateOfRegistration ]" />
v-decorator.trim="[ 'registrationDate', validatorRules.registrationDate ]" />
</a-form-item>
<!-- 适用国家/地区 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.applicableCountryRegion')">
@@ -70,37 +70,37 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.certifiedDeliverables')">
<a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketListField.certifiedDeliverables')"
:maxLength="50"
v-decorator.trim="[ 'certifiedDeliverables', validatorRules.certifiedDeliverables ]" />
v-decorator.trim="[ 'certifyTheDeliverables', validatorRules.certifyTheDeliverables ]" />
</a-form-item>
<!-- 主控部门 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.mainControlDepartment')">
<j-select-depart :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.mainControlDepartment')"
:backDepart="true"
v-decorator.trim="[ 'mainControlDepartment', validatorRules.mainControlDepartment ]" />
v-decorator.trim="[ 'mainDept', validatorRules.mainDept ]" />
</a-form-item>
<!-- 主控部门专业模块 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule')">
<j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule')"
dict-code="master_control_department_professional_module"
v-decorator.trim="[ 'masterControlDepartmentProfessionalModule', validatorRules.masterControlDepartmentProfessionalModule ]" />
v-decorator.trim="[ 'mainDeptProfMode', validatorRules.mainDeptProfMode ]" />
</a-form-item>
<!-- 关联部门 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.relatedDepartment')">
<j-select-depart :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.relatedDepartment')"
:backDepart="true"
v-decorator.trim="[ 'relatedDepartment', validatorRules.relatedDepartment ]" />
v-decorator.trim="[ 'associateDept', validatorRules.associateDept ]" />
</a-form-item>
<!-- 关联部门专业模块 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules')">
<j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules')"
dict-code="master_control_department_professional_module"
v-decorator.trim="[ 'associateDepartmentSpecializedModules', validatorRules.associateDepartmentSpecializedModules ]" />
v-decorator.trim="[ 'associateDeptProfMode', validatorRules.associateDeptProfMode ]" />
</a-form-item>
<!-- 适用车型 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.applicableVehicleType')">
<j-multi-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.applicableVehicleType')"
dict-code="applicable_vehicle_type"
v-decorator.trim="[ 'applicableVehicleType', validatorRules.applicableVehicleType ]" />
v-decorator.trim="[ 'applicableVehicle', validatorRules.applicableVehicle ]" />
</a-form-item>
<!-- 动力类型 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.dynamicType')">
@@ -112,19 +112,19 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.batchRestriction')">
<j-multi-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.batchRestriction')"
dict-code="batch_restriction"
v-decorator.trim="[ 'batchRestriction', validatorRules.batchRestriction ]" />
v-decorator.trim="[ 'batchLimit', validatorRules.batchLimit ]" />
</a-form-item>
<!-- 自动驾驶等级 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.automaticDrivingLevel')">
<j-multi-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.automaticDrivingLevel')"
dict-code="automatic_driving_level"
v-decorator.trim="[ 'automaticDrivingLevel', validatorRules.automaticDrivingLevel ]" />
v-decorator.trim="[ 'autopilotLevel', validatorRules.autopilotLevel ]" />
</a-form-item>
<!-- 要求类型 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.requirementType')">
<j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.requirementType')"
dict-code="requirement_type"
v-decorator.trim="[ 'requirementType', validatorRules.requirementType ]" />
v-decorator.trim="[ 'requireType', validatorRules.requireType ]" />
</a-form-item>
</a-form>
</a-spin>
@@ -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(() => {