Skip to content

S
SuperMan
Commit 706d6edb authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 7de01a2a eb8de9b7
Hide whitespace changes
Inline Side-by-side
Showing with 1304 additions and 750 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 706d6edb
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<div class="w150"> <div class="w150">
<!--:disabled="subItem.OPState==1"--> <!--:disabled="subItem.OPState==1"-->
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')" <el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getHotelList(subItem)' @change='sendValue(subItem)'> @visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID' <el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'> :key='itemHotel.ID'>
...@@ -204,9 +204,19 @@ ...@@ -204,9 +204,19 @@
<el-option label='签单' :value='2'></el-option> <el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='5'></el-option> <el-option label='实物抵扣' :value='5'></el-option>
<el-option label='预付' :value='4'></el-option> <el-option label='预付' :value='4'></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
<tr v-show="subItem.PayStyle==6">
<td colspan="2" style="height:5px;"></td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td width="70" style="text-align:right;">付款团号：</td>
<td>
<el-input class='w135' v-model='subItem.PayTypeTCNUM'></el-input>
</td>
</tr>
<tr> <tr>
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
...@@ -230,7 +240,7 @@ ...@@ -230,7 +240,7 @@
<!-- 操作 --> <!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<!--v-if="subItem.OPState!=1"--> <!--v-if="subItem.OPState!=1"-->
<template > <template>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start"> <el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button> <el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip> </el-tooltip>
...@@ -307,8 +317,8 @@ ...@@ -307,8 +317,8 @@
subItem.HotelId = 0; subItem.HotelId = 0;
subItem.HotelName = ""; subItem.HotelName = "";
subItem.OrderID = 0; subItem.OrderID = 0;
subItem.OrderDetailsList.forEach(childItem=>{ subItem.OrderDetailsList.forEach(childItem => {
childItem.OrderDetailsId=0; childItem.OrderDetailsId = 0;
}); });
item.HotelOrderList.push(subItem); item.HotelOrderList.push(subItem);
}, },
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 706d6edb
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
<th width="100">车配号</th> <th width="100">车配号</th>
<th width="100">车辆号</th> <th width="100">车辆号</th>
<th width="60">用车方式</th> <th width="60">用车方式</th>
<!-- <th width="60">车费</th> <th width="60">车费</th>
<th width="120">车费付款方式</th> --> <th width="120">车费付款方式</th>
<th width="80">高速公路费</th> <th width="80">高速公路费</th>
<th width="120">高速费用付款方式</th> <th width="120">高速费用付款方式</th>
<th width="60">停车费</th> <th width="60">停车费</th>
...@@ -58,29 +58,35 @@ ...@@ -58,29 +58,35 @@
<span v-if='index!=0&&index!=list.BusList.length-1'>{{item.AirportPickUpStr}}</span> <span v-if='index!=0&&index!=list.BusList.length-1'>{{item.AirportPickUpStr}}</span>
<span v-if='index==list.BusList.length-1'>送机</span> <span v-if='index==list.BusList.length-1'>送机</span>
</td> </td>
<!-- <td> <td>
{{ item.PayType === 1 ? moneyFormat(item.CostPrice) : 0}} {{item.CostPrice >= 0 && item.CostPrice !== null && item.PayType > 0 ? (item.PayType === 1 ? moneyFormat(item.CostPrice) : 0) : ''}}
</td> </td>
<td> <td>
<span v-if="item.PayType === 1">现付</span> <span v-if="item.PayType === 1">现付</span>
<span v-else-if="item.PayType === 2">公司结算</span> <span v-else-if="item.PayType === 2">公司结算</span>
<span v-else-if="item.PayType === 3">预付</span> <span v-else-if="item.PayType === 3">预付</span>
<span v-else>暂无</span> <span v-else-if="item.PayType ===6">合团公司支付</span>
</td> --> <span v-else></span>
</br>
<span v-show="item.PayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td>
<td> <td>
{{item.HighSpeedPayType === 1 ? moneyFormat(item.HighSpeedPrice) : 0}} {{item.HighSpeedPrice >= 0 && item.HighSpeedPrice !== null && item.HighSpeedPayType > 0 ? (item.HighSpeedPayType === 1 ? moneyFormat(item.HighSpeedPrice) : 0) : ''}}
</td> </td>
<td> <td>
<span v-if="item.HighSpeedPayType === 1">现付</span> <span v-if="item.HighSpeedPayType === 1">现付</span>
<span v-else-if="item.HighSpeedPayType === 2">公司结算</span> <span v-else-if="item.HighSpeedPayType === 2">公司结算</span>
<span v-else-if="item.HighSpeedPayType === 3">预付</span> <span v-else-if="item.HighSpeedPayType === 3">预付</span>
<span v-else>暂无</span> <span v-else-if="item.HighSpeedPayType ===6">合团公司支付</span>
<span v-else></span>
</br>
<span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td> </td>
<td> <td>
{{moneyFormat(item.StopPrice)}} {{item.StopPrice >= 0 && item.StopPrice !== null && item.PayType > 0 ? (item.PayType === 1 ? moneyFormat(item.StopPrice) : 0): ''}}
</td> </td>
<td> <td>
{{moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0)+Number(item.StopPrice))}} {{Number(moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))) <= 0 ? '' : moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))}}
</td> </td>
<td v-if='index==0' :rowspan='list.BusList.length'> <td v-if='index==0' :rowspan='list.BusList.length'>
{{busTotalPrice(list.BusList)}} {{busTotalPrice(list.BusList)}}
...@@ -98,7 +104,7 @@ ...@@ -98,7 +104,7 @@
</tr> </tr>
<tr v-if="TotalNav.reimburseTotalPrice"> <tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td> <td>总金额</td>
<td colspan="13"> <td colspan="14">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}} {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
</td> </td>
<!-- <td>签单/预付/抵扣总金额</td> <!-- <td>签单/预付/抵扣总金额</td>
...@@ -162,7 +168,7 @@ ...@@ -162,7 +168,7 @@
<td> <td>
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{moneyFormat(childItem.UnitPrice)}} {{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p> </p>
</td> </td>
<td> <td>
...@@ -179,7 +185,10 @@ ...@@ -179,7 +185,10 @@
<span v-else-if="subItem.PayStyle === 2">签单</span> <span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span> <span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span> <span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else>暂无</span> <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
{{subItem.Remarks}} {{subItem.Remarks}}
...@@ -234,7 +243,7 @@ ...@@ -234,7 +243,7 @@
<td> <td>
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
{{moneyFormat(childItem.PeoplePrice)}} {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p> </p>
</td> </td>
<td> <td>
...@@ -250,7 +259,10 @@ ...@@ -250,7 +259,10 @@
<span v-if="subItem.PayStyle === 1">现付</span> <span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span> <span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span> <span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else>暂无</span> <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}} {{item.Remarks}}
...@@ -307,7 +319,7 @@ ...@@ -307,7 +319,7 @@
<td> <td>
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
{{moneyFormat(childItem.PeoplePrice)}} {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p> </p>
</td> </td>
<td> <td>
...@@ -323,7 +335,10 @@ ...@@ -323,7 +335,10 @@
<span v-if="subItem.PayStyle === 1">现付</span> <span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span> <span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span> <span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else>暂无</span> <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}} {{item.Remarks}}
...@@ -653,7 +668,7 @@ ...@@ -653,7 +668,7 @@
if (str == '2') if (str == '2')
return '儿童' return '儿童'
if (str == '3') if (str == '3')
return '婴儿' return '小人'
}, },
UseDinnerTypeToWord(str) { UseDinnerTypeToWord(str) {
if (str == 1) if (str == 1)
......
src/components/Login.vue
View file @ 706d6edb
...@@ -316,17 +316,11 @@ export default { ...@@ -316,17 +316,11 @@ export default {
let previousPathInfo = localStorage.previousPathInfo ? JSON.parse(localStorage.previousPathInfo) : '' let previousPathInfo = localStorage.previousPathInfo ? JSON.parse(localStorage.previousPathInfo) : ''
if (previousPathInfo) { if (previousPathInfo) {
let path = previousPathInfo.path.indexOf('login') === -1 ? previousPathInfo.path : 'index' let path = previousPathInfo.path.indexOf('login') === -1 ? previousPathInfo.path : 'index'
let query = previousPathInfo.query ? previousPathInfo.query : {} let query = previousPathInfo.query ? previousPathInfo.query : {}
if (path!== 'index') { this.$router.push({ path: "/"+ path, query: query });
this.$router.push({ path: "/"+ path, query: query });
} else {
this.$router.push({ path: "/index" });
}
}else { }else {
this.$router.push({ path: "/index" }); this.$router.push({ path: "/index" });
} }
//登录成功后跳转页面 //登录成功后跳转页面
// this.$notify.success({ // this.$notify.success({
// title:'提示', // title:'提示',
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 706d6edb
...@@ -509,11 +509,44 @@ ...@@ -509,11 +509,44 @@
<button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button> <button class="normalBtn" type="button" @click="showDiv">{{$t('pub.addBtn')}}</button>
<button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button> <button class="normalBtn importBtn" type="button" @click="outerVisible=true">导入营销数据</button>
<a class="hollowFixedBtn downBtn" :href="downList">下载模板</a> <a class="hollowFixedBtn downBtn" :href="downList">下载模板</a>
<button class="hollowFixedBtn" type="button" style="display:none;"
@click="DownLoadShop()">导出</button>
</li> </li>
</ul> </ul>
</div> </div>
<!--不要删除-->
<div style="display:none">
<table>
<tr>
<td>
进店时间:
</td>
<td>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
v-model="DownLoadmsg.EnterTime"></el-date-picker>
</td>
<td>
创建时间:
</td>
<td>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
v-model="DownLoadmsg.CreateDate">
</el-date-picker>
</td>
<td>
购物店:
</td>
<td>
<el-select multiple="" class="w150" v-model='DownLoadmsg.ShopIds' filterable placeholder="请选择购物店">
<el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</td>
<td>
<button class="hollowFixedBtn" type="button" @click="DownLoadShop()">导出</button>
</td>
</tr>
</table>
</div>
<div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}"> <div class="hotelResource clearfix" v-loading="loading" :class="{'divTop':isShow,'fillTop':fillShow}">
<div class="resourceList" v-for="item in dataInfo" :key="item.subCode"> <div class="resourceList" v-for="item in dataInfo" :key="item.subCode">
<div class="reTopInfo"> <div class="reTopInfo">
...@@ -804,6 +837,17 @@ ...@@ -804,6 +837,17 @@
QDistrict: "", QDistrict: "",
Name: "" Name: ""
}, },
//文件下载参数
DownLoadmsg: {
//创建日期
CreateDate: "",
//进店时间
EnterTime: "",
//操作人
CreateBy: 0,
//购物店Ids
ShopIds: ""
},
addMsg: { addMsg: {
ID: "0", ID: "0",
Name: "", Name: "",
...@@ -852,15 +896,12 @@ ...@@ -852,15 +896,12 @@
//下载Excel //下载Excel
DownLoadShop() { DownLoadShop() {
this.loading = true; this.loading = true;
let qMsg = { this.DownLoadmsg.CreateBy = this.getLocalStorage().EmployeeId;
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
let fileName = "购物店单据导出" + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = "购物店单据导出" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("shop_get_downloadShopFinaceList", qMsg, fileName, this.GetLocalFile("shop_get_downloadShopFinaceList", this.DownLoadmsg, fileName,
res => { res => {
this.loading = false; this.loading = false;
}); });
}, },
//上传购物店图片 //上传购物店图片
UploadImage(file) { UploadImage(file) {
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 706d6edb
...@@ -157,9 +157,10 @@ ...@@ -157,9 +157,10 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
<tr> <tr>
<th width="50">{{$t('active.ad_xuhao')}}</th> <th width="50">{{$t('active.ad_xuhao')}}</th>
<th width="80">{{$t('Operation.Op_chutuan')}}</th> <th width="60">{{$t('Operation.Op_chutuan')}}</th>
<th width='200'>{{$t('Operation.Op_TeamName')}}</th> <th width='120'>{{$t('Operation.Op_TeamName')}}</th>
<th width="80">{{$t('fnc.tuanqi')}}</th> <th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="130">团期编号</th>
<th width="80">{{$t('Operation.Op_jinchudian')}}</th> <th width="80">{{$t('Operation.Op_jinchudian')}}</th>
<th width="100">{{$t('Operation.Op_ArriveTime')}}</th> <th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
<th width="50">{{$t('Operation.Op_price')}}</th> <th width="50">{{$t('Operation.Op_price')}}</th>
...@@ -180,22 +181,23 @@ ...@@ -180,22 +181,23 @@
'Rs_Start10':item.StartCityNum==10,'Rs_Start11':item.StartCityNum==11,'Rs_Start12':item.StartCityNum==12,'Rs_Start13':item.StartCityNum==13}"> 'Rs_Start10':item.StartCityNum==10,'Rs_Start11':item.StartCityNum==11,'Rs_Start12':item.StartCityNum==12,'Rs_Start13':item.StartCityNum==13}">
{{item.StartCityName}}</td> {{item.StartCityName}}</td>
<td>{{item.LtName}}</td> <td>{{item.LtName}}</td>
<td>{{item.StartDateStr}}</td> <td>{{item.StartDateStr}} {{item.AlCode}}</td>
<td><span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrl('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td>
<td>{{item.InOut}}</td> <td>{{item.InOut}}</td>
<td>{{item.InOutTime}}</td> <td>{{item.InOutTime}}</td>
<td>{{item.B2CMemberPrice}}</td> <td>{{item.B2CMemberPrice}}</td>
<td>{{item.TotalSeat}}</td> <td>{{item.TotalSeat}}</td>
<td> <td>
<span class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}" <span title="点击跳转到报名清单" class="Order_RS" :class="{'RS_RedType':item.OrderTotalNum>0}"
@click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span @click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderTotalNum-item.OrderLeaderGuestNum}}<span
v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span> v-if="item.OrderLeaderGuestNum>0">+{{item.OrderLeaderGuestNum}}</span></span>
</td> </td>
<td><span class="Order_RS" @click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderPaymentNum}}</span> <td><span class="Order_RS" @click="goUrl('RegistrationList',item.TCID,'设置领队')">{{item.OrderPaymentNum}}</span>
</td> </td>
<td><span :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'" <td><span title="点击跳转到报名清单" :class="item.LeaderName!=''&&item.LeaderName!=null?'PingFangSC Order_RS':'Order_RS'"
@click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName!=""&&item.LeaderName!=null ?item.LeaderName:"设置领队"}}</span> @click="goUrl('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName!=""&&item.LeaderName!=null ?item.LeaderName:"设置领队"}}</span>
</td> </td>
<td><span :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'" <td><span title="点击跳转到设置导游页面" :class="item.GuideName!=''&&item.GuideName!=null?'RS_RedType PingFangSC Order_RS':'Order_RS'"
@click="goUrl('leaderArrangement',item.TCID,'设置导游')">{{item.GuideName!=""&&item.GuideName!=null?item.GuideName:"设置导游"}}</span> @click="goUrl('leaderArrangement',item.TCID,'设置导游')">{{item.GuideName!=""&&item.GuideName!=null?item.GuideName:"设置导游"}}</span>
</td> </td>
<td><span class="RS_Nameover">{{item.OPRemark}}</span></td> <td><span class="RS_Nameover">{{item.OPRemark}}</span></td>
...@@ -349,11 +351,14 @@ ...@@ -349,11 +351,14 @@
}, },
DownLoadFile() { DownLoadFile() {
this.Info("正在下载文件...") this.Info("正在下载文件...")
this.queryCommonData.loading=true;
this.GetLocalFile( this.GetLocalFile(
"travel_get_DownTravelPriceOrderStatistics", "travel_get_DownTravelPriceOrderStatistics",
this.queryMsg, this.queryMsg,
"报名统计.xls" "报名统计.xls",
); res => {
this.queryCommonData.loading = false;
});
}, },
goUrl(path, id, NameStr) { goUrl(path, id, NameStr) {
if (id > 0) { if (id > 0) {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 706d6edb
...@@ -102,10 +102,6 @@ ...@@ -102,10 +102,6 @@
color: #4d7afd; color: #4d7afd;
} }
.Team_Incontent {
margin-left: 35px;
}
.Team_firstTitle span { .Team_firstTitle span {
margin-right: 10px; margin-right: 10px;
text-align: center; text-align: center;
...@@ -114,7 +110,6 @@ ...@@ -114,7 +110,6 @@
} }
.Team_Incontent span { .Team_Incontent span {
margin-left: 20px;
font-size: 14px; font-size: 14px;
font-family: 'PingFangSC-Fine'; font-family: 'PingFangSC-Fine';
} }
...@@ -174,9 +169,9 @@ ...@@ -174,9 +169,9 @@
</span>团费收入 </span>团费收入
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<div>应收<span>￥{{DataList.TeamBalance.ShouldReceive}}</span></div> <div>应收：<span>￥{{DataList.TeamBalance.ShouldReceive}}</span></div>
<div>实收<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span></div> <div>实收：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualReceive}}</span></div>
<div>待收<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div> <div>待收：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitRecive}}</span></div>
<div> <div>
注：应收=订单应收总额，实收=订单实收总额 注：应收=订单应收总额，实收=订单实收总额
</div> </div>
...@@ -191,9 +186,9 @@ ...@@ -191,9 +186,9 @@
</span>其他收入 </span>其他收入
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<div>应收<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div> <div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
<div>实收<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div> <div>实收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalsf)}}</span></div>
<div>待收<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div> <div>待收：<span class="Team_Coins">￥{{moneyFormat(moneyAll.otheryTotalyf-moneyAll.otheryTotalsf)}}</span></div>
<!--<div> <!--<div>
注：应收=订单应收总额，实收=订单实收总额 注：应收=订单应收总额，实收=订单实收总额
</div>--> </div>-->
...@@ -208,9 +203,9 @@ ...@@ -208,9 +203,9 @@
</span>支出 </span>支出
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<div>应付<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div> <div>应付：<span>￥{{DataList.TeamBalance.ShouldPay}}</span></div>
<div>实付<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div> <div>实付：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
<div>待付<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div> <div>待付：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
<div> <div>
注：成本单据总额(包含退款)+提成-小费收入-地接收入 注：成本单据总额(包含退款)+提成-小费收入-地接收入
</div> </div>
...@@ -225,8 +220,8 @@ ...@@ -225,8 +220,8 @@
</span>利润 </span>利润
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<div>实际利润<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div> <div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
<div>当前利润<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div> <div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
<div> <div>
注：实收-(应付/实付)+佣金收入+自费收入-联运成本 注：实收-(应付/实付)+佣金收入+自费收入-联运成本
</div> </div>
...@@ -240,16 +235,16 @@ ...@@ -240,16 +235,16 @@
<i class="iconfont icon-qian"></i> <i class="iconfont icon-qian"></i>
</span>其他 </span>其他
</div> </div>
<div class="Team_Incontent" style="height:80px;overflow:auto;"> <div>提成：</div>
<div class="Team_Incontent" style="height:50px;overflow:auto;margin-bottom:10px;">
<div> <div>
<div>提&nbsp;&nbsp;&nbsp;成</div>
<div style="margin-bottom:6px;"> <div style="margin-bottom:6px;">
<template v-for="subItem in DataList.ExpectedCutList"> <template v-for="subItem in DataList.ExpectedCutList">
<div style="margin-bottom:10px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div> <div style="margin-bottom:5px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
</template> </template>
</div> </div>
</div> </div>
<div>联运成本<span>￥{{DataList.LYCB}}</span></div> <div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
</div> </div>
<div class="Team_firstTitle"> <div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun"> <span class="Team_comCoinType Team_lirun">
...@@ -257,7 +252,7 @@ ...@@ -257,7 +252,7 @@
</span>优惠 </span>优惠
</div> </div>
<div class="Team_Incontent"> <div class="Team_Incontent">
<div>金&nbsp;&nbsp;&nbsp;额<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div> <div>金额：<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div>
</div> </div>
</div> </div>
</el-col> </el-col>
......
src/components/activity/CommodityActive.vue 0 → 100644
View file @ 706d6edb
<style>
.height_auto.el-select .el-input {
height: auto;
}
.CommodityType ._addUpload_box {
display: block;
margin: 10px 0 0;
}
.CommodityType ._addUpload_box img {
height: 15px;
display: block;
margin-right: 25px;
}
.CommodityType ._addUpload_box > div.el-upload {
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210, 210, 210, 1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.CommodityType ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
left: 9px;
top: -5px;
background-color: #f56c6c;
border-radius: 50%;
height: 15px;
width: 15px;
text-align: center;
line-height: 15px;
}
.CommodityType ._addUpload_box > div:hover {
background-color: #f5f5f5;
}
.CommodityType .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.CommodityType .bg_color_delete{
background-color: #ee4454;
border-color: #ee4454;
}
</style>
<template>
<div class="flexOne CommodityType">
<div class="query-box">
<ul class>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" value="查询">
<input
type="button"
@click="outerVisible = true,dialogTitle='新增商品活动', addMsg.reqType = 'add',resetInfo()"
class="normalBtn"
:value="$t('pub.addBtn')"
>
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="120px">活动编号</th>
<th>活动名称</th>
<th>活动图片</th>
<th>活动描述</th>
<th>创建时间</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.id}}</td>
<td>{{item.name}}</td>
<td>
<img :src="item.images" alt>
</td>
<td>{{item.descrip}}</td>
<td>{{item.createTime.replace('T', ' ')}}</td>
<td>
<el-tooltip
class="item"
effect="dark"
:content="$t('active.ld_editInfo')"
placement="top"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle='修改商品活动',updateData(item)"
></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="primary" class="bg_color_delete" icon="el-icon-delete" circle @click="Delete(item)"></el-button>
</el-tooltip> -->
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-dialog
custom-class="w400"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<el-form-item label="商品活动名称" prop="name">
<el-input v-model="addMsg.name" class="w217"/>
</el-form-item>
<el-form-item label="活动介绍" prop="descrip">
<el-input type="textarea" v-model="addMsg.descrip" class="w217"></el-input>
</el-form-item>
<el-form-item label="商品活动图标">
<div class="_addUpload_box">
<div class="_pic_upload">
<template v-if="addMsg.images!==''">
<div>
<div
style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
>
<img :src="addMsg.images">
<span
style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.images=''"
>重新上传</span>
</div>
</div>
</template>
<el-upload
v-else
drag
:http-request="uploadFileBtn"
:multiple="false"
:show-file-list="false"
action
>
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
</div>
</div>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button
class="hollowFixedBtn"
@click="outerVisible = false, resetForm('addMsg')"
>{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
state: -1,
name: ""
},
addMsg: {
descrip: "",
name: "",
images: "",
id: 0
},
rules: {
name: [
{ required: true, message: "请输入名称", trigger: "blur" }
],
descrip: [
{ required: true, message: "请输入描述", trigger: "blur" }
]
},
loading: false,
outerVisible: false,
dialogTitle: "",
dataList: [],
awardRelationList: [],
jurisdictionsList: []
};
},
mounted() {
this.getList();
},
filters: {},
methods: {
// 删除
Delete(item) {
this.$confirm("是否删除"+ item.name+"? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: 'delete', id: item.id },
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
})
.catch(() => {});
},
//上传图片
uploadFileBtn(file) {
//上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t("tips.wjdxbncgsz"));
return;
}
// 1 文档 2 数据 3 图片
let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
let ft = file.file.name
.substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
.toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != "-1") {
fileTypeNumber = x.type;
typeOk = true;
}
});
if (!typeOk) return this.$message.error(this.$t("tips.qsctpian"));
let newArr = [];
newArr.push(file.file);
let path = "/Upload/activity/";
this.$message.info(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => {
let fileSize =
file.file.size < 1024
? file.file.size
: (file.file.size / 1024).toFixed(0);
this.addMsg.images = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.$message.success(this.$t("tips.scchenggong"));
this.$forceUpdate();
});
},
//获取数据
getList() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.loading = false;
console.log(res);
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(this.dataList, "datalist");
} else {
this.Error(res.data.message);
}
},
null
);
},
//提交
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addAward();
} else {
return false;
}
});
},
//提交添加
addAward() {
if (this.addMsg.images === "") return this.Error("请上传图片");
this.apiJavaPost(
"/api/IntegralManager/AddGoodsSeries",
this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.outerVisible = false;
this.getList();
} else {
this.Error(res.data.message);
}
},
null
);
},
//修改信息
updateData(item) {
this.outerVisible = true;
this.addMsg.id = item.id;
this.addMsg.name = item.name;
this.addMsg.descrip = item.descrip;
this.addMsg.images = item.images;
},
//重置信息
resetInfo() {
var newMsg = {
name: "",
descrip: '',
images: "",
id: 0
};
this.addMsg = newMsg;
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
}
};
</script>
\ No newline at end of file
src/components/activity/CommodityType.vue
View file @ 706d6edb
...@@ -199,8 +199,6 @@ export default { ...@@ -199,8 +199,6 @@ export default {
outerVisible: false, outerVisible: false,
dialogTitle: "", dialogTitle: "",
dataList: [], dataList: [],
awardRelationList: [],
jurisdictionsList: []
}; };
}, },
mounted() { mounted() {
...@@ -268,6 +266,7 @@ export default { ...@@ -268,6 +266,7 @@ export default {
this.$forceUpdate(); this.$forceUpdate();
}); });
}, },
//获取数据 //获取数据
getList() { getList() {
this.loading = true; this.loading = true;
...@@ -300,7 +299,7 @@ export default { ...@@ -300,7 +299,7 @@ export default {
}, },
//提交添加 //提交添加
addAward() { addAward() {
if (this.addMsg.icon === "") return this.Error("请上传icon"); if (this.addMsg.icon === "") return this.Error("请上传图片");
this.apiJavaPost( this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager", "/api/IntegralManager/goodsTypeManager",
this.addMsg, this.addMsg,
......
src/components/activity/IntegralMall.vue
View file @ 706d6edb
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
</li> </li>
<li> <li>
<span> <span>
<em>热门商品</em> <em>商品活动</em>
<el-select filterable v-model="msg.ishot"> <el-select filterable v-model="msg.ishot">
<el-option label="热门" value="Y"></el-option> <el-option label="不限" value=""></el-option>
<el-option label="非热门" value="N"></el-option> <el-option v-for="item in GoodsSeriesList" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<th>市场价</th> <th>市场价</th>
<th>限购数</th> <th>限购数</th>
<th>配送说明</th> <th>配送说明</th>
<th>是否热门</th> <th>所属活动</th>
<th>商品状态</th> <th>商品状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<td>{{item.marketPrice}}</td> <td>{{item.marketPrice}}</td>
<td>{{item.quota === 0 ? '不限购' : `限购${item.quota}次`}}</td> <td>{{item.quota === 0 ? '不限购' : `限购${item.quota}次`}}</td>
<td>{{item.logistic}}</td> <td>{{item.logistic}}</td>
<td>{{item.ishot === 'Y' ? '热门' : '非热门'}}</td> <td>{{getHotName(item.ishot)}}</td>
<td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td> <td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td>
<td> <td>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
...@@ -102,21 +102,47 @@ export default { ...@@ -102,21 +102,47 @@ export default {
state: 1, state: 1,
name: '', name: '',
type: '', type: '',
ishot: 'Y' ishot: ''
}, },
loading:false, loading:false,
dataList:[], dataList:[],
GoodsTypeList: [], GoodsTypeList: [],
GoodsSeriesList: [],
}; };
}, },
mounted() { mounted() {
this.getList(); this.getList();
this.getGoodsTypeManager(); this.getGoodsTypeManager();
this.getGoodsSeries();
}, },
filters: { filters: {
}, },
methods: { methods: {
getHotName: function (id) {
for(let i = 0; i < this.GoodsSeriesList.length; i++ ) {
if (this.GoodsSeriesList[i].id === id) {
return this.GoodsSeriesList[i].name
}
}
return '无'
},
getGoodsSeries() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.GoodsSeriesList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
addIntegralMall: function( path, obj, tab){ addIntegralMall: function( path, obj, tab){
localStorage.editIntegralMall = JSON.stringify(obj); localStorage.editIntegralMall = JSON.stringify(obj);
this.$router.push({ name: path,query:{blank: 'y', tab: tab} }) this.$router.push({ name: path,query:{blank: 'y', tab: tab} })
......
src/components/activity/addIntegralMall.vue
View file @ 706d6edb
...@@ -250,10 +250,10 @@ ...@@ -250,10 +250,10 @@
<el-form-item label="包装说明"> <el-form-item label="包装说明">
<el-input v-model="addMsg.packing" class="w217"/> <el-input v-model="addMsg.packing" class="w217"/>
</el-form-item> </el-form-item>
<el-form-item label="是否热门"> <el-form-item label="商品所属活动">
<el-select filterable v-model="addMsg.ishot"> <el-select filterable v-model="addMsg.ishot">
<el-option label="热门" value="Y" :key="1"></el-option> <el-option label="无" :value="0" :key="0"></el-option>
<el-option label="非热门" value="N" :key="0"></el-option> <el-option v-for="item in GoodsSeriesList" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="配送说明"> <el-form-item label="配送说明">
...@@ -408,7 +408,7 @@ export default { ...@@ -408,7 +408,7 @@ export default {
logistic: "", logistic: "",
state: 1, state: 1,
quota: 0, quota: 0,
ishot: "Y", ishot: 0,
descripImg: '', descripImg: '',
}, },
MenberList: [], MenberList: [],
...@@ -442,10 +442,27 @@ export default { ...@@ -442,10 +442,27 @@ export default {
}, },
images: [], images: [],
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"', defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
apiUrl: 'addGoodsInfo' apiUrl: 'addGoodsInfo',
GoodsSeriesList: [],
}; };
}, },
methods: { methods: {
getGoodsSeries() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.GoodsSeriesList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
goIntegralMall: function(path) { goIntegralMall: function(path) {
this.$router.push({ name: path }); this.$router.push({ name: path });
}, },
...@@ -608,6 +625,7 @@ export default { ...@@ -608,6 +625,7 @@ export default {
} }
this.getMenberList(); this.getMenberList();
this.getGoodsTypeManager(); this.getGoodsTypeManager();
this.getGoodsSeries();
} }
}; };
</script> </script>
src/components/administrative/ExaminationStatistics.vue
View file @ 706d6edb
...@@ -505,11 +505,17 @@ export default { ...@@ -505,11 +505,17 @@ export default {
value: `2019${o}`, value: `2019${o}`,
}) })
} }
this.msg.Periods=dt.getFullYear()+(dt.getMonth()>9?dt.getMonth():"0"+dt.getMonth()) // this.msg.Periods=dt.getFullYear()+(dt.getMonth()>9?dt.getMonth():"0"+dt.getMonth())
this.getList(); this.getList();
this.getCompanyList(); this.getCompanyList();
}, },
created(){ created(){
let date=new Date;
let year=date.getFullYear();
let month=date.getMonth()+1;
month =(month<10 ? "0"+month:month);
let mydate = (year.toString()+month.toString());
this.msg.Periods = mydate;
Vue.component('commission-table-operation',{ Vue.component('commission-table-operation',{
template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`, template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-view" circle @click="see(rowData,index)"></el-button></div>`,
props:{ props:{
......
src/components/busManagement/BusInfo.vue
View file @ 706d6edb
...@@ -265,16 +265,22 @@ ...@@ -265,16 +265,22 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="付款方式" min-width="150"> <el-table-column label="付款方式" min-width="150" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')"> <el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option> <el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option> <el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option> <el-option label='预付' :value='3'></el-option>
<el-option label='合团公司支付' :value='6'></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合团支付团号" min-width="150" >
<template slot-scope="scope">
<el-input class='w120' type="text" v-model='scope.row.PayTypeTCNUM' v-show="scope.row.PayType==6"></el-input>
</template>
</el-table-column>
<el-table-column label="定团号" min-width="230"> <el-table-column label="定团号" min-width="230">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="{'BusTyleFirst':scope.$index==0}"> <div :class="{'BusTyleFirst':scope.$index==0}">
...@@ -318,6 +324,7 @@ ...@@ -318,6 +324,7 @@
<el-option label='现付' :value='1'></el-option> <el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option> <el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option> <el-option label='预付' :value='3'></el-option>
<el-option label='合团公司支付' :value='6'></el-option>
</el-select> </el-select>
</div> </div>
</template> </template>
...@@ -527,8 +534,15 @@ ...@@ -527,8 +534,15 @@
tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee); tempHighSpeedFee += parseFloat(busTypeObj.AllDayHighSpeedFee);
} }
}); });
obj.HighSpeedPrice = tempHighSpeedFee; if(obj.HighSpeedPrice==0)
obj.CostPrice = tempCostFee; {
obj.HighSpeedPrice = tempHighSpeedFee;
}
if(obj.CostPrice==0)
{
obj.CostPrice = tempCostFee;
}
} }
}else{ }else{
obj.PayType=null; obj.PayType=null;
...@@ -717,8 +731,6 @@ ...@@ -717,8 +731,6 @@
newPlanData.PayType = oldPlanData.PayType; newPlanData.PayType = oldPlanData.PayType;
newPlanData.BookGroup = oldPlanData.BookGroup; newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType; newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType;
// newPlanData.HighSpeedPrice = oldPlanData.HighSpeedPrice;
// newPlanData.CostPrice = oldPlanData.CostPrice;
} }
}, },
mounted() { mounted() {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 706d6edb
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span>
</div> </div>
<p v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0" style="display:none;"> <p v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0" >
<el-popover width="600" trigger="click" popper-class="TC_HotelPop"> <el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr> <tr>
......
src/components/sale/sale.vue
View file @ 706d6edb
<style lang="less" scoped>
@import "../../assets/css/main.less";
/*@import "../../assets/css/cssReset.css";*/
.sale_cont{position: absolute;left: 330px;right: 20px;top: 30px; bottom: 30px;}
.Sale_menu ul{width: 100%; height: 40px;}
.Sale_menu li{float: left;width: 100px; height: 40px; text-align: center; font-size: 14px;
line-height: 40px; margin-right:3px; color: #808080;
border-radius:4px 4px 0 0; cursor: pointer; box-sizing: border-box;}
.Sale_menu li.active{ color: #FFFFFF; height: 40px ;background: #1F2533;border-radius: 4px;box-shadow: 0 0 3px 3px rgba(31, 37, 51, 0.4); }
.saleChartCont{width: 100%; height: 95%; box-sizing: border-box;}
.personal{width: 100%;height: 100%}
.PersonalData{width: 100%;height: 47%;background: white;margin-top: 20px;padding: 20px;}
.PersonalData_l{width: 50%;height: 100%;float: left;overflow: hidden}
.PersonalData_l .l_top{width: 100%;height: 100px;}
.l_top .tx_img{width: 94px;height: 94px;border-radius: 50%;overflow: hidden;float: left}
.l_top .img{width: 80px;height: 70px;margin-left: 90px;float: left;margin-top: 15px}
.p_name{margin-left: 17px;margin-top: 25px;float: left}
.p_name span:nth-child(1){font-size: 18px;color: #333333;display: block}
.p_name span:nth-child(2){font-size: 12px;color: #333333;margin-top: 5px;display: block}
.l_top .royalty{margin-left: 30px;float: left;margin-top: 17px}
.l_top .royalty span:nth-child(1){font-size: 36px;color: #333333;display: block}
.l_top .royalty span:nth-child(2){font-size: 16px;color: #666666;display: block}
.order{width: 100%;height: 205px;background: #F5F5F5;margin-top: 18px;padding: 20px}
.l_title{width: 100%;height: 30px}
.table_t{width: 100%;height: 30px;}
.table_t span{width: 24.5%;height: 30px;display: inline-block;float: left;text-align: center;font-size: 12px;color: #666666;line-height: 30px}
.table_c{width: 100%;max-height: 95px;overflow: auto;background: white}
.table_c .table_cont{width: 100%;height: 30px;}
.table_c .table_cont span{width: 24.5%;height: 30px;;display: inline-block;float: left;text-align: center;line-height: 30px}
.PersonalData_r{width: 50%;height: 100%;float: left;overflow: auto;}
.PersonalData_r .r_box{width: 100%;}
.PersonalData_r .r_box .r_box_t{width: 100%;height: 130px;}
.PersonalData_r .r_box .r_box_b{width: 100%;height: 130px;margin-top: 20px}
.c_view{width: 28%;height: 127px;border-radius: 8px;border: 1px solid #E5E5E5;padding: 20px;position: relative;margin-left: 30px;overflow: hidden;float: left}
.view_t:hover{box-shadow: 0 0 10px 10px rgba(229, 156, 151, 0.2);border-radius: 4px;transform: scale(1.05);background: #FFF0EF;border:2px solid #F89291}
.view_b:hover{box-shadow: 0 0 10px 10px rgba(241, 245, 255, 0.2);border-radius: 4px;transform: scale(1.05);background: #ECECFF;border:2px solid #8F96EB}
.c_view span{font-size: 14px;color: #333333;display: inline-block}
.c_view div{margin-top: 15px;}
.c_view div span:nth-child(1){font-size: 36px;color: #333333}
.semicircle_t{width: 200px;height: 200px;border-radius: 50%;position: absolute;top: 20px;right: -100px;background: #FFE4EB}
.view_t:hover .semicircle_t{background: #FFF0EF}
.view_b:hover .semicircle_t{background: #F1F5FF}
.semicircle_b{width: 200px;height: 200px;border-radius: 50%;position: absolute;top: 20px;right: -100px;background: #ECECFF}
.view_t i{position: absolute;top:62px;right: 10px;font-size: 45px;color: #F89291}
.view_b i{position: absolute;top:62px;right: 10px;font-size: 45px;color: #8F96EB}
.dataanalysis{width: 100%;height: 48%;margin-top: 20px}
.data_l{width: 30%;height: 100%;background: white;float: left;padding: 20px}
.data_c{width: 50%;height: 100%;background: white;float: left;margin-left: 20px;padding: 20px;}
.data_title{width: 100%;height: 40px;position: relative}
.data_title span{font-size: 20px;color: #333333;display: inline-block;float: left}
.tagging{position: absolute;top: 0;right: 0;}
.yuan_o{width: 14px;height: 14px;border-radius: 50%;margin-left: 10px;float: left;margin-top: 2px;
background: -webkit-linear-gradient(90deg, #FBA299, #F36C5E);
background: linear-gradient(90deg, #FBA299, #F36C5E);}
.yuan_t{width: 14px;height: 14px;border-radius: 50%;margin-left: 10px;float: left;margin-top: 2px;
background: -webkit-linear-gradient(90deg, #5DE7B3, #00B26F);
background: linear-gradient(90deg, #5DE7B3, #00B26F);}
.yuan_tr{width: 14px;height: 14px;border-radius: 50%;margin-left: 10px;float: left;margin-top: 2px;
background: -webkit-linear-gradient(90deg, #96D1FF, #1698FD);
background: linear-gradient(90deg, #96D1FF, #1698FD);}
.tagging span{font-size: 14px;color: #333333;margin-left: 10px;float: left;display: inline-block}
.D_data{width: 100%;height: 45px;position: relative;line-height: 45px}
.D_data .zname{font-size: 14px;color: #333333;float: left;display: inline-block;width: 60px}
.Progress{width: 86%;height: 12px;border-radius: 6px;float: left;margin: 17px 0 0 40px;overflow: hidden;
background: -webkit-linear-gradient(90deg, #ECECEC, #D3D3D3);
background: linear-gradient(90deg, #ECECEC, #D3D3D3);}
.Progress div{;height: 12px;border-radius: 6px;}
.bugou{
background: -webkit-linear-gradient(90deg, #FBA299, #F36C5E);
background: linear-gradient(90deg, #FBA299, #F36C5E);}
.jiayou{
background: -webkit-linear-gradient(90deg, #5DE7B3, #00B26F);
background: linear-gradient(90deg, #5DE7B3, #00B26F);}
.chaobang{
background: -webkit-linear-gradient(90deg, #96D1FF, #1698FD);
background: linear-gradient(90deg, #96D1FF, #1698FD);}
.mean{position: absolute;top: -15px;right: 10px}
.mean span{font-size: 14px;color: #666666;display: inline-block;float: left}
.data_r{width: 16%;float: right;height: 100%;}
.data_r .r_box{width: 100%;height: 20%;background: white;margin-top: 10px}
.data_r .r_box .icon_f{width: 60px;height: 60px;margin: 6px;float: left;position: relative;margin-top: 10px;}
.data_r .r_box .icon_f i{font-size: 30px;position: absolute;top:15px;left: 15px}
.data_r .r_box:hover{box-shadow: 0 0 3px 3px rgba(184, 184, 184, 0.4);border-radius: 4px;transform: scale(1.05)}
.data_r .r_name{width: 50%;height: 50px;margin-top: 6px;margin-left: 26px;position: relative;line-height:73px;float: left}
.data_r .r_name span{font-size: 14px;color: #333333}
.r_name .tishi{width: 18px;height: 18px;border-radius: 50%;background: #E34141;position: absolute;top:0;right: 0;line-height: 18px;text-align: center}
.r_name .tishi span{font-size: 14px;color: white}
.paneldata{width: 100%;height: 100%;display: flex;flex-direction: row;justify-content: space-between}
.paneldata_l{float: left;width: 80%;height: 100%;}
.groupmembers{width: 100%;height: 48%;margin-top: 20px;background: white;padding: 20px}
.grouptiday{width: 100%;height: 30%;display: flex;flex-direction: row;}
.g_icon{width: 54px;height: 54px;border-radius: 50%;display: flex;flex-direction: column;justify-content: center;align-items: center;margin-top: 10px}
.receive{margin-left: 20px;display: flex;flex-direction: column;margin-top: 10px}
.gain{width: 64px;height: 52px;border-radius: 5px;background: #F5F5F5; display: flex;flex-direction: column;align-items: center;justify-content: center;margin-left: 20px;margin-top: 10px}
.sj{display: flex;flex-direction: row;align-items: center}
.sj span{font-size: 14px;color: #00B26F;}
.weekdata{width: 380px;height: 100%;border-radius: 5px;background: #F9F9F9;border:1px solid #A1A1A1;margin-left: 50px;display: flex;flex-direction: row;padding: 15px;}
.weekdata_box{width: 33%;height: 100%;}
.weekdata_box span{display: block;}
.weekdata_box span:nth-child(1){font-size: 14px;color: #333333}
.weekdata_box .w_da{font-size: 20px;color: #333333}
.w_d{display: flex;flex-direction: row;align-items: center}
.w_d span{font-size: 14px}
.line{width: 100%;height:5px ;position: relative;border-top: 2px dashed #DCDCDC;margin-top: 20px}
.line_title{width: 100px;height: 20px;background: white;line-height: 20px;position: absolute;top:-10px;left: 50%;text-align: center;margin-left: -50px}
.line_title span{font-size: 16px;color: #333333;}
.ranking{width: 100%;height: 60%;margin-top: 20px;display: flex;flex-direction: row;justify-content: space-between}
.rankbox{width: 15%;height: 100%;background: #F9F9F9;display: flex;flex-direction: column;align-items: center;padding: 10px;}
.rankbox .xz_tx{width: 50px;height: 50px;border-radius: 50%;margin-top: 10px;position: relative}
.rankbox img{width: 50px;height: 50px;border-radius: 50%;}
.rankbox_b{width: 100%;height: 70px;display: flex;flex-direction: row}
.today{width: 50%;height: 100%;display: flex;flex-direction: column;align-items: center;justify-content: space-around;}
.today span:nth-child(1){font-size: 12px;color: #888888;}
.today span:nth-child(2){font-size: 18px;color: #333333;}
.paneldata_r{float: right;width: 18%;height: 100%}
.paneldata_r_box{width: 100%;height:96%;background: white;padding: 20px;margin-top: 20px}
.paneldata_r_box .c_view{width: 100%;height: 120px;border-radius: 8px;border: 1px solid #E5E5E5;padding: 20px;position: relative;overflow: hidden;margin-left: 0;margin-top: 12px}
.paneldata_r_box .c_view:hover{box-shadow: 0 0 3px 3px rgba(229, 156, 151, 0.4);border-radius: 4px;transform: scale(1.05)}
.paneldata_r_box .c_view span{font-size: 14px;color: #333333;display: inline-block}
.paneldata_r_box .c_view div{margin-top: 15px;}
.paneldata_r_box .c_view div span:nth-child(1){font-size: 36px;color: #333333}
.paneldata_r_box .banyuan{width: 200px;height: 200px;border-radius: 50%;position: absolute;top: 20px;right: -100px;}
.paneldata_r_box .c_view i{position: absolute;top:62px;right: 10px;font-size: 48px}
.paneldata_r_box .gz1:hover{box-shadow: 0 0 3px 3px rgba(165, 152, 238, 0.4);border-radius: 4px;transform: scale(1.05);background: #FBF7FF;border: 2px solid #A598EE}
.paneldata_r_box .gz2:hover{box-shadow: 0 0 3px 3px rgba(219, 241, 209, 0.4);border-radius: 4px;transform: scale(1.05);background: #DBF1D1;border: 2px solid #98D482}
.paneldata_r_box .gz3:hover{box-shadow: 0 0 3px 3px rgba(227, 239, 246, 0.4);border-radius: 4px;transform: scale(1.05);background: #E3EFF6;border: 2px solid #68A3C2}
.paneldata_r_box .gz4:hover{box-shadow: 0 0 3px 3px rgba(236, 236, 255, 0.4);border-radius: 4px;transform: scale(1.05);background: #ECECFF;border: 2px solid #8F96EB}
.paneldata_r_box .gz5:hover{box-shadow: 0 0 3px 3px rgba(241, 245, 255, 0.4);border-radius: 4px;transform: scale(1.05);background: #F1F5FF;border: 2px solid #96ADEB}
.tubiao{width: 100%;height: 46%;background: white;margin-top: 20px;padding: 20px}
.tb_box{width: 100%;height: 94%;}
.topsanjiao{
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 10px solid #00B26F;
}
.bottomsanjiao{
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 10px solid #F36C5E;
}
<style lang="less" scoped>
@import "../../assets/css/main.less";
@import "../../assets/css/cssReset.css";
.nav{display: flex;.size(100%,126px);.min-width(1200px); .boxShadow(0px,0px,5px,rgba(0,0,0,.19));}
.nav-left{ flex-grow:1.5}
.nav-left img{.fl(); .size(50px;50px);.circle(25px); margin:35px 24px 41px 41px;}
.nav-left p.name{.fz(14px,18px); color: #444;margin: 42px 0 5px 0;}
.nav-left p.company{.fz(12px,18px); color: #444;}
.nav-middle{flex-grow:3; }
.nav-middle ul{display: flex; width: 690px; margin: 0 auto;}
.nav-middle ul li{.size(138px,126px);.fz(14px);.center(text-x);.box-hover2(); .hover-bg(#fafafa);cursor: pointer;}
.nav-middle ul li img{height: 40px; margin: 32px 0 14px;}
.nav-right{flex-grow:1}
.nav-right ul{display: flex; line-height: 126px; justify-content:flex-end}
.nav-right ul li{width: 60px; text-align: center;}
.nav-right ul li img{cursor: pointer;}
.shortcutsDiv{.size(264px,auto);.circle(6px);background: rgba(255,255,255,.75); .boxShadow(2px,2px,0,rgba(0,0,0,.1));.fixed(); padding-bottom: 5px; top: 156px;left: 30px;bottom:100px; z-index: 50; overflow-y: auto;}
.saleChartCont .content{.size(700px,300px);margin: 0 auto; padding-top: 280px; clear: both; }
.saleChartCont .imgShow{.fl(); width:232px; height: 268px; position: relative; margin-right: 20px;}
.saleChartCont .imgShow img{position: absolute; z-index: 10; left: 0; top:0;}
.saleChartCont .msgShow{.fl();padding-top: 55px;}
.saleChartCont .msgShow .top{overflow: hidden;margin-bottom: 24px;}
.saleChartCont .calender{.fl(); margin-right: 16px; .size(98px,84px); text-align: center; background:url(../../assets/img/calender2@2x.png) no-repeat center center;}
.saleChartCont .calender .month{.fz(12px,34px);color: #fff;}
.saleChartCont .calender .day{.fz(18px,38px);color: #333;}
.saleChartCont .description{.fr()}
.saleChartCont .description p{.fz(24px,35px,40px);color: #666; }
.saleChartCont .description span{color: #E95252;}
.saleChartCont .saleBtn{.size(200px,46px); .fz(16px);.bgc(#E95252);color: #fff;.circle(20px);border: none;}
.sale_cont{position: absolute;left: 330px;right: 20px;top: 30px; bottom: 30px;}
.Sale_menu li{float: left;width: 100px; height: 40px; text-align: center; font-size: 14px;
line-height: 40px; margin-right:3px; background: #E6E6E6; border: 1px solid #E6E6E6; color: #808080;
border-radius:4px 4px 0 0; cursor: pointer; box-sizing: border-box;}
.Sale_menu ul{width: 306px; height: 40px;border-bottom: 1px solid #E6E6E6;}
.Sale_menu li:last-child{margin-right: 0;}
.Sale_menu li.active{background: #fff; color: #333; height: 41px; border: 1px solid #E6E6E6; border-bottom: none;}
.saleChartCont{width: 100%; height: 95%; border: 1px solid #E6E6E6; background: #fff; margin-top: -1px; padding: 20px; box-sizing: border-box;}
.circleMiddle{width: 100px; height: 100px; border-radius: 50px; background:rgba(255,255,255,.3); padding: 9px; box-sizing: border-box;}
.circleIn{width: 82px; height: 82px; border-radius: 41px; background:#fff;text-align: center; line-height: 82px; font-size: 30px; transform:rotate(-60deg);font-family: 'PingFang-SC-Bold';}
.circleOut{
color: #F04736;
width: 120px; height: 120px; background: #F04736;
border-top-left-radius: 100px 60px;
border-bottom-left-radius: 60px 100px;
border-top-right-radius: 60px 100px;
border-bottom-right-radius: 100px 60px;
padding: 10px; box-sizing: border-box;
transform:rotate(60deg);
margin: 30px auto 25px;
}
.mormalCircleMiddle{width: 100px; height: 100px; border-radius: 50px; background:#549AE2; padding: 3px; box-sizing: border-box;}
.mormalCircleIn{width: 94px; height: 94px; border-radius: 47px; background:#fff;text-align: center; line-height: 94px; font-size: 30px; transform:rotate(-60deg);font-family: 'PingFang-SC-Bold';}
.mormalCircleOut{
color: #549AE2;
width: 120px; height: 120px; background: #fff;
border-top-left-radius: 100px 60px;
border-bottom-left-radius: 60px 100px;
border-top-right-radius: 60px 100px;
border-bottom-right-radius: 100px 60px;
padding: 10px; box-sizing: border-box;
transform:rotate(60deg);
margin: 30px auto 25px;
}
.circleOutOk{
background: #4BCA81!important;
color: #4BCA81!important;
}
.circleOutNormal{
background: #2CA4F0!important;
color: #2CA4F0!important;
}
.teamSale .el-row:last-child{margin-top: 20px;}
.teamSale .el-col-div{background:#CBDFEB; height: 480px; width: 100%;}
.tiChengList li{float: left; height: 30px; line-height: 30px; width: 100%; cursor: pointer;}
.tiChengList li>span{float:left; font-size: 14px; color: #666;}
.tiChengList li>span b{font-weight: normal;}
</style> </style>
<template> <template>
<div> <div>
<leftNav></leftNav> <leftNav></leftNav>
<div class="sale_cont"> <div class="sale_cont">
<div class="Sale_menu"> <div class="Sale_menu">
<ul> <ul>
<li :class="{active:type==1}" @click="type=1">个人工作台</li> <li :class="{active:type==1}" @click="type=1">
<li :class="{active:type==2}" @click="type=2">小组战绩</li> 首页
</ul> </li>
</div> <li :class="{active:type==2}" @click="type=2;getMyScore()">
个人工作台
<div class="saleChartCont"> </li>
<div v-show="type==1" class="personal"> <li :class="{active:type==3}" @click="type=3">
<div class="PersonalData"> 小组战绩
<div class="PersonalData_l"> </li>
<div class="l_top"> </ul>
<img src="../../assets/img/default_head_img.jpg" alt="" class="tx_img">
<div class="p_name">
<span>张铁明</span>
<span>销售主管</span>
</div>
<img src="../../assets/img/jinbin@2x.png" alt="" class="img">
<div class="royalty">
<span>￥1238.00</span>
<span>本月提成</span>
</div>
</div>
<div class="order">
<div class="l_title">
<span style="font-size: 14px;color: #333333;float: left">近十日发团订单</span>
<span style="font-size: 14px;color: #BABABA;float: right">···</span>
</div>
<div class="table_t">
<span>订单号</span>
<span>团号</span>
<span>出发时间</span>
<span>未收金额</span>
</div>
<div class="table_c">
<div class="table_cont" v-for="item in dxamlist">
<span style="font-size: 12px;color:#333333;">{{item.number}}</span>
<span style="font-size: 12px;color:#333333;">{{item.regiment}}</span>
<span style="font-size: 12px;color:#999999;">{{item.time}}</span>
<span style="font-size: 12px;color:#F36C5E;">{{item.money}}</span>
</div>
</div>
</div>
</div>
<!-- 顶部的右边-->
<div class="PersonalData_r">
<div class="l_title" style="padding: 0 30px">
<span style="font-size: 14px;color: #333333;float: left">今日业绩</span>
</div>
<div class="r_box">
<div class="r_box_t">
<div class="c_view view_t">
<span>今日收客数</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>
</div>
<div class="semicircle_t"></div>
<i class="iconfont icon-tuoyuan"/>
</div>
<div class="c_view view_t">
<span>今日报名单数</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">单</span>
</div>
<div class="semicircle_t"></div>
<i class="iconfont icon-xingzhuang2"/>
</div>
<div class="c_view view_t">
<span>今日涨幅</span>
<div>
<span style="font-size: 36px;color: #333333">30%</span>
<!-- <span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>-->
</div>
<div class="semicircle_t"></div>
<i class="iconfont icon-xingzhuang4" style="position: absolute;top:75px;right: 10px;font-size: 35px;color: #F89291"/>
</div>
</div>
<div class="r_box_b">
<div class="c_view view_b">
<span>新增客户</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>
</div>
<div class="semicircle_b"></div>
<i class="iconfont icon-xingzhuang5"/>
</div>
<div class="c_view view_b">
<span>广告发送</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">条</span>
</div>
<div class="semicircle_b"></div>
<i class="iconfont icon-xingzhuang1"/>
</div>
<div class="c_view view_b">
<span>广告发送</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<!-- <span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>-->
</div>
<div class="semicircle_b"></div>
<i class="iconfont icon-xingzhuang3" style="position: absolute;top:75px;right: 10px;font-size: 35px;color: #8F96EB"/>
</div>
</div>
</div>
</div>
</div>
<div class="dataanalysis">
<div class="data_l">
<div class="l_title">
<span style="font-size: 14px;color: #333333;float: left">我的评价</span>
</div>
<div id="evaluate" :style="{width: '340px', height: '300px'}" style="margin-left: 10%"></div>
</div>
<div class="data_c">
<div class="l_title">
<span style="font-size: 14px;color: #333333;float: left">本周业绩</span>
</div>
<div class="data_title">
<span style="margin-left: 100px">上周排名</span>
<span style="color: #00B26F">No.2</span>
<span>，继续保持！</span>
<div class="tagging">
<div class="yuan_o"></div>
<span>需努力</span>
<div class="yuan_t"></div>
<span>加油！</span>
<div class="yuan_tr"></div>
<span>超棒哦！</span>
</div>
</div>
<div class="D_data" v-for="item in namelist">
<span class="zname">{{item.name}}</span>
<div class="Progress">
<div :style="{width:(item.num > 0 ? (item.num/item.rj)*100 +'%' : 0)}" :class="item.num < item.rj ? 'bugou' : (item.num == item.rj) ? 'jiayou' :'chaobang'"></div>
</div>
<div class="mean">
<span style="font-size: 18px;color: #1698FD">{{item.num}}</span>
<span>/人均 {{item.rj}}人</span>
</div>
</div>
</div>
<div class="data_r">
<div class="l_title">
<span style="font-size: 14px;color: #333333;float: left">快速通道</span>
</div>
<div class="r_box">
<div style="background: #FFE6E4" class="icon_f">
<i class="iconfont icon-Compose" style="color: #F89291"/>
</div>
<div class="r_name">
<span>待处理财务单据</span>
<div class="tishi">
<span>2</span>
</div>
</div>
</div>
<div class="r_box">
<div style="background: #FFD6BF;" class="icon_f">
<i class="iconfont icon-Heart" style="color: #F4A469"/>
</div>
<div class="r_name">
<span>销售排行</span>
<div class="tishi">
<span>2</span>
</div>
</div>
</div>
<div class="r_box">
<div style="background: #D5D0F4" class="icon_f">
<i class="iconfont icon-Newspaper" style="color: #9E8DE3"/>
</div>
<div class="r_name">
<span>待处理发票</span>
<div class="tishi">
<span>2</span>
</div>
</div>
</div>
<div class="r_box">
<div style="background: #C0EBD1;" class="icon_f">
<i class="iconfont icon-Sound" style="color: #5CC790;"/>
</div>
<div class="r_name">
<span>公告</span>
<div class="tishi">
<span>1</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div v-show="type==2" class="paneldata">
<div class="paneldata_l">
<div class="groupmembers">
<div class="grouptiday">
<div style="background: #ECECFF;margin-left: 25px" class="g_icon">
<i class="iconfont icon-user" style="font-size: 20px;color: #6C7AE0"></i>
</div>
<div class="receive">
<span style="font-size: 14px;color: #333333;display: inline-block">今日总收客人数</span>
<span style="font-size: 36px;color: #333333">30<span style="font-size: 14px;color: #999999">人</span></span>
</div>
<div style="background: #C0EBD1;margin-left: 70px" class="g_icon">
<i class="iconfont icon-clipboard" style="font-size: 25px;color: #00B26F"></i>
</div>
<div class="receive">
<span style="font-size: 14px;color: #333333;display: inline-block">今日总报名单数</span>
<span style="font-size: 36px;color: #333333">30<span style="font-size: 14px;color: #999999">单</span></span>
</div>
<div style="background: #FFE5E8;margin-left: 70px" class="g_icon">
<i class="iconfont icon-graph" style="font-size: 25px;color: #FF7B8A"></i>
</div>
<div class="receive">
<span style="font-size: 14px;color: #333333;display: inline-block">今日涨幅</span>
<span style="font-size: 36px;color: #0EB913">30%</span>
</div>
<div class="gain">
<span>昨日</span>
<div class="sj">
<i class="topsanjiao"></i>
<span>10%</span>
</div>
</div>
<div class="weekdata">
<div class="weekdata_box">
<span>本周总收客</span>
<span class="w_da">156</span>
<div class="w_d">
<i class="topsanjiao"></i><span style="color: #00B26F">13.4%</span>
</div>
</div>
<div class="weekdata_box">
<span>本周报名单数</span>
<span class="w_da">156</span>
<div class="w_d">
<i class="bottomsanjiao"></i><span style="color: #F36C5E">13.4%</span>
</div>
</div>
<div class="weekdata_box">
<span>本周总涨幅</span>
<span class="w_da">156</span>
<div class="w_d">
<i class="topsanjiao"></i><span style="color: #00B26F">13.4%</span>
</div>
</div>
</div>
</div>
<!-- 分界线-->
<div class="line">
<div class="line_title">
<span>小组成员业绩</span>
</div>
</div>
<div class="ranking">
<div class="rankbox" v-for="(item,index) in ranklist" :key="index">
<div class="xz_tx">
<img src="../../assets/img/qqIco.png" alt="">
<i :class="index==0? 'iconfont icon-juxing-1':'' " style="position: absolute;top: -20px;left: -10px;font-size: 30px;color: #FFC71E"/>
<i :class="index==1? 'iconfont icon-juxing-1':'' " style="position: absolute;top: -20px;left: -10px;font-size: 30px;color: #C7C7C7"/>
<i :class="index==2? 'iconfont icon-juxing-1':'' " style="position: absolute;top: -20px;left: -10px;font-size: 30px;color: #B6794C"/>
</div>
<span style="font-size: 14px;color: #333333;margin-top: 10px">{{item.name}}</span>
<div style="width: 100%;height: 1px;background: #E7E7E7;margin: 10px 0"></div>
<div class="rankbox_b">
<div class="today">
<span>
今日收客
</span>
<span>
{{item.fk}}
</span>
</div>
<div class="today">
<span>
总收客
</span>
<span>
{{item.zsk}}
</span>
</div>
</div>
</div>
</div>
</div>
<div class="tubiao">
<div class="l_title" >
<span style="font-size: 14px;color: #333333;float: left">今日工作</span>
</div>
<div class="tb_box">
<div id="myChart" :style="{width: '1200px', height: '300px'}"></div>
</div>
</div>
</div>
<div class="paneldata_r">
<div class="paneldata_r_box">
<div class="l_title" >
<span style="font-size: 14px;color: #333333;float: left">今日工作</span>
</div>
<div class="c_view gz1">
<span>今日收客数</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>
</div>
<div class="banyuan" style="background: #FBF7FF"></div>
<i class="iconfont icon-xingzhuang5" style="color: #A598EE"/>
</div>
<div class="c_view gz2">
<span>拜访客户</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>
</div>
<div class="banyuan" style="background: #DBF1D1"></div>
<i class="iconfont icon-xingzhuang8" style="color: #98D482"/>
</div>
<div class="c_view gz3">
<span>客户活跃</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>
</div>
<div class="banyuan" style="background: #E3EFF6"></div>
<i class="iconfont icon-xingzhuang6" style="color: #68A3C2"/>
</div>
<div class="c_view gz4">
<span>广告发送</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>
</div>
<div class="banyuan" style="background: #ECECFF"></div>
<i class="iconfont icon-xingzhuang1" style="color: #8F96EB"/>
</div>
<div class="c_view gz5">
<span>今日询单</span>
<div>
<span style="font-size: 36px;color: #333333">30</span>
<span style="font-size: 14px;color: #999999;margin-left: 5px">人</span>
</div>
<div class="banyuan" style="background: #F1F5FF"></div>
<i class="iconfont icon-xingzhuang3" style="position: absolute;top:75px;right: 10px;font-size: 30px;color: #96ADEB"/>
</div>
</div>
</div>
</div> </div>
<div class="saleChartCont">
</div> <div class="content" v-show="type==1">
</div> <div class="imgShow">
<img src="../../assets/img/img-shuidi.png" />
<canvas id="c"></canvas>
</div>
<div class="msgShow">
<div class="top">
<div class="calender">
<p class="month">4月</p>
<p class="day">第12天</p>
</div>
<div class="description">
<p>销售排名第<span>123</span><img src="../../assets/img/icons8-scroll-up-filled-50@2x.png"></p>
<p>你已经<span>3</span>天没有报名</p>
</div>
</div>
<div class="bottom">
<input class="saleBtn" type="button" value="立即启动销售模式" />
</div>
</div>
</div>
<div class="teamSale" v-show="type==2">
<el-row :gutter="20">
<el-col :span="9">
<div class="el-col-div ownScrollbarStyle" style="padding: 20px; overflow-x: auto;">
<p class="fz12 color333 fbold">我的评分</p>
<div style="width: 520px; height: 410px; margin-top: 10px;">
<div id='mychart' style="width: 420; height: 410px; "></div>
</div>
</div>
</el-col>
<el-col :span="7">
<div class="el-col-div ownScrollbarStyle" style="padding: 20px; overflow-x: auto;">
<p class="fz12 color333 fbold">上月提成</p>
<div style="width: 410px; height: 200px;padding-right: 20px; margin-top: 30px;">
<p style="height: 120px; line-height: 120px;">
<img src="../../assets/img/tichengTypeOne.png" v-show="prevMonthExtract<1000"/>
<img src="../../assets/img/tichengTypeTwo.png" v-show="prevMonthExtract<5000&&prevMonthExtract>=1000"/>
<img src="../../assets/img/tichengTypeThree.png" v-show="prevMonthExtract>=5000"/>
<span class="fr" style="color:#F29F00; font-size: 36px; font-weight: bold;">¥{{prevMonthExtract}}</span>
</p>
<div style="border-bottom: 1px dashed #fff; width:390px; margin-top: 30px;"></div>
<p class="fz12 color333 fbold mt30">最近提成
<i class="el-icon-more fr cursorpointer" @click="goUrlT('enrollTotal','',true)"></i>
</p>
<div class="tiChengList mt20">
<ul>
<li v-for="item in prevMonthExtractList" @click="goUrlT('enrollTotal',item.OrderId,true)">
<span class="w180">{{item.TCNUM}}</span>
<span>{{item.OrderId}}</span>
<span class="fr" style="color:#F29F00;">¥{{item.Commission}}</span>
</li>
<li v-show="prevMonthExtractList.length==0" class="fz14 color333 alcenter">暂无提成</li>
</ul>
</div>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="el-col-div ownScrollbarStyle" style="padding: 20px; overflow-x: auto;">
<p class="fz12 color333 fbold">本周任务</p>
<div style="width: 475px; height:250px; padding-right: 20px; border-bottom: 1px dashed #fff;">
<div class="tiChengList mt20">
<ul>
<li v-for="item in myWeekTask" @click="goUrl('saleTaskDetail',item.TaskId)">
<span class="w180">{{item.TaskName}}</span>
<span v-if="item.TaskType==2">￥{{item.TaskNum}}</span>
<span v-else>{{item.TaskNum}}{{item.Unit}}</span>
<span v-if="item.TaskType==2" class="fr">
<b v-show="item.IsFinish==1" style="color:#4BCA81 ;"><i class="iconfont icon-yiqueren"></i>&nbsp;
￥{{item.FinishNum}}</b>
<b v-show="item.IsFinish==2" style="color:#E95252 ;"><i class="iconfont icon-yiquxiao"></i>&nbsp;
￥{{item.FinishNum}}</b>
</span>
<span v-else class="fr">
<b v-show="item.IsFinish==1" style="color:#4BCA81 ;"><i class="iconfont icon-yiqueren"></i>&nbsp;
{{item.FinishNum}}{{item.Unit}}</b>
<b v-show="item.IsFinish==2" style="color:#E95252 ;"><i class="iconfont icon-yiquxiao"></i>&nbsp;
{{item.FinishNum}}{{item.Unit}}</b>
</span>
</li>
<li v-show="myWeekTask.length==0" class="fz14 color333 alcenter">暂无任务</li>
</ul>
</div>
</div>
<p style="margin-top: 30px; text-align: center;" v-show="isFinishNum>0">
<i class="iconfont icon-xiaoshoushouye-jiayou" style="color:#56B6F3; font-size: 34px;"></i>
</p>
<p v-show="isFinishNum>0" style="color:#56B6F3; text-align: center; margin-top: 20px;">加油哦，你本周还剩{{isFinishNum}}个任务</p>
<p style="margin-top: 30px; text-align: center;" v-show="isFinishNum==0">
<i class="iconfont icon-xiaoshoushouye_zan" style="color:#56B6F3; font-size: 34px;"></i>
</p>
<p v-show="isFinishNum==0" style="color:#56B6F3; text-align: center; margin-top: 20px;">你已经完成全部任务，非常棒，向你学习。</p>
</div>
</el-col>
</el-row>
<el-row :gutter="0">
<el-col :span="4">
<div class="el-col-div" style="height: 275px;">
<div class="circleOut" :class="{circleOutOk:myTask.GuestNumStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{myTask.GuestNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">今日收客人数</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 275px;">
<div class="circleOut" :class="{circleOutOk:myTask.RoseStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{myTask.Rose}}%
</div>
</div>
</div>
<p class="fz14 fbold tcenter">今日涨幅</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 275px;">
<div class="circleOut" :class="{circleOutOk:myTask.OrderNumStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{myTask.OrderNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">今日报名单数</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 275px;">
<div class="circleOut" :class="{circleOutOk:myTask.NewClientNumStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{myTask.NewClientNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">新增客户</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 275px;">
<div class="circleOut" :class="{circleOutOk:myTask.AdvCountStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{myTask.AdvCount}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">广告转发</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 275px;">
<div class="circleOut circleOutNormal">
<div class="circleMiddle">
<div class="circleIn">
{{myTask.DemandNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">今日询单</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
</el-row>
</div>
<div class="teamSale" v-show="type==3">
<el-row :gutter="20">
<el-col :span="4" style='padding-right: 0;'>
<div class="el-col-div" style="height: 400px;padding: 20px;">
<p class="fz12 color333 fbold">今日销售</p>
<div class="circleOut" :class="{circleOutOk:teamTaskToday.GuestNumStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{teamTaskToday.GuestNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">今日收客人数</p>
<p v-show="teamTaskToday.GuestNumStatus==1" class="fz12 color666 alcenter mt5">不错不错，大家棒棒哒！</p>
<p v-show="teamTaskToday.GuestNumStatus==2" class="fz12 color666 alcenter mt5">别灰心，昂首挺胸继续加油！</p>
<p class="mt30 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4" style='padding: 0;'>
<div class="el-col-div" style="height: 400px;padding:34px 20px 20px;">
<div class="circleOut" :class="{circleOutOk:teamTaskToday.OrderNumStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{teamTaskToday.OrderNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">今日报名单数</p>
<p v-show="teamTaskToday.OrderNumStatus==1" class="fz12 color666 alcenter mt5">不错不错，大家棒棒哒！</p>
<p v-show="teamTaskToday.OrderNumStatus==2" class="fz12 color666 alcenter mt5">别灰心，昂首挺胸继续加油！</p>
<p class="mt30 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4" style='padding-left: 0;'>
<div class="el-col-div" style="height: 400px;padding:34px 20px 20px;">
<div class="circleOut" :class="{circleOutOk:teamTaskToday.RoseStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{teamTaskToday.Rose}}%
</div>
</div>
</div>
<p class="fz14 fbold tcenter">今日涨幅</p>
<p v-show="teamTaskToday.RoseStatus==1" class="fz12 color666 alcenter mt5">不错不错，大家棒棒哒！</p>
<p v-show="teamTaskToday.RoseStatus==2" class="fz12 color666 alcenter mt5">别灰心，昂首挺胸继续加油！</p>
<p class="mt30 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4" style='padding-right: 0;'>
<div class="el-col-div" style="height: 400px;padding: 20px;">
<p class="fz12 color333 fbold">本周销售</p>
<div class="circleOut" :class="{circleOutOk:teamTaskWeek.GuestNumStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{teamTaskWeek.GuestNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">收客人数</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4" style='padding: 0;'>
<div class="el-col-div" style="height: 400px;padding:34px 20px 20px;">
<div class="circleOut" :class="{circleOutOk:teamTaskWeek.OrderNumStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{teamTaskWeek.OrderNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">报名单数</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4" style='padding-left: 0;'>
<div class="el-col-div" style="height: 400px;padding:34px 20px 20px;">
<div class="circleOut" :class="{circleOutOk:teamTaskWeek.RoseStatus==1}">
<div class="circleMiddle">
<div class="circleIn">
{{teamTaskWeek.Rose}}%
</div>
</div>
</div>
<p class="fz14 fbold tcenter">涨幅</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
</el-row>
<el-row :gutter="0">
<el-col :span="4">
<div class="el-col-div" style="height: 350px; padding: 20px;">
<p class="fz12 color333 fbold">今日工作</p>
<div class="mormalCircleOut">
<div class="mormalCircleMiddle">
<div class="mormalCircleIn">
{{teamTodayWork.NewClientNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">新增客户</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 350px; padding: 34px 20px 20px;"">
<div class="mormalCircleOut">
<div class="mormalCircleMiddle">
<div class="mormalCircleIn">
{{teamTodayWork.CallOnClientNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">拜访客户</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 350px; padding: 34px 20px 20px;"">
<div class="mormalCircleOut">
<div class="mormalCircleMiddle">
<div class="mormalCircleIn">
{{teamTodayWork.ClientDynamic}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">客户活跃</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 350px; padding: 34px 20px 20px;"">
<div class="mormalCircleOut">
<div class="mormalCircleMiddle">
<div class="mormalCircleIn">
{{teamTodayWork.AdvCount}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">广告转发</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 350px; padding: 34px 20px 20px;"">
<div class="mormalCircleOut">
<div class="mormalCircleMiddle">
<div class="mormalCircleIn">
{{teamTodayWork.DemandNum}}
</div>
</div>
</div>
<p class="fz14 fbold tcenter">今日询单</p>
<p class="mt20 tcenter">
<input type="button" class="hollowFixedBtn" value="详情"/>
</p>
</div>
</el-col>
<el-col :span="4">
<div class="el-col-div" style="height: 350px;">
</div>
</el-col>
</el-row>
</div>
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
import leftNav from '../public/leftNav.vue' import leftNav from '../public/leftNav.vue'
export default { export default {
data (){ name: 'login-box',
return{ data (){
type:1, return{
style:{ isFinishNum:0,
width:0, type:1,
background:"#FFFFFF" prevMonthExtract:12.00,
}, prevMonthExtractList:[],
dxamlist:[ myTask:{},
{'number':'0125','regiment':'OCH0708CA1123','time':'2019-5-21','money':'1500.00'}, myWeekTask:[],
{'number':'0125','regiment':'OCH0708CA1123','time':'2019-5-21','money':'1500.00'}, myScore:[],
{'number':'0125','regiment':'OCH0708CA1123','time':'2019-5-21','money':'1500.00'}, teamTaskToday:{},
{'number':'0125','regiment':'OCH0708CA1123','time':'2019-5-21','money':'1500.00'}, teamTaskWeek:{},
{'number':'0125','regiment':'OCH0708CA1123','time':'2019-5-21','money':'1500.00'}, teamTodayWork:{}
], }
loading:false, },
namelist:[ components:{
{'name':'拜访客户','num':3,'rj':5}, leftNav
{'name':'新增客户','num':3,'rj':6}, },
{'name':'报名单','num':5,'rj':5}, methods:{
{'name':'报名人数','num':3,'rj':5}, wave(){
{'name':'销售金额','num':6,'rj':5}, var canvas = document.getElementById('c');
{'name':'开发需求','num':0,'rj':0}, var ctx = canvas.getContext('2d');
], var range = document.getElementById('r');
ranklist:[ //range控件信息
{'name':'钟飞非','fk':'2','zsk':'25'}, //var rangeValue = range.value;
{'name':'钟飞非','fk':'2','zsk':'25'}, var rangeValue = 50;
{'name':'钟飞非','fk':'2','zsk':'25'}, var nowRange = 0; //用于做一个临时的range
{'name':'钟飞非','fk':'2','zsk':'25'}, //画布属性
{'name':'钟飞非','fk':'2','zsk':'25'}, var mW = canvas.width = 200;
{'name':'钟飞非','fk':'2','zsk':'25'}, var mH = canvas.height = 250;
], var lineWidth = 2;
//圆属性
} var r = mH / 2; //圆心
}, var cR = r - 16 * lineWidth; //圆半径
components:{ //Sin 曲线属性
leftNav var sX = 0;
}, var sY = mH / 2;
mounted(){ var axisLength = mW; //轴长
this.drawLine(); var waveWidth = 0.025; //波浪宽度,数越小越宽
}, var waveHeight = 6; //波浪高度,数越大越高
methods:{ var speed = 0.09; //波浪速度，数越大速度越快
var xOffset = 0; //波浪x偏移量
drawLine() {
// 基于准备好的dom，初始化echarts实例 ctx.lineWidth = lineWidth;
let myChart = this.$echarts.init(document.getElementById('myChart'))
let evaluate = this.$echarts.init(document.getElementById('evaluate')) //画圈函数
// 绘制图表 var IsdrawCircled = false;
myChart.setOption({ var drawCircle = function() {
title: '',
tooltip: {}, ctx.beginPath();
legend: { ctx.strokeStyle = '#33B87F';
x: 'right', //ctx.arc(r, r, cR + 5, 0, 2 * Math.PI);
data:['本周收客','上周收客',] ctx.stroke();
}, ctx.beginPath();
xAxis: { // ctx.arc(r, r, cR, 0, 2 * Math.PI);
data: ["成都印象\n"+"XX小组", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子","成都印象\n"+"XX小组","成都印象\n"+"XX小组","成都印象\n"+"XX小组","成都印象\n"+"XX小组"] //ctx.clip();
},
yAxis: {}, }
series: [{
// name: '本周收客', //画sin 曲线函数
type: 'bar', var drawSin = function(xOffset) {
name:'本周收客', ctx.save();
stack: '广告', var points = []; //用于存放绘制Sin曲线的点
data: [5, 20, 36, 10, 10, 20,12,23,43,67], ctx.beginPath();
itemStyle:{ //在整个轴长上取点
normal:{ for(var x = sX; x < sX + axisLength; x += 20 / axisLength) {
color:'#1698FD' //此处坐标(x,y)的取点，依靠公式 “振幅高*sin(x*振幅宽 + 振幅偏移量)”
} var y = -Math.sin((sX + x) * waveWidth + xOffset);
},
barWidth:20 var dY = mH * (1 - nowRange / 100);
},
{ points.push([x, dY + y * waveHeight]);
// name: '上周收客', ctx.lineTo(x, dY + y * waveHeight);
type: 'bar', }
name:'上周收客',
stack: '广告', //封闭路径
data: [10, 26, 30, 15, 2, 30,23,45,67,23], ctx.lineTo(axisLength, mH);
ctx.lineTo(sX, mH);
itemStyle:{ ctx.lineTo(points[0][0], points[0][1]);
normal:{ ctx.fillStyle = '#37d5a8';
color:'#7FEFEF' ctx.fill();
} ctx.restore();
}, };
barWidth:20 var drawSin1 = function(xOffset) {
} var waveWidth = 0.015; //波浪宽度,数越小越宽
] var waveHeight = 10; //波浪高度,数越大越高
}); ctx.save();
evaluate.setOption({ var points = []; //用于存放绘制Sin曲线的点
tooltip: { ctx.beginPath();
trigger: 'axis' //在整个轴长上取点
}, for(var x = sX; x < sX + axisLength; x += 20 / axisLength) {
radar: [ //此处坐标(x,y)的取点，依靠公式 “振幅高*sin(x*振幅宽 + 振幅偏移量)”
{ var y = -Math.sin((sX + x) * waveWidth + xOffset);
indicator: [ var dY = mH * (1 - nowRange / 100);
{text: '名单开发', max: 100}, points.push([x, dY + y * waveHeight]);
{text: '约访', max: 100}, ctx.lineTo(x, dY + y * waveHeight);
{text: '解决需求', max: 100}, }
{text: '探询需求', max: 100}, //封闭路径
{text: '说明成交', max: 100}, ctx.lineTo(axisLength, mH);
{text: '售后服务', max: 100} ctx.lineTo(sX, mH);
], ctx.lineTo(points[0][0], points[0][1]);
ctx.fillStyle = '#b9f0e1';
}, ctx.fill();
ctx.restore();
};
],
series: [ //写百分比文本函数
{ var drawText = function() {
type: 'radar', ctx.save();
tooltip: {
trigger: 'item' ctx.font = 24 + 'px Microsoft Yahei';
}, ctx.textAlign = 'center';
itemStyle: {normal: {areaStyle: {type: 'default'}}}, ctx.fillStyle = "rgba(06, 85, 128, 0.8)";
data: [ ctx.fillText(~~nowRange + '%', r, r + 50 / 2);
{ ctx.restore();
value: [60,73,85,40,100,54], };
var render = function() {
} ctx.clearRect(0, 0, mW, mH);
], //rangeValue = range.value;
radius: 60 rangeValue = 50;
},
if(IsdrawCircled == false) {
] drawCircle();
}); }
}
} if(nowRange <= rangeValue) {
} var tmp = 1;
nowRange += tmp;
}
if(nowRange > rangeValue) {
</script> var tmp = 1;
nowRange -= tmp;
}
drawSin1(xOffset);
drawSin(xOffset);
drawText();
xOffset += speed;
requestAnimationFrame(render);
}
render();
},
goUrl(path,id){
this.$router.push({ name:path,query:{"id":id,"PersonOrDepartment":1,blank:'y',tab:'任务详情'} })
},
goUrlT(path,id){
this.$router.push({ name:path,query:{"id":id,"PersonOrDepartment":1,isOwn:true,blank:'y',tab:'销售提成'} })
},
getPrevMonthExtract(){ //上月提成
this.apipost('TaskManagemnet_get_GetThisWeekCommission',{},res=>{
if(res.data.resultCode==1){
this.prevMonthExtract=Number(res.data.data)
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getPrevMonthExtractList(){ //上月提成列表
this.apipost('TaskManagemnet_get_GetThisWeekCommissionList',{pageIndex:1,pageSize:5},res=>{
if(res.data.resultCode==1){
this.prevMonthExtractList=res.data.data.pageData
console.log(this.prevMonthExtractList)
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getMyTask(){
this.apipost('TaskManagemnet_get_GetToDayStatistics',{},res=>{
if(res.data.resultCode==1){
this.myTask=res.data.data
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getTeamTaskToday(){
this.apipost('TaskManagemnet_get_GetDepThisWeekWork',{WorkType:1},res=>{
if(res.data.resultCode==1){
this.teamTaskToday=res.data.data
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getTeamTaskWeek(){
this.apipost('TaskManagemnet_get_GetDepThisWeekWork',{WorkType:2},res=>{
if(res.data.resultCode==1){
this.teamTaskWeek=res.data.data
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getMyWeekTask(){
this.apipost('TaskManagemnet_get_GetThisWeekTask',{},res=>{
if(res.data.resultCode==1){
this.myWeekTask=res.data.data
this.isFinishNum=0
this.myWeekTask.forEach(item=>{
if(item.IsFinish==2)
{
this.isFinishNum+=1
}
})
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getMyScore(){
this.apipost('TaskManagemnet_get_GetSellMyGrade',{},res=>{
if(res.data.resultCode==1){
this.myScore=res.data.data
this.myScore.forEach(item=>{
if(item.score<60){
item['color']='D'
}else if(item.score<70&&item.score>=60){
item['color']='C'
}else if(item.score<80&&item.score>=70){
item['color']='B'
}else if(item.score<95&&item.score>=80){
item['color']='A'
}else{
item['color']='S'
}
})
this.$nextTick(()=>{
this.$chartsUtils.saleIndex('mychart',this.myScore)
})
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getTeamTodayWork(){
this.apipost('TaskManagemnet_get_GetDepToDayWork',{},res=>{
if(res.data.resultCode==1){
this.teamTodayWork=res.data.data
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
},
mounted(){
this.wave()
this.getMyTask()
//this.getMyScore()
this.getMyWeekTask()
this.getTeamTaskToday()
this.getTeamTaskWeek()
this.getTeamTodayWork()
this.getPrevMonthExtract()
this.getPrevMonthExtractList()
},
}
</script>
\ No newline at end of file
src/router/config.js
View file @ 706d6edb
...@@ -3345,7 +3345,7 @@ export default { ...@@ -3345,7 +3345,7 @@ export default {
meta: { meta: {
title: '商品类型' title: '商品类型'
} }
}, },
{ {
path: '/IntegralMall', path: '/IntegralMall',
name: 'IntegralMall', name: 'IntegralMall',
...@@ -3362,6 +3362,14 @@ export default { ...@@ -3362,6 +3362,14 @@ export default {
title: '新增商品' title: '新增商品'
} }
}, },
{
path: '/CommodityActive',
name: 'CommodityActive',
component: resolve => require(['@/components/activity/CommodityActive'], resolve),
meta: {
title: '商品活动'
}
},
] ]
}, },
{ {
......
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