|
@@ -152,7 +152,9 @@
|
|
|
}
|
|
|
}
|
|
|
.section-box{
|
|
|
+ margin-top: 30px;
|
|
|
padding: 20px 20px;
|
|
|
+ border: 1px solid #E9E9E9;
|
|
|
.description{
|
|
|
margin-top: 10px;
|
|
|
.time{
|
|
@@ -298,7 +300,7 @@
|
|
|
<div class="sectionBody">
|
|
|
<div class="tabBody">
|
|
|
<a-tabs v-model="activeKey" @change='tabChange'>
|
|
|
- <a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title" v-if="pane.role=='all'||pane.role==roleCode" >
|
|
|
+ <a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title" v-if="pane.role=='all'||pane.role==roleCode||roleCode=='admin'" >
|
|
|
<!-- {{ pane.content }}{{pane.role+'-'+roleCode}} -->
|
|
|
</a-tab-pane>
|
|
|
</a-tabs>
|
|
@@ -376,8 +378,6 @@
|
|
|
{{text}}
|
|
|
</div>
|
|
|
<span slot="options" slot-scope="text,record">
|
|
|
- <a href="javascript:;" @click="hurryUp(record)">催一下</a>
|
|
|
- <a-divider type="vertical" />
|
|
|
<a href="javascript:;" @click="viewDetails(record)">详情</a>
|
|
|
|
|
|
<!-- <a-divider type="vertical" />
|
|
@@ -538,9 +538,10 @@ let marterialData=[
|
|
|
export default {
|
|
|
data() {
|
|
|
const panes = [
|
|
|
- { title: '全部订单', content: '', key: '1' , role:'all' },
|
|
|
- { title: '我发起的', content: '', key: '2' , role:'all' },
|
|
|
- { title: '下给我的', content: '', key: '3' , role:'design' },
|
|
|
+ { title: '全部订单', content: '', key: '9' , role:'all' },
|
|
|
+ { title: '我发起的', content: '', key: '1' , role:'operate' },
|
|
|
+ { title: '待确定的', content: '', key: '2' , role:'designLeader' },
|
|
|
+ { title: '待指派的', content: '', key: '3' , role:'designLeader' },
|
|
|
{ title: '我参与的', content: '', key: '4' , role:'all' },
|
|
|
{ title: '待审核的', content: '', key: '5' , role:'all' },
|
|
|
{ title: '已完成的', content: '', key: '6' , role:'all' },
|
|
@@ -612,12 +613,10 @@ export default {
|
|
|
// 查看详情
|
|
|
viewDetails(record){
|
|
|
console.log(record)
|
|
|
- this.visible = true;
|
|
|
+ this.$route.push(`/workBench/orderDetail?orderId=${record.id}`)
|
|
|
},
|
|
|
|
|
|
- onClose() {
|
|
|
- this.visible = false;
|
|
|
- },
|
|
|
+
|
|
|
// 撤回订单
|
|
|
withdrawOrder(){
|
|
|
|
|
@@ -657,15 +656,7 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
- // tabqiehuan
|
|
|
- // tabChange(key){
|
|
|
- // console.log(key);
|
|
|
- // if(key==1){
|
|
|
- // this.columns=[...materialColumns]
|
|
|
- // }else{
|
|
|
- // this.columns=[...scriptColumns]
|
|
|
- // }
|
|
|
- // },
|
|
|
+
|
|
|
|
|
|
// 素材通过审核
|
|
|
approved(){
|
|
@@ -686,6 +677,10 @@ export default {
|
|
|
this.orderParticipants="";
|
|
|
this.orderSponsor='';
|
|
|
},
|
|
|
+
|
|
|
+ tableHttp(){
|
|
|
+
|
|
|
+ },
|
|
|
},
|
|
|
mounted(){
|
|
|
let userInfo=localStorage.getItem('pro__Login_Userinfo');
|
|
@@ -693,7 +688,10 @@ export default {
|
|
|
this.userInfo=JSON.parse(userInfo).value
|
|
|
}
|
|
|
this.roleCode=localStorage.getItem('roleCode')
|
|
|
-
|
|
|
+ console.log(this.$route.query.status)
|
|
|
+ this.activeKey=this.$route.query.status
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
</script>
|