Commit 1fd79828 authored by xiangzj's avatar xiangzj

优化

parent d8731c9f
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<span class="active-dot">{{ index + 1 }}</span> <span class="active-dot">{{ index + 1 }}</span>
</template> </template>
<p class="step-title"> <p class="step-title">
{{ item.statusName }},{{ item.startTime }} {{ item.handler }} {{ item.statusName }},{{ item.startTime }} {{ item.executorPersonMemberName }}
</p> </p>
</van-step> </van-step>
<van-step class="last-step"> <van-step class="last-step">
...@@ -280,7 +280,8 @@ export default { ...@@ -280,7 +280,8 @@ export default {
procUnitHandlerId: '', procUnitHandlerId: '',
groupId: '' groupId: ''
}, },
flag: false flag: false,
status: '',
} }
}, },
computed: { computed: {
...@@ -331,6 +332,7 @@ export default { ...@@ -331,6 +332,7 @@ export default {
apiWantgoodsFindById(this.conditions).then(res => { apiWantgoodsFindById(this.conditions).then(res => {
res.data.pyear += '' res.data.pyear += ''
this.conditions = { ...this.conditions, ...res.data } this.conditions = { ...this.conditions, ...res.data }
this.status = res.data.status
for (const key in this.conditions) { for (const key in this.conditions) {
if (this.conditions.hasOwnProperty(key)) { if (this.conditions.hasOwnProperty(key)) {
if (key === 'isShunt') { if (key === 'isShunt') {
...@@ -355,7 +357,7 @@ export default { ...@@ -355,7 +357,7 @@ export default {
this.stepActive = this.tablePathData.length this.stepActive = this.tablePathData.length
this.selectSelfTask(res.data.Rows) this.selectSelfTask(res.data.Rows)
this.flag = res.data.Rows.some(item => { this.flag = res.data.Rows.some(item => {
return item.executorPersonId === Cookies.get('HEADER_USERID_KEY') && item.statusId === 'ready' && item.id === this.conditions.taskId return item.executorPersonId === Cookies.get('HEADER_USERID_KEY') && item.statusId === 'ready' && item.id === this.conditions.taskId && this.status - 1 === 0
}); });
} }
}) })
...@@ -408,7 +410,7 @@ export default { ...@@ -408,7 +410,7 @@ export default {
return return
} }
} }
if (this.isShowWork && !this.form.salecenterAuditQuantity) { if (this.isShowWork) {
if (this.form.salecenterAuditQuantity - 0 <= 0 || !Number(this.form.salecenterAuditQuantity)) { if (this.form.salecenterAuditQuantity - 0 <= 0 || !Number(this.form.salecenterAuditQuantity)) {
Toast('请正确填写内勤审批量') Toast('请正确填写内勤审批量')
return return
......
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