Skip to content

S
SuperMan
Commit c4a50d1f authored by 吴春's avatar 吴春
Browse files
Options

11

parent 9f87401e
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 32 deletions
src/components/busManagement/HPTripPlan.vue
View file @ c4a50d1f
......@@ -96,7 +96,7 @@
<li>
<span><em>公司</em>
<el-select v-model="msg.BusCompany" filterable :placeholder="$t('pub.pleaseSel')" clearable
@clear="getCarList(),getList()" @change="getCarList(),getList()" >
@clear="getCarList(),getList()" @change="getCarList(),getList()">
<el-option label="永樂車行(東京)" :value="1248" :key="1248">
</el-option>
<el-option label="永樂車行(大阪)" :value="1256" :key="1256">
......@@ -122,20 +122,21 @@
</div>
<div style="float: right;">
<el-form :inline="true">
<el-form-item label="车">
<el-form-item label="车">
<el-select v-model="CarId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in carList" :label="item.CarName+`(`+item.CarNo+`)`" :value="item.Id" :key="item.Id">
<el-option v-for="item in carList" :label="item.CarName+`(`+item.CarNo+`)`" :value="item.Id"
:key="item.Id">
</el-option>
</el-select>
</el-select>
</el-form-item>
<el-form-item label="司机">
<el-select v-model="DriverId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in driverList" :label="item.DriverName" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
<el-select v-model="DriverId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in driverList" :label="item.DriverName" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="success" size="mini" @click="SureCar()" :loading="saveLoading">确认派车</el-button>
<el-button type="success" size="mini" @click="SureCar()" :loading="saveLoading">确认派车</el-button>
</el-form-item>
</el-form>
</div>
......@@ -232,11 +233,22 @@
</template>
</el-tooltip>
<template v-if="item.CarId==0 && childItem.ProductTypeName&&childItem.ProductTypeName!=''">
<font style="color:blue;font-weight:bold;">[{{childItem.ProductTypeName}}]</font>
</template>
<template v-if="childItem.DriverName&&childItem.DriverName!=''">
<font style="color:blue">{{childItem.DriverName}}</font>
</template>
<font style="color:blue;font-weight:bold;">[{{childItem.ProductTypeName}}]</font>
</template>
<template v-if="childItem.DriverName&&childItem.DriverName!=''">
<font style="color:blue">{{childItem.DriverName}}</font>
</template>
<template v-if="item.CarId>0">
<el-popover placement="right" width="250" trigger="click">
<div>
<el-checkbox v-model="cancelMsg.isCancelBus">车牌</el-checkbox>
<el-checkbox v-model="cancelMsg.isCancelDriver">司机</el-checkbox>
<el-button size="mini" type="primary" style="margin-left:5px;"
@click="cancelBusOrDriver(childItem)">保存</el-button>
</div>
<el-link type="danger" slot="reference">取消</el-link>
</el-popover>
</template>
</td>
</template>
<template v-else>
......@@ -277,19 +289,51 @@
isShowEditPlanDialog: false, //是否显示新增修改
dialogTitle: "",
carList: [],
driverList:[],
driverList: [],
isHaveAuth: false,
boxHeight: 0,
CarOrderIds: "",
CarId: "",//车Id
DriverId:"",//司机Id
CarId: "", //车Id
DriverId: "", //司机Id
saveLoading: false,
cancelMsg: {
isCancelBus: false,
isCancelDriver: false,
}
}
},
components: {
editTripPlan
},
methods: {
cancelBusOrDriver(item) {
var that = this;
console.log("item", item)
var tipMsg = "是否取消【" + (item.OrderTCNUM && item.OrderTCNUM != '' ? item.OrderTCNUM : item.TCNUM) + "】用车或司机?";
this.Confirm(tipMsg, function () {
var postMsg = {
MainId: item.MainId,
OrderId: item.OrderId,
isCancelBus: that.cancelMsg.isCancelBus ? 1 : 0,
isCancelDriver: that.cancelMsg.isCancelDriver ? 1 : 0
};
that.apipost(
"travel_post_CancelCarOrDriver",
postMsg,
res => {
if (res.data.resultCode == 1) {
that.Success(that.$t('objFill.v101.quxiaoshenhcgo'));
that.cancelMsg.isCancelBus = false;
that.cancelMsg.isCancelDriver = false;
that.getList();
} else {
that.Error(res.data.message);
}
},
null
);
});
},
//跳转到车订单
goToBus(item) {
let carUrl = this.domainManager().CarUrl;
......@@ -314,10 +358,8 @@
});
},
//获取司机列表
getDriverList()
{
this.apipost("JapanCar_get_GetCarDriverList", {}, res => {
getDriverList() {
this.apipost("JapanCar_get_GetCarDriverList", {}, res => {
if (res.data.resultCode == 1) {
this.driverList = res.data.data;
}
......@@ -370,7 +412,7 @@
that.Success(that.$t('tips.shanchuchenggong'));
that.getList();
} else {
that.Error(res.data.data);
that.Error(res.data.message);
}
},
null
......@@ -428,7 +470,7 @@
this.apipost('travel_post_SetTripUseCar', {
OrderIds: OrderIds.join(','),
CarId: this.CarId,
DriverId:this.DriverId,
DriverId: this.DriverId,
}, res => {
this.saveLoading = false;
if (res.data.resultCode == 1) {
......@@ -441,7 +483,8 @@
},
mounted() {
var userInfo = this.getLocalStorage();
if (userInfo.EmployeeId == 1 || userInfo.EmployeeId == 5 ||userInfo.EmployeeId==2075 || userInfo.RB_Branch_id == 49 || userInfo
if (userInfo.EmployeeId == 1 || userInfo.EmployeeId == 5 || userInfo.EmployeeId == 2075 || userInfo
.RB_Branch_id == 49 || userInfo
.RB_Branch_id == 1248 || userInfo.RB_Branch_id == 1256) {
this.isHaveAuth = true;
}
......
src/components/busManagement/JourneyTripPlan.vue
View file @ c4a50d1f
......@@ -221,6 +221,10 @@
</label>
<span @click="gotoTeam(fItem)" style="cursor:pointer;"><template
v-if="fItem.OutBranchName&&fItem.OutBranchName!=''">({{fItem.OutBranchName}})</template>{{fItem.TCNUM}}</span>
</div>
<!-- 第二行: 车辆和司机信息 -->
<div class="team-row" v-if="fItem.BusTip&&fItem.BusTip!=''">
需求车型:<font style="color:green">{{fItem.BusTip}}</font>
</div>
<!-- 第二行: 车辆和司机信息 -->
<div class="team-row" v-if="fItem.CarName&&fItem.CarName!=''">
......
src/components/newTravelmanager/travelLineTrip/trifficTripThree.vue
View file @ c4a50d1f
......@@ -10,8 +10,8 @@
<span v-for="(subTraffic,subTrafficIndex) in trafficObj.SubTraffic">
<span v-if="subTrafficIndex==0">
<el-form-item class="StartCity" :rules="trifficTripRules.StartCityId">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('system.table_goCity')" filterable remote
v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1"
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('system.table_goCity')" filterable
remote v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1"
@change="changeGetDepartList(subTraffic.StartCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in DepartList1" :label="item.Name" :value="item.ID" :key="item.ID+10000">
......@@ -36,9 +36,9 @@
</span>
<span>
<el-form-item :rules="trifficTripRules.ArrivalCityId">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('system.query_arrivalCity')" filterable remote
v-model="subTraffic.ArrivalCityId" reserve-keyword :remote-method="GetArrivalList1"
@change="changeArrivalCity(subTraffic.ArrivalCityId)">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('system.query_arrivalCity')"
filterable remote v-model="subTraffic.ArrivalCityId" reserve-keyword
:remote-method="GetArrivalList1" @change="changeArrivalCity(subTraffic.ArrivalCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in ArriveList1" :label="item.Name" :value="item.ID" :key="item.ID+1000">
</el-option>
......@@ -56,9 +56,10 @@
</span>
</div>
</div>
<div class="TC-TrauseCar" style="padding-top: 6px;">
<div>
<el-checkbox v-model="trafficObj.IsUseBus" :checked="trafficObj.IsUseBus===CheckedVaule"
:true-label="CheckedVaule" :false-label="UnCheckedVaule" border size="mini">{{$t('objFill.yongche')}}</el-checkbox>
:true-label="CheckedVaule" :false-label="UnCheckedVaule" border size="mini">{{$t('objFill.yongche')}}
</el-checkbox>
</div>
</div>
<div class="TC-userCarPlan TDRightPlan column" v-if="trafficObj.IsUseBus===CheckedVaule">
......@@ -67,6 +68,9 @@
<span :class="{'ListCked':trafficObj.AirportPickUp==1}" @click="changeAirportType(1)">{{AirPickUp}}</span>
<span :class="{'ListCked':trafficObj.AirportPickUp==2}" @click="changeAirportType(2)">{{AirSend}}</span>
<span :class="{'ListCked':trafficObj.AirportPickUp==16}" @click="changeAirportType(16)">{{HotelPaiChe}}</span>
<el-input v-if="trafficObj.IsUseBus==CheckedVaule" style="width:120px;" size="mini" placeholder="请输入需求车型"
v-model="trafficObj.BusTip" maxlength="50">
</el-input>
</div>
<div class="clearfix TC-userCarPlan_time marginT10 marginL20" style="width: 100%;">
<div v-if="!isOpenGroup" class="useTypeDiv" v-for="useTypeItem in UseTypeArray">
......@@ -78,7 +82,8 @@
</div>
<div class="useTypeDiv">
<el-input :disabled="isOpenGroup" size="mini" v-model="trafficObj.UseTime"
@keyup.native="checkInteger(trafficObj,'UseTime')" :placeholder="$t('objFill.qiingshuruycshc')"></el-input>
@keyup.native="checkInteger(trafficObj,'UseTime')" :placeholder="$t('objFill.qiingshuruycshc')">
</el-input>
</div>
</div>
</div>
......
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