Skip to content

S
SuperMan
Commit b1c0dc51 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents b2118bb1 97fe9493
Hide whitespace changes
Inline Side-by-side
Showing with 243 additions and 139 deletions
src/components/busManagement/busHandBook.vue
View file @ b1c0dc51
<style> <style>
.busManagerTalbe { .busManagerTalbe {
font-size: 12px; font-size: 12px;
border-collapse: collapse; border-collapse: collapse;
background-color: #fff; background-color: #fff;
border: 1px solid #ccc; border: 1px solid #ccc;
}
.busManagerTalbe tr {
text-align: center;
height: 40px;
}
.busManagerTalbe tr td {
padding: 0 5px;
background-color: #fff;
border: 1px solid #ccc;
}
.commonBackColor {
background-color: #e6e6e6 !important;
color: #333;
}
} .comTextAlign {
.busManagerTalbe tr { text-align: left;
text-align: center; padding-left: 20px;
height: 40px; }
}
.busManagerTalbe tr td{
padding:0 5px;
background-color: #fff;
border: 1px solid #ccc;
}
.commonBackColor {
background-color: #E6E6E6!important;
color: #333;
}
.comTextAlign { .addHandBook {
text-align: left; margin-right: 5px;
padding-left: 20px; color: seagreen;
} cursor: pointer;
visibility: hidden;
.addHandBook{ }
margin-right: 5px; .addHandBookDIS {
color: seagreen; visibility: visible !important;
cursor: pointer; }
visibility: hidden; .disClick {
} background-color: #d1d1d1;
.addHandBookDIS{ color: #fff;
visibility: visible!important; border: 1px solid #d1d1d1;
} }
.disClick {
background-color: #d1d1d1;
color: #fff;
border: 1px solid #d1d1d1;
}
.disClick:hover { .disClick:hover {
background-color: #d1d1d1 !important; background-color: #d1d1d1 !important;
cursor: default !important; cursor: default !important;
box-shadow: none !important; box-shadow: none !important;
} }
</style> </style>
<template> <template>
<div> <div>
<table border="0" cellspacing="1" cellpadding="0" class="busManagerTalbe" style="width: 100%;" v-loading='loading'> <table
border="0"
cellspacing="1"
cellpadding="0"
class="busManagerTalbe"
style="width: 100%;"
v-loading="loading"
>
<tr> <tr>
<td colspan="6">印象ｼﾞｬﾊﾟﾝバス手配依頼書</td> <td colspan="6">印象ｼﾞｬﾊﾟﾝバス手配依頼書</td>
</tr> </tr>
...@@ -92,10 +98,22 @@ ...@@ -92,10 +98,22 @@
<td class="commonBackColor" width="400">ホテル</td> <td class="commonBackColor" width="400">ホテル</td>
<td class="commonBackColor" width="300">ホテルTEL</td> <td class="commonBackColor" width="300">ホテルTEL</td>
</tr> </tr>
<tr v-for="(subItem,index) in DataObj.Details_Extends"> <tr v-for="(subItem, index) in DataObj.Details_Extends">
<td> <td>
<i class="iconfont icon-bumenguanli-tianjia addHandBook" :class="{'addHandBookDIS':index==0||index==DataObj.Details_Extends.length-1}" @click="addHand(index)"></i> <i
<el-date-picker v-model='subItem.UseDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> class="iconfont icon-bumenguanli-tianjia addHandBook"
:class="{
addHandBookDIS:
index == 0 || index == DataObj.Details_Extends.length - 1
}"
@click="addHand(index)"
></i>
<el-date-picker
v-model="subItem.UseDate"
class="w135"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>
</td> </td>
<td> <td>
<el-input type="text" v-model="subItem.BusType" /> <el-input type="text" v-model="subItem.BusType" />
...@@ -104,13 +122,28 @@ ...@@ -104,13 +122,28 @@
<el-input type="text" v-model="subItem.FlightNum" /> <el-input type="text" v-model="subItem.FlightNum" />
</td> </td>
<td> <td>
<el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.BusContent" /> <el-input
type="textarea"
resize="none"
style="padding:5px 0;"
v-model="subItem.BusContent"
/>
</td> </td>
<td> <td>
<el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.HotelName" /> <el-input
type="textarea"
resize="none"
style="padding:5px 0;"
v-model="subItem.HotelName"
/>
</td> </td>
<td> <td>
<el-input type="textarea" resize="none" style="padding:5px 0;" v-model="subItem.HotelTel" /> <el-input
type="textarea"
resize="none"
style="padding:5px 0;"
v-model="subItem.HotelTel"
/>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -120,17 +153,57 @@ ...@@ -120,17 +153,57 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="6" class="comTextAlign">*迎えや送りは必要・不要となることは、必ず標記してください。</td> <td colspan="6" class="comTextAlign">
*迎えや送りは必要・不要となることは、必ず標記してください。
</td>
</tr> </tr>
<tr> <tr>
<td colspan="6" class="comTextAlign">*直接バス會社へ送付するので、必ず日本語でご記入ください。</td> <td colspan="6" class="comTextAlign">
*直接バス會社へ送付するので、必ず日本語でご記入ください。
</td>
</tr> </tr>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="6"> <td colspan="6">
<input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="SaveData()" value="保存" /> <input
<input type="button" class="normalBtn" :class="{'disClick':isSave}" @click="DownLoadFile()" type="button"
value="下载" /> class="normalBtn"
:class="{ disClick: isSave }"
@click="SaveData()"
value="保存"
/>&nbsp;
<input
type="button"
class="normalBtn"
:class="{ disClick: isSave }"
@click="DownLoadFile()"
value="下载"
/>
&nbsp;
<template v-if="BusObj.BusId > 0">
<template v-if="BusObj.OrderState == 0">
<span style="color:red;">未确认手配</span>
<input
type="button"
class="normalBtn"
@click="SureBus(1)"
value="确认手配"
/>
</template>
<template v-if="BusObj.OrderState == 1">
<span style="color:green;">已确认手配</span>
<input
type="button"
class="normalBtn"
@click="SureBus(0)"
value="暂定手配"
/>
</template>
</template>
</td>
</tr>
<tr>
<td colspan="6" style="height:25px;">
</td> </td>
</tr> </tr>
</tfoot> </tfoot>
...@@ -139,60 +212,91 @@ ...@@ -139,60 +212,91 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
loading: false, loading: false,
DataObj: { DataObj: {
Id: 0, Id: 0,
TCIDS: "", TCIDS: "",
TeamNum: "", TeamNum: "",
GuideName: "", GuideName: "",
GuideTel: "", GuideTel: "",
PeopleNum: "", PeopleNum: "",
BusType: "", BusType: "",
DayNight: "", DayNight: "",
Remarks: "", Remarks: "",
Details_Extends: [] Details_Extends: []
},
BusObj: {
BusId: 0,
OrderState: 1 //0暂定，1-OK
},
isSave: false,
TCIDS: ""
};
},
methods: {
//确认手配
SureBus(type) {
this.loading = true;
this.BusObj.OrderState=type;
this.apipost(
"bus_post_SetBusService",
this.BusObj,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.GetData();
} else {
this.Error(res.data.message);
}
}, },
isSave: false, err => {}
TCIDS: "" );
}
}, },
methods: { DownLoadFile(item) {
DownLoadFile(item) { if (!this.isSave) {
if (!this.isSave) { this.isSave = true;
this.isSave = true; let msg = {
let msg = { TCIDS: this.TCIDS
TCIDS: this.TCIDS };
};
this.loading = true;
var fileName = "バス手配依頼書" + this.DataObj.TeamNum + ".xls";
this.GetLocalFile("bus_get_DownLoadBusConfig", msg, fileName,
res => {
this.loading = false;
this.isSave = false;
});
}
},
GetData() {
this.loading = true; this.loading = true;
this.apipost('bus_Get_GetBusDownLoadData', { var fileName = "バス手配依頼書" + this.DataObj.TeamNum + ".xls";
this.GetLocalFile("bus_get_DownLoadBusConfig", msg, fileName, res => {
this.loading = false;
this.isSave = false;
});
}
},
GetData() {
this.loading = true;
this.apipost(
"bus_Get_GetBusDownLoadData",
{
TCIDs: this.TCIDS TCIDs: this.TCIDS
}, res => { },
res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DataObj = res.data.data; this.DataObj = res.data.data.model;
this.BusObj.BusId = res.data.data.BusId;
this.BusObj.OrderState = res.data.data.OrderState;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) },
}, err => {}
SaveData() { );
if (!this.isSave) { },
this.isSave = true; SaveData() {
this.DataObj.TCIDS = this.TCIDS; if (!this.isSave) {
this.apipost('bus_Post_SaveBusDownLoadData', this.DataObj, res => { this.isSave = true;
this.DataObj.TCIDS = this.TCIDS;
this.apipost(
"bus_Post_SaveBusDownLoadData",
this.DataObj,
res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success("操作成功"); this.Success("操作成功");
this.GetData(); this.GetData();
...@@ -200,38 +304,39 @@ ...@@ -200,38 +304,39 @@
this.Error(res.data.message); this.Error(res.data.message);
} }
this.isSave = false; this.isSave = false;
}, err => {}) },
} err => {}
}, );
//添加
addHand(index){
var obj = {
BusContent:'',
BusType:'',
FlightNum:'',
HotelName:'',
HotelTel:'',
Id:0,
MainId:0,
UseDate:''
}
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
var day = date.getDate();
var UseDate = year+'-'+month+"-"+day;
obj.UseDate = UseDate
if(index==0){
this.DataObj.Details_Extends.unshift(obj)
}else{
this.DataObj.Details_Extends.push(obj);
}
} }
}, },
mounted() { //添加
this.TCIDS = this.$route.query.TCID; addHand(index) {
this.GetData(); var obj = {
}, BusContent: "",
BusType: "",
FlightNum: "",
HotelName: "",
HotelTel: "",
Id: 0,
MainId: 0,
UseDate: ""
};
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
var day = date.getDate();
var UseDate = year + "-" + month + "-" + day;
obj.UseDate = UseDate;
if (index == 0) {
this.DataObj.Details_Extends.unshift(obj);
} else {
this.DataObj.Details_Extends.push(obj);
}
}
},
mounted() {
this.TCIDS = this.$route.query.TCID;
this.GetData();
} }
};
</script> </script>
src/components/dmc/manager/groundOperation2.vue
View file @ b1c0dc51
...@@ -453,15 +453,14 @@ export default { ...@@ -453,15 +453,14 @@ export default {
msg, msg,
res => { res => {
this.loading2 = false; this.loading2 = false;
console.log("res.data",res.data.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// this.BaseInfo = res.data.data.BaseInfo; this.BaseInfo = res.data.data.BaseInfo;
// this.PrincipalList = res.data.data.PrincipalList; this.PrincipalList = res.data.data.PrincipalList;
// this.JourneyTitle = res.data.data.JourneyTitle; this.JourneyTitle = res.data.data.JourneyTitle;
// this.guestList = res.data.data.guestList; this.guestList = res.data.data.guestList;
// this.DMCStaticsCommon = res.data.data.DMCStaticsCommon; this.DMCStaticsCommon = res.data.data.DMCStaticsCommon;
// this.shopList = res.data.data.shopList; this.shopList = res.data.data.shopList;
// this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply; this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
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