Skip to content

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

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

parents ad73887b 746be6de
Show whitespace changes
Inline Side-by-side
Showing with 303 additions and 44 deletions
src/App.vue
View file @ aca883b8
......@@ -257,4 +257,63 @@
.groupTourOrderByTuan_ico>span {
vertical-align: middle;
}
.groupTourOrder_count {
margin: 0 0 20px 0;
width: 100%;
height: auto;
}
.groupTourOrder_count_col {
height: 80px;
}
.groupTourOrder_count_item {
font-weight: 400;
padding: 10px;
height: 100%;
border: 1px solid #E6E6E6;
background-color: #FFFFFF;
color: #333333;
}
.groupTourOrder_count_item>div>i {
font-size: 12px;
vertical-align: bottom;
}
.groupTourOrder_count_item>div>span:nth-child(2) {
font-size: 14px;
vertical-align: bottom;
}
.groupTourOrder_count_item>div>span:nth-child(3) {
font-weight: bold;
font-size: 16px;
vertical-align: bottom;
}
.groupTourOrder_count_item>p {
font-size: 12px;
line-height: 18px;
}
.groupTourOrder_count_item>p>span {
margin: 0 5px 0 0;
white-space: nowrap;
}
.groupTourOrder_count_green {
color: #1BC594;
}
.groupTourOrder_count_blue {
color: #4D7AFD;
}
.groupTourOrder_count_yellow {
color: #FF9C00;
}
.groupTourOrder_count_gray {
color: #999999;
}
</style>
\ No newline at end of file
src/components/FinancialModule/BasicDocuments.vue
View file @ aca883b8
......@@ -1582,8 +1582,57 @@ export default {
}
});
},
// 获取包车type
GetCarList(path) {
let data = {
pageIndex: 1,
pageSize: 5,
OrderType: '',
OrderId: this.GetDetail.ReFinanceId,
OrderNo: '',
SurName: '',
Name: '',
OrderStatus: 0,
StartTime: '',
EndTime: '',
OrderSTime: '',
OrderETime: '',
ProductName: '',
Mobile: '',//电话
IsSelectSale: 1,
EnterID: 0,//业务员
}
let url
url = "CarSingle_post_GetAdminCarOrderPageList"
this.apipost(url, data,
res => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
let OrderType
if(data&&data.length>0){
OrderType = data[0].OrderType
}
this.$router.push({
path: path,
query: {
OrderType: OrderType?OrderType:4,
OrderId: this.GetDetail.ReFinanceId,
blank: 'y'
}
});
}else {
this.Error(res.data.message);
}
},
err => {}
);
},
// 单项酒店订单
ImpressionSingleDetails(path){
if(this.GetDetail.OtherType==67){
this.GetCarList(path)
}else{
this.$router.push({
path: path,
query: {
......@@ -1591,6 +1640,8 @@ export default {
blank: 'y'
}
});
}
},
// 印象票务制单详情
ImpressionTicketDetails(path){
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ aca883b8
......@@ -1052,8 +1052,57 @@ export default {
}
});
},
// 获取包车type
GetCarList(path) {
let data = {
pageIndex: 1,
pageSize: 5,
OrderType: '',
OrderId: this.GetDetail.ReFinanceId,
OrderNo: '',
SurName: '',
Name: '',
OrderStatus: 0,
StartTime: '',
EndTime: '',
OrderSTime: '',
OrderETime: '',
ProductName: '',
Mobile: '',//电话
IsSelectSale: 1,
EnterID: 0,//业务员
}
let url
url = "CarSingle_post_GetAdminCarOrderPageList"
this.apipost(url, data,
res => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
let OrderType
if(data&&data.length>0){
OrderType = data[0].OrderType
}
this.$router.push({
path: path,
query: {
OrderType: OrderType?OrderType:4,
OrderId: this.GetDetail.ReFinanceId,
blank: 'y'
}
});
}else {
this.Error(res.data.message);
}
},
err => {}
);
},
// 单项酒店订单
ImpressionSingleDetails(path){
if(this.GetDetail.OtherType==67){
this.GetCarList(path)
}else{
this.$router.push({
path: path,
query: {
......@@ -1061,6 +1110,8 @@ export default {
blank: 'y'
}
});
}
},
// 印象票务制单详情
ImpressionTicketDetails(path){
......
src/components/Hotel/reservation/HotelOrderList.vue
View file @ aca883b8
......@@ -366,10 +366,13 @@
mounted() {
this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage();
if(this.$route.query.OrderId){
this.msg.OrderId = this.$route.query.OrderId
}
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.OrderId = crmOrderObj.OrderId
console.log(crmOrderObj.OrderId,'======酒店订单')
}
this.getEmployee()
......
src/components/Hotel/reservation/OrderList.vue
View file @ aca883b8
......@@ -524,7 +524,7 @@
</el-table-column>
<el-table-column label="毛利" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?scope.row.Income-scope.row.CostMoney-scope.row.Refund:'-' }}</span>
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
</el-table>
......@@ -1047,6 +1047,7 @@ export default {
query: {
id: obj.OrderId,
OrderType: 1,
isShoufeifei: obj.HandFittingTax?true:false,
blank: "y",
tab: title
}
......
src/components/Hotel/roomReservationsDetails.vue
View file @ aca883b8
......@@ -249,7 +249,7 @@
<tr>
<td colspan="2">
<span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">{{$t('ground.wshoupeifei')}}</span>
<span v-if="subItem.IsHaveShouPeiFee==1"
<span v-if="subItem.IsHaveShouPeiFee==1&&isShoufeifei"
style="color:red;">{{$t('ground.shoupeifei')}}:{{subItem.ShouPeiMoney}}</span>
</td>
</tr>
......@@ -603,6 +603,7 @@
export default {
data() {
return {
isShoufeifei: false,
LineId: 0,
EditBtn: false, //房餐景点修改权限
defaultSelectValue: 0,
......@@ -1238,6 +1239,7 @@
this.GuestNum = this.$route.query.GuestNum;
this.IsCombine = this.$route.query.IsCombine;
this.NewTCIDs = this.$route.query.NewTCIDs;
this.isShoufeifei = this.$route.query.isShoufeifei
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 55;
this.boxHeight = height;
......
src/components/Hotel/roomReservationsDetails_swt.vue
View file @ aca883b8
......@@ -212,7 +212,7 @@
<tr>
<td colspan="2">
<span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">{{$t('ground.wshoupeifei')}}</span>
<span v-if="subItem.IsHaveShouPeiFee==1"
<span v-if="subItem.IsHaveShouPeiFee==1&&isShoufeifei"
style="color:red;">{{$t('ground.shoupeifei')}}:{{subItem.ShouPeiMoney}}</span>
</td>
</tr>
......@@ -540,6 +540,7 @@
export default {
data() {
return {
isShoufeifei: false,
EditBtn: false, //房餐景点修改权限
defaultSelectValue: 0,
list: [],
......@@ -1111,6 +1112,7 @@
this.NewTCIDs = this.$route.query.NewTCIDs;
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 55;
this.isShoufeifei = this.$route.query.isShoufeifei
this.boxHeight = height;
this.offsetwidth = width;
this.initSupplier();
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ aca883b8
......@@ -887,7 +887,7 @@
<th width="5%">状态</th>
<th width="12%">操作</th>
</tr>
<tbody v-for='item in dataList'>
<tbody v-for='(item,index) in dataList'>
<tr>
<td>
<span class="fz16">{{item.VisaTCNUM}}({{item.Id}})</span>
......@@ -1161,11 +1161,12 @@
if (row.tcid) {
TCIDARR.push(row.tcid)
}
let orderObj = {
OrderID: row.id,
OrderID: row.Id,
OrderSource: 10,
Obj: {},
SourceID: row.visaId,
SourceID: row.VisaId,
TCIDList: TCIDARR,
ReFinanceId2: num,
MatchFrId:0
......@@ -1173,7 +1174,7 @@
let query = {};
query = {
path: 'SaleOrderModule',
companyID: row.rB_Branch_Id,
companyID: row.OutBranchId,
visaType: true,
blank: 'y',
orderObj: JSON.stringify(orderObj),
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ aca883b8
......@@ -615,9 +615,9 @@
(scope.row.TicketStatus==5?'Black':''))))">
{{item.TicketStatusName}}
</span>
<i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'"
<!-- <i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'"
class="c3FC4FF cursor-pointer el-icon-document-checked"
@click="viewCredentials(scope.row)"></i>
@click="viewCredentials(scope.row)"></i> -->
</template>
</el-table-column>
<el-table-column label="签证状态" style="background:#EAEAEA">
......@@ -639,7 +639,8 @@
style="background:#EAEAEA"
>
<template slot-scope="scope">
<span class="fz15 fbold"></span>
<input type="button" class="normalBtn" value="查看"
@click="goDetails(scope.row)" />
</template>
</el-table-column>
<template slot="append" v-if="item.Remark">
......@@ -1028,6 +1029,20 @@
}
},
methods: {
goDetails(item){
let data = [
{
path: "myCustomerOrder",
OrderId: item.OrderId
},
];
let href = this.domainManager().crmRoutingUrl +
"automaticLogin?token=" +
this.getLocalStorage().token +
"&data=" +
JSON.stringify(data);
window.open(href);
},
// 签证状态
AmendVisa(){
......
src/components/SingleAirTicket/components/TicketOrder.vue
View file @ aca883b8
......@@ -123,18 +123,87 @@
</li>
</ul>
</div>
<template>
<div style="display: flex;justify-content: end;margin-bottom: 10px;">
<!-- 统计版块 -->
<div class="groupTourOrder_count">
<el-row :gutter="20">
<el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_total">
<div>
<i class="iconfont icon-qian groupTourOrder_count_green"></i>
<span>{{$t('op.TotalMoney')}}</span>
</div>
<p>
<span class="groupTourOrder_count_green">{{$t('op.TotalMoney')}}：
{{TotalMsg.Money}}
</span>
<span class="groupTourOrder_count_green">{{$t('salesModule.TotalIncome')}}：
{{TotalMsg.Money-TotalMsg.PayMoney}}
</span>
<span class="color_red_order">{{$t('op.Tocollected')}}：
{{TotalMsg.DueinMoney}}
</span>
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_total">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_blue"></i>
<span>{{$t('restaurant.res_Number')}}</span>
</div>
<p>
<span class="groupTourOrder_count_green">{{$t('op.TotalRoomNum')}}：
{{TotalMsg.NorNumber}}
</span>
<span class="color_red_order">{{$t('op.CanCelRoomNum')}}：
{{TotalMsg.CancelNum}}
</span>
</p>
</div>
</el-col>
<!-- <el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_total">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>{{$t('fnc.qtxtongji')}}</span>
</div>
<p>
<span class="groupTourOrder_count_green">{{$t('fnc.nbbaoming')}}：
{{TotalMsg.totalERP}}
</span>
<span class="color_red_order">{{$t('fnc.B2BWAP')}}：
{{TotalMsg.totalB2B}}
</span>
</p>
</div>
</el-col> -->
<el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_totalFinacel">
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>{{$t('fnc.cwdjshuoming')}}</span>
</div>
<p>
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</p>
</div>
</el-col>
</el-row>
</div>
<!-- <div style="display: flex;justify-content: end;margin-bottom: 10px;">
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</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>
<el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
</template>
</div>
</template>
<script>
......@@ -144,6 +213,7 @@
components: { OrderList },
data() {
return {
TotalMsg: null,
MultipleChoiceList: [ //多选项目
{
Name: '机票',
......@@ -448,6 +518,7 @@
});
this.OrderList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.TotalMsg = res.data.data.StatModel
}else {
this.Error(res.data.message);
}
......
src/components/TravelManager/TravelTeam/chooseCustomer.vue
View file @ aca883b8
......@@ -35,11 +35,11 @@
{{scope.row.ContactNumber}}
</template>
</el-table-column>
<el-table-column fixed label="关联销售" min-width="180">
<!-- <el-table-column fixed label="关联销售" min-width="180">
<template slot-scope="scope">
{{scope.row.EmName}}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column fixed label="地址" min-width="180">
<template slot-scope="scope">
{{scope.row.Address}}
......@@ -97,13 +97,13 @@
getCustomerList() {
this.loading = true;
this.apipost(
"app_customer_GetCustomerListForCareOf",
"app_post_GetAllCustomerPage",
this.qMsg,
(res) => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pages.pageData;
this.qMsg.total = res.data.data.pages.count;
this.dataList = res.data.data.pageData;
this.qMsg.total = res.data.data.count;
} else {
this.$message.error(res.data.message);
}
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ aca883b8
......@@ -89,9 +89,11 @@
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>机位信息</span></div>
<div class="mb"><span>经济舱: {{item.YSeat}}</span></div>
<div class="mb"><span>商务舱: {{item.CSeat}}</span></div>
<div class="mb"><span>头等舱: {{item.FSeat}}</span></div>
<div class="mb"><span>经济舱: {{item.YSeat}} 剩余:{{item.SurplusYSeatNum}}</span></div>
<div class="mb"><span>商务舱: {{item.CSeat}} 剩余:{{item.SurplusCSeatNum}}</span></div>
<div class="mb"><span>头等舱: {{item.FSeat}} 剩余:{{item.SurplusFSeatNum}}</span></div>
<div class="mb"><span>报名人数: {{item.OrderGuestNum}} </span></div>
<div class="mb"><span>领队导游: {{item.LeaderNum}} </span></div>
</div>
</div>
<div class="el-col w_10">
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ aca883b8
......@@ -568,7 +568,7 @@
</el-table-column>
<el-table-column label="毛利" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?scope.row.Income-scope.row.CostMoney-scope.row.Refund:'-' }}</span>
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
</el-table>
......
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ aca883b8
......@@ -536,7 +536,7 @@
</el-table-column>
<el-table-column label="毛利" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?scope.row.Income-scope.row.CostMoney-scope.row.Refund:'-' }}</span>
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
</el-table>
......
src/components/busManagement/BookAcar/orderOP.vue
View file @ aca883b8
......@@ -62,6 +62,8 @@
}else{
this.dataObj.tab = '0'
}
}else if(this.$route.query.OrderId){
this.dataObj.OrderId = this.$route.query.OrderId
}else if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.dataObj.OrderId = crmOrderObj.OrderId
......
src/components/busManagement/tripBusOrder.vue
View file @ aca883b8
......@@ -647,7 +647,6 @@
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/components/scenicSpot/reservation/OrderList.vue
View file @ aca883b8
......@@ -610,7 +610,7 @@
</el-table-column>
<el-table-column label="毛利" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?scope.row.Income-scope.row.CostMoney-scope.row.Refund:'-' }}</span>
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
</el-table>
......
src/plug/index.js
View file @ aca883b8
......@@ -119,7 +119,7 @@ export default {
let crmUrl = ""; //crm API
let locationName = window.location.hostname;
// domainUrl = "http://192.168.10.128";
domainUrl = "http://192.168.10.128" // 刘东电脑
domainUrl = "http://192.168.10.9:8083" // 刘东电脑
// domainUrl = "http://192.168.10.206:8015";
// domainUrl = "http://reborn.oytour.com";
let crmLocalFileStreamDownLoadUrl = "";
......@@ -177,7 +177,7 @@ export default {
mallUrl: mallUrl,
lxymallUrl: lxymallUrl,
crmUrl: crmUrl,
crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8081/#/",
crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8080/#/",
};
return obj;
},
......
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