diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue index c9627e8..6eb4c21 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue @@ -585,6 +585,19 @@ export default { this.filters.manifestVersion = this.$route.query.manifestVersion } this.ids = this.$route.query.ids.split(',') + if (this.ids.length <= 1) { + // 只有一条数据按排序字段排序 + this.isorter = { + column: 'orderNo', + order: 'asc' + } + } else { + // 有多条可能会合并,用标准编号排序 + this.isorter = { + column: 'standardNumber', + order: 'desc' + } + } this.filters.manifestId = this.$route.query.ids this.initData(this.$route.query.ids) this.loadData() diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/modules/EditVersionModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/EditVersionModal.vue index d819765..a1ce4ca 100644 --- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/EditVersionModal.vue +++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/EditVersionModal.vue @@ -16,10 +16,13 @@ v-decorator.trim="[ 'manifestNo', validatorRules.manifestNo ]" /> - + + V + @change="e => {e.target.value = (e.target.value.replace(/[^0-9-]/g, '')).trim()}" + v-decorator.trim="[ 'manifestVersionCenter', validatorRules.manifestVersionCenter ]" /> + .0 @@ -51,7 +54,7 @@ export default { }, validatorRules: { // 清单版本 - manifestVersion: { + manifestVersionCenter: { rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('standardRegulationLibrary.marketRegulationsList.listVersion') @@ -66,8 +69,10 @@ export default { this.form.resetFields() this.visible = true this.model = Object.assign({}, record) + const manifestVersionLeft = (this.model.manifestVersion || '').split('.')[0] + this.model.manifestVersionCenter = manifestVersionLeft.substring(1) this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'manifestNo', 'manifestVersion')) + this.form.setFieldsValue(pick(this.model, 'manifestNo', 'manifestVersionCenter')) }) }, handleOk () { @@ -75,8 +80,9 @@ export default { this.form.validateFields((err, values) => { if (!err) { this.confirmLoading = true - const param = Object.assign({}, values) + const param = {} param.id = this.model.id + param.manifestVersion = 'V' + values.manifestVersionCenter + '.0' marketRegulationDetailEditVersion(param).then(res => { if (res.success) { this.$message.success(res.message) @@ -102,6 +108,17 @@ export default { } -