From c70e400c7e5113fdee191d11a6bffb091f84a1a0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 21 Feb 2022 10:00:15 +0800 Subject: [PATCH 1/3] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 376fb2101..b13b07f8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2072,7 +2072,7 @@ export default { this.defaultCheckedKeys3 = [this.form.dybxh] this.treeCheckedKeys = this.form.treeListId.split(',') this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + this.form.standYear = this.form.standYear ? this.form.standYear : '' if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { this.form.country = this.form.country.split(","); } @@ -2211,7 +2211,7 @@ export default { this.key2++ this.key3++ this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' + this.form.standYear = bringData.standYear ? bringData.standYear : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = bringData.id diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index d7d84b0f6..42b2a59d7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -1091,7 +1091,7 @@ export default { this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + this.form.standYear = this.form.standYear ? 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 !== ''){ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index caca4b13c..a94daa191 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2540,11 +2540,14 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + console.log(processForm); + console.log(this.form); // this.commentText = processForm.commentText if (processForm.form === undefined) { this.getFormFieldList(processForm) } else { //表单文件处理 + console.log(2); this.getFormFieldList(processForm.form) } } @@ -2565,7 +2568,7 @@ export default { this.defaultCheckedKeys3 = [this.form.dybxh]; this.treeCheckedKeys = this.form.treeListId.split(',') this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + this.form.standYear = this.form.standYear ? this.form.standYear : '' this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id From 202d2264ed994aa2e50c2746a17b24226f1eab47 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 21 Feb 2022 12:34:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=B3=A8=E6=8E=89=20=E6=8A=80=E6=9C=AF=E7=B3=BB=E5=88=97=20?= =?UTF-8?q?=E5=9B=BD=E5=86=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 2804dfc07..2687b3efa 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3666,6 +3666,8 @@ export default { this.selectSarMenu = treeNode this.standCommonlySearch.menuId = treeNode.id this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 + this.standCommonlySearch.treeType = treeNode.treeType + this.sarStandardsSearch.treeType = treeNode.treeType this.sarStandardsSearch.page = 1 this.standCommonlySearch.page = 1 //搜索后点击属性菜单依然显示搜索条件的数据 @@ -3786,7 +3788,7 @@ export default { async getTreeAsync(){ let tsResource = await this.selectMenu1() - let sarMenuStandard = await this.selectMenu2() + // let sarMenuStandard = await this.selectMenu2() let list1 = [] let list2 = [] @@ -3794,13 +3796,14 @@ export default { list1 = tsResource.data } - if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){ - list2 = sarMenuStandard.data - } + // 国内技术系列 逻辑 注释掉 + // if(sarMenuStandard && sarMenuStandard.ok && sarMenuStandard.data){ + // list2 = sarMenuStandard.data + // } - if(list2.length > 0){ - list1 = list1.concat(list2) - } + // if(list2.length > 0){ + // list1 = list1.concat(list2) + // } if(list1.length > 0){ this.treeList = this.sortByKey(list1,"displaySeq") @@ -4469,8 +4472,10 @@ export default { const formData = {...data} if (!item) { formData.menuId = this.sarStandardsSearch.menuId + formData.treeType = this.sarStandardsSearch.treeType } else { formData.menuId = this.selectSarMenu.id + formData.treeType = this.selectSarMenu.treeType } // 排序 @@ -5103,7 +5108,14 @@ export default { }) } else { this.configStandFlag = true - this.sarConfigStandSearch.menuId = 'nomenu' + if(this.selectSarMenu.treeType === 'sarMs'){ + this.sarConfigStandSearch.menuId = 'nomenu' + this.sarConfigStandSearch.sarMsMenuId = menuId + this.sarConfigStandSearch.sarMsType = 'filterSarMsMenu' + }else { + this.sarConfigStandSearch.menuId = 'nomenu' + this.sarConfigStandSearch.sarMsType = '' + } this.sarConfigStandSearch.page = 1 this.sarConfigStandSearch.country = '' this.sarConfigStandSearch.standNumber = '' From 9db5bc0a1838beb45a78db8d72f1502dda362e47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 21 Feb 2022 14:24:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/xmpg/step1.vue | 7 ++++++- .../processCenter/pages/creatProcess/xmpg/step3.vue | 4 ++++ .../processCenter/pages/creatProcess/xmpg/step5.vue | 12 ++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 5f47ce3fb..f234e079a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -640,7 +640,11 @@ export default { }, //查询项目下的标准 getStandData() { - this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { + this.$http.get("sarStandProjectLibrary/queryStandInfo", { + id: this.projectId, + current: this.pageNo, + PageSize: this.pageSizeNo + }, { _this: this }, res => { res.data.records.forEach(item => { @@ -649,6 +653,7 @@ export default { } }) this.standData = res.data.records; + this.totalNo = res.data.total let ids = []; this.standData.forEach(item => { ids.push(item.standId); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index bfef3b75e..cc5e6c159 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -769,6 +769,10 @@ export default { if(index > -1){ dataListChildren.splice(index, 1) } + dataListChildren.forEach(item => { + item.workPeople = this.$store.getters.userInfo.userName + item.workPeopleId = this.$store.getters.userInfo.userId + }) this.dataList = dataListChildren; this.total = this.dataList.length; } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index fec5e76c9..9058c3e8f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -465,13 +465,13 @@ export default { dataListChildren = dataListChildren.concat(item); }); dataListChildren = this.dataList.concat(dataListChildren); - let index = dataListChildren.findIndex(item => { - return item.people + let newDataListChildren = [] + dataListChildren.forEach(item => { + if(!item.people){ + newDataListChildren.push(item) + } }) - if(index > -1){ - dataListChildren.splice(index, 1) - } - this.dataList = dataListChildren; + this.dataList = newDataListChildren; this.total = this.dataList.length; }); },