Skip to content

E
ElectricitySheep
Commit 9da809f0 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

parents 763e1935 7fb2c723
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 62 deletions
src/components/offlineService/appointmentBoard.vue
View file @ 9da809f0
<template> <template>
<div class="appointmentBoard"> <div class="appointmentBoard" ref="appoint">
<div class="content"> <div class="content">
<div> <div>
<el-select class="w200" style="margin-right: 10px;" v-model="msg.StoreId" @change="getList" size="small" <el-select class="w200" style="margin-right: 10px;" v-model="msg.StoreId" @change="getList" size="small"
...@@ -14,67 +14,72 @@ ...@@ -14,67 +14,72 @@
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<table class="appointTable" border="0" cellspacing="0" cellpadding="0"> <div style="overflow:scroll;" :style="{'width':myWidth+'px'}">
<tr> <table class="appointTable" border="0" cellspacing="0" v-if="dataList.KanBanList&&dataList.KanBanList.length>0" cellpadding="0">
<th style="width:100px;">服务</th> <tr>
<th v-for="(subItem,subIndex) in dataList.KanBanList" :key="subIndex">{{subItem.Name}}</th> <th style="width:100px;">服务</th>
</tr> <th v-for="(subItem,subIndex) in dataList.KanBanList" style="width:200px;" :key="subIndex">{{subItem.Name}}</th>
<tr v-for="(item,index) in dataList.allTime" :key="index"> </tr>
<td>{{item}}</td> <tr v-for="(item,index) in dataList.allTime" :key="index">
<!-- <td class="posi" v-for="(childItem,childIndex) in dataList.KanBanList" :key="childIndex" <td>{{item}}</td>
:rowspan="getRow(item,childItem)"> --> <!-- <td class="posi" v-for="(childItem,childIndex) in dataList.KanBanList" :key="childIndex"
<td class="posi" v-for="(childItem,childIndex) in dataList.KanBanList" :key="childIndex"> :rowspan="getRow(item,childItem)"> -->
<template v-for="(sItem,sIndex) in childItem.OrderList"> <td class="posi" v-for="(childItem,childIndex) in dataList.KanBanList" :key="childIndex">
<el-popover :key="sIndex" popper-class="Order_Popover" placement="top-start" title="" width="200" <template v-for="(sItem,sIndex) in childItem.OrderList">
trigger="click"> <el-popover :key="sIndex" popper-class="Order_Popover" placement="top-start" title="" width="200"
<div class="orderTips_top"> trigger="click">
<span class="order_dian"></span>{{tipsInfo.StoreName}} <div class="orderTips_top">
</div> <span class="order_dian"></span>{{tipsInfo.StoreName}}
<div class="OrderList_info"> </div>
<div style="margin:0 20px;"> <div class="OrderList_info">
<div class="OrderList_top"> <div style="margin:0 20px;">
<img style="width:36px;height:36px;border-radius:50%;margin-right:10px;" :src="tipsInfo.UserPhoto" alt="" /> <div class="OrderList_top">
<div> <img style="width:36px;height:36px;border-radius:50%;margin-right:10px;" :src="tipsInfo.UserPhoto" alt="" />
<div class="orderList_Name">{{tipsInfo.UserName}}</div> <div>
<div style="color:#777777;font-size:12px;margin-top:3px;"> <div class="orderList_Name">{{tipsInfo.UserName}}</div>
{{tipsInfo.GoodsName}}<span v-if="tipsInfo.GoodServiceTime>0"> | <div style="color:#777777;font-size:12px;margin-top:3px;">
{{getHours(tipsInfo.GoodServiceTime)}}小时</span> {{tipsInfo.GoodsName}}<span v-if="tipsInfo.GoodServiceTime>0"> |
{{getHours(tipsInfo.GoodServiceTime)}}小时</span>
</div>
</div> </div>
</div> </div>
<div class="order_ListInfo" style="margin-top:15px;">
<div class="Order_StoreTitle">门店地址</div>
<div class="Order_Store_Address">{{tipsInfo.StoreAddress}}</div>
</div>
<div class="order_ListInfo">
<div class="Order_StoreTitle">服务人员</div>
<div class="Order_Store_Address">{{tipsInfo.Name}}</div>
</div>
<div class="order_ListInfo">
<div class="Order_StoreTitle">到店信息</div>
<div class="Order_Store_Address">{{tipsInfo.Number}}人 | {{tipsInfo.Mobile}}</div>
</div>
<div class="order_ListInfo" style="padding-bottom:15px;margin-bottom:0;">
<div class="Order_StoreTitle">备注信息</div>
<div class="Order_Store_Address">{{tipsInfo.BuyerMessage}}</div>
</div>
</div> </div>
<div class="order_ListInfo" style="margin-top:15px;"> </div>
<div class="Order_StoreTitle">门店地址</div> <div v-if="sItem.ServiceTime==item" slot="reference" @click="getStoreInfo(sItem,childItem)" class="OrderDiv_Main">
<div class="Order_Store_Address">{{tipsInfo.StoreAddress}}</div> <div class="appointUser">
</div> <img :src="sItem.UserPhoto" class="UserPhote" alt="" />
<div class="order_ListInfo"> <span style="margin-left:5px;">{{sItem.UserName}}</span>
<div class="Order_StoreTitle">服务人员</div>
<div class="Order_Store_Address">{{tipsInfo.Name}}</div>
</div>
<div class="order_ListInfo">
<div class="Order_StoreTitle">到店信息</div>
<div class="Order_Store_Address">{{tipsInfo.Number}}人 | {{tipsInfo.Mobile}}</div>
</div> </div>
<div class="order_ListInfo" style="padding-bottom:15px;margin-bottom:0;"> <div style="margin-top:5px;color:#777777">
<div class="Order_StoreTitle">备注信息</div> {{sItem.GoodsName}}<span v-if="sItem.GoodServiceTime>0"> |
<div class="Order_Store_Address">{{tipsInfo.BuyerMessage}}</div> {{getHours(sItem.GoodServiceTime)}}小时</span>
</div> </div>
</div> </div>
</div> </el-popover>
<div v-if="sItem.ServiceTime==item" slot="reference" @click="getStoreInfo(sItem,childItem)" class="OrderDiv_Main"> </template>
<div class="appointUser"> </td>
<img :src="sItem.UserPhoto" class="UserPhote" alt="" /> </tr>
<span style="margin-left:5px;">{{sItem.UserName}}</span> </table>
</div> </div>
<div style="margin-top:5px;color:#777777"> <div v-if="dataList.KanBanList&&dataList.KanBanList.length==0" class="empty-text">
{{sItem.GoodsName}}<span v-if="sItem.GoodServiceTime>0"> | 暂无数据
{{getHours(sItem.GoodServiceTime)}}小时</span> </div>
</div>
</div>
</el-popover>
</template>
</td>
</tr>
</table>
</div> </div>
</div> </div>
</template> </template>
...@@ -90,6 +95,7 @@ ...@@ -90,6 +95,7 @@
StoreList: [], //门店下拉 StoreList: [], //门店下拉
scheduleData: {}, scheduleData: {},
tipsInfo: {}, //提示信息 tipsInfo: {}, //提示信息
myWidth:0 //宽度
}; };
}, },
created() { created() {
...@@ -111,12 +117,6 @@ ...@@ -111,12 +117,6 @@
this.apipost("/api/MContent/GetStoresList", {}, res => { this.apipost("/api/MContent/GetStoresList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.StoreList = res.data.data; this.StoreList = res.data.data;
// if(this.StoreList.length>0){
// this.msg.StoreId = this.StoreList[0].Id
// this.getList();
// }else{
// this.getList();
// }
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -165,6 +165,8 @@ ...@@ -165,6 +165,8 @@
this.msg.WorkDate = year+'-'+month+'-'+day; this.msg.WorkDate = year+'-'+month+'-'+day;
this.getStoreList(); this.getStoreList();
this.getList(); this.getList();
this.myWidth = this.$refs.appoint.offsetWidth-50;
} }
}; };
...@@ -314,5 +316,11 @@ ...@@ -314,5 +316,11 @@
height: 100%; height: 100%;
background: #67C23A; background: #67C23A;
} }
.appointmentBoard .empty-text{
line-height: 60px;
color: #909399;
text-align: center;
border-bottom: 1px solid #EBEEF5;
}
</style> </style>
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