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

[update] 市场法规清单调整清单字段顺序，下一步完成导入没带入id

Browse Source
This commit is contained in:
lideqin
2024-09-19 17:27:11 +08:00
parent 5e11d346c8
commit 2cca6ef32f
3 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
+38 -38
View File
@@ -164,6 +164,25 @@ export default {
return parseInt(index) + 1
}
},
{ // 类型
title: this.$t('standardRegulationLibrary.marketListField.type'),
align: 'center',
width: 180,
dataIndex: 'type_dictText',
customRender: (text, row, index) => {
return {
children: <a-tooltip overlay-class-name="tooltip-style">
<template slot={'title'}>{text || text === 0 ? text : Vue.prototype.global.emptyLine}</template>
<div class="table-text">{text || text === 0 ? text : Vue.prototype.global.emptyLine}</div>
</a-tooltip>,
attrs: {
// 合并行 含col字段则合并，其他的必须设置为0！！
rowSpan: row.typeCol ? row.typeCol : 0
}
}
}
// scopedSlots: { customRender: 'dictText' }
},
{ // 标准编号
title: this.$t('standardNumber'),
align: 'center',
@@ -221,25 +240,6 @@ export default {
}
// scopedSlots: { customRender: 'text' }
},
{ // 新生产车实施日期
title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'),
align: 'center',
width: 180,
dataIndex: 'newProductImplDate',
customRender: (text, row, index) => {
return {
children: <a-tooltip overlay-class-name="tooltip-style">
<template slot={'title'}>{text || text === 0 ? text : Vue.prototype.global.emptyLine}</template>
<div class="table-text">{text || text === 0 ? text : Vue.prototype.global.emptyLine}</div>
</a-tooltip>,
attrs: {
// 合并行 含col字段则合并，其他的必须设置为0！！
rowSpan: row.newProductImplDateCol ? row.newProductImplDateCol : 0
}
}
}
// scopedSlots: { customRender: 'text' }
},
{ // 新认证车实施日期
title: this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate'),
align: 'center',
@@ -259,6 +259,25 @@ export default {
}
// scopedSlots: { customRender: 'text' }
},
{ // 新生产车实施日期
title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'),
align: 'center',
width: 180,
dataIndex: 'newProductImplDate',
customRender: (text, row, index) => {
return {
children: <a-tooltip overlay-class-name="tooltip-style">
<template slot={'title'}>{text || text === 0 ? text : Vue.prototype.global.emptyLine}</template>
<div class="table-text">{text || text === 0 ? text : Vue.prototype.global.emptyLine}</div>
</a-tooltip>,
attrs: {
// 合并行 含col字段则合并，其他的必须设置为0！！
rowSpan: row.newProductImplDateCol ? row.newProductImplDateCol : 0
}
}
}
// scopedSlots: { customRender: 'text' }
},
{ // 注册日期
title: this.$t('standardRegulationLibrary.marketListField.dateOfRegistration'),
align: 'center',
@@ -354,25 +373,6 @@ export default {
}
// scopedSlots: { customRender: 'text' }
},
{ // 类型
title: this.$t('standardRegulationLibrary.marketListField.type'),
align: 'center',
width: 180,
dataIndex: 'type_dictText',
customRender: (text, row, index) => {
return {
children: <a-tooltip overlay-class-name="tooltip-style">
<template slot={'title'}>{text || text === 0 ? text : Vue.prototype.global.emptyLine}</template>
<div class="table-text">{text || text === 0 ? text : Vue.prototype.global.emptyLine}</div>
</a-tooltip>,
attrs: {
// 合并行 含col字段则合并，其他的必须设置为0！！
rowSpan: row.typeCol ? row.typeCol : 0
}
}
}
// scopedSlots: { customRender: 'dictText' }
},
{ // 动力类型
title: this.$t('standardRegulationLibrary.marketListField.dynamicType'),
align: 'center',
src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+15 -14
View File
@@ -330,6 +330,13 @@ export default {
return parseInt(index) + 1
}
},
{ // 类型
title: this.$t('standardRegulationLibrary.marketListField.type'),
align: 'center',
width: 180,
dataIndex: 'type_dictText',
scopedSlots: { customRender: 'dictText' }
},
{ // 标准编号
title: this.$t('standardNumber'),
align: 'center',
@@ -351,13 +358,6 @@ export default {
dataIndex: 'standardEnglishName',
scopedSlots: { customRender: 'text' }
},
{ // 新生产车实施日期
title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'),
align: 'center',
width: 180,
dataIndex: 'newProductImplDate',
scopedSlots: { customRender: 'text' }
},
{ // 新认证车实施日期
title: this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate'),
align: 'center',
@@ -365,6 +365,13 @@ export default {
dataIndex: 'newAuthImplDate',
scopedSlots: { customRender: 'text' }
},
{ // 新生产车实施日期
title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'),
align: 'center',
width: 180,
dataIndex: 'newProductImplDate',
scopedSlots: { customRender: 'text' }
},
{ // 注册日期
title: this.$t('standardRegulationLibrary.marketListField.dateOfRegistration'),
align: 'center',
@@ -400,13 +407,6 @@ export default {
dataIndex: 'certifyTheDeliverables',
scopedSlots: { customRender: 'text' }
},
{ // 类型
title: this.$t('standardRegulationLibrary.marketListField.type'),
align: 'center',
width: 180,
dataIndex: 'type_dictText',
scopedSlots: { customRender: 'dictText' }
},
{ // 动力类型
title: this.$t('standardRegulationLibrary.marketListField.dynamicType'),
align: 'center',
@@ -643,6 +643,7 @@ export default {
// this.model = Object.assign({}, values)
this.model.id = res.message
this.filters.manifestId = this.model.id
this.importData.manifestId = this.model.id
}
// 更新清单编号
this.initData(this.model.id)
src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
+12 -12
View File
@@ -13,6 +13,13 @@
<div class="custom-drawer-style-scroll">
<a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
<a-form :form="form">
<!-- 类型 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.type')">
<j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.type')"
disabled
dict-code="type"
v-decorator.trim="[ 'type', validatorRules.type ]" />
</a-form-item>
<!-- 标准编号 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardNumber')">
<standard-selection :placeholder="$t('pleaseSelect') + $t('standardNumber')"
@@ -34,12 +41,11 @@
disabled
v-decorator.trim="[ 'standardEnglishName', validatorRules.standardEnglishName ]" />
</a-form-item>
<!-- 类型 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.type')">
<j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.type')"
disabled
dict-code="type"
v-decorator.trim="[ 'type', validatorRules.type ]" />
<!-- 新认证车实施日期 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate')">
<j-multiple-date-picker :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate')"
field-name="newAuthImplDate"
v-decorator.trim="[ 'newAuthImplDate', validatorRules.newAuthImplDate ]" />
</a-form-item>
<!-- 新生产车实施日期 -->
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate')">
@@ -47,12 +53,6 @@
field-name="newProductImplDate"
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')"
field-name="newAuthImplDate"
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')"