Commit 4ca48942 authored by 张俊's avatar 张俊

修复服务申请

parent 440d807f
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
<div <div
style="float:right;cursor: pointer;position:relative;" style="float:right;cursor: pointer;position:relative;"
class="shop_hover" class="shop_hover"
@click="gotopage('/shop/shopping_cart')"
> >
<div class="number">99+</div> <div class="number">{{shopping_list.length>=100?'99+':shopping_list.length}}</div>
<img src="../assets/imgs/home_ic_shop.png" alt class="car" /> <img src="../assets/imgs/home_ic_shop.png" alt class="car" />
<div class="shop_menu"> <div class="shop_menu">
<div class="shop_list_title">最近加入的服务:</div> <div class="shop_list_title">最近加入的服务:</div>
......
...@@ -378,36 +378,45 @@ export default { ...@@ -378,36 +378,45 @@ export default {
} }
] ]
console.log(this.zd_table_arr); console.log(this.zd_table_arr);
data.service_apply_info.approval_process.forEach(e => { if(data.service_apply_info.approval_process){
this.use_approval_arr.push( data.service_apply_info.approval_process.forEach(e => {
{ this.use_approval_arr.push(
title:e.level==1?'一级审批':'二级审批', {
result:e.status==-1?'审批未通过':e.status==0?'审批中':'审批通过', title:e.level==1?'一级审批':'二级审批',
} result:e.status==-1?'审批未通过':e.status==0?'审批中':'审批通过',
) }
)
if(e.status!==0){
this.use_approval_arr[this.use_approval_arr.length - 1]['arr']=[
{
title:'审批时间:',
info:e.approval_time.split('+')[0].replace("T",' ')
},
{
title:'审批单位:',
info:e.user_info.department_name
},
{
title:'审批人:',
info:e.user_info.user_name
},
{
title:'审批意见:',
info:e.comments
},
]
} if(e.status!==0){
}); this.use_approval_arr[this.use_approval_arr.length - 1]['arr']=[
{
title:'审批时间:',
info:e.approval_time.split('+')[0].replace("T",' ')
},
{
title:'审批单位:',
info:e.user_info.department_name
},
{
title:'审批人:',
info:e.user_info.user_name
},
{
title:'审批意见:',
info:e.comments
},
]
}
});
}else{
this.use_approval_arr.push(
{
title:'一级审批',
result:'待审批',
}
)
}
this.res_data = JSON.parse(data.res_fields) this.res_data = JSON.parse(data.res_fields)
}) })
.catch(function(response) { .catch(function(response) {
......
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
option:[ option:[
{ required: true, message: '请输入意见', trigger: 'blur' }, { required: true, message: '请输入意见', trigger: 'blur' },
{ {
min: 10, message: '长度大于10个字符', trigger: 'blur' min: 10, message: '长度大于10个字符', trigger: 'blur'
} }
] ]
}, },
......
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