From 12371449b844a4d605b6c535d5f07096c0a4c7b5 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 30 Aug 2021 17:56:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6--?=
=?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/localTool/standardWarning.vue | 73 +++++++++++++++++++++++--
1 file changed, 68 insertions(+), 5 deletions(-)
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 59df5b758..471eb3411 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -11,25 +11,51 @@
实施预警
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
-
+
新车型实施日期预警
{
@@ -567,6 +607,19 @@ export default {
console.log(e)
})
},
+ clearBtnClick() {
+ this.dynamic = {
+ //标准编号
+ standCode: "",
+ //标准名称
+ standName: "",
+ //实施日期
+ putTime: "",
+ //适用车型
+ applyType: "",
+ }
+ this.searchBtnClick()
+ },
//取消预警
cancelWarning (index, row) {
console.log(index, row)
@@ -882,6 +935,16 @@ export default {
}
.more {
+
+ /deep/ .el-input__inner {
+ width: 155px;
+ }
+ .choose-time-area {
+ /deep/ .el-input__inner {
+ width: 220px;
+ }
+ }
+
cursor: pointer;
color: #12508e;
position: absolute;
From bde3d83e69fd3aa468f6ed9535ad49aff4249246 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Mon, 30 Aug 2021 17:58:34 +0800
Subject: [PATCH 2/3] commit
---
.../pages/creatProcess/bzzqyj/step1.vue | 68 +++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 8accf6817..bd8699ea8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -52,6 +52,16 @@
placeholder="请选择结束日期">
+
+
+ 选择附件
+
+
+
+
+
@@ -255,6 +265,38 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
>
+
+
+
@@ -269,6 +311,10 @@ export default {
name: "bzzqyjStep1",
data() {
return {
+ addFjList: [],
+ fzShow: false,
+ fzlistModel: false,
+ fjList: [],
commentText: '',
textarea: '', // 意见
title: '', // 新增抽屉标题
@@ -283,6 +329,7 @@ export default {
cname: '', // 名称
standType: '',
standId: '',
+ fjList: []
},
formRules: {
cid: [
@@ -364,6 +411,27 @@ export default {
}
},
methods: {
+ updataFj (item) {},
+ addfjList () {
+ this.$http.get('lawss/sarStandFile/queryFileInfo', {
+ standId: this.form.standId
+ }, {}, res => {
+ this.fjList = res.data
+ })
+ this.fzlistModel = true
+ },
+ handleSelection2 (data) {
+ console.log(data);
+ this.addFjList = data
+ },
+ closeDrawer2 () {
+ this.fzlistModel = false
+ this.addFjList = []
+ },
+ enterDrawer2 () {
+ this.fzlistModel = false
+ this.form.fjList = this.addFjList
+ },
// 点击查看
handlePreview (item) {
let pageType
From 7a34acb06cc02d48910fe46432abc4b03a7e6a6a 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, 30 Aug 2021 17:59:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
=?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/home/information.vue | 2 +-
.../pages/components/ProcessMixin.vue | 4 +
.../pages/creatProcess/xmqdqr/step1.vue | 758 +++++++++++++++++
.../pages/creatProcess/xmqdqr/step2.vue | 769 ++++++++++++++++++
.../processCenter/pages/newProcess/index.vue | 24 +-
.../tabComponents/processCenter/index.vue | 15 +
src/router/index.js | 18 +
7 files changed, 1588 insertions(+), 2 deletions(-)
create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
diff --git a/src/pages/home/information.vue b/src/pages/home/information.vue
index cc9c493bb..44065aabf 100644
--- a/src/pages/home/information.vue
+++ b/src/pages/home/information.vue
@@ -136,7 +136,7 @@
-
+
diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index 8ae1ab0b0..6273d72d0 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -40,6 +40,10 @@ export default {
{
label: "标准解读流程",
value: "9"
+ },
+ {
+ label: '项目清单确认流程',
+ value: "10"
}
],
formDisableFlag: false,
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
new file mode 100644
index 000000000..628214c8b
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -0,0 +1,758 @@
+
+
+
+ 项目清单确认流程
+ 申请人发起流程
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+ 选择项目
+
+
+
+
+
+
+
+
+
+ 选择清单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+
+
+
+
+
+
+
+ 确认人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 未发布
+ 已发布
+ 审核中
+
+
+
+
+ {{ scope.row.detailedListVision
+ }}
+
+
+
+
+
+ {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
new file mode 100644
index 000000000..6bbd2d579
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -0,0 +1,769 @@
+
+
+
+ 项目清单确认流程
+ 确认人确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+ 流程列表加载中
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index 3448e1f47..273b26f9e 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -148,6 +148,24 @@
+
+
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
@@ -259,7 +277,11 @@ export default {
name:'bzjdStep1'
})
break
- case '10':
+ case '11':
+ // 项目清单确认流程
+ this.$router.push({
+ name:'xmqdqrStep1'
+ })
break
}
},
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 40c7f5a42..0856bd2e9 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -778,6 +778,21 @@ export default {
}
})
}
+ break
+ case '10':
+ if (row.taskInfo === '确认人确认') {
+ this.$router.push({
+ name: 'xmqdqrStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index 3f580e304..c5f00b910 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -529,6 +529,24 @@ const routes = [
title: '项目合规评估流程-项目'
}
},
+ {
+ path: '/xmqdqrStep1',
+ name: 'xmqdqrStep1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
+ {
+ path: '/xmqdqrStep2',
+ name: 'xmqdqrStep2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '项目清单确认流程'
+ }
+ },
{
path: '/wfhxzgStep1',
name: 'wfhxzgStep1',