diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index c15f9b668..faaa39b35 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -27,6 +27,7 @@
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 3de6d38dd..8accf6817 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -552,6 +552,10 @@ export default {
if (res.success) {
this.$message.success('流程发起成功')
this.$router.push('/processCenter')
+ this.isSubmit = false
+ } else {
+ this.$message.warning('流程启动失败')
+ this.isSubmit = false
}
})
} else {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 1d19fe428..0ff0abfea 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -221,7 +221,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+ import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default {
name: "bzzqyjStep3",
@@ -324,7 +324,22 @@
handleTabs(name) {
this.active = name
},
- handleSave() {},
+ handleSave() {
+ this.saveLoading = true
+ let _formData = new FormData()
+ _formData.append('taskIds', this.taskIds)
+ _formData.append('json', JSON.stringify({
+ form: this.form,
+ data: this.data,
+ commentText: this.commentText,
+ }))
+ saveTaskForPub(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ }).catch(e => {
+ this.saveLoading = false
+ })
+ },
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见')
@@ -378,11 +393,11 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- this.form.cid = data.cid
- this.form.endTime = data.endTime
- this.form.cname = data.cname
+ this.form.cid = data.cid || data.form.cid
+ this.form.endTime = data.endTime || data.form.endTime
+ this.form.cname = data.cname || data.form.cname
this.json = data
- this.data = data.info || []
+ this.data = data.info || data.data || []
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 4e3e3e5b3..8f2419ce2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -301,11 +301,11 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- this.form.cid = data.cid
- this.form.endTime = data.endTime
- this.form.cname = data.cname
+ this.form.cid = data.cid || data.form.cid
+ this.form.endTime = data.endTime || data.form.endTime
+ this.form.cname = data.cname || data.form.cname
this.json = data
- this.data = data.info
+ this.data = data.info || data.data
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 1320b9156..e08b93f6e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -352,9 +352,9 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- this.form.cid = data.cid
- this.form.endTime = data.endTime
- this.form.cname = data.cname
+ this.form.cid = data.cid || data.form.cid
+ this.form.endTime = data.endTime || data.form.endTime
+ this.form.cname = data.cname || data.form.cname
this.oldData = JSON.parse(JSON.stringify(data.summaryList))
data.summaryList.forEach( item => {
if (item.state) {
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 2f8411f01..233ebf577 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -219,8 +219,12 @@ export default {
}else{
this.toProcessDetail('xmpg2Step1-2',row)
}
+ //标准解读流程
}else if(prcType === '9'){
this.toProcessDetail('bzjdStep1-6',row)
+ //标准调研流程
+ }else if(prcType === '2'){
+ this.toProcessDetail('bzdyStep1-9',row)
}
} else {
this.$message.warning('当前流程未全部办理完成,无法查看')
diff --git a/src/router/index.js b/src/router/index.js
index cb6fc9cd6..5669438e8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -799,6 +799,15 @@ const routes = [
title: '标准调研流程'
}
},
+ {
+ path: '/bzdyStep1-9',
+ name: 'bzdyStep1-9',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准调研流程'
+ }
+ },
{
path: '/bzjdStep1',
name: 'bzjdStep1',