diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index b431e0e06..5dc8a02c7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -626,7 +626,6 @@
}, {}, res => {
if (res.ok) {
this.options = res.data.list
- console.log(this.options);
}
}, e => {
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
new file mode 100644
index 000000000..d13400055
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -0,0 +1,535 @@
+
+
+
+
+ 标准征求意见流程
+ 责任部门对接人汇总并选择审批人
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.fileName }}
+ 下载
+
+
+
+
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+ 征求意见列表
+
+
+
+
+
+
+
+
+
+
+
+ 查看修改前内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
new file mode 100644
index 000000000..623c13b0e
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -0,0 +1,521 @@
+
+
+
+
+ 标准征求意见流程
+ 责任部门对接人汇总并选择审批人
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.fileName }}
+ 下载
+
+
+
+
+
+
+ - -
+
+
+
+
+
+
+
+ 征求意见列表
+
+
+
+
+
+
+
+
+
+
+
+ 查看修改前内容
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 4689b0ce1..63b78d37c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -295,8 +295,8 @@ export default {
spName: '',
},
formRules: {
- responUserList: [
- {required: true, message: '请选择责任人', trigger: 'change'},
+ spId: [
+ {required: true, message: '请选择审批人', trigger: 'change'},
]
},
json: {}
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index d6a4098b4..d83214356 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -12,11 +12,11 @@
基础信息
@@ -26,32 +26,42 @@
+ disabled
+ v-model="form.endTime"
+ type="date"
+ placeholder="请选择结束日期">
@@ -60,100 +70,79 @@
征求意见列表
+ type="index"
+ label="序号"
+ width="55"
+ align="center">
+ prop="chapterNumber"
+ align="center"
+ sortable
+ label="章条编号"
+ width="101px">
+ prop="chapterName"
+ align="center"
+ width="200px"
+ label="章节名称">
+ prop="commentText"
+ align="center"
+ label="修改意见内容(包括理由或依据)">
+ prop="name"
+ align="center"
+ label="修改前">
-
-
-
-
- {{ scope.row.oldText }}
-
+ 查看修改前内容
-
-
-
-
-
- {{ scope.row.newText }}
-
-
+ prop="name"
+ align="center"
+ label="修改后">
-
-
-
-
-
- {{ scope.row.reason }}
-
-
+ prop="name"
+ align="center"
+ label="修改理由">
+ prop="department"
+ align="center"
+ label="提出部门">
+ prop="responUserName"
+ align="center"
+ label="提出人">
+ prop="state"
+ align="center"
+ label="处理意见">
+ :disabled="scope.row.type"
+ v-model="scope.row.state"
+ collapse-tags
+ style="margin-left: 20px;"
+ placeholder="请选择处理意见">
@@ -161,17 +150,29 @@
+
+
+ 处理
+
+
+ type="textarea"
+ :rows="3"
+ resize="none"
+ placeholder="请输入意见"
+ v-model="commentText">
@@ -179,57 +180,57 @@
+ height="100%"
+ ref="selection"
+ :data="histortData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ border
+ row-key="id"
+ :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+ prop="createTime"
+ label="创建时间"
+ sortable="custom"
+ align="center">
{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ prop="endTime"
+ label="完成时间"
+ align="center">
{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ prop="comment"
+ label="流程信息"
+ align="center">
{{ scope.row.commentText }}
+ prop="completeFlag"
+ label="状态"
+ align="center">
{{ scope.row.endTime ? "已完成" : "未完成" }}
@@ -237,13 +238,13 @@
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 82d854de8..00fe29240 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -616,7 +616,7 @@ export default {
})
} else if (row.taskInfo === '审批人审批') {
this.$router.push({
- name: 'bzzqyjStep5',
+ name: 'bzzqyjStep4-1',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
@@ -625,7 +625,29 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '责任人会签') {
+ } else if (row.taskInfo === '标准法规工程师分线审核') {
+ this.$router.push({
+ name: 'bzzqyjStep4-2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '标准法规工程师汇总') {
+ this.$router.push({
+ name: 'bzzqyjStep5',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '责任人会签') {
this.$router.push({
name: 'bzzqyjStep6',
query: {
diff --git a/src/router/index.js b/src/router/index.js
index 3d1818917..535f26f7c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1129,6 +1129,24 @@ const routes = [
title: '标准征求意见流程'
}
},
+ {
+ path: '/bzzqyjStep4-1',
+ name: 'bzzqyjStep4-1',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准征求意见流程'
+ }
+ },
+ {
+ path: '/bzzqyjStep4-2',
+ name: 'bzzqyjStep4-2',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准征求意见流程'
+ }
+ },
{
path: '/bzzqyjStep5',
name: 'bzzqyjStep5',