diff --git a/src/components/CustomFormComponents/InputForStandards.vue b/src/components/CustomFormComponents/InputForStandards.vue index 3b9d5a974..946f39711 100644 --- a/src/components/CustomFormComponents/InputForStandards.vue +++ b/src/components/CustomFormComponents/InputForStandards.vue @@ -186,6 +186,7 @@ export default { replaceLawsNumRow: [], // 代替政策号 数组内容 replaceTotal: 0, selectedListRep: [], + ids: [], replaceLoading: true, replacePage: 1 @@ -297,6 +298,7 @@ export default { // 代替政策编号确定 replaceLawsNumModelBt () { let textArr = [] + this.ids = [] if (typeof this.value === 'string') { if (this.value) { @@ -322,12 +324,14 @@ export default { } else { texts = item.standSortShow !== null ? item.standSortShow + ' ' + item.standNumber : item.standNumber } + this.ids.push(item.id); textArr.push(texts) textArr = [...new Set(textArr)] this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') this.$emit('input', textArr.join(',')) + this.$emit('popoverHide', this.ids, this.config.attrField); this.$refs.selections.clearSelection() }, // 点击查看 diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index 364112bcc..6dbb4e219 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -3,7 +3,7 @@
新增 - 展示区域管理 + 展示区域管理
数据处理中
@@ -188,8 +188,8 @@
@@ -199,7 +199,7 @@ width="400px" >
- 新增 + 新增
- + - 取 消 - 确 定 + 取 消 + 确 定
@@ -319,6 +319,7 @@ export default { }, displayLocationDialogFormData: { areaName: '', + sarType: '', showIndex: '' }, displayLocationDialogFormRules: { @@ -330,8 +331,9 @@ export default { {required: true, message: '所属模块不能为空', trigger: 'change'} ], showIndex: [ - { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' }, - { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' } + { required: true, message: '排序号不能为空且为正整数', trigger: 'blur'}, + { type: 'string', validator: this.verify.validStandNumInCompile2, trigger: 'blur'}, + { min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' } ] }, attributeDataLoading: false, diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index b7bc135d9..24f5c3bb9 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -72,7 +72,7 @@ :key="child.id" class="modular-item" :class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''" - v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' " + v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' " > - + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 40db856ba..41331f01f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -93,22 +93,23 @@ - - - - - - - - -