From 8f2a1ef1fd41e89487fdac02d826fe9c0f670933 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 18 Aug 2021 12:35:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=86=E8=A7=A3?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 6b191d902..1ae32f44e 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -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 => { }) From c0317dbea6825d45fbf07374172ee4c761a3b07f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 18 Aug 2021 13:00:02 +0800 Subject: [PATCH 2/4] feat: There is no way the auth menu --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..a0e8edb5c 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2689,7 +2689,7 @@ export default { }, // 查询二级菜单 selectMenu () { - this.$http.get('sarResource/ts-resource', { + this.$http.get('sarResource/ts-resource/getList', { sorDivide: 'FOREIGN_STAND' }, {}, res => { if (res.ok) { From 5674737c404a3e7cc9b34ab7921bad3d1452ade1 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Wed, 18 Aug 2021 13:06:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 1ae32f44e..99e9ee793 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -552,7 +552,7 @@ From 366dfbb509195a95538eb193f351ce7f8376aea2 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 18 Aug 2021 13:13:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6/=E5=9C=B0=E5=8C=BA=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 42 +++++++++++++++++-- .../pages/creatProcess/bzrk/step2.vue | 16 ++++++- .../pages/creatProcess/bzrk/step3.vue | 8 +++- .../pages/creatProcess/bzrk/step4.vue | 20 ++++++++- .../foreignStandardsAndRegulations/index.vue | 7 +++- 5 files changed, 85 insertions(+), 8 deletions(-) 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/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index e2297f63a..d6a4891a2 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 @@ +
保存 提交 @@ -2431,7 +2432,7 @@ export default { console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA') this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; - if(item.country !== undefined && item.country !== null){ + if(item.country !== undefined && item.country !== null && item.country !== ''){ this.sarStandardsInfoEO.country = item.country.split(","); } this.sarStandardsInfoEO.standSort = item.standSort @@ -3139,6 +3140,8 @@ export default { sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] }) nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") + console.log("nowstandinfo"); + console.log(nowstandinfo); this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { _this: this }, res => {