diff --git a/src/api/api.js b/src/api/api.js index 2a8615f..d3398ef 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -132,8 +132,8 @@ const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params) // 标准选择框,分页查询标准数据 const getStandardList = (params) => getAction('/laws/standard/common/getManyStandardSelectionBox', params) -// 市场法规清单选择框,分页查询数据(无权限) -const getMarketRegulationsList = (params) => getAction('', params) +// 市场法规清单选择框,分页查询数据(无权限) TODO 暂时用列表接口 +const getMarketRegulationsList = (params) => getAction('/laws/marketStandard/page', params) // 内部工作组,左侧树查询 const getWorkGroupTreeList = (params) => getAction('/sys/lawsWorkingGroup/list', params) diff --git a/src/components/selection/MarketRegulationsListSelectionModal.vue b/src/components/selection/MarketRegulationsListSelectionModal.vue index 60cc3f3..dcfccf5 100644 --- a/src/components/selection/MarketRegulationsListSelectionModal.vue +++ b/src/components/selection/MarketRegulationsListSelectionModal.vue @@ -17,7 +17,7 @@ + v-model="queryParam.manifestNo"> @@ -26,7 +26,7 @@ + v-model="queryParam.manifestName"> @@ -35,7 +35,7 @@ @@ -45,7 +45,7 @@ @@ -69,7 +69,7 @@ {{ text || text === 0 ? text : global.emptyLine }} - {{ text }} - {{ global.emptyLine }} + {{ text || text === 0 ? text : global.emptyLine }} + + + + + + @@ -166,64 +171,57 @@ export default { title: this.$t('standardRegulationLibrary.marketRegulationsList.countryRegion'), align: 'center', width: 180, - dataIndex: 'countryRegion', + dataIndex: 'country_dictText', 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: 'manifestName', scopedSlots: { customRender: 'toDetail' } }, { // 驾驶位置 title: this.$t('standardRegulationLibrary.marketRegulationsList.drivingPosition'), align: 'center', width: 180, - dataIndex: 'drivingPosition', + dataIndex: 'drivePosition_dictText', 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' } }, { // 作者 title: this.$t('standardRegulationLibrary.marketRegulationsList.author'), align: 'center', width: 180, - dataIndex: 'author', + dataIndex: 'author_dictText', scopedSlots: { customRender: 'text' } }, { // 清单状态 title: this.$t('standardRegulationLibrary.marketRegulationsList.listState'), align: 'center', width: 180, - dataIndex: 'listState', + dataIndex: 'manifestStatus_dictText', scopedSlots: { customRender: 'text' } - }, - { - title: this.$t('operation'), - scopedSlots: { customRender: 'action' }, - align: 'center', - fixed: 'right', - width: 170 } ], dataList: []