Skip to content

S
SuperMan
Commit ec5185cd authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 355ef01b 4002ddfb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1024 additions and 620 deletions
src/components/Hotel/HotelInfo.vue
View file @ ec5185cd
......@@ -80,17 +80,17 @@
<el-row v-for="(list,index) in addMsg.DiscountList" :key="index">
<el-col :span="6" :gutter="35">
<el-form-item label="开始数量">
<el-input class='w80' type="text" v-model="list.StartNum"></el-input>
<el-input class='w80' type="text" v-model="list.StartNum" @keyup.native="checkInteger(list,'StartNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item label="结束数量">
<el-input class='w80' type="text" v-model="list.EndNum"></el-input>
<el-input class='w80' type="text" v-model="list.EndNum" @keyup.native="checkInteger(list,'EndNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item label="返还数量">
<el-input class='w80' type="text" v-model="list.DisCountNum"></el-input>
<el-input class='w80' type="text" v-model="list.DisCountNum" @keyup.native="checkInteger(list,'DisCountNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35" v-if="index==0">
......@@ -100,36 +100,7 @@
<el-button icon="el-icon-minus" circle @click="deleteAir(index)"> </el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="0">
<el-col :span="6">
<el-form-item label="开始数量" >
<el-input class='w80' type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结束数量" >
<el-input class='w80'type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="返还数量">
<el-input class='w80' type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" style='padding-top: 5px;'>
</el-col>
</el-row> -->
</div>
<!--<div v-for="(item) in GetPolicy" :key="item.subCode">
<div class="common-lefttit">{{item.Content}}</div>
<span class="resource-net">
<el-input v-model="item.checked" maxlength="50" class="w300"></el-input>
</span>
</div>-->
</div>
<div class="resource-imginfo">
<div class="resourcerightTop">
......
src/components/Hotel/HotelProductManage2.vue
View file @ ec5185cd
......@@ -187,27 +187,27 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单人间成本价" prop="SingleroomPrice">
<el-form-item label="单间成本价" prop="SingleroomPrice">
<el-input-number v-model="msg2.SingleroomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="小孩不占床成本价" prop="ChildNotBedPrice">
<el-form-item label="不占床成本价" prop="ChildNotBedPrice">
<el-input-number v-model="msg2.ChildNotBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="加床成本价" prop="AddBedPrice">
<el-form-item label="三人间成本价" prop="AddBedPrice">
<el-input-number v-model="msg2.AddBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="display:none;">
<el-form-item label="司机房成本价" prop="DriverRoomPrice">
<el-input-number v-model="msg2.DriverRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="导游房成本价" prop="GuideRoomPrice">
<el-form-item label="司导间成本价" prop="GuideRoomPrice">
<el-input-number v-model="msg2.GuideRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
......@@ -424,27 +424,27 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单人间成本价" prop="SingleroomPrice">
<el-form-item label="单间成本价" prop="SingleroomPrice">
<el-input-number v-model="msg.SingleroomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="小孩不占床成本价" prop="ChildNotBedPrice">
<el-form-item label="不占床成本价" prop="ChildNotBedPrice">
<el-input-number v-model="msg.ChildNotBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="加床成本价" prop="AddBedPrice">
<el-form-item label="三人间成本价" prop="AddBedPrice">
<el-input-number v-model="msg.AddBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="display:none;">
<el-form-item label="司机房成本价" prop="DriverRoomPrice">
<el-input-number v-model="msg.DriverRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="导游房成本价" prop="GuideRoomPrice">
<el-form-item label="司导间成本价" prop="GuideRoomPrice">
<el-input-number v-model="msg.GuideRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
......
src/components/Hotel/roomReservationsDetails.vue
View file @ ec5185cd
......@@ -22,10 +22,12 @@
<ul>
<li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
</li>
</ul>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br/>
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
class="ownScrollbarStyle" ref="ownScrollbarStyle">
......@@ -52,6 +54,7 @@
<th width="80">金额小计</th>
<th width="80">返佣类型</th>
<th width="80">返佣</th>
<th width="80">返佣金额</th>
<th width="80">入汤税</th>
<th width="80">城市税</th>
<th width="80">停车费</th>
......@@ -221,7 +224,7 @@
<!-- 返佣类型 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1">
<span style="color:green">含税</span>
<span style="color:green">含税</span>
</template>
<template v-else>
<span style="color:red"> 不含税</span>
......@@ -239,6 +242,29 @@
:disabled="IsEditHotel==0?true:false"></el-input> %
</template>
</td>
<!--返佣金额-->
<td>
<!--含税-->
<template v-if="subItem.RebateType==1">
<!--税别-->
<template v-if="subItem.TaxType==2">
{{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
</template>
</template>
<!--不含税-->
<template v-else>
<!--税别-->
<template v-if="subItem.TaxType==2">
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
</template>
</td>
<!-- 入汤税 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}}
......@@ -453,8 +479,8 @@
IsEditHotel: 0,
//0-可以操作，1-已制单，不能操作
IsOperation: 1,
LeaderName:"",//领队名称
GuideName:"",//导游名称
LeaderName: "", //领队名称
GuideName: "", //导游名称
}
},
components: {
......@@ -658,7 +684,7 @@
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
if (list != null && list.length > 0) {
list.forEach(item => {
list.forEach((item,sIndex) => {
item.HotelOrderList.forEach(subItem => {
subItem.hotelList.push({
Name: subItem.NewHotelName,
......@@ -678,6 +704,7 @@
})
});
this.list = list;
this.$forceUpdate();
}
} else {
......@@ -693,7 +720,8 @@
if (obj.TaxType == 2) {
if (index == 4) {
if (obj.DriverGuideIsRebate == 1) {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100);
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
100);
} else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
}
......@@ -868,8 +896,8 @@
},
},
mounted() {
this.LeaderName=this.$route.query.LeaderName;
this.GuideName=this.$route.query.GuideName;
this.LeaderName = this.$route.query.LeaderName;
this.GuideName = this.$route.query.GuideName;
this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal;
this.GuestNum = this.$route.query.GuestNum;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ ec5185cd
......@@ -132,27 +132,34 @@
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="21" class="bgwhite">酒店使用</th>
<th colspan="22" class="bgwhite">酒店使用 </th>
</tr>
<tr>
<th colspan="22" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
<th width="180">酒店名称</th>
<th width="100">占床/不占床</th>
<th width="80">实际用房数</th>
<th width="">房间类型</th>
<th width="">房间数</th>
<th width="80">预定人数</th>
<th width="80">免费人数</th>
<th width="">单价/人</th>
<th width="">金额小计</th>
<th width="">返佣类型</th>
<th width="">返佣</th>
<th width="">入汤税</th>
<th width="">城市税</th>
<th width="">停车费</th>
<th width="">税入/税别</th>
<th width="">总金额</th>
<th width="">付款方式</th>
<th width="90">使用时间</th>
<th width="150">酒店名称</th>
<th width="70">占床<br />不占床</th>
<th width="70">实际<br />用房数</th>
<th width="70">房间<br />类型</th>
<th width="70">房间数</th>
<th width="60">预定<br />人数</th>
<th width="60">免费<br />人数</th>
<th width="60">单价/人</th>
<th width="60">金额<br />小计</th>
<th width="60">返佣<br />类型</th>
<th width="60">返佣</th>
<th width="60">返佣<br />金额</th>
<th width="60">入汤税</th>
<th width="60">城市税</th>
<th width="60">停车费</th>
<th width="60">税入<br />税别</th>
<th width="60">总金额</th>
<th width="60">付款<br />方式</th>
<th width="100">供应商</th>
<th width="100">状态</th>
<th width="100">备注</th>
......@@ -160,10 +167,10 @@
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length">{{outItem.UseTimeStr}}
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length"
style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="6">{{subItem.HotelName}}
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">{{subItem.HotelName}}
<p class="cursorpointer" style="margin-top:5px;color: blue;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
......@@ -176,8 +183,8 @@
</td>
<td>
<span v-if="childItem.HouseType === 1">单间</span>
<span v-if="childItem.HouseType === 2">标准双人间</span>
<span v-if="childItem.HouseType === 3">大床房</span>
<span v-if="childItem.HouseType === 2">标准间</span>
<span v-if="childItem.HouseType === 3">大床间</span>
<span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5">
司导间
......@@ -203,13 +210,13 @@
<td>
{{childItem.HotelDiscount}}
</td>
<td>
<td style="white-space:nowrap; ">
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p>
</td>
<td>
<td style="white-space:nowrap; ">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="6">
......@@ -223,6 +230,28 @@
<td>
{{childItem.RebateRatio}} %
</td>
<td style="white-space:nowrap; ">
<!--含税-->
<template v-if="subItem.RebateType==1">
<!--税别-->
<template v-if="subItem.TaxType==2">
{{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
</template>
</template>
<!--不含税-->
<template v-else>
<!--税别-->
<template v-if="subItem.TaxType==2">
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
</template>
</td>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}}
</td>
......@@ -240,7 +269,7 @@
税别
</template>
</td>
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap; ">
{{hotelTotalPrice(subItem)}}
</td>
<td v-if="childIndex==0" :rowspan="6">
......@@ -276,7 +305,7 @@
</template>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="20">
<td colspan="21">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
</tr>
......@@ -834,7 +863,6 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
console.log("this.list", this.list);
this.UseCount = this.list.UseCount;
if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) {
this.list.OtherOrderReportList.OtherList.forEach(x => {
......
src/components/SalesModule/CustomerAnalysis.vue
View file @ ec5185cd
......@@ -9,8 +9,8 @@
<img v-else src="../../assets/img/default.png" alt="">
</div>
<div>
<p>{{datainfo.Contact}}</p>
<p style="color:#7F8593;font-size:14px">{{datainfo.CustomerName}}</p>
<p>{{datainfo.CustomerName}}</p>
<p style="color:#7F8593;font-size:14px;padding:6px 0">{{datainfo.Contact}}</p>
</div>
</div>
</div>
......@@ -71,7 +71,7 @@
<el-row :gutter="23" justify="space-between">
<el-col :span="16"><div id="chartsMap" class="bgDiv" style="height:400px;width:100%;padding:20px 10px"></div> </el-col>
<el-col :span="8">
<div class="bgDiv" style="padding:20px 30px;height:400px;">
<div class="bgDiv" style="padding:20px 30px;height:400px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">价格区间占比</p>
<div v-for="(item,index) in datainfo.priceList" :key="index" class="perceItem">
<el-row :gutter="22">
......@@ -85,10 +85,10 @@
</el-col>
</el-row>
</div>
<div class="third" style="padding:0 10px;margin-top:20px">
<div class="third" style="padding:0 10px;margin:20px 0 40px 0">
<el-row :gutter="23" justify="space-between">
<el-col :span="8">
<div class="bgDiv" style="padding:20px 30px;height:320px;">
<div class="bgDiv" style="padding:20px 30px;height:320px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">返利红包预期收益</p>
<el-row>
<el-col :span="6">
......@@ -108,19 +108,21 @@
<el-col :span="18">
<div style="margin-bottom:20px" v-for="(item,index) in datainfo.list" :key="index+500">
<div>
<p style="color:#7F8593;font-size:12px">月交易额达<span style="color:#7F8593">￥{{item.Money}}</span> 返{{item.Ratio}}%</p>
<p style="color:#7F8593;font-size:12px">年交易额达<span style="color:#7F8593">￥{{item.Money}}</span> 返{{item.Ratio}}‰</p>
</div>
<div>
<el-row :gutter="23" justify="space-between">
<el-col :span="18">
<el-col :span="16">
<p style="margin-top:6px">
<el-progress :color="colorMethod(item)" :show-text="false" :stroke-width="12" :percentage="datainfo.totalYearPrice"></el-progress>
<!-- 数据是：{{datainfo.totalYearPrice/item.Money>1?100:(datainfo.totalYearPrice/item.Money)*100}} -->
<el-progress :color="colorMethod(item)" :show-text="false" :stroke-width="12" :percentage="datainfo.totalYearPrice/item.Money>1?100:(datainfo.totalYearPrice/item.Money)*100"></el-progress>
</p>
</el-col>
<el-col :span="6">
<span><img v-if="item.ActivateState==2" style="width:20px;height:20px" src="../../assets/img/saleRank/gou.png" alt=""></span>
<el-col :span="8">
<span v-if="item.ActivateState==2"><img style="width:20px;height:20px" src="../../assets/img/saleRank/gou.png" alt=""></span>
<span style="font-size:14px;font-weight:bold;color:#2C3343" v-if="item.ActivateState==0">未开启</span>
<span style="font-size:14px;font-weight:bold;color:#2C3343" v-if="item.ActivateState==1">还差 ¥{{item.PriceSpread}}满足</span>
</el-col>
</el-row>
</div>
......@@ -130,7 +132,7 @@
</div>
</el-col>
<el-col :span="16">
<div class="bgDiv" style="padding:20px 30px;height:320px;">
<div class="bgDiv" style="padding:20px 30px;height:320px;overflow:auto">
<p style="color:#2C3343;margin-bottom:30px">交客线路占比</p>
<div v-for="(item,index) in datainfo.LineIdList" :key="index+100" class="circleItem">
<div style="height:126px;position:relative">
......@@ -190,10 +192,9 @@ export default {
getData(){
this.loading=true;
this.apipost('app_customer_GetCustomerOrderInfo', {customerId:this.customerId}, res => {
console.log("res.data",res.data)
this.loading=false;
if (res.data.resultCode == 1) {
res.data.data.LineIdList.forEach(item => {
this.colorList.forEach(color=>{
item.color=color;
......
src/components/SalesModule/HappyPassbook.vue
View file @ ec5185cd
......@@ -108,10 +108,39 @@
<el-select filterable v-model='msg.Type' placeholder="请选择">
<el-option label="不限" value='0'></el-option>
<el-option label='收入' value='1'></el-option>
<el-option label='折扣' value='2'></el-option>
<el-option label='抵扣' value='2'></el-option>
</el-select>
</span>
</li>
<li>
<span><em>线路</em>
<el-select filterable v-model='msg.LineId' placeholder="请选择">
<el-option label="不限" value=""></el-option>
<el-option v-for="(item,index) in LineList" :key="index+300" :label="item.LineName" :value="item.LineID"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>公司</em>
<el-select filterable v-model='msg.RB_Branch_Id' placeholder="请选择">
<el-option
v-for="item in companyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</span>
</li>
<li>
<span><em>销售</em>
<el-select v-model="msg.EmployeeId" filterable placeholder="请选择">
<el-option label="不限" value=""></el-option>
<el-option v-for="item in employee" :key="item.employeeId" :label="item.name" :value="item.employeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>日期</em>
<el-date-picker
......@@ -132,25 +161,30 @@
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th>金额</th>
<th>门店名称</th>
<th>类型</th>
<th>金额</th>
<th>所属团</th>
<th>描述</th>
<th>时间</th>
<th>历史余额</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index+500">
<td>{{item.Money}}</td>
<td>{{item.CustomerName}}({{item.Contact}})</td>
<td>
<span>{{item.Type==1?"收入":"折扣"}}</span>
<span>{{item.Type==1?"收入":"抵扣"}}</span>
</td>
<td>{{item.Money}}</td>
<td><span style="cursor:pointer" @click="Gourl(item)">{{item.TCNUM}}</span></td>
<td>{{item.Description}}</td>
<td>{{item.UpdateTime}}</td>
<td>{{item.AccountMoney}}</td>
</tr>
<tr v-if='DataList.length==0'>
<td colspan="5" align="center">暂无数据</td>
<td colspan="7" align="center" style="text-align: center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
......@@ -177,11 +211,21 @@
OrderSource:"",
StartTime:"",
EndTime:"",
LineId:"",
EmployeeId:"",
RB_Branch_Id:"",
},
currentPage:1,
DataList:[],
dateList:[],
LineList:[],
getCompanyMsg: {
RB_Group_Id: "0",
Status: "0"
},
companyList:[],
employee:[],
}
},
created(){
......@@ -193,8 +237,57 @@
let userInfo = this.getLocalStorage();
this.getList();
this.getLineList();
this.getCompanyList();
this.getEmployee();
},
methods: {
getCompanyList() {
let userInfo = this.getLocalStorage();
let RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
}
this.apipost('admin_get_BranchGetList', msg, res => {
if (res.data.resultCode == 1) {
this.companyList = [{
Id: '-1',
BName: '不限'
}];
res.data.data.forEach(x => {
var obj = {
Id: '',
BName: ''
}
obj.Id = x.Id.toString();
obj.BName = x.BName;
this.companyList.push(obj);
})
}
}, err => {})
},
Gourl(item){
this.$router.push({ name:"groupTourOrderByTuan",query:{"id":item.TCID,"tcmun":item.TCNUM,blank: 'y'} })
},
getEmployee(){
this.apiJavaPost("/api/user/employee/getAllSalesList",{}, res => {
if (res.data.resultCode === 1) {
this.employee=res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
getLineList() {
this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
getList() { //获取数据
if(this.dateList){
this.msg.StartTime=this.dateList[0];
......
src/components/SalesModule/MyCustomer.vue
View file @ ec5185cd
......@@ -7,7 +7,7 @@
z-index: 50; bottom:0;left: 0;border-top:3px solid #38425d;background-color:#f9f9f9; padding: 10px;width: 100%;min-width: 1146px;}
.page_MyCustomer .edHeightOne{display: block!important;height: 450px;}
.page_MyCustomer ._mc_list{overflow-x: auto; background: #fff; padding-top: 20px; padding-left: 15px;}
.page_MyCustomer ._mc_list>ul>li{padding: 20px 20px 0 20px;width: 260px;box-sizing: border-box; height:348px;
.page_MyCustomer ._mc_list>ul>li{padding: 20px 20px 0 20px;width: 260px;box-sizing: border-box; height:386px;
float: left;border: 1px solid #F1F2F5;background: #fff; margin-right:10px;margin-bottom: 20px; border-radius: 10px; position: relative; cursor: pointer;}
.page_MyCustomer ._mc_list>ul>li:hover{box-shadow:0px 0px 10px rgba(191,191,191,1);transition: all linear 0.3s;}
.page_MyCustomer ._mc_list>ul>li .iconDelete{cursor: pointer; display: none; position: absolute; top: -4px; right: 0; color: #E95252; z-index: 5; }
......@@ -70,6 +70,17 @@
.page_MyCustomerSearch ._class_b{
color: #257BF1 !important
}
.xqBtn{
background: #09D49D;
color:#fff!important;
width: 100%;
display: inline-block;
border-radius: 4px;
font-size: 14px;
height: 38px;
line-height: 38px;
text-align: center;
}
</style>
<template>
<div class="page_MyCustomer">
......@@ -105,7 +116,7 @@
<div class="_mc_list _scrollbar" :class="addShow==true?'_edHeight':''">
<ul class="clearfix">
<li v-for="(item,index) in dataList" @click="goUrl(type,item.customerId)">
<i class="iconDelete2 iconfont icon-zongbiao" @click.stop="goUrC('CustomerAnalysis',item.customerId)"></i>
<i class="iconDelete1 iconfont icon-kehuguanxi_kehu" @click.stop="goUrlT('empBankAccount',item.customerId)"></i>
<i class="iconDelete iconfont icon-kehuguanxi_delete1" @click.stop="deleteCustomer(item)"></i>
<img src="../../assets/img/vip.png" style="left: 134px; top: 50px;" v-show="item.isMember==1&&type==2"/>
......@@ -125,16 +136,26 @@
<p class="_other" v-if="item.customerVisitList[1]">最近拜访：{{item.customerVisitList[1].visitDateTime}}</p>
<p class="_other" v-else>最近拜访：暂无</p>
<p class="_other">累计拜访：{{item.visiteCount}}</p>
<p class="_fist_n">幸福存折 <span> {{item.cL_Balance}}</span></p>
</div>
<div class="_record" v-else>
<p class="_fist_n" v-if="item.customerVisitList.length>0">近期约访：{{item.customerVisitList[0].visitDateTime}}</p>
<p class="_fist_n" v-else>近期约访：暂无</p>
<p class="_other_n" v-if="item.customerVisitList[1]">最近拜访：{{item.customerVisitList[1].visitDateTime}}</p>
<p class="_other_n" v-else>最近拜访：暂无</p>
<p class="_fist_n">幸福存折 <span> {{item.cL_Balance}}</span></p>
</div>
<div class="_bt">
<p>累计交易额度 <span> {{item.tradeTotal}}</span></p>
<p>询价与需求 <span> {{item.inquireCount}}</span></p>
<el-row :gutter="24">
<el-col :span="18">
<p>累计交易额度 <span> {{item.tradeTotal}}</span></p>
<p>询价与需求 <span> {{item.inquireCount}}</span></p>
</el-col>
<el-col :span="6" style="text-align:right;padding:0">
<span class="xqBtn" @click.stop="goUrC('CustomerAnalysis',item.customerId)">详情</span>
</el-col>
</el-row>
</div>
</li>
<div class="clearfix"></div>
......
src/components/SalesModule/Returnratio.vue 0 → 100644
View file @ ec5185cd
<style scoped>
.departmentTreeStyleCont {
padding-top: 20px;
display: flex;
height: 100%;
}
.departmentTreeStyleCont .departmentTreeStyle {
background: #fff;
padding: 20px;
flex: 0 1 400px;
min-height: 800px;
}
.departmentTreeStyleCont .departmentTreeStyle > p {
font-size: 14px;
margin-bottom: 15px;
color: #333;
font-weight: bold;
height: 14px;
line-height: 14px;
border-left: 3px solid #E95252;
text-indent: 20px;
}
.departmentTreeStyleCont .departmentTreeStyle .spanIcon {
padding-left: 20px;
display: none
}
.departmentTreeStyleCont .departmentTreeStyle .el-tree-node__content {
height: 32px;
line-height: 32px;
font-size: 12px
}
.TreeSpan img {
width: 24px;
height: 24px;
border-radius: 12px;
vertical-align: sub;
margin-right: 3px;
}
.departmentTreeStyleCont .departmentTreeStyle .el-tree-node__content:hover .spanIcon {
display: inline-block
}
.departmentTreeStyleCont .departmentTreeStyle .el-tree-node__content:hover .spanIcon i {
font-size: 14px !important;
color: #999;
margin-right: 2px;
}
.departmentTreeStyleCont .departmentTreeStyle .el-tree-node__content:hover .spanIcon i:hover {
color: #E95252;
}
.departmentTreeStyleCont .departmentTreeLayer > p {
font-size: 14px;
margin-bottom: 15px;
color: #333;
font-weight: bold;
height: 14px;
line-height: 14px;
border-left: 3px solid #E95252;
text-indent: 20px;
}
.departmentTreeStyleCont .departmentTreeLayer {
background: #fff;
min-height: 300px;
padding: 20px;
margin-left: 20px;
flex: auto
}
.departmentTreeStyleCont .el-date-editor.el-input,
.departmentTreeStyleCont .el-date-editor.el-input__inner {
width: auto !important;
}
</style>
<template>
<div class="flexOne">
<div style="text-align:right;padding:10px">
<input type="button" class="hollowFixedBtn" value="新增" @click="add"/>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th>金额</th>
<th>返佣比例</th>
<th>操作人姓名</th>
<th>操作时间</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index+500">
<td>{{item.Money}}</td>
<td>{{item.Ratio}}‰</td>
<td>{{item.UpdateByName}}</td>
<td>{{item.UpdateTime}}</td>
<td>
<el-tooltip
class="item"
effect="dark"
content="编辑"
placement="top-start"
>
<el-button
type="primary" icon="el-icon-edit"
circle
@click="Edit(item)"
>
</el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top-start"
>
<el-button @click="Delete(item)" type="danger" icon="el-icon-delete" circle></el-button>
</el-tooltip>
</td>
</tr>
<tr v-if='DataList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination> -->
<el-dialog
title="提示"
:visible.sync="dialogVisible"
width="400px">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
<el-form-item label="金额" prop="Money">
<el-input v-model="ruleForm.Money" @keyup.native="checkPrice(ruleForm,'Money')"></el-input>
</el-form-item>
<el-form-item label="返佣比例(‰)" prop="Ratio">
<el-input v-model="ruleForm.Ratio" @keyup.native="checkPrice(ruleForm,'Ratio')"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="danger" @click="submitForm('ruleForm')">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
dialogVisible:false,
loading: true,
//分页
total: 0,
pageSize: '',
currentPage:1,
DataList:[],
dateList:[],
rules: {
Money: [
{ required: true, message: '请输入金额', trigger: 'blur' },
],
Ratio: [
{ required: true, message: '请输入返佣比例', trigger: 'blur' },
],
},
ruleForm:{
Id:0,
Money:"",
Ratio:"",
},
}
},
created(){
},
mounted() {
let userInfo = this.getLocalStorage();
this.getList();
},
methods: {
Delete(item){
this.$confirm('是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('customer_post_DelCustomerCommissionRatio', {Id:item.Id}, res => {
if (res.data.resultCode == 1) {
this.getList();
this.dialogVisible=false;
this.Success(res.data.message)
} else {
this.Success(res.data.message)
}
}, err => {
})
}).catch(() => {
});
},
Edit(item){
this.ruleForm={
Id:item.Id,
Money:item.Money,
Ratio:item.Ratio,
}
this.dialogVisible=true;
},
add(){
this.ruleForm={
Id:0,
Money:"",
Ratio:"",
}
this.dialogVisible=true;
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('customer_post_SetCustomerCommissionRatio', this.ruleForm, res => {
if (res.data.resultCode == 1) {
this.getList();
this.dialogVisible=false;
this.$refs["ruleForm"].resetFields();
} else {
}
}, err => {
})
} else {
}
});
},
getList() { //获取数据
this.loading = true;
this.apipost('customer_post_GetCustomerCommissionRatioList', {}, res => {
this.loading = false
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
this.total = res.data.data.count;
} else {
}
}, err => {
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1
},
}
}
</script>
src/components/SalesModule/customerTransfer.vue
View file @ ec5185cd
......@@ -94,12 +94,13 @@
<!--<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>门店名称</label>-->
</th>
<th width="10%">联系人</th>
<th width="15%">联系电话</th>
<th width="10%">联系电话</th>
<th width="20%">地址</th>
<th width="8%">所属销售</th>
<th width="8%">客户状态</th>
<th width="5%">幸福存折</th>
<th width="10%">备注</th>
<th width="10%">操作</th>
<th width="12%">操作</th>
</tr>
<tr>
<td colspan="8" align="center" v-show="list.length==0">暂无数据</td>
......@@ -126,7 +127,9 @@
<td>{{item.Address}}</td>
<td>{{item.EmName}}</td>
<td>{{valueToWord(item.CustomerStatus)}}</td>
<td>{{item.CL_Balance}}</td>
<td>{{item.Remark}}</td>
<td>
<el-tooltip effect="dark" content="转交" placement="top-start">
<el-popover width="280" popper-class="pd20" trigger="click">
......@@ -228,6 +231,14 @@
>
</el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="详情"
placement="top-start"
>
<el-button @click="getUrl(item)" type="success" icon="iconfont icon-nav-xiaoshou" circle></el-button>
</el-tooltip>
</td>
</tr>
</table>
......@@ -561,6 +572,9 @@ export default {
};
},
methods: {
getUrl(item){
this.$router.push({ name:"CustomerAnalysis",query:{"customerId":item.CustomerIdS,blank: 'y'} })
},
updateData: function(obj) {
this.apipost(
"app_customer_GetLeaderCustomerInfo",
......
src/components/SalesModule/enrollTotal.vue
View file @ ec5185cd
......@@ -286,7 +286,7 @@
<th>金额</th>
<th>类型</th>
<th>描述</th>
<th>时间</th>
<th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>）</th>
</tr>
<tr v-for="(item2,index2) in redBagList"
:key="index2">
......@@ -435,6 +435,7 @@
return obj;
},
redBagList:[],
happy:false,
defaultImg: 'this.src="' + require("../../assets/img/litheader.png") + '"',
currentPage: 1,
total: 0,
......@@ -516,6 +517,7 @@
},
methods: {
goUrlHappy(item){
this.happy=false;
this.$router.push({
name: "HappyPassbook",
query: {
......@@ -791,6 +793,47 @@
text-indent: 15px;
}
*/
.personNolayer p {
height: 28px;
line-height: 28px;
padding-left: 15px;
}
.personNolayer p>span {
font-size: 12px;
color: #333;
margin-right: 15px;
}
.personNolayer table {
padding: 10px 0 0 20px;
width: 100%;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.personNolayer table th {
background-color: #ededed;
height: 34px;
text-indent: 15px;
}
.personNolayer table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.personNolayer table ._color_666 {
color: #666666;
}
.personNolayer table tr._color_666 th {
padding: 9px 15px;
}
.personNolayer table th{
background-color: #ededed;
......
src/components/SalesModule/groupTourOrder.vue
View file @ ec5185cd
......@@ -1664,7 +1664,7 @@
<th>金额</th>
<th>类型</th>
<th>描述</th>
<th>时间</th>
<th>时间（<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>）</th>
</tr>
<tr v-for="(item2,index2) in redBagList"
:key="index2">
......@@ -1678,9 +1678,6 @@
<tr v-if='redBagList.length==0'>
<td colspan="4" align="center">暂无数据</td>
</tr>
<tr>
<!-- <td @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</td> -->
</tr>
</table>
</div>
<span @click="getRedBag(item)" style="cursor: pointer;color: #e95252;" slot="reference">{{item.redEnvelopeMoney}}</span>
......@@ -1939,6 +1936,7 @@
export default {
data() {
return {
happy:false,
redBagList:[],
// 修改应收总额
Ysze: false,
......@@ -2242,6 +2240,7 @@
},
methods: {
goUrlHappy(item){
this.happy=false;
this.$router.push({
name: "HappyPassbook",
query: {
......@@ -2251,6 +2250,7 @@
});
},
getRedBag(item){
console.log("111")
let msg={
CustomerId:item.customerId,
pageIndex: 1,
......@@ -2258,6 +2258,7 @@
};
if(item.customerId){
this.apipost('customer_post_GetC_BigRedEnvelopeInfoList',msg, res => {
this.happy=true;
if (res.data.resultCode == 1) {
this.redBagList = res.data.data.pageData;
} else {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ ec5185cd
......@@ -1191,7 +1191,7 @@
</el-select>
</el-form-item>
<el-form-item label="成交单价" prop="Unit_Price" v-else>
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)" ></el-input><!--:disabled="addMsg.GroupType==4" -->
</el-form-item>
</template>
<el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4">
......@@ -1206,7 +1206,7 @@
<el-col :span="5" v-else>
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' class="w210"
@keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
@keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item>
<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
......@@ -1650,7 +1650,7 @@
<th>金额</th>
<th>类型</th>
<th>描述</th>
<th>时间</th>
<th>时间(<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>)</th>
</tr>
<tr v-for="(item2,index2) in redBagList"
:key="index2">
......@@ -3249,6 +3249,7 @@
},
// 点击弹出下拉框
getDetail(obj) {
console.log(obj)
this.Ysze = false;
this.starTime = obj.StartDate;
this.endTime = obj.BackDate;
......@@ -3846,13 +3847,14 @@
}
},
getTotalPrice(t) {
console.log(t)
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error('请输入正确的价格！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
if (this.addMsg.Unit_Price < this.addMsg.TC_Price) {
if (this.addMsg.Unit_Price < this.addMsg.TC_Price && this.addMsg.GroupType!=4) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
......@@ -4966,7 +4968,7 @@
gettypechange(type) {
//切换参团类型时 把值初始化
if (type == 4) {
this.addMsg.Unit_Price = this.Unit_Price; //成交单价
this.addMsg.Unit_Price = this.addObj.SingleDMCPrice; //成交单价
this.HightUnitPrice = '1';
this.addMsg.AirticketNum = 0;
this.addMsg.ManNum = 0;
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ ec5185cd
......@@ -195,7 +195,7 @@
<th width="80">{{$t('fnc.yszonge')}}</th>
<th width="80">{{$t('fnc.shishou')}}</th>
<th width="70">{{$t('fnc.youhui')}}</th>
<th width="70">幸福存折</th>
<th width="80">幸福存折</th>
<th width="70">{{$t('fnc.xiaofei')}}</th>
<th width="70">{{$t('fnc.tuikuan')}}</th>
<th width="70">{{$t('fnc.ptshuijin')}}</th>
......@@ -291,7 +291,7 @@
<th>金额</th>
<th>类型</th>
<th>描述</th>
<th>时间</th>
<th>时间(<span @click="goUrlHappy(item)" style="cursor: pointer;" colspan="4" align="center">查看更多</span>)</th>
</tr>
<tr v-for="(item2,index2) in redBagList"
:key="index2">
......
src/router/config.js
View file @ ec5185cd
......@@ -1862,14 +1862,22 @@ export default {
title: '拜访记录'
},
},
{ // 销售 幸福存折
{ // 销售 返佣查询
path: '/HappyPassbook',
name: 'HappyPassbook',
component: resolve => require(['@/components/SalesModule/HappyPassbook'], resolve),
meta: {
title: '幸福存折'
title: '返佣查询'
},
}, { // 销售 统计
},
{ // 销售 返佣比例管理
path: '/Returnratio',
name: 'Returnratio',
component: resolve => require(['@/components/SalesModule/Returnratio'], resolve),
meta: {
title: '返佣比例管理'
},
},{ // 销售 统计
path: '/demandStatistics',
name: 'demandStatistics',
component: resolve => require(['@/components/SalesModule/demandStatistics'], resolve),
......
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