Skip to content

S
SuperMan
Commit 05ca195a authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent acf39998
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 54 deletions
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 05ca195a
......@@ -540,6 +540,12 @@
<p class="travelnowrap">
<span>{{$t('Operation.Op_teamNotice')}}</span>
{{item.OutNotice==1?"OK":$t('visa.v_zanding')}}
</p>
<p class="travelnowrap" v-if="item.IsSetOut == 0">
<span style="color: blue">{{ $t("objFill.zhengchangft") }}</span>
</p>
<p class="travelnowrap" v-if="item.IsSetOut == 1">
<span style="color: red">{{ $t("objFill.quxiaofatuan") }}</span>
</p>
<p class="travelnowrap">
<span>{{$t('scen.sc_cp')}}</span>
......@@ -1072,6 +1078,16 @@
</el-dropdown-item>
<el-dropdown-item @click.native='reSubmit(item)' v-if="item.AuditStatus==3">
{{$t('objFill.v101.chongxtjshe')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.IsSetOut == 0">
<div @click="setIsSetOutOffer(item, 1)">
{{ $t("objFill.quxiaofatuan") }}
</div>
</el-dropdown-item>
<el-dropdown-item v-if="item.IsSetOut == 1">
<div @click="setIsSetOutOffer(item, 0)">
{{ $t("objFill.zhengchangft") }}
</div>
</el-dropdown-item>
<el-dropdown-item>
<div @click='GoToleaderReimbursement(item)' style="color:red">{{$t('objFill.dijiecbzc')}} </div>
......@@ -2184,6 +2200,21 @@
err => {}
);
},
//修改是否发团
setIsSetOutOffer(item, IsSetOut) {
var updateMsg = {
TCID: item.TCID,
IsSetOut: IsSetOut,
};
this.apipost("travel_post_SetIsSetOutService", updateMsg, (res) => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getControlList();
} else {
this.Info(res.data.message);
}
});
},
//新获取列表数据
getControlList() {
var msg = JSON.parse(JSON.stringify(this.queryMsg));
......
src/components/busManagement/HPTripPlan.vue
View file @ 05ca195a
......@@ -35,7 +35,8 @@
</li>
<li>
<span><em>车</em>
<el-select v-model="msg.CarId" filterable :placeholder="$t('pub.pleaseSel')" clearable @clear="getList()" @change="getList()">
<el-select v-model="msg.CarId" filterable :placeholder="$t('pub.pleaseSel')" clearable @clear="getList()"
@change="getList()">
<el-option v-for="item in carList" :label="item.CarName+`(`+item.CarNo+`)`" :value="item.Id"
:key="item.Id">
</el-option>
......@@ -44,8 +45,8 @@
</li>
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<button class="hollowFixedBtn" @click="editPlan(null)">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" type="button" @click="downLoadPlan()">{{$t('adm.adm_download')}}</button>
<!-- <button class="hollowFixedBtn" @click="editPlan(null)">{{$t('pub.addBtn')}}</button> -->
<button class="normalBtn" type="button" @click="downLoadPlan()" style="display:none;">{{$t('adm.adm_download')}}</button>
</li>
</ul>
</div>
......@@ -68,63 +69,57 @@
</tr>
</thead>
<tbody v-for="(item,index) in dataList" :key="`d_`+index">
<tr>
<td rowspan="2">
{{item.CarName}}({{item.CarSeatNum}}座)<br />
<!-- {{item.CarNo}} -->
</td>
<template v-for="(subItem,subIndex) in item.SubList">
<td :key="`d_`+index+`_j_`+subIndex">
<template v-if="subItem.DayObj">
<template v-if="subItem.DayObj.UseType==1">
<font>接</font>
</template>
<template v-if="subItem.DayObj.UseType==2">
<font>送</font>
</template>
<template v-if="subItem.DayObj.UseType==3">
<font>√</font>
</template>
<template v-if="subItem.DayObj.UseType==4">
<font>X</font>
</template>
</template>
<template v-for="(subItem,subIndex) in item.DayList">
<tr :key="`d1_`+index+`s1_`+subIndex">
<td :rowspan="item.DayList.length*2" v-if="subIndex==0">
{{item.CarName}}({{item.CarSeatNum}}座)
</td>
</template>
</tr>
<tr>
<template v-for="(subItem,subIndex) in item.SubList">
<template v-if="subItem.DayObj">
<td v-if="subItem.DayObj.DayNum==1" :colspan="subItem.DayObj.ColumnNum"
:key="`d_`+index+`_d_`+subIndex">
<font style="cursor:pointer;">
<template v-if="subItem.DayObj.PlanType==1">
<el-tooltip class="item" effect="dark" content="点击修改" placement="top-start">
<font style="color:blue;" @click="editPlan(subItem.DayObj)">
{{subItem.DayObj.DMCNum}}&nbsp;{{subItem.DayObj.InOutStr}}</font>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="点击跳转团队详情" placement="top-start">
<i class="el-icon-view" @click="gotoTeam(subItem.DayObj)" style="color:green;"></i>
</el-tooltip>
<template v-for="(childItem,childIndex) in subItem">
<td :key="`d1_`+index+`s1_`+subIndex+`d1`+childIndex">
<template v-if="childItem.OrderId>0">
<template v-if="childItem.UseType==1">
<font>接</font>
</template>
<template v-else-if="childItem.UseType==2">
<font>送</font>
</template>
<template v-else-if="childItem.UseType==3">
<font>半天</font>
</template>
<template v-else-if="childItem.UseType==4">
<font>√</font>
</template>
<template v-else>
<el-tooltip class="item" effect="dark" content="点击修改" placement="top-start">
<font style="color:green;" @click="editPlan(subItem.DayObj)">
{{subItem.DayObj.UseName}}&nbsp;{{subItem.DayObj.InOutStr}}(外部车)</font>
</el-tooltip>
<font>X</font>
</template>
</font>
<el-tooltip class="item" effect="dark" content="点击删除" placement="top-start">
<i class="el-icon-delete" @click="deleteTrip(subItem.DayObj)" style="color:red;"></i>
</el-tooltip>
</template>
</td>
</template>
<template v-else>
<td :key="`d_`+index+`_n_`+subIndex">
</td>
</tr>
<tr :key="`d2_`+index+`s2_`+subIndex">
<template v-for="(childItem,childIndex) in subItem">
<template v-if="childItem.OrderId>0">
<td v-if="childItem.DayNum==1" :colspan="childItem.ColumnNum>1? childItem.ColumnNum:0"
:key="`d2_`+index+`s2_`+subIndex+`d2`+childIndex">
<el-tooltip :content="(childItem.OrderType==1?`常规订单:`:`包车订单:`)+childItem.OrderId">
<font>
<template v-if="childItem.TCNUM">
{{childItem.TCNUM}}
</template>
<template v-else>
{{childItem.OrderTCNUM}}
</template>
</font>
</el-tooltip>
</td>
</template>
<template v-else>
<td :key="`d2_`+index+`s2_`+subIndex+`d3`+childIndex">
</td>
</template>
</template>
</template>
</tr>
</tr>
</template>
</tbody>
</table>
</div>
......@@ -143,6 +138,7 @@
msg: {
MonthStr: "",
CarId: "",
QOrderId: "",
},
headerList: [], //表头
dataList: [],
......@@ -244,7 +240,7 @@
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
if (this.dataList && this.dataList.length > 0) {
this.headerList = this.dataList[0].SubList;
this.headerList = this.dataList[0].HeaderList;
}
} else {
this.Error(res.data.message);
......@@ -257,6 +253,10 @@
let yearStr = myDate.getFullYear();
let monthStr = parseInt(myDate.getMonth() + 1);
this.msg.MonthStr = yearStr + "-" + (monthStr < 10 ? '0' + monthStr : monthStr);
//this.msg.MonthStr = "2025-05";
// this.msg.CarId = 1030;
//this.msg.CarId = 1021;
//this.msg.QOrderId="483"
this.getCarList();
this.getList();
},
......
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