From af8cc1abfb246fb92b1e28b80bb9d193eb138c8a Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 8 Oct 2021 15:42:44 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=BA=93=E8=BD=A6=E5=9E=8B=E6=B8=85=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E5=8F=91=E5=B8=83=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-4.vue | 825 ++++++++++++++++++ .../accessStandardsAndRegulations/index.vue | 2 +- .../localProductsOrProjectLibrary/index.vue | 28 +- src/router/index.js | 9 + 4 files changed, 850 insertions(+), 14 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue new file mode 100644 index 000000000..ed8e83e68 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue @@ -0,0 +1,825 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 244c81671..c24f4f472 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -88,7 +88,7 @@ export default { this.tabValue = this.list[0].name; }, beforeRouteLeave(to, from, next) { - const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "ProjectAddEit", "OtherAddEit"]; + const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"]; // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName if (toName.includes(to.name)) { this.$store.commit("SET_ACCESS_STANDARD_REG_TABS", this.tabValue); diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 5a962c0dd..f2881be94 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -198,6 +198,9 @@ 查看 + + 发起确认流程 + @@ -891,6 +894,9 @@ export default { case "查看": this.handlePreview(command[0]); break; + case "发起确认流程": + this.handleProcess(command[0]); + break; } }, /** @@ -1394,19 +1400,15 @@ export default { } }); }, - // 关联 - handleRelation(row) { - this.row = row; - this.rowId = this.row.id; - this.getSearchInforList(); - this.getRelectiontTable(); - this.showModelRelation = true; - this.$nextTick(() => { - this.relationTableHeight = $(".demo-drawer-content").height() - 52 - 60; - window.onresize = function() { - this.relationTableHeight = $(".demo-drawer-content").height() - 52 - 60; - }.bind(this); - }); + // 发起确认流程 + handleProcess(row) { + // 项目清单确认流程 + this.$router.push({ + name:'xmqdqrStep1-4', + query: { + row + } + }) }, // 关联里面条件查询的下拉列表数据获取 getSearchInforList() { diff --git a/src/router/index.js b/src/router/index.js index e508867cf..33bcf020f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -577,6 +577,15 @@ const routes = [ title: '项目清单确认流程' } }, + { + path: '/xmqdqrStep1-4', + name: 'xmqdqrStep1-4', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, { path: '/xmqdqrStep3', name: 'xmqdqrStep3', From f70f9a0deaad50fbedafe5e3aca7e5c165ff6007 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Fri, 8 Oct 2021 15:53:37 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=9A=84=E5=9C=A8=E4=BA=A7=E5=92=8C=E5=9C=A8?= =?UTF-8?q?=E7=A0=94,=E5=8F=AA=E4=BF=9D=E7=95=99=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg/step4.vue | 206 +++++++++--------- .../pages/creatProcess/xmpg/step5.vue | 84 +++---- .../pages/creatProcess/xmpg/step6.vue | 84 +++---- .../pages/creatProcess/xmpg/step7.vue | 86 ++++---- .../pages/creatProcess/xmpg2/step10.vue | 86 ++++---- .../pages/creatProcess/xmpg2/step11.vue | 86 ++++---- .../pages/creatProcess/xmpg2/step12.vue | 86 ++++---- .../pages/creatProcess/xmpg2/step6.vue | 206 +++++++++--------- .../pages/creatProcess/xmpg2/step7.vue | 86 ++++---- .../pages/creatProcess/xmpg2/step8.vue | 84 +++---- .../pages/creatProcess/xmpg2/step9.vue | 86 ++++---- .../pages/standInvolveProjectDetail.vue | 102 ++++----- 12 files changed, 641 insertions(+), 641 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 25617f65b..b8aaccff7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -209,10 +209,10 @@ {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }} - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -897,7 +897,7 @@ export default { margin-top: 10px; } /deep/.el-table th > .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index ae2d006d8..d8d5311fc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -209,10 +209,10 @@ {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue index 54388a43e..8c3a1eb61 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue @@ -209,10 +209,10 @@ {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue index 760c0be00..b5b553ef5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue @@ -4,7 +4,7 @@ - + xmpgStep7
基础信息
审批历史
@@ -209,10 +209,10 @@ {{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 9b8150cf1..79c3f6494 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -112,10 +112,10 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index 2cb6a9e8a..5136f8096 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -112,10 +112,10 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 85982828e..48afb2bfe 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -112,10 +112,10 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 1d608e3e5..9c6f1eed6 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -121,10 +121,10 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -981,7 +981,7 @@ export default { } /deep/ .el-table th > .cell { - font-size: 12px; + font-size: 14px; } /deep/ .el-table thead.is-group th { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 4aef6ba14..d6aa4034a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -112,10 +112,10 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index d4121b273..a90cf0aa9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -112,10 +112,10 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index b9f09d6b6..e1fd3c39b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -112,10 +112,10 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .cell{ - font-size: 12px; + font-size: 14px; } /deep/.el-table thead.is-group th{ padding: 0px; diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index e6137ab47..a51c91f57 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -201,10 +201,10 @@ prop="clauseName" label="条款名称"> - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Fri, 8 Oct 2021 16:07:20 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index f2881be94..99d730955 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -198,7 +198,8 @@ 查看 - + // 权限id 91ed4c216c019e869aad04baf7bc7db4 + 发起确认流程 From 22bf6c6fd526eab7f3548d0de71ae040c3518aec Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sat, 9 Oct 2021 09:15:34 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 05a392fc9..da7517fad 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -83,7 +83,8 @@ prop="standNumber" label="标准号" fixed="left" - width="260px" + show-overflow-tooltip + width="180px" >