提交 115b2ec0 authored 作者: lihuihui's avatar lihuihui

修改bug

上级 68f04a55
...@@ -59,12 +59,13 @@ export default { ...@@ -59,12 +59,13 @@ export default {
getOrderStatus(id) { getOrderStatus(id) {
api.getOrder(id).then(response => { api.getOrder(id).then(response => {
const code = parseInt(response.data.status) const code = parseInt(response.data.status)
setTimeout(() => { if (code === 1) {
if (code === 1) { clearInterval(this.clearTime)
this.$router.go(0)
setTimeout(() => {
this.$router.go(0) this.$router.go(0)
clearInterval(this.clearTime) }, 1000)
} }
}, 1000);
}) })
}, },
// 微信支付 // 微信支付
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
v-model="form.birth_place" v-model="form.birth_place"
name="pattern" name="pattern"
placeholder="请填写" placeholder="请填写"
:rules="[{ pattern, message: '输入有误,请检查并重新填写' }]"
/> />
</div> </div>
<div class="item"> <div class="item">
...@@ -80,7 +79,6 @@ ...@@ -80,7 +79,6 @@
v-model="form.address" v-model="form.address"
name="pattern" name="pattern"
placeholder="请填写" placeholder="请填写"
:rules="[{ pattern, message: '输入有误,请检查并重新填写' }]"
/> />
</div> </div>
<div class="item"> <div class="item">
......
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
<div class="xx" v-if="item.approve_status == 0"> <div class="xx" v-if="item.approve_status == 0">
审批备注:<span>{{ item.approve_remark }}</span> 审批备注:<span>{{ item.approve_remark }}</span>
</div> </div>
<div class="xx" v-if="item.approve_status != -1"> <div class="xx" v-if="item.approve_status != -1 && item.approve_status != -3">
审批时间:<span>{{ item.updated_time }}</span> 审批时间:<span>{{ item.updated_time }}</span>
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<template v-if="item.approve_status == -1"> <template v-if="item.approve_status == -1 || item.approve_status == -3">
<div class="btn" @click="goEdit(item.id)">编辑</div> <div class="btn" @click="goEdit(item.id)">编辑</div>
<div class="btn" @click="revoke(item.id)">撤销</div> <div class="btn" @click="revoke(item.id)">撤销</div>
</template> </template>
...@@ -79,6 +79,10 @@ export default { ...@@ -79,6 +79,10 @@ export default {
cont.text = '审批通过' cont.text = '审批通过'
cont.class = 'tag stu3' cont.class = 'tag stu3'
break break
case -3:
cont.text = '待上传'
cont.class = 'tag'
break
} }
return cont return cont
} }
...@@ -100,7 +104,7 @@ export default { ...@@ -100,7 +104,7 @@ export default {
}, },
goEdit(id) { goEdit(id) {
this.$router.push({ this.$router.push({
path: '/attestation/printing', path: '/attestation/upload',
query: { query: {
id: id, id: id,
edit: 1 edit: 1
......
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
this.auditStatus = response.approve_status this.auditStatus = response.approve_status
this.ispay = response.pay this.ispay = response.pay
this.approveRemark = response.approve_remark this.approveRemark = response.approve_remark
if (this.$route.query.look || this.$route.query.edit) { if (this.$route.query.look) {
this.isLook = true this.isLook = true
} }
} }
...@@ -224,7 +224,7 @@ export default { ...@@ -224,7 +224,7 @@ export default {
console.log(ruleForm) console.log(ruleForm)
for (let i = 0; i < Object.values(ruleForm).length; i++) { for (let i = 0; i < Object.values(ruleForm).length; i++) {
if (Object.values(ruleForm)[i] === '') { if (Object.values(ruleForm)[i] === '') {
Toast('上传资料不完整。请将资料补充完整,再确认提交') Toast('请上传')
return return
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论