Commit 379164d2 authored by chuan.liu's avatar chuan.liu

提交流程参数遗漏补上

parent 25a18d57
...@@ -170,7 +170,11 @@ export default { ...@@ -170,7 +170,11 @@ export default {
this.taskNode = selfTask this.taskNode = selfTask
} }
}, },
onClickLeft() {} onClickLeft() {
window.opener = null
window.open('', '_self', '')
window.close()
}
} }
} }
</script> </script>
......
...@@ -85,7 +85,11 @@ export default { ...@@ -85,7 +85,11 @@ export default {
handleOpinion: '', handleOpinion: '',
handleResult: '1' handleResult: '1'
}, },
tablePathData: [] tablePathData: [],
taskNode: {
procUnitHandlerId: '',
groupId: ''
}
} }
}, },
computed: { computed: {
...@@ -117,6 +121,7 @@ export default { ...@@ -117,6 +121,7 @@ export default {
if (res.data) { if (res.data) {
this.tablePathData = res.data.Rows this.tablePathData = res.data.Rows
this.stepActive = this.tablePathData.length this.stepActive = this.tablePathData.length
this.selectSelfTask(res.data.Rows)
} }
}) })
.catch(() => {}) .catch(() => {})
...@@ -124,8 +129,8 @@ export default { ...@@ -124,8 +129,8 @@ export default {
async submit(handleResult) { async submit(handleResult) {
this.conditions.handleResult = handleResult this.conditions.handleResult = handleResult
const params = JSON.parse(JSON.stringify(this.conditions)) const params = JSON.parse(JSON.stringify(this.conditions))
params.currentHandleId = '' params.currentHandleId = this.taskNode.procUnitHandlerId
params.currentHandleGroupId = '' params.currentHandleGroupId = this.taskNode.groupId
params.taskId = this.$route.query.taskId params.taskId = this.$route.query.taskId
if (this.conditions.id) { if (this.conditions.id) {
const res = await advance(params) const res = await advance(params)
...@@ -156,7 +161,21 @@ export default { ...@@ -156,7 +161,21 @@ export default {
Toast('下载异常') Toast('下载异常')
} }
}, },
onClickLeft() {} selectSelfTask(list) {
if (list.length === 0) return
const selfTask = list.find(item => {
return item.id === this.conditions.taskId
})
if (selfTask) {
this.taskNode = selfTask
}
},
onClickLeft() {
window.opener = null
window.open('', '_self', '')
window.close()
}
} }
} }
</script> </script>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<van-field <van-field
v-if="isShowBase" v-if="isShowBase"
v-model="form.baseAuditQuantity" v-model="form.baseAuditQuantity"
:required="taskNode === 'base'" :required="taskNode.subProcUnitId === 'base'"
label="基地审批量" label="基地审批量"
placeholder="" placeholder=""
/> />
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
v-if="isShowWarZone" v-if="isShowWarZone"
v-model="form.warAuditQuantity" v-model="form.warAuditQuantity"
label="战区审批量" label="战区审批量"
:required="taskNode === 'warZone'" :required="taskNode.subProcUnitId === 'warZone'"
placeholder="" placeholder=""
error-message="" error-message=""
/> />
...@@ -254,19 +254,23 @@ export default { ...@@ -254,19 +254,23 @@ export default {
planType: '' planType: ''
}, },
tablePathData: [], tablePathData: [],
taskNode: '' taskNode: {
subProcUnitId: '',
procUnitHandlerId: '',
groupId: ''
}
} }
}, },
computed: { computed: {
...mapGetters['token'], ...mapGetters['token'],
isShowBase() { isShowBase() {
return this.taskNode === 'base' || this.isShowWarZone || this.isShowWork return this.taskNode.subProcUnitId === 'base' || this.isShowWarZone || this.isShowWork
}, },
isShowWarZone() { isShowWarZone() {
return this.taskNode === 'warZone' || this.isShowWork return this.taskNode.subProcUnitId === 'warZone' || this.isShowWork
}, },
isShowWork() { isShowWork() {
return this.taskNode === 'work' return this.taskNode.subProcUnitId === 'work'
} }
}, },
created() { created() {
...@@ -327,8 +331,8 @@ export default { ...@@ -327,8 +331,8 @@ export default {
this.conditions = { ...this.conditions, ...this.form } this.conditions = { ...this.conditions, ...this.form }
this.conditions.handleResult = handleResult this.conditions.handleResult = handleResult
const params = JSON.parse(JSON.stringify(this.conditions)) const params = JSON.parse(JSON.stringify(this.conditions))
params.currentHandleId = '' params.currentHandleId = this.taskNode.procUnitHandlerId
params.currentHandleGroupId = '' params.currentHandleGroupId = this.taskNode.groupId
params.taskId = this.$route.query.taskId params.taskId = this.$route.query.taskId
if (this.conditions.id) { if (this.conditions.id) {
const res = await advance(params) const res = await advance(params)
...@@ -351,9 +355,9 @@ export default { ...@@ -351,9 +355,9 @@ export default {
const selfTask = list.find(item => { const selfTask = list.find(item => {
return item.id === this.conditions.taskId return item.id === this.conditions.taskId
}) })
if (selfTask.length > 0) { if (selfTask) {
if (selfTask[0].statusId === 'ready') { if (selfTask.statusId === 'ready') {
this.taskNode = selfTask[0].subProcUnitId this.taskNode = selfTask
} }
} }
}, },
...@@ -363,7 +367,11 @@ export default { ...@@ -363,7 +367,11 @@ export default {
1: '是' 1: '是'
}[val * 1] }[val * 1]
}, },
onClickLeft() {} onClickLeft() {
window.opener = null
window.open('', '_self', '')
window.close()
}
} }
} }
</script> </script>
......
...@@ -17,8 +17,8 @@ module.exports = { ...@@ -17,8 +17,8 @@ module.exports = {
devServer: { devServer: {
proxy: { proxy: {
'/huigou': { '/huigou': {
// target: 'http://10.0.135.139', target: 'http://10.0.135.139',
target: 'http://10.2.7.85', // target: 'http://10.2.7.85',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/huigou': '/crm-app' // 重写, '^/huigou': '/crm-app' // 重写,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment