Skip to content

S
SuperMan
Commit 12ebad01 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents c6f87f4e 83def117
Show whitespace changes
Inline Side-by-side
Showing with 387 additions and 64 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 12ebad01
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
<el-tooltip class="item" effect="dark" content="新增" placement="top-start"> <el-tooltip class="item" effect="dark" content="新增" placement="top-start">
<el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button> <el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.HotelOrderList.length>1" class="item" effect="dark" content="删除" <el-tooltip v-if="item.HotelOrderList.length>1||index==0" class="item" effect="dark" content="删除"
placement="top-start"> placement="top-start">
<el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'> <el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
</el-button> </el-button>
......
src/components/SalesModule/groupTourOrder.vue
View file @ 12ebad01
...@@ -2163,7 +2163,13 @@ ...@@ -2163,7 +2163,13 @@
}, },
SuperiorPeople: [], SuperiorPeople: [],
TransferMission:'',//订单转团权限 TransferMission:'',//订单转团权限
Unit_Price:0 Unit_Price:0,
goLVurl:{ //跳转到旅客页面的参数
orderId:'',
tcid:'',
tcnum:'',
isOrder:'',
},
} }
}, },
components: { components: {
...@@ -2687,6 +2693,10 @@ ...@@ -2687,6 +2693,10 @@
} }
}, },
getDetail(obj) { getDetail(obj) {
this.goLVurl.orderId = obj.orderId;
this.goLVurl.tcid = obj.tcid;
this.goLVurl.tcnum = obj.tcnum;
this.goLVurl.isOrder = obj.isOrder;
this.Ysze = false; this.Ysze = false;
this.starTime = obj.startDate this.starTime = obj.startDate
this.endTime = obj.backDate this.endTime = obj.backDate
...@@ -3439,6 +3449,10 @@ ...@@ -3439,6 +3449,10 @@
this.clearMsg() this.clearMsg()
this.getList() this.getList()
this.isShowLayer = false this.isShowLayer = false
if(res.data.data == 1){
this.$router.push({ name: 'passengerSaleList', query: { id: this.goLVurl.orderId,tcid: this.goLVurl.tcid, tcnum: this.goLVurl.tcnum,isOrder: this.goLVurl.isOrder, blank: 'y', tab: '旅客名单'} });
}
} else { } else {
this.isShowLayer = false this.isShowLayer = false
this.$message.error(res.data.message) this.$message.error(res.data.message)
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 12ebad01
...@@ -2526,6 +2526,14 @@ ...@@ -2526,6 +2526,14 @@
SuperiorPeople:[], SuperiorPeople:[],
TransferMission:'',//订单转团 TransferMission:'',//订单转团
Unit_Price:0,// 地接临时存值 Unit_Price:0,// 地接临时存值
goLVurl:{ //跳转到旅客页面的参数
orderId:'',
tcid:'',
tcnum:'',
isOrder:'',
},
}; };
}, },
components: { components: {
...@@ -3015,6 +3023,10 @@ ...@@ -3015,6 +3023,10 @@
}, },
// 点击修改 // 点击修改
getDetail(obj) { getDetail(obj) {
this.goLVurl.orderId = obj.orderId;
this.goLVurl.tcid = obj.tcid;
this.goLVurl.tcnum = obj.tcnum;
this.goLVurl.isOrder = obj.isOrder;
this.Ysze=false; this.Ysze=false;
this.starTime = obj.startDate; this.starTime = obj.startDate;
this.endTime = obj.backDate; this.endTime = obj.backDate;
...@@ -3809,6 +3821,10 @@ ...@@ -3809,6 +3821,10 @@
this.clearMsg(); this.clearMsg();
this.getList(); this.getList();
this.isShowLayer = false; this.isShowLayer = false;
if(res.data.data == 1){
this.$router.push({ name: 'passengerSaleList', query: { id: this.goLVurl.orderId,tcid: this.goLVurl.tcid, tcnum: this.goLVurl.tcnum,isOrder: this.goLVurl.isOrder, blank: 'y', tab: '旅客名单'} });
}
} else { } else {
this.isShowLayer = false; this.isShowLayer = false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 12ebad01
...@@ -987,7 +987,7 @@ ...@@ -987,7 +987,7 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="婴儿人数" prop="BabyNum"> <el-form-item label="婴儿人数" prop="BabyNum">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')" <el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')"
@input='getNumber();getTotalPrice();getTotalPrice()'></el-input> @input='getNumber();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -1094,7 +1094,7 @@ ...@@ -1094,7 +1094,7 @@
<input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')" /> <input type="button" class="normalBtn" value="保存" @click="submitForm('addMsg')" />
</span> </span>
</p> </p>
<el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="80px"> <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType"> <el-form-item label="客户类型" prop="CustomerType">
...@@ -1105,7 +1105,7 @@ ...@@ -1105,7 +1105,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="参团类型" prop="GroupType"> <el-form-item label="参团类型" prop="GroupType">
<el-select v-model='addMsg.GroupType' filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model='addMsg.GroupType' filterable :placeholder="$t('pub.pleaseSel')" @change="gettypechange(addMsg.GroupType)">
<el-option v-for="item in ctlxList" :label='item.Name' :value='item.Id' :key='item.Id' <el-option v-for="item in ctlxList" :label='item.Name' :value='item.Id' :key='item.Id'
v-if="item.Id!=5"> v-if="item.Id!=5">
</el-option> </el-option>
...@@ -1181,15 +1181,23 @@ ...@@ -1181,15 +1181,23 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5" v-if="isChecked==true"> <el-col :span="5" v-if="isChecked==true">
<el-form-item label="成交单价" prop="Unit_Price"> <template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')"
@change="getTotalPrice()"> @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'> <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<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-form-item>
</template>
<el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4" >
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
<el-form-item v-show="addMsg.GroupType != 4">
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p> <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item> </el-form-item>
...@@ -1207,7 +1215,7 @@ ...@@ -1207,7 +1215,7 @@
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div> <div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="成人人数" prop="ManNum"> <el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')" <el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
...@@ -1215,37 +1223,37 @@ ...@@ -1215,37 +1223,37 @@
<el-col :span="4"> <el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;"> <p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p> 本团不支持儿童出游!</p>
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum"> <el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')" <el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if='IsChildrenTour==1'> <el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="儿童占床" prop="ChirdNeedBedNum"> <el-form-item label="儿童占床" prop="ChirdNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ChirdNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')" <el-input v-model='addMsg.ChirdNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')"
@input='getHouseNo();getTotalPrice()'></el-input> @input='getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if='IsChildrenTour==1'> <el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="婴儿人数" prop="BabyNum"> <el-form-item label="婴儿人数" prop="BabyNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')" <el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')"
@input='getNumber();getTotalPrice();getTotalPrice()'></el-input> @input='getNumber();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="老人人数" prop="OldPeopleNum"> <el-form-item label="老人人数" prop="OldPeopleNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.OldPeopleNum' @keyup.native="checkInteger(addMsg,'OldPeopleNum')" <el-input v-model='addMsg.OldPeopleNum' @keyup.native="checkInteger(addMsg,'OldPeopleNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="3">
<el-row :gutter="20"> <el-form-item label="单地接数量" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
<el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input> @input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="单房数量" prop="SingleRoomNum"> <el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')" <el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
...@@ -3075,7 +3083,8 @@ ...@@ -3075,7 +3083,8 @@
OrderUnitPrice: 0 OrderUnitPrice: 0
}, },
SuperiorPeople: [], SuperiorPeople: [],
IsBackStatus: 1 IsBackStatus: 1,
Unit_Price:0
}; };
}, },
components: { components: {
...@@ -3182,7 +3191,13 @@ ...@@ -3182,7 +3191,13 @@
this.IsBirdDiscount = x.IsBirdDiscount; this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople; this.OpSetLossPeople = x.OpSetLossPeople;
this.OpSetLossMoney = x.OpSetLossMoney; this.OpSetLossMoney = x.OpSetLossMoney;
if(this.addMsg.GroupType == 4){
this.HightUnitPrice = '1'
this.Unit_Price = x.Unit_Price
}else {
this.HightUnitPrice = '2'
this.Unit_Price = this.addObj.SingleDMCPrice
}
this.stratPrice = 0; this.stratPrice = 0;
if (res.data.data.modelPrice && res.data.data.modelPrice.GoAddPrice) { if (res.data.data.modelPrice && res.data.data.modelPrice.GoAddPrice) {
this.stratPrice = res.data.data.modelPrice.GoAddPrice; this.stratPrice = res.data.data.modelPrice.GoAddPrice;
...@@ -3217,7 +3232,7 @@ ...@@ -3217,7 +3232,7 @@
this.Unit_PriceList = []; this.Unit_PriceList = [];
this.apipost('sellorder_post_GetLessPrice', { this.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.TCID, "TCID": obj.TCID,
"MaxPeopleNum": MaxPeopleNum "MaxPeopleNum": maxPeopleNum
}, res => { }, res => {
this.LessMoney = res.data.data.lessMoney; this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) { if (parseFloat(this.LessMoney) > 0) {
...@@ -3729,7 +3744,19 @@ ...@@ -3729,7 +3744,19 @@
} }
}, },
getTotalPrice() { getTotalPrice(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) {
this.$message.error('成交单价必须大于等于本团单价！')
this.addMsg.Unit_Price = this.addMsg.TC_Price
return
}
}
if (this.addMsg.GroupType != 5) { if (this.addMsg.GroupType != 5) {
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1 this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
if (this.addObj.IsBirdDiscount == 1) { if (this.addObj.IsBirdDiscount == 1) {
...@@ -3782,8 +3809,12 @@ ...@@ -3782,8 +3809,12 @@
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)) * Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice)); (Number(this.stratPrice) + Number(this.returnPrice));
let dandijie = let dandijie
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); if(this.addMsg.GroupType == 4){
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
}else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
this.addMsg.PreferPrice = this.addMsg.PreferPrice =
this.OpSetLossMoney + this.OpSetLossMoney +
dandijie + dandijie +
...@@ -3838,8 +3869,12 @@ ...@@ -3838,8 +3869,12 @@
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)) * Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice)); (Number(this.stratPrice) + Number(this.returnPrice));
let dandijie = let dandijie
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); if(this.addMsg.GroupType == 4){
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
}else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
this.addMsg.PreferPrice = this.addMsg.PreferPrice =
this.OpSetLossMoney + this.OpSetLossMoney +
dandijie + dandijie +
...@@ -3860,6 +3895,9 @@ ...@@ -3860,6 +3895,9 @@
this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney; this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney;
} }
this.getTicheng(); this.getTicheng();
if (!t) {
this.getTypePrice2()
}
}, },
yzBigBed2() { yzBigBed2() {
let x = let x =
...@@ -4822,7 +4860,124 @@ ...@@ -4822,7 +4860,124 @@
// } // }
// }, // },
// err => {}) // err => {})
},
gettypechange(type){
//切换参团类型时 把值初始化
if(type == 4){
this.addMsg.Unit_Price = this.Unit_Price; //成交单价
this.HightUnitPrice = '1';
this.addMsg.AirticketNum = 0;
this.addMsg.ManNum = 0;
// this.addMsg.ChirdNum = 0;
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0;
this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.PreferPrice = 0;
this.addMsg.SafeNum = 0;
this.addMsg.VisaNum = 0;
this.addMsg.PredictRoomNum = 0;
this.addMsg.YSeatNum = 0;
}else {
this.HightUnitPrice = '2';
this.addMsg.AirticketNum = 0;
this.addMsg.ManNum = 0;
// this.addMsg.ChirdNum = 0; //?
this.addMsg.BabyNum = 0;
this.addMsg.OldPeopleNum = 0;
this.addMsg.ChirdNoNeedBedNum = 0;
this.addMsg.ChirdNeedBedNum = 0;
this.addMsg.PreferPrice = 0;
this.addMsg.SafeNum = 0;
this.addMsg.VisaNum = 0;
this.addMsg.PredictRoomNum = 0;
this.addMsg.YSeatNum = 0;
};
if (this.addMsg.CustomerType == 1) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2BMemberPrice;
this.addMsg.Unit_Price = this.addObj.B2BMemberPrice;
}
}
if (this.addMsg.CustomerType == 2) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2BPrice
this.addMsg.Unit_Price = this.addObj.B2BPrice;
} }
}
if (this.addMsg.CustomerType == 3) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2CMemberPrice
this.addMsg.Unit_Price = this.addObj.B2CMemberPrice;
}
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
if (this.addMsg.CustomerType == 4) {
if(this.addMsg.GroupType==4){
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
this.addMsg.TC_Price = this.addObj.B2CPrice
this.addMsg.Unit_Price = this.addObj.B2CPrice;
}
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0'
}
},
getTypePrice2() {
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList = [];
console.log(this.Unit_PriceList)
this.apipost('sellorder_post_GetLessPrice', {
"TCID": this.addMsg.TCID,
"MaxPeopleNum": maxPeopleNum
}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney) > 0) {
for (var i = 0; i <= parseInt(this.LessMoney) / 10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price - i * 10;
obj.LessMoney = this.addMsg.TC_Price - i * 10;
this.Unit_PriceList.push(obj);
}
if (this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price) < 0) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
} else {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
},
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
src/components/activity/CommodityType.vue
View file @ 12ebad01
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
background-color: #ee4454; background-color: #ee4454;
border-color: #ee4454; border-color: #ee4454;
} }
.comType_Img{
max-height: 50px;
}
</style> </style>
<template> <template>
...@@ -77,6 +80,8 @@ ...@@ -77,6 +80,8 @@
<th width="120px">类型编号</th> <th width="120px">类型编号</th>
<th>商品类型名称</th> <th>商品类型名称</th>
<th>商品类型图标</th> <th>商品类型图标</th>
<th>商品类型logo</th>
<th>商品类型展示图片</th>
<th>商品类型状态</th> <th>商品类型状态</th>
<th>更新时间</th> <th>更新时间</th>
<th>操作</th> <th>操作</th>
...@@ -85,7 +90,13 @@ ...@@ -85,7 +90,13 @@
<td>{{item.id}}</td> <td>{{item.id}}</td>
<td>{{item.name}}</td> <td>{{item.name}}</td>
<td> <td>
<img :src="item.icon" alt> <img :src="item.icon" class="comType_Img" />
</td>
<td>
<img :src="item.miniLog" class="comType_Img" />
</td>
<td>
<img :src="item.typeImg" class="comType_Img" />
</td> </td>
<td>{{item.state === 1 ? '正常' : '禁用'}}</td> <td>{{item.state === 1 ? '正常' : '禁用'}}</td>
<td>{{item.updateTime.replace('T', ' ')}}</td> <td>{{item.updateTime.replace('T', ' ')}}</td>
...@@ -160,6 +171,67 @@ ...@@ -160,6 +171,67 @@
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="商品类型logo">
<div class="_addUpload_box">
<div class="_pic_upload">
<template v-if="addMsg.miniLog!==''">
<div>
<div
style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
>
<img :src="addMsg.miniLog">
<span
style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.miniLog=''"
>重新上传</span>
</div>
</div>
</template>
<el-upload
v-else
drag
:http-request="uploadLogoBtn"
:multiple="false"
:show-file-list="false"
action
>
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
</div>
</div>
</el-form-item>
<el-form-item label="商品类型图片">
<div class="_addUpload_box">
<div class="_pic_upload">
<template v-if="addMsg.typeImg!==''">
<div>
<div
style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
>
<img :src="addMsg.typeImg">
<span
style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.typeImg=''"
>重新上传</span>
</div>
</div>
</template>
<el-upload
v-else
drag
:http-request="uploadTypeImgBtn"
:multiple="false"
:show-file-list="false"
action
>
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
</div>
</div>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button <button
...@@ -185,7 +257,9 @@ export default { ...@@ -185,7 +257,9 @@ export default {
name: "", name: "",
state: 1, state: 1,
icon: "", icon: "",
id: 0 id: 0,
miniLog:'',
typeImg:''
}, },
rules: { rules: {
memberLevel: [ memberLevel: [
...@@ -251,22 +325,89 @@ export default { ...@@ -251,22 +325,89 @@ export default {
typeOk = true; typeOk = true;
} }
}); });
if (!typeOk) return this.$message.error(this.$t("tips.qsctpian")); if (!typeOk) return this.Error(this.$t("tips.qsctpian"));
let newArr = []; let newArr = [];
newArr.push(file.file); newArr.push(file.file);
let path = "/Upload/activity/"; let path = "/Upload/activity/";
this.$message.info(this.$t("tips.shangchuanzhong")); this.Success(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
let fileSize = let fileSize =
file.file.size < 1024 file.file.size < 1024
? file.file.size ? file.file.size
: (file.file.size / 1024).toFixed(0); : (file.file.size / 1024).toFixed(0);
this.addMsg.icon = this.domainManager().ViittoFileUrl + x.data.FilePath; this.addMsg.icon = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.$message.success(this.$t("tips.scchenggong")); this.Success(this.$t("tips.scchenggong"));
this.$forceUpdate();
});
},
uploadLogoBtn(file){
//上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t("tips.wjdxbncgsz"));
return;
}
// 1 文档 2 数据 3 图片
let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
let ft = file.file.name
.substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
.toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != "-1") {
fileTypeNumber = x.type;
typeOk = true;
}
});
if (!typeOk) return this.Error(this.$t("tips.qsctpian"));
let newArr = [];
newArr.push(file.file);
let path = "/Upload/activity/";
this.Success(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => {
let fileSize =
file.file.size < 1024
? file.file.size
: (file.file.size / 1024).toFixed(0);
this.addMsg.miniLog = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.Success(this.$t("tips.scchenggong"));
this.$forceUpdate();
});
},
uploadTypeImgBtn(file){
//上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t("tips.wjdxbncgsz"));
return;
}
// 1 文档 2 数据 3 图片
let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
let ft = file.file.name
.substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
.toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != "-1") {
fileTypeNumber = x.type;
typeOk = true;
}
});
if (!typeOk) return this.Error(this.$t("tips.qsctpian"));
let newArr = [];
newArr.push(file.file);
let path = "/Upload/activity/";
this.Success(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => {
let fileSize =
file.file.size < 1024
? file.file.size
: (file.file.size / 1024).toFixed(0);
this.addMsg.typeImg = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.Success(this.$t("tips.scchenggong"));
this.$forceUpdate(); this.$forceUpdate();
}); });
}, },
//获取数据 //获取数据
getList() { getList() {
this.loading = true; this.loading = true;
......
src/components/busManagement/BusInfo.vue
View file @ 12ebad01
...@@ -301,24 +301,21 @@ ...@@ -301,24 +301,21 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="定团号" min-width="230"> <el-table-column label="订团号" min-width="215">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-for="(subItem,subIndex) in scope.row.BusPlanOrderList"> <div class="comBTM" v-for="(subItem,subIndex) in scope.row.BusPlanOrderList">
<template v-if="scope.$index==0&&subIndex==0"> <template v-if="scope.$index==0&&subIndex==0">
<div class="BusTyleFirst"> <i class="iconfont icon-tongshang" style="opacity:0;filter:alpha(opacity=0); "></i>
<el-input class='w170' type="text" v-model="subItem.BookGroup"></el-input> <el-input class='w150' type="text" v-model="subItem.BookGroup"></el-input>
</div>
</template> </template>
<template v-else> <template v-else>
<div class="comBTM">
<el-tooltip class="item" effect="dark" content="同上" placement="top"> <el-tooltip class="item" effect="dark" content="同上" placement="top">
<i class="iconfont icon-tongshang" style="cursor:pointer;" <i class="iconfont icon-tongshang" style="cursor:pointer;"
@click="getBeforeInfo(scope.$index,subIndex),getBusPrice(subItem)"></i> @click="getBeforeInfo(scope.$index,subIndex),getBusPrice(subItem)"></i>
</el-tooltip> </el-tooltip>
<el-input class='w170' type="text" v-model="subItem.BookGroup"></el-input> <el-input class='w150' type="text" v-model="subItem.BookGroup"></el-input>
</div>
</template>
</template> </template>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="司机住宿" min-width="180"> <el-table-column label="司机住宿" min-width="180">
...@@ -343,19 +340,19 @@ ...@@ -343,19 +340,19 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高速费用" min-width="150"> <el-table-column label="高速费用" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM"> <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<el-input v-model="subItem.HighSpeedPrice" @keyup.native="checkPrice(subItem,'HighSpeedPrice')" <el-input v-model="subItem.HighSpeedPrice" @keyup.native="checkPrice(subItem,'HighSpeedPrice')"
placeholder="请输入费用" :disabled="isShowBtn==1?true:false"></el-input> placeholder="请输入费用" :disabled="isShowBtn==1?true:false" class='w135'></el-input>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="高速费用付款方式" min-width="150"> <el-table-column label="高速费用付款方式" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<div v-for="(subItem,index) in scope.row.BusPlanOrderList" class="comBTM"> <div v-for="(subItem,index) in scope.row.BusPlanOrderList" class="comBTM">
<el-select class='sel' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')" <el-select class='sel w135' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')"
@change="PayTypeChange(subItem)" :disabled="isShowBtn==1?true:false"> @change="PayTypeChange(subItem)" :disabled="isShowBtn==1?true:false">
<el-option label='请选择' :value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option> <el-option label='现付' :value='1'></el-option>
...@@ -377,11 +374,11 @@ ...@@ -377,11 +374,11 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成本价" min-width="150"> <el-table-column label="成本价" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM"> <div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<el-input v-model="subItem.CostPrice" @keyup.native="checkPrice(subItem,'CostPrice')" <el-input v-model="subItem.CostPrice" @keyup.native="checkPrice(subItem,'CostPrice')"
placeholder="请输入成本价" :disabled="isShowBtn==1?true:false"></el-input> placeholder="请输入成本价" :disabled="isShowBtn==1?true:false" class="w135"></el-input>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
......
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