diff --git a/src/api/api.js b/src/api/api.js index d3398ef..d36d17b 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -132,7 +132,8 @@ const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params) // 标准选择框,分页查询标准数据 const getStandardList = (params) => getAction('/laws/standard/common/getManyStandardSelectionBox', params) -// 市场法规清单选择框,分页查询数据(无权限) TODO 暂时用列表接口 +// 市场法规清单选择框,分页查询数据(无权限) +// todo 需要换没权限的 const getMarketRegulationsList = (params) => getAction('/laws/marketStandard/page', params) // 内部工作组,左侧树查询 diff --git a/src/api/standardRegulationLibraryApi.js b/src/api/standardRegulationLibraryApi.js index 1fad21d..a476ce3 100644 --- a/src/api/standardRegulationLibraryApi.js +++ b/src/api/standardRegulationLibraryApi.js @@ -138,8 +138,6 @@ const editStandardMasterPlan = (params) => postAction('/laws/StandardMasterPlan/ const getMarketRegulationListById = (params) => getAction('/laws/marketStandard/detail', params) // 市场法规清单-根据id查询-无权限 const getMarketRegulationListByIdNoPerm = (params) => getAction('', params) -// 市场法规清单-根据ids获取多个清单的清单列表-用于复制 -const getMarketRegulationListByIds = (params) => getAction('', params) // 市场法规清单-新增 const marketRegulationListAdd = (params) => postAction('/laws/marketStandard/add', params) // 市场法规清单-编辑 @@ -227,7 +225,6 @@ export { // 市场法规清单 getMarketRegulationListById, getMarketRegulationListByIdNoPerm, - getMarketRegulationListByIds, marketRegulationListAdd, marketRegulationListEdit, marketRegulationListHistoryList diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js index f250cb9..5f33dc6 100644 --- a/src/common/lang/standardRegulationLibrary/en-us.js +++ b/src/common/lang/standardRegulationLibrary/en-us.js @@ -70,7 +70,9 @@ module.exports = { securityClass: 'Security class', listDeclaration: 'Manifest declaration', templateName: 'Market regulation list import template', - historicalVersion: 'Historical version' + historicalVersion: 'Historical version', + standardExist: 'The standard already exists', + haveStandardExist: 'Some standards already exist' }, // 市场清单详情列表字段 marketListField: { diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js index d276322..a48ba2f 100644 --- a/src/common/lang/standardRegulationLibrary/zh-cn.js +++ b/src/common/lang/standardRegulationLibrary/zh-cn.js @@ -71,7 +71,9 @@ module.exports = { securityClass: '密级', listDeclaration: '清单说明', templateName: '市场法规清单导入模版', - historicalVersion: '历史版本' + historicalVersion: '历史版本', + standardExist: '标准已经存在', + haveStandardExist: '部分标准已存在' }, // 市场清单详情列表字段 marketListField: { diff --git a/src/components/selection/MarketRegulationsListSelectionModal.vue b/src/components/selection/MarketRegulationsListSelectionModal.vue index dcfccf5..47ceb92 100644 --- a/src/components/selection/MarketRegulationsListSelectionModal.vue +++ b/src/components/selection/MarketRegulationsListSelectionModal.vue @@ -97,6 +97,14 @@ + + + @@ -200,7 +208,7 @@ export default { align: 'center', width: 180, dataIndex: 'manifestVersion', - scopedSlots: { customRender: 'text' } + scopedSlots: { customRender: 'manifestVersion' } }, { // 发布时间 title: this.$t('standardRegulationLibrary.marketRegulationsList.releaseTime'), diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue index 03ba941..880dcbf 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue @@ -22,7 +22,7 @@ - + @@ -32,8 +32,6 @@ v-decorator="['manifestNo', validatorRules.manifestNo]" /> - - + + + + + + - - - - + v-decorator="['manifestDesc']"> - @@ -87,7 +87,7 @@ {{ $t('next') }} -