Skip to content

S
SuperMan
Commit b1998f14 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents ee4fc3eb 2c083e0a
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 132 deletions
src/components/Hotel/SupplierHandFee.vue
View file @ b1998f14
......@@ -35,7 +35,7 @@
</li>
<li>
<span>
<em>{{$t('objFill.v101.hote.tuanzhuant')}</em>
<em>{{$t('objFill.v101.hote.tuanzhuant')}}</em>
<el-select v-model="msg.IsSetOut">
<el-option :label="$t('objFill.zhengchangft')" :value="0"></el-option>
<el-option :label="$t('objFill.quxiaofatuan')" :value="1"></el-option>
......@@ -94,7 +94,8 @@
</td>
<td v-if="subIndex==0" :rowspan="item.SubList.length">
<el-tooltip class="item" effect="dark" :content="$t('ground.scdanju')" placement="top-start">
<el-button type="success" icon="el-icon-check" circle @click="CreateSupplierBill(item)"></el-button>
<el-button type="success" icon="el-icon-check" circle @click="CreateSupplierBill(item)">
</el-button>
</el-tooltip>
</td>
</tr>
......
src/components/busManagement/BusInfo.vue
View file @ b1998f14
......@@ -211,13 +211,12 @@
</tfoot>
</table>
<div style="width: 100%; overflow-x: auto;margin-top:20px;" class="ownScrollbarStyle">
<el-form :rules="rules">
<el-form>
<el-table :data="PlanTableData" style="width:100%" border v-loading='loading'>
<el-table-column fixed :label="$t('pub.date')" prop="UseTimeStr" min-width="100"></el-table-column>
<el-table-column fixed :label="$t('hotel.hotel_name')" prop="HotelName" min-width="200"></el-table-column>
<el-table-column fixed :label="$t('sm.yongchejihua')" min-width="180">
<template slot-scope="scope">
<!-- {{scope.$index+1}} -->
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_ap_`+subIndex">
<em>
<!--接机送机-->
......@@ -268,6 +267,17 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('hotel.hotel_Supplier')" min-width="150">
<template slot-scope="scope">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bps_`+subIndex">
<el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="subItem.BusCompany">
<el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('ground.sijiName')" min-width="120">
<template slot-scope="scope">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpd_`+subIndex">
......@@ -289,17 +299,6 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('hotel.hotel_Supplier')" min-width="150">
<template slot-scope="scope">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bps_`+subIndex">
<el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="subItem.BusCompany">
<el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('ground.busType')" min-width="150">
<template slot-scope="scope">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_b_`+subIndex">
......@@ -329,7 +328,7 @@
</div>
</template>
</el-table-column>
<!--订团号-->
<el-table-column :label="$t('ground.dingtuanhao')" min-width="180">
<template slot-scope="scope">
<div class="comBTM" v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" :key="`bpo_bo_`+subIndex">
......@@ -459,7 +458,6 @@
export default {
data() {
return {
defaultSelectValue: 0,
//车辆类型列表
BusTypeList: [],
/*供应商列表*/
......@@ -479,102 +477,13 @@
/*计划表数据*/
forbidInput: false,
PlanTableData: [],
UseTypeArray: [], //用车类型
BusAirportPickUpList: [], //用车类型
//防止重复提交
saveLoading: false,
//司机住宿类型
AccommodationTypeArray: [],
rules: {
//表单必填验证
BusCode: [{
required: true,
message: this.$t('ground.qtxcphao'),
trigger: "change"
}],
DriverName: [{
required: true,
message: this.$t('objFill.v101.busManagement.qingtianxsjmc'),
trigger: "change"
}],
DriverTel: [{
required: true,
message: this.$t('objFill.v101.busManagement.qingtxlxdh'),
trigger: "change"
}],
BusType: [{
required: true,
message: this.$t('objFill.v101.busManagement.qingxzclx'),
trigger: "change"
}],
CarrierNum: [{
required: true,
message: this.$t('objFill.v101.busManagement.qingtxhzrs'),
trigger: "change"
},
{
pattern: this.$commonUtils.Regex.el_isInteger,
message: this.$t('objFill.qingshuruzqdz')
}
],
BusNum: [{
required: true,
message: this.$t('objFill.v101.busManagement.qingtxcphm'),
trigger: "change"
}],
StartDate: [{
required: true,
message: this.$t('objFill.v101.administrative.qingxuanzhekssj'),
trigger: "change"
}],
UseDays: [{
required: true,
message: this.$t('objFill.v101.busManagement.qingtxsyts'),
trigger: "change"
},
{
pattern: this.$commonUtils.Regex.el_isInteger,
message: this.$t('objFill.qingshuruzqdz')
}
],
SupplierId: [{
required: true,
message: this.$t('objFill.qingxuanzhegys'),
trigger: "change"
}],
CostPrice: [{
pattern: this.$commonUtils.Regex.el_Isdecimal,
message: this.$t('objFill.v101.SalesModule.col2.t3')
},
{
required: true,
message: this.$t('objFill.v101.busManagement.qingtxcbj'),
trigger: "change"
}
],
SalesPrice: [{
pattern: this.$commonUtils.Regex.el_Isdecimal,
message: this.$t('objFill.v101.SalesModule.col2.t3')
},
{
required: true,
message: this.$t('objFill.v101.busManagement.qingtxnbj'),
trigger: "change"
}
]
},
//团名
title: '',
//团号
TCNUMS: '',
//进出点
InOut: '',
//订单人数
RealityNum: '',
//机位总数
totalFlySeat: '',
LeaderName: '',
GuideName: '',
loading: false,
isShowBtn: 1, //1禁用高速费，成本费，高速付款方式文本框
IsEditBus: 0, //车辆修改权限
......@@ -617,7 +526,6 @@
MTCNUM: ""
});
},
PayTypeChange(obj) {
if (obj.PayType == 7) {
obj.CostPrice = 0;
......@@ -710,7 +618,11 @@
if (res.data.resultCode == 1) {
this.BusTypeList = res.data.data;
this.BusTypeList.forEach(item => {
item['newName'] = item.AreaTypeStr + '-' + item.BusTypeStr
var tempStr = item.AreaTypeStr;
if (item.BusTypeStr) {
tempStr += '-' + item.BusTypeStr;
}
item['newName'] = tempStr + '(' + item.UseNum + '座)';
});
}
},
......@@ -775,7 +687,6 @@
}
}, err => {})
},
//司机住宿点击事件
AccommodationCLick(value, item) {
if (
......@@ -787,19 +698,6 @@
item.AccommodationType = "0";
}
},
/*获取用车类型列表*/
GetUseTypeList() {
this.apipost(
"bus_get_GetUseTypeList",
null,
response => {
if (response.data.resultCode == 1) {
this.UseTypeArray = response.data.data;
}
},
null
);
},
/*获取接送机类型列表*/
GetAirportPickUpList() {
this.apipost(
......@@ -890,18 +788,11 @@
mounted() {
this.currentUserInfo = this.getLocalStorage();
this.GetAuth();
this.GetUseTypeList();
this.GetAirportPickUpList();
this.GeAccommodationTypeList();
this.BusId = this.$route.query.id;
this.title = this.$route.query.title;
this.TCNUMS = this.$route.query.TCNUMS;
this.InOut = this.$route.query.InOut;
this.RealityNum = this.$route.query.RealityNum;
this.totalFlySeat = this.$route.query.TotalNumber + '/' + this.$route.query.RealityYSeatNum + '/' + this.$route
.query.RealityESeatNum + '/' + this.$route.query.RealityFSeatNum;
this.LeaderName = this.$route.query.LeaderName;
this.GuideName = this.$route.query.GuideName;
this.parametersData.TCID = this.$route.query.TCID;
this.parametersData.StartDate = this.$route.query.StartDate;
this.parametersData.DayNum = this.$route.query.DayNum;
......
src/components/busManagement/busUsePrice.vue
View file @ b1998f14
......@@ -387,7 +387,7 @@
<el-col :span="5">
<el-form-item :label="$t('ground.busType')" prop="BusType">
<el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="addMsg.BusType">
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.Name" :value="item.Id"></el-option>
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.Name+`(`+item.SeatNum+`座)`" :value="item.Id"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -415,7 +415,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('ground.AlldayPrice')" prop="AllDayPrice">
<el-form-item :label="$t('ground.AllDayPrice')" prop="AllDayPrice">
<el-input v-model="addMsg.AllDayPrice" @keyup.native="checkPrice(addMsg,'AllDayPrice')"></el-input>
</el-form-item>
</el-col>
......
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