Skip to content

S
SuperMan
Commit 8ddda635 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 083f9c70 dc6cee95
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1644 additions and 739 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ 8ddda635
......@@ -1210,6 +1210,7 @@ input[type="number"] {
</el-form-item>
</el-form>
<p style="color: red;text-align: right;padding: 5px;">注:冲抵请勾选单据后点击下方确认冲抵</p>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th></th>
......@@ -1256,7 +1257,10 @@ input[type="number"] {
</el-pagination>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="yfcdState=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="goUrlZD('')">{{$t('pub.sureBtn')}}</button>
<button class="normalBtn" type="primary" @click="goUrlZD('')">
<!-- {{$t('pub.sureBtn')}} -->
确认冲抵
</button>
</div>
</el-dialog>
<!-- 修改汇率 -->
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 8ddda635
......@@ -418,8 +418,12 @@
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==15" @click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商采购单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==16" @click="goassets(GetDetail.ReFinanceId,GetDetail.OtherType)"> 电商出库单:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17" @click="lookbreakage(GetDetail.ReFinanceId)"> 报损/报溢单:{{GetDetail.ReFinanceId}}</span>
<span v-if="(GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64" @click="Gourl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64" @click="GoOPurl(GetDetail)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==28 || GetDetail.TemplateId==30) && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
@click="Gourl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="(GetDetail.TemplateId==29 || GetDetail.TemplateId==31) && OPState && GetDetail.OtherType!=63 && GetDetail.OtherType!=64"
@click="GoOPurl(GetDetail)"
style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">提成详情</span>
<span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
<span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
<span v-if="GetDetail.OtherType==5" @click="GourlHotelZr" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">酒店折让</span>
......@@ -1159,12 +1163,10 @@ export default {
},
GoOPurl(GetDetail){
this.$router.push({
name: 'OpComPersonDetails',
name: 'OPsalesCommissiondetails',
query: {
EmployeeId:GetDetail.AccountEmployeeId,
PeriodsId:GetDetail.OPPeriodsId,
RB_Branch_Id:GetDetail.RB_Branch_Id,
PeriodId: GetDetail.ReFinanceId,
OutBranchId: stringify(GetDetail.RB_Branch_Id),
blank: "y",
tab: "op提成明细"
}
......
src/components/FinancialModule/ServiceCommission/ServiceCommission.vue
View file @ 8ddda635
......@@ -369,11 +369,12 @@
},
gofinancialdetail(id){
gofinancialdetail(item){
let arr = item.split('-')
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: id,
id: arr[0],
blank: 'y',
tab: '单据详情'
}
......
src/components/FinancialModule/domestic/OPsalesCommission.vue
View file @ 8ddda635
......@@ -260,11 +260,12 @@
});
},
gofinancialdetail(id) {
gofinancialdetail(item) {
let arr = item.split('-')
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: id,
id: arr[0],
blank: 'y',
tab: '单据详情'
}
......
src/components/FinancialModule/domestic/OPsalesCommissiondetails.vue
View file @ 8ddda635
......@@ -208,6 +208,9 @@
if (this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
}
if(this.$route.query.OutBranchId){
this.msg.OutBranchId = Number(this.$route.query.OutBranchId)
}
}
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
......
src/components/FinancialModule/domesticCommission.vue
View file @ 8ddda635
......@@ -277,11 +277,12 @@
});
},
gofinancialdetail(id){
gofinancialdetail(item){
let arr = item.split('-')
this.$router.push({
name: 'FinancialDocumentsDetail',
query: {
id: id,
id: arr[0],
blank: 'y',
tab: '单据详情'
}
......
src/components/Hotel/singleProduct/HotelQueryList.vue 0 → 100644
View file @ 8ddda635
This diff is collapsed.
src/components/Hotel/singleProduct/components/HotelTipTableList.vue 0 → 100644
View file @ 8ddda635
<template>
<div>
<el-form>
<table v-loading="loading" border="0" cellspacing="1" cellpadding="0"
class="HouseTypeList Hq_addTable" style="width:100%;">
<tr>
<th width="50">编号</th>
<th>内容</th>
<th width="70">操作人</th>
<th width="140">操作时间</th>
</tr>
<template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList">
<td>{{item.Id}}</td>
<td>
<p style="text-align:left;padding:0 5px;" v-html="item.TipContent"></p>
</td>
<td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td>
</tr>
</template>
<tr v-else>
<td colspan="5">暂无数据...</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
:page-size="queryMsg.pageSize" layout="total,prev, pager, next, jumper" :total="queryMsg.total">
</el-pagination>
</el-form>
</div>
</template>
<script>
import SamplePriceList from './SamplePriceList'
import hotelDetails from './hotelDetails'
export default {
components: { SamplePriceList,hotelDetails },
props:['list','tableHeight'],
data() {
return {
loading: false,
postMsg: {
Id: 0,
TipContent: '',
OpType: 0,
},
HotelTipList: [],
queryMsg: {
QStartDate: '',
QEndDate: '',
pageIndex: 1,
pageSize: 5,
currentPage: 1,
total: 0,
OpType: 0
},
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.queryMsg.QStartDate)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.queryMsg.QEndDate)
return startTime.getTime() >= time.getTime()
}
},
editorOption: {
placeholder: '请输入内容',
modules: {
toolbar: [
['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block', 'align']
]
}
},
};
},
watch: {
list:{
handler(val, oldVal){
},
deep: true,
immediate: true,
},
},
methods: {
handleCurrentChange(val) {
this.queryMsg.pageIndex = val;
this.GetHotelTipList()
},
resetPageIndex() {
this.queryMsg.pageIndex = 1;
this.queryMsg.currentPage = 1;
},
//获取酒店列表
GetHotelTipList() {
this.loading = true
this.apipost(
"hoteltip_get_GetPageList", this.queryMsg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
this.HotelTipList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
}
},
err => {}
);
},
SaveHotelTip() {
this.apipost(
"hoteltip_post_SetHotelTip", this.postMsg,
res => {
if (res.data.resultCode == 1) {
this.Success("保存成功!");
this.postMsg.Id = 0;
this.postMsg.TipContent = "";
this.GetHotelTipList();
} else {
this.Error("保存失败!");
}
},
err => {}
);
},
},
mounted() {
this.GetHotelTipList()
}
};
</script>
<style>
</style>
\ No newline at end of file
src/components/Hotel/singleProduct/components/TableOperation.vue
View file @ 8ddda635
......@@ -128,6 +128,7 @@
cars: [],//购物车参数
HotelLength: 0,//购物车酒店数
editor: {},//预定订单对象
contrastCars: [],//对比缓存cars
};
},
watch: {
......@@ -146,6 +147,7 @@
},
hotelInfor: {
handler: function (val, oldVal) {
if(this.hotelInfor&&this.hotelInfor.RemainingInventory){
this.onlyNum = this.hotelInfor.RemainingInventory
}
......@@ -166,6 +168,7 @@
},
mounted() {
if(this.hotelInfor&&this.hotelInfor.RemainingInventory){
this.onlyNum = this.hotelInfor.RemainingInventory
}
......@@ -173,6 +176,7 @@
this.setList()
}
},
methods: {
changePeople(val){
......@@ -191,6 +195,8 @@
})
},
join(){
this.cars = []
this.cars = JSON.parse(localStorage.getItem('cars'))
if(!this.sumPeople) return this.Error('请加入人数');
const temp= JSON.parse(JSON.stringify(this.parameters))
temp.Money=0
......@@ -198,26 +204,26 @@
temp.SumPeople = this.sumPeople
temp.DetailList = temp.DetailList.filter(((x)=>x.PeopleNumber>0))
temp.DetailList.forEach((x) => {
temp.Money+=(x.PeopleNumber*(x.Unit_Price+x.TaxesPrice+x.PriceInTangTax))
temp.Money+=(x.PeopleNumber*(x.Unit_Price+x.TaxesPrice+x.PriceInTangTax))
});
let existsIndex = this.cars.findIndex((x)=>x.Date == temp.Date)
let exists = existsIndex==-1?null:this.cars[existsIndex]
if(exists){
let existsHotel = exists.Hotels.findIndex((h)=>h.HotelId==temp.HotelId)
if(existsHotel!=-1) exists.Hotels.splice(existsHotel,1)
let existsHotel = exists.Hotels.findIndex((h)=>h.HotelId==temp.HotelId)
if(existsHotel!=-1) exists.Hotels.splice(existsHotel,1)
}else{
exists = {
Date:temp.Date,
Hotels:[]
}
this.cars.push(exists)
exists = {
Date:temp.Date,
Hotels:[]
}
this.cars.push(exists)
}
exists.Hotels.push(temp)
this.cars.sort((x,y)=>{
return new Date(x.Date).getTime()-new Date(y.Date).getTime()
return new Date(x.Date).getTime()-new Date(y.Date).getTime()
})
this.HotelLength = this.cars.length
localStorage.setItem("cars",JSON.stringify(this.cars))
localStorage.setItem("HotelLength",this.HotelLength)
this.Success('加入购物车成功');
......
src/components/Hotel/singleProduct/components/WarmReminder.vue 0 → 100644
View file @ 8ddda635
<template>
<div>
<el-form label-width="80px">
<el-row>
<el-col :span="20">
<el-form-item label="日期">
<el-date-picker class="w150" type="date" v-model="queryMsg.QStartDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.QEndDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<input type="button" class="normalBtn" value="查询" @click="resetPageIndex(),GetHotelTipList()" />
<input type="button" class="normalBtn" value="关闭" @click="close" />
</el-col>
</el-row>
<div class="Hq_addDetail">
<el-row>
<el-col :span="12">
<el-form-item label="说明">
<quill-editor class="w595" :options="editorOption" v-model="postMsg.TipContent"></quill-editor>
</el-form-item>
</el-col>
<el-col :span="12">
<input type="button" class="normalBtn" value="保存" @click="SaveHotelTip()" />
</el-col>
</el-row>
</div>
</el-form>
<div>
<table v-loading="loading" border="0" cellspacing="1" cellpadding="0"
class="HouseTypeList Hq_addTable" style="width:97%;">
<tr>
<th width="50">编号</th>
<th>内容</th>
<th width="70">操作人</th>
<th width="150">操作时间</th>
<th width="80">操作</th>
</tr>
<template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList">
<td>{{item.Id}}</td>
<td>
<p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p>
</td>
<td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td>
<td>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<el-button type="primary" icon="el-icon-edit" circle @click="GetHotelTip(item.Id)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" icon="el-icon-delete" circle @click="RemoveHotelTip(item.Id)"></el-button>
</el-tooltip>
</td>
</tr>
</template>
<tr v-else>
<td colspan="5">暂无数据...</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
:page-size="queryMsg.pageSize" layout="total,prev, pager, next, jumper" :total="queryMsg.total">
</el-pagination>
</div>
</div>
</template>
<script>
import SamplePriceList from './SamplePriceList'
import hotelDetails from './hotelDetails'
export default {
components: { SamplePriceList,hotelDetails },
props:['list','tableHeight'],
data() {
return {
loading: false,
postMsg: {
Id: 0,
TipContent: '',
OpType: 0,
},
HotelTipList: [],
queryMsg: {
QStartDate: '',
QEndDate: '',
pageIndex: 1,
pageSize: 5,
currentPage: 1,
total: 0,
OpType: 0
},
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.queryMsg.QStartDate)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.queryMsg.QEndDate)
return startTime.getTime() >= time.getTime()
}
},
editorOption: {
placeholder: '请输入内容',
modules: {
toolbar: [
['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block', 'align']
]
}
},
};
},
watch: {
list:{
handler(val, oldVal){
},
deep: true,
immediate: true,
},
},
methods: {
close(){
this.$emit('close')
},
handleCurrentChange(val) {
this.queryMsg.pageIndex = val;
this.GetHotelTipList()
},
resetPageIndex() {
this.queryMsg.pageIndex = 1;
this.queryMsg.currentPage = 1;
},
//获取酒店列表
GetHotelTipList() {
this.loading = true
this.apipost(
"hoteltip_get_GetPageList", this.queryMsg,
res => {
if (res.data.resultCode == 1) {
this.loading = false
this.HotelTipList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
}
},
err => {}
);
},
SaveHotelTip() {
this.apipost(
"hoteltip_post_SetHotelTip", this.postMsg,
res => {
if (res.data.resultCode == 1) {
this.Success("保存成功!");
this.postMsg.Id = 0;
this.postMsg.TipContent = "";
this.GetHotelTipList();
} else {
this.Error("保存失败!");
}
},
err => {}
);
},
RemoveHotelTip(Id) {
var that = this;
this.Confirm('是否要删除此数据?', function () {
that.apipost(
"hoteltip_post_RemoveHotelTip", {
ID: Id
},
res => {
if (res.data.resultCode == 1) {
that.Success("删除成功!");
that.GetHotelTipList();
} else {
that.Error("删除失败!");
}
},
err => {}
);
})
},
GetHotelTip(Id) {
this.apipost(
"hoteltip_get_GetHotelTip", {
ID: Id
},
res => {
if (res.data.resultCode == 1) {
this.postMsg.Id = res.data.data.Id;
this.postMsg.TipContent = res.data.data.TipContent;
} else {
this.Error("获取数据失败!");
}
},
err => {}
);
},
},
mounted() {
this.GetHotelTipList()
}
};
</script>
<style>
</style>
\ No newline at end of file
src/components/Hotel/singleProduct/components/hotelTableList.vue 0 → 100644
View file @ 8ddda635
<template>
<div>
<el-table :data="dataList"
style="width:100%" border
ref="mytable" key="HotelId" :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="showHotelDetailHandler(scope.row.HotelId)">
{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
</template>
</el-table-column>
<el-table-column label="价格&库存" fixed min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong">价格</div>
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
<div class="Hotel_kong">确认/预定</div>
<div class="Hotel_kong">超定</div>
</template>
</el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index'
min-width="120">
<template slot-scope="scope">
<div @click="showOrderSubmitHandler(scope.row,index,0)">
<div class="Hotel_kong Com_hoteldiv">
<template v-if="scope.row.subList[index].PriceList.length>0">
<template v-for="childItem in scope.row.subList[index].PriceList">
<div :class="getClass(1,childItem.InventoryType)"
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}" class="CostPriceHover">
<el-popover
placement="bottom"
width="300"
trigger="hover">
<SamplePriceList
v-if="
scope.row.subList[index].PriceList[0].BidroomPrice>0||
scope.row.subList[index].PriceList[0].SingleroomPrice>0||
scope.row.subList[index].PriceList[0].AddBedPrice>0||
scope.row.subList[index].PriceList[0].GuideRoomPrice>0" :price="scope.row.subList[index]"></SamplePriceList>
<div v-else style="text-align: center;width: 100%;">没有其他房型报价</div>
<span slot="reference" class="CostPriceHover">{{childItem.CostPrice}}</span>
</el-popover>
</div>
</template>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div>
<div class="Hotel_kong Com_hoteldiv">
{{scope.row.subList[index].ConfirmNum}}/{{scope.row.subList[index].ReserveNum}}
</div>
<div class="Hotel_kong Com_hoteldiv">
<span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0"
style="color:red;">
{{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}}
</span>
</div>
</div>
</template>
</el-table-column>
</el-table>
<!-- 酒店详情信息 -->
<el-dialog custom-class="w800" title="酒店详情" :visible.sync="showHotelDetails" center @close="close">
<hotelDetails :hotelId="HotelDetailId"></hotelDetails>
</el-dialog>
</div>
</template>
<script>
import SamplePriceList from './SamplePriceList'
import hotelDetails from './hotelDetails'
export default {
components: { SamplePriceList,hotelDetails },
props:['list','tableHeight'],
data() {
return {
showHotelDetails: false,
HotelDetailId: 0,
dataList: [],
};
},
watch: {
list:{
handler(val, oldVal){
this.dataList = val
let _this = this
setTimeout(()=>{
this.$nextTick(() => {
_this.$refs.mytable.doLayout();
})
},200)
},
deep: true,
immediate: true,
},
},
methods: {
// 酒店信息详情
showHotelDetailHandler(hotelId){
this.HotelDetailId = hotelId
this.showHotelDetails = true
},
// 取消
close(){
this.showHotelDetails = false
},
// 加入购物车
showOrderSubmitHandler(row,index,type){
this.$emit('showOrderSubmitHandler',row,index,type)
},
//格式化返回显示日期
getDateList(dateStr) {
var str = dateStr.split('-');
var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr));
return str[1] + '/' + str[2] + "（" + weekDay[myDate.getDay()] + "）";
},
//获取星期几
getWeek(dateStr) {
var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr));
return weekDay[myDate.getDay()]
},
//获取颜色状态
getClass(Status, InventoryType) {
var classStr = "";
if (Status == 0) {
classStr = 'noKucun';
}
switch (InventoryType) {
case 1:
classStr = "classHong";
break;
case 2:
classStr = "classWang";
break;
case 3:
classStr = "classPing";
break;
case 4:
classStr = "classDan";
break;
case 5:
classStr = "classTe";
break;
case 6:
classStr = "hotelQueryListclass6"
break;
}
return classStr;
},
},
mounted() {
}
};
</script>
<style>
.Hq_duoge {
cursor: pointer;
text-decoration: underline;
}
.HqCom_bottom .ql-container {
min-height: 100px;
}
.classHong {
background-color: rgb(255, 55, 55);
color: #fff;
}
.classWang {
background-color: rgb(255, 153, 204);
}
.classPing {
background-color: rgb(188, 214, 238);
}
.classDan {
background-color: rgb(221, 221, 221);
}
.classTe {
background-color: rgb(2, 247, 142);
}
.hotelQueryListclass6 {
background-color:#808000;
}
.HouseTypeList {
background: #ccc;
width: 100%;
margin-top: 20px;
}
.Com_hoteldiv {
min-width: 70px;
white-space: nowrap;
}
.noKucun {
background-color: black !important;
}
.Hotel_kong {
width: 100%;
height: 35px;
text-align: center;
line-height: 35px;
border-bottom: 1px solid #d1d1d1;
}
.Hotel_kong:last-child {
border: 0;
}
.HouseTypeList tr th {
background: #e6e6e6;
height: 35px;
font-size: 12px;
color: #333;
}
.HouseTypeList tr {
background: #fff;
text-align: center;
height: 35px;
}
.HouseTypeList tr td {
font-size: 12px;
}
.hotelProductManage2_tableBox span {
margin: 0 10px 10px 0;
}
.Hq_addDetail {
margin-top: 20px;
}
.Hq_addDetail .el-textarea__inner {
resize: none;
}
.Hq_addTable .el-button.is-circle {
padding: 5px;
}
.HqCom_bottom .el-form-item {
margin-bottom: 0
}
.HqCom_bottom {
height: 350px;
padding-top: 35px;
}
.HQ_miaoshu {
color: #E95252;
font-size: 12px;
}
.HQ_miaoshu:first-child {
margin-top: 10px;
}
.HotelQueryList .has-gutter tr th,
.el-table th.is-leaf {
background: #EAEAEA !important;
}
.HotelQueryList .el-table td,
.el-table th.is-leaf {
border-bottom: 1px solid #ebeef5;
}
.HotelQueryList .el-table .cell {
padding: 0;
}
.HotelQueryList .el-table td {
padding: 0;
}
.CostPriceHover{
height:100%;
float:left;
width:100%;
cursor: pointer;
}
</style>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 8ddda635
......@@ -122,6 +122,25 @@
@click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
</div>
<ul>
<li>
<span>
<em>提成状态</em>
<el-select class="w150" v-model="queryMsg.QSendCommissionState" filterable
@change="getControlList()">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0" @change="resetPageIndex(),getControlList()"/>
</span>
</li>
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
......@@ -1164,6 +1183,11 @@
},
data() {
return {
QSendCommissionStateList:[
{Name:'不限',ID: 0},
{Name:'已发放',ID: 1},
{Name:'未发放',ID: 2},
],
TeamShouZhi: false, //团队收支明细权限
OutHotel: false, //酒店下架权限
FenXiaoLianYun: false, //分销联运
......@@ -1243,6 +1267,8 @@
},
//查询参数
queryMsg: {
QOutGroupAuditReject: 0,//只查看审核驳回 1
QSendCommissionState: 0,//提成状态 0不限， 1已发放， 2未发放
//出团公司集合
OutBranchIds: [],
pageIndex: 1,
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 8ddda635
......@@ -94,6 +94,25 @@
@click="getCompanyCheck(item)">{{item.BName}}</span>
</div>
<ul>
<li>
<span>
<em>提成状态</em>
<el-select class="w150" v-model="queryMsg.QSendCommissionState" filterable
@change="getControlList()">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch
v-model="queryMsg.QOutGroupAuditReject"
active-text=""
inactive-text=""
active-color="#409eff"
inactive-color="#dcdfe6"
active-value="1"
inactive-value="0" @change="resetPageIndex(),getControlList()"/>
</span>
</li>
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
......@@ -742,6 +761,11 @@
export default {
data() {
return {
QSendCommissionStateList:[
{Name:'不限',ID: 0},
{Name:'已发放',ID: 1},
{Name:'未发放',ID: 2},
],
LookAllTeam: false, //查看所有团控
//查询数据列表
queryCommonData: {
......@@ -813,6 +837,8 @@
},
//查询参数
queryMsg: {
QOutGroupAuditReject: 0,//只查看审核驳回 1
QSendCommissionState: 0,//提成状态 0不限， 1已发放， 2未发放
//出团公司集合
OutBranchIds: [],
pageIndex: 1,
......
src/components/busManagement/AreaandType.vue
View file @ 8ddda635
<style>
<style scoped>
.AreaandType .BusAddArea{
width:100%;
text-align: right;
......@@ -7,6 +7,28 @@
.AreaandType .AreaTypeTable td, .AreaTypeTable th{
text-align: center!important;
}
/deep/.el-form-item{
margin-bottom: 0;
}
/deep/.AreaandType .el-input-number .el-input__inner{
height: 30px;
}
/deep/.AreaandType .el-input-number{
width: 100%;
line-height: 30px;
}
/deep/.AreaandType .el-input-number__increase{
width: 25px !important;
height: 28px !important;
}
/deep/.AreaandType .el-input-number__decrease{
width: 25px !important;
height: 28px !important;
}
/deep/.AreaandType .el-input-number .el-input__inner{
padding-left: 20px;
padding-right: 20px;
}
</style>
<template>
<div class="flexOne AreaandType">
......@@ -49,16 +71,18 @@
</div>
<table class="singeRowTable AreaTypeTable" border="0" cellspacing="0" cellpadding="0" v-loading="loadingBus">
<tr>
<th style="border-bottom:1px solid #d1d1d1;" colspan="4">车辆类型</th>
<th style="border-bottom:1px solid #d1d1d1;" colspan="5">车辆类型</th>
</tr>
<tr>
<th width="400">车辆类型</th>
<th>座位数</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in BusTypeDataList" :key="index">
<td>{{item.Name}}</td>
<td>{{item.SeatNum}}</td>
<td>{{item.CreateByName}}</td>
<td>{{item.CreateDateStr}}</td>
<td>
......@@ -117,6 +141,9 @@
<el-form-item label="名称">
<el-input v-model="addBusType.Name" class="w217"/>
</el-form-item>
<el-form-item label="座位数">
<el-input-number v-model="addBusType.SeatNum" :min="1" class="w217"/>
</el-form-item>
</td>
</tr>
</table>
......@@ -172,6 +199,7 @@ export default {
Id:0,
Type:2,
Name:'',
SeatNum: 1,
}
};
},
......@@ -269,8 +297,8 @@ export default {
},
//保存车辆
saveBusInfo(){
if(this.addBusType.Name==''){
this.Error('请填写车辆类型');
if(!this.addBusType.Name||!this.addBusType.SeatNum){
this.Error('请填写车辆类型名称和座位数');
return;
}
this.apipost('bus_get_SetBusAreaTypeService', this.addBusType,
......@@ -278,6 +306,7 @@ export default {
if (res.data.resultCode == 1) {
this.getBusData();
this.addBusType.Name="";
this.addBusType.SeatNum=1
this.BusVisible=false;
}else{
this.Error(res.data.message);
......@@ -317,6 +346,7 @@ export default {
if (res.data.resultCode == 1) {
this.addBusType.Id = res.data.data.Id;
this.addBusType.Name = res.data.data.Name;
this.addBusType.SeatNum = res.data.data.SeatNum;
}else{
this.Error(res.data.message);
}
......
src/components/busManagement/BookAcar/CharterPreview.vue
View file @ 8ddda635
......@@ -739,7 +739,7 @@
if (res.data.resultCode == 1) {
this.Success('下单成功');
this.$router.push({
path: `/CharterOrderList?OrderType=${this.msg.OrderType}`,
path: `/CharterOrderList?Type=${this.msg.OrderType}`,
});
} else {
this.Error(res.data.message)
......
src/components/busManagement/BookAcar/components/BookAcarOrder.vue
View file @ 8ddda635
......@@ -141,7 +141,7 @@
<script>
import OrderList from './OrderList.vue';
export default {
props:['pagesTitle','type','OrderId'],
props:['pagesTitle','dataObj'],
components: { OrderList },
data() {
return {
......@@ -206,14 +206,14 @@
pagesTitle(val,oldval){
this.Title = val
},
type(val,oldval){
this.msg.OrderType = val
dataObj:{
handler(val, oldVal) {
this.msg.OrderType = val.tab
this.msg.OrderId = val.OrderId
this.GetList()
},
OrderId(val,oldval){
this.msg.OrderId = val
this.GetList()
},
},
deep: true,
}
},
methods: {
getEmployee() { //员工
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ 8ddda635
......@@ -639,7 +639,7 @@
>
<i
class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
@click="makeAdocument(item, index, 2)"
@click="makeAdocument(item, index, 3)"
></i>
</el-tooltip>
</div>
......@@ -1003,6 +1003,8 @@
text = "收款";
} else if (num == 2) {
text = "付款";
} else if (num == 3) {
text = "成本";
}
query = {
blank: "y",
......
src/components/busManagement/BookAcar/order.vue
View file @ 8ddda635
......@@ -5,16 +5,16 @@
<div>
<el-tabs v-model="tab" @tab-click="handleClick">
<el-tab-pane label="团队订单" name="0">
<TeamOrder :pagesTitle="pagesTitle"></TeamOrder>
<TeamOrder :pagesTitle="pagesTitle" :OrderId="OrderId"></TeamOrder>
</el-tab-pane>
<el-tab-pane label="接机订单" name="1">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
<BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane>
<el-tab-pane label="送机订单" name="2">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
<BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane>
<el-tab-pane label="包车订单" name="3">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
<BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane>
</el-tabs>
</div>
......@@ -27,17 +27,31 @@
data() {
return {
pagesTitle: '销售',
tab:'1'
tab:'1',
OrderId: '',
dataObj:{
tab:'1',
OrderId: 0,
}
};
},
watch: {
pagesTitle(val,oldval){
}
},
// dataObj:{
// handler(val, oldVal) {
// this.dataObj.OrderType = val.tab
// this.dataObj.OrderId = val.OrderId
// },
// deep: true,
// immediate: true,
// }
},
methods: {
handleClick(tab, event){
this.tab = tab.name
this.dataObj.tab = tab.name
}
},
created() {
......@@ -45,9 +59,20 @@
},
mounted() {
if(this.$route.query.OrderType){
this.tab = this.$route.query.OrderType
this.OrderId = this.$route.query.OrderId
this.dataObj.OrderId = this.$route.query.OrderId
if(this.$route.query.Type<4){
this.tab = this.$route.query.Type
this.dataObj.tab = this.$route.query.Type
}else{
this.tab = '0'
this.dataObj.tab = '0'
}
}else{
this.tab = '0'
this.OrderId = 0
this.dataObj.OrderId = 0
this.dataObj.tab = '0'
}
},
};
......
src/components/busManagement/BookAcar/orderOP.vue
View file @ 8ddda635
<style>
</style>
</style>
<template>
<div>
<el-tabs v-model="tab" @tab-click="handleClick">
<el-tab-pane label="团队订单" name="0">
<TeamOrder></TeamOrder>
</el-tab-pane>
<el-tab-pane label="接机订单" name="1">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
</el-tab-pane>
<el-tab-pane label="送机订单" name="2">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
</el-tab-pane>
<el-tab-pane label="包车订单" name="3">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import BookAcarOrder from './components/BookAcarOrder.vue';
import TeamOrder from '../../busManagement/tripBusOrder.vue';
export default {
components: { TeamOrder,BookAcarOrder },
data() {
return {
pagesTitle: 'OP',
tab:'1'
};
},
watch: {
pagesTitle(val,oldval){
}
},
methods: {
handleClick(tab, event){
this.tab = tab.name
<template>
<div>
<el-tabs v-model="tab" @tab-click="handleClick">
<el-tab-pane label="团队订单" name="0">
<TeamOrder :pagesTitle="pagesTitle" :OrderId="OrderId"></TeamOrder>
</el-tab-pane>
<el-tab-pane label="接机订单" name="1">
<BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane>
<el-tab-pane label="送机订单" name="2">
<BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane>
<el-tab-pane label="包车订单" name="3">
<BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import BookAcarOrder from './components/BookAcarOrder.vue';
import TeamOrder from '../../busManagement/tripBusOrder.vue';
export default {
components: { TeamOrder,BookAcarOrder },
data() {
return {
pagesTitle: 'OP',
tab:'1',
OrderId: '',
dataObj:{
tab:'1',
OrderId: 0,
}
},
created() {
};
},
watch: {
pagesTitle(val,oldval){
},
mounted() {
if(this.$route.query.OrderType){
this.tab = this.$route.query.OrderType
// dataObj:{
// handler(val, oldVal) {
// this.dataObj.OrderType = val.tab
// this.dataObj.OrderId = val.OrderId
// },
// deep: true,
// immediate: true,
// }
},
methods: {
handleClick(tab, event){
this.tab = tab.name
this.dataObj.tab = tab.name
}
},
created() {
},
mounted() {
if(this.$route.query.OrderType){
this.OrderId = this.$route.query.OrderId
this.dataObj.OrderId = this.$route.query.OrderId
if(this.$route.query.Type<4){
this.tab = this.$route.query.Type
this.dataObj.tab = this.$route.query.Type
}else{
this.tab = '0'
this.dataObj.tab = '0'
}
}else{
this.tab = '0'
this.OrderId = 0
this.dataObj.OrderId = 0
this.dataObj.tab = '0'
}
},
};
},
};
</script>
</script>
<style>
<style>
</style>
</style>
src/components/busManagement/tripBusOrder.vue
View file @ 8ddda635
......@@ -18,7 +18,7 @@
</li>
<li>
<span>
<em>订单流水号</em>
<em>订单Id</em>
<el-input v-model='msg.OrderId' class="w200"></el-input>
</span>
</li>
......@@ -42,7 +42,7 @@
</li>
<li>
<span>
<em>日期</em>
<em>开始日期</em>
<el-date-picker
style="height: 34px;"
value-format="yyyy-MM-dd"
......@@ -398,6 +398,7 @@
},
OrderId(val,oldval){
this.msg.OrderId = val
this.getList()
},
},
methods: {
......@@ -607,11 +608,11 @@
this.userInfo = this.getLocalStorage();
let myDate = new Date();
let nowDate = myDate.getFullYear() +"-" + parseInt(myDate.getMonth() + 1)+"-" +myDate.getDate();
let today = new Date(myDate.getFullYear(), parseInt(myDate.getMonth()), myDate.getDate()+2)
let nowDate2 = this.$calendarUtils.formatDate(myDate.getFullYear(), parseInt(myDate.getMonth()) + 1, myDate.getDate()+28)
this.msg.StartTime = nowDate;
this.msg.EndTime = nowDate2;
let nowDate2 = myDate.getFullYear() +"-" + parseInt(myDate.getMonth() + 2)+"-" +myDate.getDate();
this.Datelist = [nowDate,nowDate2]
this.msg.StartTime = this.Datelist[0];
this.msg.EndTime = this.Datelist[1];
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 300;
this.boxHeight = height;
......
src/router/config.js
View file @ 8ddda635
......@@ -938,7 +938,7 @@ export default {
}, {
path: '/HotelQueryList', //酒店查询统计
name: 'HotelQueryList',
component: resolve => require(['@/components/Hotel/HotelQueryList'], resolve),
component: resolve => require(['@/components/Hotel/singleProduct/HotelQueryList'], resolve),//@/components/Hotel/HotelQueryList
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