From 4ac5dd4cfbe58347c96441db0bbff6c07109c9f2 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 30 Sep 2021 18:00:06 +0800
Subject: [PATCH 01/19] feat: There is no way the
---
src/api/process.js | 8 +
.../pages/components/ProcessFooter.vue | 9 +-
.../pages/creatProcess/bzzqyj/step3.vue | 35 +-
.../pages/processAcceptDetail/index.vue | 1107 +++++++++++++++++
src/router/index.js | 9 +
5 files changed, 1161 insertions(+), 7 deletions(-)
create mode 100644 src/pages/processCenter/pages/processAcceptDetail/index.vue
diff --git a/src/api/process.js b/src/api/process.js
index c6bbdfcaf..ae17707fa 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -415,6 +415,14 @@ export function isEnd (data) {
})
}
+export function execTask (data) {
+ return axios({
+ url: '/api/lawss/activiti/execTask',
+ method: 'get',
+ params: data
+ })
+}
+
export function get_verify_by_instance (data) {
return axios({
url: '/api/lawss/activiti/get_verify_by_instance',
diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 8ed146e64..e5ecd16c3 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -1,6 +1,6 @@
-
+
+
+
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 08/19] =?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') : '' }}
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).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') : '' }}
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).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