Skip to content

S
SuperMan
Commit 80f8ac78 authored by Mac's avatar Mac
Browse files
Options

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

parents c1914762 a3ca71d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4332 additions and 3889 deletions
src/assets/img/supplierBg.png deleted 100644 → 0
View file @ c1914762
This diff is collapsed.
src/components/FinancialModule/BasicDocuments.vue
View file @ 80f8ac78
......@@ -1528,7 +1528,6 @@ export default {
if(x.ID==i){
if (type) {
this.payMsgList[index].Account = x.allName;
console.log(x)
this.payMsgList[index].CurrenName =x.CurrencyName;
this.payMsgList[index].Rate = x.PayRate;
this.payMsgList[index].CurrencyId = x.CurrencyId;
......@@ -1536,7 +1535,6 @@ export default {
this.Calculation(1, index);
} else {
this.payMsg.Account = x.allName;
console.log(x)
this.payMsg.CurrenName =x.CurrencyName;
this.payMsg.Rate = x.PayRate;
this.payMsg.CurrencyId = x.CurrencyId;
......@@ -1762,7 +1760,12 @@ export default {
// }
// }
// });
this.AuditOrRefundMsg.TradeDetailList = this.GetDetail.TradeDetailList;
this.AuditOrRefundMsg.TradeDetailList = [];
this.GetDetail.TradeDetailList.forEach(x=>{
if(x.isChecked){
this.AuditOrRefundMsg.TradeDetailList.push(x);
}
})
// if(this.allMoney!=this.currentMoney){
// this.Error('原路退款金额与单据总金额不一致');
// return;
......@@ -1982,7 +1985,21 @@ export default {
Trade_Order:subItem.Trade_Order,
show: false
}
this.payMsgList.push(payMsg);
if(this.payMsgList.length==0){
this.payMsgList.push(payMsg);
}else{
var isPush =false;
this.payMsgList.forEach(x=>{
if(x.Trade_Order==subItem.Trade_Order){
isPush=true;
x.OriginalMoney = subItem.RefundMoney;
x.allMoney = subItem.RefundMoney;
}
})
if(!isPush){
this.payMsgList.push(payMsg);
}
}
let total = 0;
this.payMsgList.forEach(x=>{
total +=parseFloat(x.OriginalMoney);
......
src/components/SalesModule/groupTourOrder.vue
View file @ 80f8ac78
......@@ -141,8 +141,6 @@
padding: 9px 15px;
}
.groupSuperSearchLayer {}
.groupSuperSearchLayer>p {
padding: 20px 0;
font-size: 14px;
......
src/components/SalesVisa/VisaProduct.vue
View file @ 80f8ac78
......@@ -301,15 +301,16 @@
<tr>
<th width="10%">产品名称</th>
<th width="8%">签证类型</th>
<th width="10%">价格有效日期</th>
<th width="8%">价格有效日期</th>
<th width="8%">成本价</th>
<th width="8%">同业价</th>
<th width="8%">直客价</th>
<th width="6%">状态</th>
<th width="6%">订单数</th>
<!-- <th width="12%">总人数（剩余人数）</th> -->
<th width="10%">创建者</th>
<th width="8%">创建者</th>
<th width="10%">广告图</th>
<th width="10%">申请表</th>
<th width="14%">操作</th>
</tr>
<tr v-for="item in dataList">
......@@ -355,7 +356,7 @@
<i
class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2)"
@click="delUnpload(item.Id,item2,'广告图',1)"
></i>
</p>
<el-upload
......@@ -366,7 +367,30 @@
:show-file-list="false"
action
>
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id)">上传广告图</span>
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id,1)">上传广告图</span>
</el-upload>
</td>
<td>
<p v-for="(item2, index2) in item.ApplyForCounterfoilList" :key="index2+100">
<span
style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)"
>{{item2.Name}}</span>
<i
class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2,'申请表',2)"
></i>
</p>
<el-upload
:http-request="uploadImg"
:data="item"
ref="upload"
:multiple="false"
:show-file-list="false"
action
>
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id,2)">上传申请表</span>
</el-upload>
</td>
<td class="groupTourOrderIcon">
......@@ -642,6 +666,7 @@ export default {
currentPage: 1,
VisaManagementList: [],
buttonshow:false,
Type:0,
};
},
created(){
......@@ -673,8 +698,9 @@ export default {
}
});
},
saveitem(tcid) {
saveitem(tcid,Type) {
this.uploadTCID = tcid;
this.Type=Type;
},
//上传
uploadImg(file) {
......@@ -688,7 +714,8 @@ export default {
Path: this.domainManager().ViittoFileUrl + x.data.FilePath,
FileName: file.file.name,
Status: 1,
VId: this.uploadTCID
VId: this.uploadTCID,
Type:this.Type,
},
res => {
if (res.data.resultCode === 1) {
......@@ -701,8 +728,8 @@ export default {
);
});
},
delUnpload: function(tcid, item) {
this.$confirm("是否删除该广告图?", "提示", {
delUnpload: function(tcid, item,str,Type) {
this.$confirm( `是否删除该${str}?`, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
......@@ -713,7 +740,8 @@ export default {
Path: item.FullUrl,
FileName: item.Name,
Status: 2,
VId: tcid
VId: tcid,
Type:Type,
},
res => {
if (res.data.resultCode === 1) {
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ 80f8ac78
......@@ -121,7 +121,7 @@
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="10%">单号</th>
<th width="10%">业务员</th>
<th width="8%">业务员</th>
<th width="4%">人数</th>
<th width="8%">出发日期</th>
<th width="8%">报名日期</th>
......@@ -133,7 +133,7 @@
<th width="5%">在途</th>
<th width="7%">订单状态</th>
<th width="5%">状态</th>
<th width="8%">操作</th>
<th width="12%">操作</th>
</tr>
<tbody v-for='item in dataList'>
<tr>
......@@ -192,6 +192,10 @@
<!-- 订单拆分 -->
<el-tooltip v-if="item.PeopleNum==item.GuestList.length" class="item" effect="dark" content="订单拆分" placement="top-start">
<el-button type="primary" style='background:#47BF8C; border-color:#47BF8C;' icon="el-icon-edit" @click="goUrl2('OrderSplitting',item.Id,'订单拆分')"></el-button>
</el-tooltip>
<!-- 修改金额 -->
<el-tooltip v-if="EmployeeId==1&& item.VisaType==1" class="item" effect="dark" content="修改金额" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px' icon="el-icon-edit" @click='Edit(item)'></el-button>
</el-tooltip>
</td>
</tr>
......@@ -247,6 +251,18 @@
:page-size="this.msg.pageSize"
:total="total">
</el-pagination>
<el-dialog
title="修改金额"
:visible.sync="EditVisible"
width="400px">
<div>
金额：<el-input style="width:300px" v-model="EditMsg.TotalPrice"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="EditVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="PerferPrice">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
......@@ -271,9 +287,31 @@ export default {
currentPage: 1,
isShow:0,
PreferPrice:0,
IncomePrice:0
IncomePrice:0,
EmployeeId:0,
EditVisible:false,
EditMsg:{
TotalPrice:0,
},
}
},methods:{
PerferPrice(){
this.apipost('dmc_get_visa_SetVisaOrderPrice',this.EditMsg,res=>{
if(res.data.resultCode==1){
this.EditVisible=false;
this.Success(res.data.message)
this.getList();
}else{
this.Error(res.data.message)
}
},err=>{})
},
Edit(item){
this.EditVisible=true;
this.EditMsg.OrderId=item.Id;
this.EditMsg.TotalPrice=item.TotalPrice;
},
goUrlVisaList(obj){
if(obj.VisaPlanIdStr=="" || obj.VisaPlanIdStr==null){
this.$router.push({ name: 'visaList2',query:{"visaPlanId":obj.VisaPlanId,blank:'y',tab:'签证详情'} })
......@@ -343,6 +381,8 @@ export default {
this.getList();
},
},mounted(){
let userinfo = this.getLocalStorage();
this.EmployeeId = userinfo.EmployeeId;
if (this.$route.query.name!==undefined) {
this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")"
this.nameShow = true
......
src/components/SalesVisa/salesOrderToday.vue
View file @ 80f8ac78
......@@ -109,11 +109,11 @@
<th width="10%">业务员</th>
<th width="5%">人数</th>
<th width="10%">出发日期</th>
<th width="10%">报名日期</th>
<th width="9%">报名日期</th>
<th width="15%">备注</th>
<th width="8%">应收金额</th>
<th width="7%">订单状态</th>
<!-- <th width="8%">操作</th> -->
<th width="10%">操作</th>
</tr>
<tr v-for='(item,index) in dataList' :key="index">
<td>
......@@ -144,7 +144,11 @@
</td>
<td>
{{item.OrderStateStr}}
<!-- <span class="fz12" v-if="item.VisaOrderStatus==2">操作：{{item.UpdateName}}</span> -->
</td>
<td>
<el-tooltip v-if="EmployeeId==1&& item.VisaType==1" class="item" effect="dark" content="修改金额" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;padding:5px' icon="el-icon-edit" @click='Edit(item)'></el-button>
</el-tooltip>
</td>
<!-- <td class="groupTourOrderIcon">
<el-tooltip effect="dark" content="签证详情" placement="top-start">
......@@ -167,6 +171,19 @@
:page-size="this.msg.pageSize"
:total="total">
</el-pagination>
<el-dialog
title="修改金额"
:visible.sync="EditVisible"
width="400px">
<div>
金额：<el-input style="width:300px" v-model="EditMsg.TotalPrice"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="EditVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="PerferPrice">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
......@@ -194,8 +211,31 @@ export default {
total: 0,
currentPage: 1,
isShow:0,
EmployeeId:0,
EditVisible:false,
EditMsg:{
TotalPrice:0,
},
}
},methods:{
},
methods:{
PerferPrice(){
this.apipost('dmc_get_visa_SetVisaOrderPrice',this.EditMsg,res=>{
if(res.data.resultCode==1){
this.EditVisible=false;
this.Success(res.data.message)
this.getList();
}else{
this.Error(res.data.message)
}
},err=>{})
},
Edit(item){
this.EditVisible=true;
this.EditMsg.OrderId=item.OrderId;
this.EditMsg.TotalPrice=item.PreferPrice;
},
goUrlR: function (item) {
if (item.VisaType === 1) {
this.$router.push({ name: 'VisaProductOrder', query: { id: item.TCID, blank:'y', tab: '签证详情'} });
......@@ -250,7 +290,10 @@ export default {
this.msg.pageIndex = val;
this.getList();
},
},mounted(){
},
mounted(){
let userinfo = this.getLocalStorage();
this.EmployeeId = userinfo.EmployeeId;
if (this.$route.query.name!==undefined) {
this.visaProduct = this.$route.query.name+"("+this.$route.query.sendDate+")"
this.nameShow = true
......
src/components/Supplier/roomQuery.vue
View file @ 80f8ac78
......@@ -140,21 +140,73 @@
{{childItem.CheckInDateStr}}
</td>
<td class="tdLeft">
<template v-if="childItem.SupplierId==UserInfo.SupplierId"> {{childItem.NewHotelName}}</template>
<template v-if="childItem.SupplierId==UserInfo.SupplierId"> {{childItem.NewHotelName}}</template>
<template v-else>
组团社自理
</template>
组团社自理
</template>
</td>
<td>
<span style="color:red;">
<template v-if="childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
<template
v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
</template>
</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<el-tooltip class="item" effect="dark" content="操作信息" placement="top-start" style="display:none;">
<el-popover placement="bottom" width="460" trigger="click">
<table>
<tr>
<th width="100">
时间
</th>
<th width="150">
酒店
</th>
<th width="100">
数量
</th>
<th width="100">
状态
</th>
</tr>
<tr v-for="opItem in subItem.hotelList">
<template v-if="opItem.SupplierId==UserInfo.SupplierId">
<td>
{{opItem.CheckInDateStr}}
</td>
<td>
{{opItem.NewHotelName}}
</td>
<td>
<el-input style="width:60px;" v-model='opItem.SupplierBookNum' type='text'
placeholder="预订数量">
</el-input> 间
</td>
<td>
<el-select v-model="opItem.SupplierHotelStatus" filterable class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option label='未操作' :value='0' :key='0'>
</el-option>
<el-option label='操作中' :value='1' :key='1'>
</el-option>
<el-option label='操作完成' :value='2' :key='2'>
</el-option>
</el-select>
</td>
</template>
</tr>
</table>
<p class="alcenter mt10">
<input type="button" value="保存" @click="SaveSupplierData(subItem.hotelList)" class="normalBtn" />
</p>
<a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference">操作</a>
</el-popover>
</el-tooltip>
<a style="text-decoration:underline;color:blue;cursor:pointer"
@click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
<template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
......@@ -164,6 +216,13 @@
@click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
</td>
</tr>
<template v-if="subItem.SupplierRemarks">
<tr v-if="subIndex==0" :class="{roomQuerySplitTrCss:index%2!=0}">
<td colspan="8" class="redTip">
<p>备注：{{subItem.SupplierRemarks}}</p>
</td>
</tr>
</template>
</template>
</template>
</table>
......@@ -201,7 +260,7 @@
PriceStatus: 0,
CombinationNum: ''
},
UserInfo:{},
UserInfo: {},
//分公司类表
companyList: [],
//酒店列表
......@@ -342,7 +401,6 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
console.log("dataList",this.dataList);
} else {
this.$message.error(res.data.message)
}
......@@ -363,13 +421,28 @@
err => {}
);
},
//保存酒店新
SaveSupplierData(hotelList) {
this.ApiPost2(
"dmcstatistics_post_SetNewHotelOrder_Supplier", hotelList,
res => {
if (res.data.resultCode == 1) {
this.Success("操作成功!");
this.getList();
} else {
this.Error("操作失败!");
}
},
err => {}
);
},
//下载Excel
DownLoadHotel() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.UserInfo.SupplierAccountId,
OPType:1
OPType: 1
};
let fileName = "订房查询" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
......@@ -459,7 +532,7 @@
},
},
mounted() {
this.UserInfo=this.getLocalStorageSupplier();
this.UserInfo = this.getLocalStorageSupplier();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -493,7 +566,7 @@
background: #eee !important;
}
.roomQuery_SupplierTable{
.roomQuery_SupplierTable {
width: 98%;
font-size: 12px;
color: #333;
......@@ -514,11 +587,17 @@
border: 1px solid #d1d1d1;
text-align: center;
padding: 5px 0;
}
}
.roomQuery_SupplierTable .tdLeft {
text-align: left;
padding-left: 5px;
}
.roomQuery_SupplierTable .redTip {
text-align: left;
color: red;
padding-left: 5px;
}
</style>
src/components/SupplierIndex.vue
View file @ 80f8ac78
This diff is collapsed.
src/components/SupplierLogin.vue
View file @ 80f8ac78
......@@ -48,7 +48,7 @@
<div class="homepage-hero-module">
<div :style="{'height':'100vh'}">
<div class="item">
<img :style="{'height':'100vh'}" src="../assets/img/supplierBg.png" />
<img :style="{'height':'100vh'}" src="../assets/img/supplierBg.jpg" />
</div>
</div>
</div>
......
src/components/activity/ItineraryCustomizer.vue
View file @ 80f8ac78
......@@ -60,7 +60,7 @@
<el-dialog custom-class='w400' title="行程定制师" :visible.sync="Visible">
<el-form :model="pwdMsg" label-width="80px" :rules="rulesPwd" ref="pwdMsg">
<el-form-item label="员工ID" prop="employeeId">
<el-select class='w217' v-model="pwdMsg.employeeId" placeholder="请选择">
<el-select class='w217' v-model="pwdMsg.employeeId" filterable placeholder="请选择">
<el-option v-for="item in employee" :key="item.employeeId" :label="`${item.bName} ${item.departmentName}(${item.name})`" :value="item.employeeId"></el-option>
</el-select>
</el-form-item>
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 80f8ac78
......@@ -235,7 +235,7 @@
</td>
<td>
<div class="fz16 fbold linkspan">
<span @click="goUrlRR('confirmationOrderDownLoad',item)" style="color: #4BCA81;"
<span @click="toTrip(item)" style="color: #4BCA81;"
v-if="item.ResultReport.LetterDeparture==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.LetterDeparture=='-1'?"x":"O"}}</span>
</div>
......@@ -423,15 +423,22 @@
</div>
<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 custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1"></tripDownLoadCommon>
</el-dialog>
</div>
</template>
<script>
import tripDownLoadCommon from "../../commonPage/TripDownLoadCommon.vue";
export default {
data() {
return {
loading: false,
currentPage: 1,
total: 0,
travelControlTripLayerShow: false,
msg: {
StartDate: '',
EndDate: '',
......@@ -471,6 +478,12 @@
AirlineList: [],
EmployeeList: [],
},
tripObj: {
tcid: 0,
configId: 0,
cityId: 0,
orderId: 0
},
pickerBeginDateBefore: {
disabledDate: time => {
if (this.msg.EndDate == null) {
......@@ -489,6 +502,9 @@
}
}
},
components: {
tripDownLoadCommon
},
methods: {
openChart(obj) {
this.MsgBus.$emit('openChat', {
......@@ -720,6 +736,16 @@
err => {}
)
},
toTrip: function (obj) {
this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigID;
this.tripObj.cityId = obj.StartCityIdS;
this.tripObj.orderId = 0;
this.travelControlTripLayerShow = true;
},
hideTripDown() {
this.travelControlTripLayerShow = false;
}
},
mounted() {
let myDate = new Date();
......
src/plug/index.js
View file @ 80f8ac78
......@@ -118,7 +118,8 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
domainUrl = "http://192.168.2.214:8082";
// domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......@@ -149,7 +150,7 @@ export default {
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.2.214:8120",
//文件站点
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.2.214:8130',
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.106:9000",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
};
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