Skip to content

S
SuperMan
Commit fb74d674 authored by wuchun's avatar wuchun
Browse files
Options

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

parents 7095e96b 2ca7d68e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6814 additions and 8191 deletions
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ fb74d674
......@@ -2133,6 +2133,8 @@ export default {
let STime = this.getBeforeDate(31,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
let ETime = this.getBeforeDate(0,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
this.productionDate = [STime,ETime]
this.msg.startDate = this.productionDate[0];
this.msg.endDate = this.productionDate[1];
let allH, allW, cH, cW;
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
......
src/components/FinancialModule/components/BillModule.vue
View file @ fb74d674
......@@ -65,8 +65,10 @@
</template>
</td>
</tr> -->
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
<template v-for="(item,daIn) in GetDetail.CashierDetail">
<template v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
<template v-for="(item,daIn) in GetDetail.CashierDetail">
<tr>
<td height="34px" colspan="1" class="_color_b">
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>
</td>
......@@ -88,8 +90,9 @@
<td height="34px" class="">
{{item.Money}}
</td>
</template>
</tr>
</template>
</template>
</table>
</div>
</template>
......@@ -176,7 +179,7 @@ export default {
this.GetDetail.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney
x.Money = Math.round(x.Money)
x.Money = x.Money.toFixed(2)
// x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
......@@ -192,7 +195,8 @@ export default {
this.GetDetail.CashierDetail.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney
x.Money = Math.round(x.Money)
// x.Money = Math.round(x.Money)
x.Money = x.Money.toFixed(2)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money = parseFloat(x.Money)*100
benMoney += Money
......
src/components/FinancialModule/components/ReceivablesModule.vue
View file @ fb74d674
......@@ -59,8 +59,9 @@
<td colspan="1">{{$t('fnc.shouxufei')}}<br/><span class="_font_size12">{{$t('fnc.khbweibi')}}</span></td>
<td colspan="2" class="_font_size12">{{GetDetail.Fee}}</td>
</tr>
<tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=2|| GetDetail.Type!=5)">
<template v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=2|| GetDetail.Type!=5)">
<template v-for="(item,daIn) in GetDetail.CashierDetail">
<tr>
<td height="34px" colspan="1" class="_color_b">
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>
</td>
......@@ -82,8 +83,10 @@
<td height="34px" class="">
{{item.Money}}
</td>
</template>
</tr>
</template>
</template>
</table>
</div>
</template>
......@@ -143,7 +146,7 @@ export default {
this.GetDetail.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney
x.Money = Math.round(x.Money)
x.Money = x.Money.toFixed(2)
// x.Money = Math.round(x.Money * 100) / 100
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
......@@ -159,7 +162,7 @@ export default {
this.GetDetail.CashierDetail.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = x.Rate*x.OriginalMoney
x.Money = Math.round(x.Money)
x.Money = x.Money.toFixed(2)
x.OriginalMoney = Math.round(x.OriginalMoney * 100) / 100
Money = parseFloat(x.Money)*100
benMoney += Money
......
src/components/SalesModule/enrollTotal.vue
View file @ fb74d674
This diff is collapsed.
src/components/SalesModule/groupTourOrder.vue
View file @ fb74d674
......@@ -2231,6 +2231,10 @@
</div>
<p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">联运备注：{{ item.unionRemark }}
</p>
<p v-if="item.airticketUnionNotes||item.configNum>0" style="color: red;font-size:10px;margin-top:5px;">
票务备注：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
</p>
</td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px">
<div>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ fb74d674
......@@ -2432,6 +2432,10 @@
<div v-if="item.unionRemark" style="color: red">
<span>联运备注：{{ item.unionRemark }}</span>
</div>
<div v-if="item.airticketUnionNotes||item.configNum>0" style="color: red">
票务备注：<span style="color: red">已配联运{{item.configNum}}人,{{item.airticketUnionNotes}}</span>
</div>
</div>
<div style="
float: right;
......@@ -4618,7 +4622,7 @@
} else {
this.remarksMsg.OrderId = obj.orderId;
this.remarksMsg.Remarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
this.remarksMsg.OldRemarks = obj.remarks;
this.isShowLayerRemarks = true;
}
},
......
src/components/Ticketing/TicketManager.vue
View file @ fb74d674
......@@ -1529,6 +1529,7 @@
<th>已配数量</th>
<th>是否住宿</th>
<th>联运备注</th>
<th>票务备注</th>
</tr>
<tr v-for="(unionItem,x) in item.UnionDetailList" :key="x">
<td>{{unionItem.UnionCityName}}</td>
......@@ -1540,6 +1541,7 @@
<span v-else>否</span>
</td>
<td>{{unionItem.UnionRemark}}</td>
<td>{{unionItem.Notes}}</td>
</tr>
</table>
<p slot="reference" class="_wz _yiyong">联运</p>
......@@ -3449,7 +3451,7 @@
}
this.loading = true;
this.apipost(
"AirTicket_get_GetPageList",
"AirTicket_get_GetNewPageList",
this.msg,
res => {
this.loading = false;
......
src/components/myOrdersAllType/components/allList.vue
View file @ fb74d674
<style scoped>
.groupTourOrder_count{
display: flex;
flex-wrap: wrap;
}
.groupTourOrder_count>div{
margin-right: 20px;
}
.groupTourOrder_count>div:last-child{
margin-right: 0;
}
.groupTourOrder_count_item{
max-width: 500px;
}
.groupTourOrder_count_item>p>span{
margin: 0;
}
......@@ -17,7 +31,11 @@
.HT_total p>span{
float: left;
display: inline-block;
width: 25%;
/* width: 25%; */
margin-right: 20px;
}
.HT_total p>span:last-child{
margin-right: 0;
}
.TC_leftSearch>div{
padding: 5px 0;
......@@ -81,7 +99,7 @@
</li>
<li>
<span><em>订单Id</em>
<el-input clearable type="" v-model="msg.OrderId" placeholder="请输入订单Id" class="w200"/>
<el-input clearable type="Number" v-model="msg.OrderId" placeholder="请输入订单Id" class="w200"/>
</span>
</li>
<li>
......@@ -251,10 +269,8 @@
</div>
<!-- 统计版块 -->
<div class="groupTourOrder_count">
<el-row :gutter="20">
<template v-for="(item,index) in SummaryList">
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8">
<div class="groupTourOrder_count_item HT_total">
<!-- <el-row :gutter="20"> <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="8"></el-col></el-row> -->
<div class="groupTourOrder_count_item HT_total" v-for="(item,index) in SummaryList">
<div>
<span>{{item.CurrencyName}}</span>
</div>
......@@ -295,10 +311,10 @@
</span>
</p>
</div>
</el-col>
</template>
</el-row>
</div>
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
<div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
......
src/components/public/rightHead.vue
View file @ fb74d674
......@@ -42,10 +42,10 @@
<img v-if="data.icon !=null && data.icon !='' " :src="data.icon" alt="" class="tx_img"
:onerror='defaultHeadImg'>
<img v-else src="../../assets/img/default_head_img.jpg" alt="" alt="" class="tx_img">
<div class="p_name">
<div class="p_name" :style="{'margin-top':pagesTitle!=1?'20px':'0'}">
<span>{{data.emName}}</span>
<span>{{data.postName}}</span>
<div @click="goAnticipate(5)" style="cursor: pointer;">
<div @click="goAnticipate(5)" style="cursor: pointer;" v-if="pagesTitle==1">
<div v-if="SumPreferPrice" style="padding: 2px 0 0 0;"><a style="color: #666666;font-size: 14px;font-weight: bold;">{{SumPreferPrice}}</a></div>
<div style="font-size: 14px;color: #333333;" v-if="rankingNum">
第<a style="color: #FF8C00;margin-left: 3px;margin-right: 3px;
......@@ -267,7 +267,7 @@
}
if(type!=5&&name){
this.$router.push({
path: name,
name: name,
query: {
UserId: Number(userInfo.EmployeeId),
isSale: 1,
......
src/components/sale/sale.vue
View file @ fb74d674
This diff is collapsed.
src/components/temp/components/OrderList.vue 0 → 100644
View file @ fb74d674
<template>
<div>
<el-table border ref="multipleTable" :data="OrderList"
:default-sort="{prop: 'null', order: 'null'}"
:sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','OrderProfit','DueInMoney']">
<el-table-column prop="Title" label="团名">
</el-table-column>
<el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip>
<template slot-scope="scope">
<div>
<p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
@click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}({{scope.row.TCID}})</p>
<p>出团日期：{{scope.row.StartDate}}</p>
</div>
</template>
</el-table-column>
<el-table-column prop="GuestNum" label="收客人数">
</el-table-column>
<el-table-column label="类型">
<template slot-scope="scope">
{{scope.row.TeamTypeName}}/{{scope.row.PriceTeamTypeName}}
</template>
</el-table-column>
<el-table-column label="线路/系列" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.LineName}}/{{scope.row.LtName}}
</template>
</el-table-column>
<el-table-column prop="StateName" label="状态" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{scope.row.Status}}</span>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
props: {
OrderList: {
type: Array,
require: false
},
},
data() {
return {
loading: false,
};
},
watch: {
OrderList: {
handler (val, oldVal) {
},
deep: true
}
},
created() {
},
mounted() {
},
methods: {
}
};
</script>
<style scoped>
</style>
src/components/temp/components/details.vue 0 → 100644
View file @ fb74d674
<style scoped>
</style>
<template>
<el-tooltip class="item" effect="dark" :content="type==1?'出境提成详情':type==3?'提成明细':type==2?'国内提成详情':''" placement="top">
<!-- <img src="../../../assets/img/xiaosouYQ.png" @click="goDetails"
style="width: 12px;height: auto; cursor: pointer;color: #33B3FF;"></img> -->
<i class="el-icon-document" style="font-size: 18px;color: red;cursor: pointer;" @click="goDetails"></i>
</el-tooltip>
</template>
<script>
export default {
props:['type','obj','Month'],
data() {
return {
};
},
watch: {
obj:{
handler(val, oldVal){
this.obj = val
},
deep: true,
immediate: true
}
},
mounted() {
},
created() {
},
methods: {
goDetails(){
let nowdays = new Date()
let Year = new Date().getFullYear()
let LastMonthTime = new Date().getMonth()
let MonthTime = new Date().getMonth() + 1
let userInfo = this.getLocalStorage();
let MonthDayNum
let name
if(this.type!=3){
let DepartSTime
let DepartETime
if(this.Month==1){
DepartSTime = Year+'-'+(MonthTime>10?MonthTime:'0'+MonthTime)+'-01'
MonthDayNum = new Date(Year, MonthTime, 0).getDate();
DepartETime = Year+'-'+(MonthTime>10?MonthTime:'0'+MonthTime)+'-'+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum)
}else{
DepartSTime = Year+'-'+(LastMonthTime>10?LastMonthTime:'0'+LastMonthTime)+'-01'
MonthDayNum = new Date(Year, LastMonthTime, 0).getDate();
DepartETime = Year+'-'+(LastMonthTime>10?LastMonthTime:'0'+LastMonthTime)+'-'+(MonthDayNum>10?MonthDayNum:'0'+MonthDayNum)
}
name = 'erpMyCustomerOrder'
this.$router.push({
name: name,
query: {
DepartSTime: DepartSTime,
DepartETime: DepartETime,
CommissionType: String(this.type),
blank: 'y'
}
});
}else{
name = 'TradeTicketUserDetails'
this.$router.push({
name: name,
query: {
UserId: Number(userInfo.EmployeeId),
blank: 'y'
}
});
}
}
}
};
</script>
src/components/temp/components/progressComm.vue 0 → 100644
View file @ fb74d674
<style scoped>
.progress-box{
flex: 1;
display: flex;
margin-bottom: 25px;
}
.relative-position{
/* min-width: 80px; */
flex: 1;
margin-right: 0;
position: relative;
}
.rate-box {
position: absolute;
top: 30px;
left: 50%;
transform: translateX(-50%);
color: #000;
z-index: 9;
display: flex;
flex-wrap: wrap;
justify-content: center;
}
.sanjiao {
width: 0;
height: 0;
margin-left: 5%;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
border-bottom: 3px solid #CACACA;
}
.rate {
min-width: 20px;
padding: 2px 6px;
background-color: #CACACA !important;
display: flex;
justify-content: center;
align-items: center;
color: #666666;
font-size: 0.62vw;
font-family: PingFang SC;
border-radius: 7px;
line-height:12px;
white-space:nowrap;
}
.active-rate{
background-color: #33B3FF !important;
color: #FFFFFF !important;
}
/deep/.relative-position .el-progress-bar__outer{
border-radius: 0 !important;
}
/deep/.relative-position .el-progress-bar__inner{
text-align: left;
text-indent: 10px;
border-radius: 0 !important;
}
/deep/.relative-position:first-child .el-progress{
border-top-left-radius: 15px !important;
border-bottom-left-radius: 15px !important;
overflow: hidden !important
}
/deep/.relative-position:last-child .el-progress{
border-top-right-radius: 15px !important;
border-bottom-right-radius: 15px !important;
overflow: hidden !important
}
</style>
<template>
<div>
<div class="progress-box">
<div v-for="(item,index) in CommissionRateList" :key="index"
class="relative-position">
<el-progress :text-inside="true" :stroke-width="20"
:percentage="setItemProgress(item)"
:status="setItemStatus(item)"
:format="setItemText(item)"
:text-color="'#666666'"
:color="customColor[0]">
</el-progress>
<div class="rate-box">
<div class="sanjiao"
:style="{'border-bottom-color':Profit>item.StartValue&&Profit<item.EndValue?'#33B3FF':'#CACACA'}"></div>
<div class="rate full-width"
:class="{'active-rate':Profit>item.StartValue&&Profit<item.EndValue}">
<i v-if="Profit>item.StartValue&&Profit<item.EndValue" class="el-icon-check" style="font-size:8px"></i>
{{item.Rate}}{{type==2?'%':''}}
</div>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
props:['CommissionRateList','Profit','type'],
data() {
return {
customColor: ['rgba(51,179,255,1)','rgba(222,225,230,1)'],
};
},
watch: {
CommissionRateList:{
handler(val, oldVal){
this.CommissionRateList = val
},
deep: true,
immediate: true
}
},
mounted() {
},
created() {
},
methods: {
// 设置进度
setItemProgress(data) {
if(this.Profit&&this.Profit>=data.StartValue&&this.Profit<=data.EndValue){
return data.EndValue<999999?this.Profit/data.StartValue:this.Profit/data.EndValue
}else{
return 0
}
},
// 自定义进度条文字
setItemText(row) {
if(this.type==2){
this.formatProgress(row)
return () => {
return `${row.EndValue2>99?'>'+row.StartValue2:row.StartValue2+' - '+row.EndValue2}w`
}
}else if(this.type==1){
return () => {
return `${row.EndValue>999?'>'+row.StartValue:row.StartValue+' - '+row.EndValue}人`
}
}
},
// 设置当前进度条状态，显示不同颜色
setItemStatus(data) {
if(this.AvgLureNum>=data.StartValue&&this.AvfOrderNum>=data.EndValue){
return 'exception'
}
},
formatProgress(data){
let obj = JSON.parse(JSON.stringify(data))
if(obj.StartValue>=10000) {
data.StartValue2 = (obj.StartValue/1000).toFixed(1)>0?(obj.StartValue/10000).toFixed(1):0 //Math.floor(obj.StartValue/10000)
if(data.StartValue2>=10&&data.StartValue2.indexOf('.0')!=-1){
data.StartValue2 = data.StartValue2.slice(0,2)
}else if(data.StartValue2.indexOf('.0')!=-1){
data.StartValue2 = data.StartValue2.slice(0,1)
}
}else{
data.StartValue2 = (obj.StartValue/10000).toFixed(1)>0?(obj.StartValue/10000).toFixed(1):0
}
if(obj.EndValue>=10000) {
data.EndValue2 = obj.EndValue/10000
}else{
data.EndValue2 = (obj.EndValue/1000).toFixed(1)>0?(obj.EndValue/10000).toFixed(1):0
}
},
}
};
</script>
src/components/temp/operation.vue
View file @ fb74d674
This diff is collapsed.
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