From db072b5d6286f8b7169aea62b5ae79e2ce67232f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 18 Mar 2022 09:56:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=B1=95=E7=A4=BAbug=2051872?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standInvolveProjectDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 26cec42cd..b14655ab7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -191,7 +191,7 @@
符合
-
不涉及
+
不涉及
不符合
From 87451fdaea4414f06b1f41e1c1ab76c736d4e3ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 18 Mar 2022 09:57:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=20=E8=A1=A8=E6=A0=BC=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=8D=E5=9B=9E=E6=98=BEbug=2051798?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step1.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 69b9e7373..2fd3e28bc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -1064,11 +1064,15 @@ export default { this.projectList = data; }, choiceZRR(scope, type, title, id) { - console.log(scope); if (scope != null) { this.currentIndex = scope.$index; this.nodeList = []; - this.nodeList.push(scope.row.distributePersonId); + if(type === 'distributePerson'){ + this.nodeList.push(scope.row.distributePersonId); + }else{ + this.nodeList.push( scope.row.projectGroupPeopleId) + } + }else{ this.nodeList = []; this.nodeList.push(id); From 8f01cfdaa2acbd9f5d6aa849ff9b0f39670e2408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 18 Mar 2022 10:27:14 +0800 Subject: [PATCH 3/7] commit --- src/pages/config/pages/roleManage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 595f0bca7..6a04988c1 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -188,7 +188,7 @@ Date: Fri, 18 Mar 2022 13:37:48 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=20=E5=A1=AB=E5=86=99=E4=B8=8D=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=A0=A1=E9=AA=8C51846?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzpg/step5.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index d84cd2b92..877f9745c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -620,10 +620,6 @@ export default { noCompliance: "", //在研不合规项目 countermeasures: "", //在研应对措施 completionTime: "", //在研完成时间 - zcComplianceReasons: "", //在产的合规原因 - zcNoCompliance: "", //在产不合规项目 - zcCountermeasures: "", //在产的应对措施 - zcCompletionTime: "" //在产的完成时间 }] }, choiceForm: {}, //选择标准清单列表 @@ -814,7 +810,7 @@ export default { }, handlePrice(){ for (let i = 0; i < this.dataList.length; i++) { - if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){ + if (this.dataList[i].complianceReasons|| (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){ }else { this.comFlag ++ } @@ -847,6 +843,8 @@ export default { this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); this.isSubmit = true + console.log('可以提交'); + return this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, From 41b9d4ab9da32686f43c2ef299a4011f22c10d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 18 Mar 2022 14:25:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=B7=B3=E8=BD=AC=E6=9D=83=E9=99=90=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../searchCenter/pages/advancedSearch.vue | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 9344a22f5..f7761a03a 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -1426,14 +1426,14 @@ lawsName: '', lawsEnName: '', lawsNo: '', - issueTime: '', + // issueTime: '', issueCompany: '', commentCycleStart: '', commentCycleEnd: '', lawsTextState: '', lawsSyqy: '', lawsSycx: '', - isRelateAccess: '', + // isRelateAccess: '', lawsYear: '', lawsNotisyncNum: '', lawsBulletin: '', @@ -2198,7 +2198,7 @@ pagetype = "BUSINESS_STAND "; } // 详情跳到新页 - if (routername !== "") { + if (routername !== "" && routername !== "OtherBussStandardDetails") { let routeUrl = this.$router.resolve({ name: routername, params: { @@ -2207,6 +2207,26 @@ } }); window.open(routeUrl.href, "_blank"); + }else{ + this.$http.get('lawss/sarBussionessStand/checkIsShow', { + id: item.id, + userId: this.$store.getters.userInfo.userId + }, { + _this: this + }, res =>{ + if(res){ + let routeUrl = this.$router.resolve({ + name: routername, + params: { + id: item.id, + pageType: pagetype + } + }); + window.open(routeUrl.href, "_blank"); + }else{ + this.$message.warning('您暂无权限查看') + } + }) } }, judgeBussRole(item) { From 8aa80d3999cbd8a49dffdb99216264126c7f06dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 18 Mar 2022 16:26:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbfs/common/formListStep5.vue | 4 +- .../pages/phone/qbfs/common/formList.vue | 891 ++++++++++++++++++ .../pages/phone/qbfs/common/formListStep5.vue | 826 ++++++++++++++++ .../processCenter/pages/phone/qbfs/step2.vue | 458 --------- .../processCenter/pages/phone/qbfs/step4.vue | 482 ---------- .../processCenter/pages/phone/qbfs/step5.vue | 844 +++++++++++++++++ src/router/index.js | 16 +- 7 files changed, 2566 insertions(+), 955 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/qbfs/common/formList.vue create mode 100644 src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue delete mode 100644 src/pages/processCenter/pages/phone/qbfs/step2.vue delete mode 100644 src/pages/processCenter/pages/phone/qbfs/step4.vue create mode 100644 src/pages/processCenter/pages/phone/qbfs/step5.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue index b04525431..fe8b4420b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue @@ -9,8 +9,8 @@ diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue new file mode 100644 index 000000000..ab57da038 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue @@ -0,0 +1,891 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue new file mode 100644 index 000000000..36fa47d76 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue @@ -0,0 +1,826 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbfs/step2.vue b/src/pages/processCenter/pages/phone/qbfs/step2.vue deleted file mode 100644 index 681239939..000000000 --- a/src/pages/processCenter/pages/phone/qbfs/step2.vue +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - diff --git a/src/pages/processCenter/pages/phone/qbfs/step4.vue b/src/pages/processCenter/pages/phone/qbfs/step4.vue deleted file mode 100644 index bdf95231d..000000000 --- a/src/pages/processCenter/pages/phone/qbfs/step4.vue +++ /dev/null @@ -1,482 +0,0 @@ - - - - - - diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue new file mode 100644 index 000000000..9b663b732 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue @@ -0,0 +1,844 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 14ed05908..d12c0f404 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2636,19 +2636,9 @@ const routes = [ } }, { - path: '/phoneQbfsStep2', - name: 'phoneQbfsStep2', - component: () => import('@/pages/processCenter/pages/phone/qbfs/step2.vue'), - meta: { - isBoolean: true, - requireAuth: true, - title: '企标复审流程' - } - }, - { - path: '/phoneQbfsStep4', - name: 'phoneQbfsStep4', - component: () => import('@/pages/processCenter/pages/phone/qbfs/step4.vue'), + path: '/phoneBussFs3', + name: 'phoneBussFs3', + component: () => import('@/pages/processCenter/pages/phone/qbfs/step5.vue'), meta: { isBoolean: true, requireAuth: true, From 007d509448013b86829c59eaaecabf279742abb8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 18 Mar 2022 19:39:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/foreignRegulationsDatabase/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue index 2762bd95d..4f84584d3 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue @@ -2418,7 +2418,7 @@ // 树节点鼠标移入移出 mouseenter(data){ this.$set(data, 'show', true) - if(data.parentId !== null){ + if(data.parentId !== null && data.id !== 'zcwdsc'){ this.$set(data, 'showDel', true) } },