diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 6b191d902..99e9ee793 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -552,7 +552,7 @@ @@ -621,16 +621,22 @@ 数据加载中... + - - + + + + + + + + + + @@ -1243,6 +1249,8 @@ export default { knowType: '', KnowTitle: '', knowIdList: '', + total7: 0, + page7: 1, addForm: { title: '', content: '', @@ -1759,6 +1767,15 @@ export default { this.knowId = '' this.AddKnowledgDialog = false }, + //查看分解单分页 + pageChange7(page) { + this.page7 = page + this.selectSarStandItems() + }, + pageSizeChange7(pageSize){ + this.pageSize7 = pageSize + this.selectSarStandItems() + }, // 知识点分页 pageChange1(page) { this.pageNo = page @@ -2317,12 +2334,9 @@ export default { this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => { this.selectedItemList = [] if (res.ok) { - this.standItemList = res.data.list; - console.log("standItemList"); - console.log(this.standItemList); - console.log("res.data"); + this.standItemList = res.data; console.log(res.data); - this.standitemTotal = res.data.count // 分页需要 + this.total7 = res.data.length // 分页需要 } }, e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index bb62223f3..ebb987a99 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -80,15 +80,29 @@ - - + + + + + + + + + + + + + + + + > + @@ -892,6 +906,7 @@ + { if (valid) { this.$refs['userForm'].validate((valid) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 4ef370645..2e5e7caad 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -33,7 +33,7 @@ - + 流程列表加载中 + { if (valid) { this.isSubmit = true diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index eaf8c0817..983b1fe33 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -33,7 +33,7 @@ - + { this.form = JSON.parse(JSON.stringify(item)) + console.log("this.form"); + console.log(this.form); this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] @@ -964,6 +966,10 @@ export default { this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName + if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){ + this.form.country=this.form.country.split(","); + } + this.form['id'] = item.id this.$forceUpdate() }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index b8ec12e52..4ab71a53d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -32,7 +32,7 @@ - + 流程列表加载中 + { if (valid) { this.isSubmit = true @@ -1795,6 +1799,20 @@ export default { this.modelFunc() }, watch:{ + + 'form.country': { + handler (val) { + if (val !== '' && val !== null && typeof (val) !== 'undefined') { + if (val instanceof Array) { + this.countryArr = val.join(","); + } else { + this.countryArr = val + } + } else if (val === '') { + this.countryArr = [] + } + } + }, form(val){ if(this.form){ diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7698de5a5..ff7742bf9 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2982,7 +2982,7 @@ export default { }, // 查询二级菜单 selectMenu() { - this.$http.get('sarResource/ts-resource', { + this.$http.get('sarResource/ts-resource/getList', { sorDivide: 'INLAND_STAND' }, {}, res => { if (res.ok) { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index e2297f63a..7f3bea503 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -623,6 +623,7 @@ + - {{ item.label }} @@ -943,6 +943,7 @@ +