Skip to content

S
SuperMan
Commit 2c992d7d authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 32f68bd0 71d529bc
Hide whitespace changes
Inline Side-by-side
Showing with 422 additions and 189 deletions
src/components/Hotel/HotelProductManage2.vue
View file @ 2c992d7d
...@@ -63,31 +63,31 @@ ...@@ -63,31 +63,31 @@
<div class="triangle_border_up"></div> <div class="triangle_border_up"></div>
<div class="popContent"> <div class="popContent">
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="popList"> <div class="popList">
<table style="margin-left:3px;padding-top:2px;"> <table style="margin-left:3px;padding-top:2px;">
<tr> <tr>
<th width="50">批次</th> <th width="50">批次</th>
<th width="50">价格</th> <th width="50">价格</th>
<th width="50">库存</th> <th width="50">库存</th>
</tr> </tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList"> <tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td> <td>
{{childItem.BatchNumber}} {{childItem.BatchNumber}}
</td> </td>
<td> <td>
{{childItem.CostPrice}} {{childItem.CostPrice}}
</td> </td>
<td> <td>
{{childItem.Inventory}} {{childItem.Inventory}}
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</template> </template>
</div> </div>
</div> </div>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span> <span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span>
</template> </template>
</div> </div>
</div> </div>
...@@ -156,6 +156,12 @@ ...@@ -156,6 +156,12 @@
@keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="税金">
<el-input-number v-model="msg2.TaxesPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'TaxesPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="大床间成本价" prop="BidroomPrice"> <el-form-item label="大床间成本价" prop="BidroomPrice">
<el-input-number v-model="msg2.BidroomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.BidroomPrice" :precision="2" :min="0"></el-input-number>
...@@ -362,7 +368,12 @@ ...@@ -362,7 +368,12 @@
@keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="税金">
<el-input-number v-model="msg.TaxesPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg,'TaxesPrice')" maxlength="10"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="大床间成本价" prop="BidroomPrice"> <el-form-item label="大床间成本价" prop="BidroomPrice">
<el-input-number v-model="msg.BidroomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.BidroomPrice" :precision="2" :min="0"></el-input-number>
...@@ -566,6 +577,7 @@ ...@@ -566,6 +577,7 @@
DateList: [], DateList: [],
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0 //税金
}, },
msg2: { msg2: {
Hotel: '0', Hotel: '0',
...@@ -594,7 +606,8 @@ ...@@ -594,7 +606,8 @@
Week: '', Week: '',
DateList: [], DateList: [],
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1 //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0 //税金
}, },
rules: { rules: {
InventoryType: { InventoryType: {
...@@ -917,6 +930,7 @@ ...@@ -917,6 +930,7 @@
this.msg.GuideRoomPrice = data.GuideRoomPrice; this.msg.GuideRoomPrice = data.GuideRoomPrice;
this.msg.SanKePrice = data.SanKePrice; this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber; this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice;
} }
}) })
}, },
...@@ -994,6 +1008,7 @@ ...@@ -994,6 +1008,7 @@
this.msg.CostPrice = 0; this.msg.CostPrice = 0;
this.msg.SanKePrice = 0; this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1; this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1008,6 +1023,8 @@ ...@@ -1008,6 +1023,8 @@
this.$refs['hotelProductForm2'].resetFields(); this.$refs['hotelProductForm2'].resetFields();
this.msg2.CostPrice = 0; this.msg2.CostPrice = 0;
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0;
}, },
//批量删除 //批量删除
delete2Reset: function () { delete2Reset: function () {
...@@ -1021,6 +1038,7 @@ ...@@ -1021,6 +1038,7 @@
that.msg2.CostPrice = 0; that.msg2.CostPrice = 0;
that.msg2.SanKePrice = 0; that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1; that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0;
} else { } else {
that.Error(res.data.message) that.Error(res.data.message)
} }
...@@ -1029,6 +1047,7 @@ ...@@ -1029,6 +1047,7 @@
}, },
// 页面编辑保存 // 页面编辑保存
edit2Save: function () { edit2Save: function () {
console.log("msg2",this.msg2);
this.$refs['hotelProductForm2'].validate((valid) => { this.$refs['hotelProductForm2'].validate((valid) => {
if (valid) { if (valid) {
this.apipost('dict_post_HotelOffer_SetNewHotelPrice', this.msg2, res => { this.apipost('dict_post_HotelOffer_SetNewHotelPrice', this.msg2, res => {
...@@ -1039,6 +1058,7 @@ ...@@ -1039,6 +1058,7 @@
this.msg2.CostPrice = 0; this.msg2.CostPrice = 0;
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1531,14 +1551,17 @@ ...@@ -1531,14 +1551,17 @@
color: #606266; color: #606266;
font-size: 14px; font-size: 14px;
} }
.popList{
.popList {
font-size: 12px; font-size: 12px;
line-height: 15px; line-height: 15px;
text-align: left; text-align: left;
} }
.hotelProductManage2_calendarItem>.calendarItem_day>.nowMonth:hover .detailInfo{
display:block; .hotelProductManage2_calendarItem>.calendarItem_day>.nowMonth:hover .detailInfo {
display: block;
} }
.hotelProductManage2 .detailInfo { .hotelProductManage2 .detailInfo {
display: none; display: none;
position: absolute; position: absolute;
...@@ -1553,29 +1576,34 @@ ...@@ -1553,29 +1576,34 @@
border-width: 0 86px 30px; border-width: 0 86px 30px;
border-style: solid; border-style: solid;
opacity: 0.75; opacity: 0.75;
border-color: transparent transparent rgba(233, 82, 82, 1); /*透明 透明 灰*/ border-color: transparent transparent rgba(233, 82, 82, 1);
/*透明 透明 灰*/
} }
.hotelProductManage2 .detailInfo .popContent{
.hotelProductManage2 .detailInfo .popContent {
width: 170px; width: 170px;
height: 80px; height: 80px;
background-color: #e95252; background-color: #e95252;
text-align: left; text-align: left;
color: #fff; color: #fff;
font-size: 12px; font-size: 12px;
margin-top:-2px; margin-top: -2px;
overflow: auto; overflow: auto;
padding-bottom:10px; padding-bottom: 10px;
} }
.hotelProductManage2 .popList label:first-child{
.hotelProductManage2 .popList label:first-child {
display: inline-block; display: inline-block;
width: 40%; width: 40%;
margin: 10px 0 0 10px; margin: 10px 0 0 10px;
text-align: left; text-align: left;
} }
.hotelProductManage2 .popList label:last-child { .hotelProductManage2 .popList label:last-child {
display: inline-block; display: inline-block;
width: 40%; width: 40%;
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
text-align: right; text-align: right;
} }
</style> </style>
src/components/Hotel/HotelQueryList.vue
View file @ 2c992d7d
...@@ -52,8 +52,10 @@ ...@@ -52,8 +52,10 @@
</span> </span>
</li> </li>
<li><span><em>日期</em> <li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck"></el-date-picker> <el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck">
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck"></el-date-picker> </el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck">
</el-date-picker>
</span> </span>
</li> </li>
<li> <li>
...@@ -69,6 +71,7 @@ ...@@ -69,6 +71,7 @@
<input type="button" class="normalBtn" value="温馨提示" <input type="button" class="normalBtn" value="温馨提示"
@click="showNotice=true,resetPageIndex(),GetHotelTipList()" /> @click="showNotice=true,resetPageIndex(),GetHotelTipList()" />
<input type="button" class="normalBtn" value="查询" @click="getList()" /> <input type="button" class="normalBtn" value="查询" @click="getList()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -248,7 +251,7 @@ ...@@ -248,7 +251,7 @@
//星级 //星级
Star: 0, Star: 0,
//价格等级 //价格等级
PriceLevel: 0 PriceLevel: 0,
}, },
beforeCheck: { beforeCheck: {
disabledDate: time => { disabledDate: time => {
...@@ -541,6 +544,19 @@ ...@@ -541,6 +544,19 @@
} }
}, err => {}) }, err => {})
}, },
//Excel下载
DownLoadHotelQuery() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
let fileName = "酒店查询统计" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotelQuery", qMsg, fileName,
res => {
this.loading = false;
});
},
}, },
mounted() { mounted() {
this.getBranchList(); this.getBranchList();
......
src/components/ShoppingStore/ShoppingStore.vue
View file @ 2c992d7d
...@@ -601,20 +601,20 @@ ...@@ -601,20 +601,20 @@
<el-input v-model="item.TCNUM" class="w150"></el-input> <el-input v-model="item.TCNUM" class="w150"></el-input>
</td> </td>
<td :class="{'redType':item.ShoppingNameExist==-1}"> <td :class="{'redType':item.ShoppingNameExist==-1}">
<el-select clearable class="w150" v-model='item.ShoppingID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.ShoppingID' filterable placeholder="请选择购物店">
<el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td>{{item.EnterTime}}</td> <td>{{item.EnterTime}}</td>
<td :class="{'redType':item.GuideExist==-1}"> <td :class="{'redType':item.GuideExist==-1}">
<el-select clearable class="w150" v-model='item.GuideID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.GuideID' filterable placeholder="请选择领队">
<el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td :class="{'redType':item.LeaderName==-1}"> <td :class="{'redType':item.LeaderName==-1}">
<el-select clearable class="w150" v-model='item.LeaderID' filterable :placeholder="$t('hotel.hotel_area')"> <el-select clearable class="w150" v-model='item.LeaderID' filterable placeholder="请选择导游">
<el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ 2c992d7d
...@@ -103,6 +103,8 @@ ...@@ -103,6 +103,8 @@
<div class="d7"> <div class="d7">
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button> <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">{{$t('Operation.Op_tripDownLoad')}}</el-button>
<el-button style="display:none;" @click="goB2B(item.ID, 0)" type="primary">{{$t('Operation.Op_b2bView')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button> <el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
</div> </div>
</div> </div>
...@@ -157,6 +159,8 @@ ...@@ -157,6 +159,8 @@
StartGroupDate: "", StartGroupDate: "",
EndGroupDate: "", EndGroupDate: "",
}, },
//当前登录人员信息
CurrentUserInfo:{},
remarkMsg: { remarkMsg: {
TCID: 0, TCID: 0,
OPRemark: "", OPRemark: "",
...@@ -326,12 +330,44 @@ ...@@ -326,12 +330,44 @@
err => {} err => {}
); );
}, },
goB2B(ConfigId, tcid) {
var B2BDomain = this.CurrentUserInfo.B2BDomain;
var url="http://192.168.2.214:8084";
url="http://www.oytour.com";
window.open(
url+'/#/detailTwo/' +
encodeURIComponent(ConfigId) + '/' + tcid +
'/preview',
'_blank'
)
},
goUrlR(path, item) {
var cityId = item.StartCityID
if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId
}
let routeData = this.$router.resolve({
name: path,
query: {
configId: item.ID,
cityId: cityId,
tcid: 0,
orderId: 0,
vshowL: false,
vshowM: false,
vshowTCNUM: true,
}
})
window.open(routeData.href, '_blank')
}
}, },
mounted() { mounted() {
this.getEmployeeList(); this.getEmployeeList();
this.getLineList(); this.getLineList();
}, },
created() { created() {
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
this.getControlList(); this.getControlList();
}, },
}; };
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 2c992d7d
...@@ -34,12 +34,25 @@ ...@@ -34,12 +34,25 @@
<li> <li>
<span> <span>
<em>{{$t('Operation.Op_baomingCompany')}}</em> <em>{{$t('Operation.Op_baomingCompany')}}</em>
<el-select class="w200" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w200" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getDepartmentMsg.RB_Branch_Id=msg.BranchId,msg.RB_Department_Id='',msg.CreateBy='',getDepartment()">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span>
<em>部门选择</em>
<el-select filterable v-model='msg.RB_Department_Id' @change="employeeMsg.DepartmentId=msg.RB_Department_Id,getEmployee(),msg.CreateBy=''">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</span>
</li>
<li> <li>
<span> <span>
<em>{{$t('Operation.Op_peopleChoice')}}</em> <em>{{$t('Operation.Op_peopleChoice')}}</em>
...@@ -52,10 +65,10 @@ ...@@ -52,10 +65,10 @@
> >
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option <el-option
v-for="item in employeeList" v-for="item in EmployeeList"
:label="item.name" :label="item.EmName"
:value="item.empId" :value="item.EmployeeId"
:key="item.empId" :key="item.EmployeeId"
></el-option> ></el-option>
</el-select> </el-select>
</li> </li>
...@@ -203,7 +216,7 @@ ...@@ -203,7 +216,7 @@
<th v-if="userId==1" width="130">{{$t('system.table_operation')}}</th> <th v-if="userId==1" width="130">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr> <tr>
<td v-show="OrderList.length==0" colspan="15" align="center">{{$t('system.content_noData')}}</td> <td v-show="OrderList.length==0" colspan="16" align="center">{{$t('system.content_noData')}}</td>
</tr> </tr>
<tbody v-for="(item,index) in OrderList" :key="index"> <tbody v-for="(item,index) in OrderList" :key="index">
<tr> <tr>
...@@ -457,7 +470,7 @@ export default { ...@@ -457,7 +470,7 @@ export default {
BranchId:-1, BranchId:-1,
LineId: -1, LineId: -1,
LineIdStr:"",//线路字符串 LineIdStr:"",//线路字符串
RB_Department_Id: null, RB_Department_Id: '',
CreateBy: "-1", CreateBy: "-1",
OrderState: "-1", OrderState: "-1",
CStartDate: "", CStartDate: "",
...@@ -467,6 +480,13 @@ export default { ...@@ -467,6 +480,13 @@ export default {
tempOrderId: "", tempOrderId: "",
SellFormEmp: 0 SellFormEmp: 0
}, },
getDepartmentMsg:{// 部门
RB_Group_Id:'',
RB_Branch_Id:'',
Status:0,
ParentId:-1,
Tier:0,
},
employeeMsg: { employeeMsg: {
RB_Group_id: "0", RB_Group_id: "0",
RB_Branch_id: "-1", RB_Branch_id: "-1",
...@@ -477,8 +497,8 @@ export default { ...@@ -477,8 +497,8 @@ export default {
OrderList: [], OrderList: [],
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
departmentList: [], DepartmentList: [],
employeeList: [], EmployeeList: [],
ddztList: [], ddztList: [],
countData: { countData: {
// 总报名人数 // 总报名人数
...@@ -605,32 +625,6 @@ export default { ...@@ -605,32 +625,6 @@ export default {
err => {} err => {}
); );
}, },
getEmployee() {
this.apipost(
"app_get_company_employee",
this.employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
},
err => {}
);
},
getDepartment() {
this.apipost(
"Advertising_get_GetNowDepartmentAndSubordinate",
{},
res => {
if (res.data.resultCode == 1) {
this.departmentList = res.data.data;
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
getLineList() { getLineList() {
this.apipost("line_post_GetList", {}, res => { this.apipost("line_post_GetList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -681,7 +675,23 @@ export default { ...@@ -681,7 +675,23 @@ export default {
//关闭修改业务员 //关闭修改业务员
closeSalseDiv(){ closeSalseDiv(){
this.showChangeSales=false; this.showChangeSales=false;
} },
getDepartment(){ //部门
this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
if(res.data.resultCode == 1) {
this.DepartmentList = res.data.data;
}
}, err => {})
},
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
console.log(this.EmployeeList);
}
}, err => {})
},
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
src/components/busManagement/busStockManager.vue
View file @ 2c992d7d
<template> <template>
<div> <div class="busStockManager">
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li><span> <li><span>
...@@ -8,9 +8,28 @@ ...@@ -8,9 +8,28 @@
@keyup.native.enter="getList();resetPageIndex()" placeholder="停车场"></el-input> @keyup.native.enter="getList();resetPageIndex()" placeholder="停车场"></el-input>
</span> </span>
</li> </li>
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.Country" clearable class="w150" filterable @change="getProvinceList(msg.Country,1)"
:placeholder="$t('hotel.hotel_country')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.Province" class="w150" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.City" class="w150" filterable :placeholder="$t('hotel.hotel_city')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li> <li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" /> <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" value="新增" @click="IsShow=true" /> <input type="button" class="normalBtn" value="新增" @click="IsShow=true,resetMsg()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -30,7 +49,7 @@ ...@@ -30,7 +49,7 @@
<td> <td>
{{item.Id}} {{item.Id}}
</td> </td>
<td style="text-align:left"> <td style="text-align:left;padding:0 20px;">
{{item.ParkName}} {{item.ParkName}}
<br /> <br />
{{item.Address}} {{item.Address}}
...@@ -47,12 +66,22 @@ ...@@ -47,12 +66,22 @@
{{item.UpdateDateStr}} {{item.UpdateDateStr}}
</td> </td>
<td> <td>
<a style="cursor:pointer;" @click="IsShow=true,GetPark(item.Id)">修改</a> <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<a style="cursor:pointer;" @click="delPark(item.Id)">删除</a> <el-button type="primary" icon="el-icon-edit" @click="IsShow=true,GetPark(item.Id)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-button type="danger" icon="el-icon-delete"
@click="delPark(item.Id)" circle></el-button>
</el-tooltip>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="noDataNotice" v-if="!DataList||DataList.length==0">
<i class="iconfont icon-kong"></i>
<p>没有找到你需要的数据</p>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
...@@ -70,44 +99,55 @@ ...@@ -70,44 +99,55 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item label="停车场"> <el-form-item label="停车场">
<el-input v-model="PostMsg.ParkName"></el-input> <el-input v-model="PostMsg.ParkName" class="w210"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="国家"> <el-form-item label="国家">
<el-input v-model="PostMsg.Country"></el-input> <el-select v-model="PostMsg.Country" clearable class="w210" filterable @change="getAddProvince(PostMsg.Country,1)"
:placeholder="$t('hotel.hotel_country')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="省份"> <el-form-item label="省份">
<el-input v-model="PostMsg.Province"></el-input> <el-select v-model="PostMsg.Province" filterable class="w210" @change="getAddProvince(PostMsg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in provinceList2" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="城市"> <el-form-item label="城市">
<el-input v-model="PostMsg.City"></el-input> <el-select v-model="PostMsg.City" filterable class="w210" :placeholder="$t('hotel.hotel_city')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in cityList2" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="详细地址"> <el-form-item label="详细地址">
<el-input v-model="PostMsg.Address"></el-input> <el-input v-model="PostMsg.Address" class="w210"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="经度"> <el-form-item label="经度">
<el-input v-model="PostMsg.Lng"></el-input> <el-input v-model="PostMsg.Lng" class="w210"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="纬度"> <el-form-item label="纬度">
<el-input v-model="PostMsg.Lat"></el-input> <el-input v-model="PostMsg.Lat" class="w210"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="库存数量"> <el-form-item label="库存数量">
<el-input v-model="PostMsg.StockNum"></el-input> <el-input v-model="PostMsg.StockNum" @keyup.native="checkInteger(PostMsg,'StockNum')" class="w210"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
...@@ -142,7 +182,13 @@ ...@@ -142,7 +182,13 @@
Lng: "", Lng: "",
Lat: "", Lat: "",
StockNum: 0, StockNum: 0,
} },
countryList:[],
provinceList:[],
cityList:[],
provinceList2:[],
cityList2:[]
} }
}, },
methods: { methods: {
...@@ -172,6 +218,13 @@ ...@@ -172,6 +218,13 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PostMsg = res.data.data; this.PostMsg = res.data.data;
console.log(this.PostMsg);
if(this.PostMsg.Country>0){
this.getPrivince(this.PostMsg.Country,1);
}
if(this.PostMsg.Province>0){
this.getPrivince(this.PostMsg.Province,2);
}
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -218,8 +271,106 @@ ...@@ -218,8 +271,106 @@
}); });
} }
}, },
//获取国家
getCountryList() {
this.apipost(
"dict_post_Destination_GetCountry", {},
res => {
this.countryList = res.data.data;
},
err => {}
);
},
getProvinceList(ID, type) {
//根据省份获取城市
let msg = {
Id: ID
};
if (type == 1) {
this.msg.Province = "";
this.msg.City = "";
} else if (type == 2) {
this.msg.City = "";
}
if (this.msg.Country !== "") {
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
if (type == 1) {
this.provinceList = res.data.data;
} else if (type == 2) {
this.cityList = res.data.data;
}
},
err => {}
);
}
},
getAddProvince(ID, type) {
//根据省份获取城市
let msg = {
Id: ID
};
if (type == 1) {
this.PostMsg.Province = "";
this.PostMsg.City = "";
} else if (type == 2) {
this.PostMsg.City = "";
}
if (this.PostMsg.Country !== "") {
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
if (type == 1) {
this.provinceList2 = res.data.data;
} else if (type == 2) {
this.cityList2 = res.data.data;
}
},
err => {}
);
}
},
//初始化对应下拉
getPrivince(ID,type){
let msg = {
Id: ID
};
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
if (type == 1) {
this.provinceList2 = res.data.data;
} else if (type == 2) {
this.cityList2 = res.data.data;
}
},
err => {}
);
},
//重置
resetMsg(){
let msg = {
Id: 0,
ParkName: "",
Country: 0,
Province: 0,
City: 0,
District: 0,
Address: "",
Lng: "",
Lat: "",
StockNum: 0,
}
this.PostMsg = msg;
}
}, },
mounted() { mounted() {
this.getCountryList();
this.getList(); this.getList();
} }
} }
...@@ -275,47 +426,10 @@ ...@@ -275,47 +426,10 @@
cursor: pointer; cursor: pointer;
} }
.busStatistics_tripDetails { .busStockManager .w150 .el-input{
padding: 0; width:150px;
box-shadow: 0px 1px 3px 0px #dedede;
max-height: 400px;
overflow-y: auto;
} }
.busStockManager .el-button.is-circle{
.busStatistics_tripDetails .popper__arrow::after { padding:5px;
border-bottom-color: #ededed !important;
} }
.busStatistics_tripDetails table {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.busStatistics_tripDetails table th {
background-color: #ededed;
padding: 5px;
}
.busStatistics_tripDetails table td {
background-color: #ffffff;
padding: 9px 15px;
color: #333333;
border: 1px solid #d2d2d2;
}
.busStatistics_tripDetails table td._d_name {
background-color: #ededed;
}
.busStatistics_tripDetails table ._color_666 {
color: #666666;
}
.busStatistics_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
</style> </style>
src/components/confirmationOrderDownLoad.vue
View file @ 2c992d7d
<style> <style>
.confirmOrder{ .confirmOrder {
width:950px; width: 950px;
} }
.travelControlTrip .hangban-info tr td,.travelControlTrip .hangban-info tr th{
.travelControlTrip .hangban-info tr td,
.travelControlTrip .hangban-info tr th {
padding-left: 0 !important; padding-left: 0 !important;
} }
</style> </style>
<template> <template>
<div class="travelControlTrip detail-box"> <div class="travelControlTrip detail-box">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div> <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" /> @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" /> <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"
@click="gernalFeature(0)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
@click="gernalFeature(1)" />
<a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none; <a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a> width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
:href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') --> <!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息--> <!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" /> <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
...@@ -22,7 +29,8 @@ ...@@ -22,7 +29,8 @@
<div id='pdfDom' style="padding:0 20px;"> <div id='pdfDom' style="padding:0 20px;">
<div id="pdf_1"> <div id="pdf_1">
<div class="logo-div"> <div class="logo-div">
<img :src="vshowJ===true? domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/headerImg.jpg':domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/headerImg2.jpg'"> <img
:src="vshowJ===true? domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/headerImg.jpg':domainManager().ViittoFileUrl+'/Upload/PictureMaterial/Web/headerImg2.jpg'">
</div> </div>
<div class="website"> <div class="website">
<div class="website-line"></div> <div class="website-line"></div>
...@@ -157,10 +165,13 @@ ...@@ -157,10 +165,13 @@
</table> </table>
<div class="_hangban_line"></div> <div class="_hangban_line"></div>
<table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list"> <table border="0" align="center" cellspacing="0" cellpadding="0" class="flight_list">
<tbody v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0"> <tbody
v-if="orderTripdiff&&orderTripdiff.travelOrderFlightList&& orderTripdiff.travelOrderFlightList.length>0">
<tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex"> <tr v-for="(flight,ftIndex) in orderTripdiff.travelOrderFlightList" :key="ftIndex">
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.departureTime}}</span></td> <td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td> class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.arrivalTime}}</span></td>
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td> <td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td> <td width="18" class="gap">&nbsp;</td>
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td> <td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
...@@ -173,8 +184,10 @@ ...@@ -173,8 +184,10 @@
</tbody> </tbody>
<tbody v-else-if="priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0"> <tbody v-else-if="priceList.length>0&&priceList[0].priceFlight&&priceList[0].priceFlight.length>0">
<tr v-for="(flight,ftIndex) in priceList[0].priceFlight" :key="ftIndex"> <tr v-for="(flight,ftIndex) in priceList[0].priceFlight" :key="ftIndex">
<td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.departureTime}}</span></td> <td width="140"><span class="nth-day">{{flight.startDate.substring(5)}}</span>&nbsp;<span
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span class="num">{{flight.arrivalTime}}</span></td> class="num">{{flight.departureTime}}</span></td>
<td width="160"><span class="nth-day">{{flight.arriveDate.substring(5)}}</span>&nbsp;<span
class="num">{{flight.arrivalTime}}</span></td>
<td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td> <td width="160">{{flight.departureAirPortName}}<span class="citycode"></span></td>
<td width="18" class="gap">&nbsp;</td> <td width="18" class="gap">&nbsp;</td>
<td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td> <td width="160">{{flight.arrivalAirPortName}}<span class="citycode"></span></td>
...@@ -199,20 +212,23 @@ ...@@ -199,20 +212,23 @@
<table> <table>
<tbody> <tbody>
<tr> <tr>
<td @click="showImg(feature.featureImgList),initialIndex=index" v-for="(i,index) in feature.featureImgList" <td @click="showImg(feature.featureImgList),initialIndex=index"
:key="index" v-if="index<3" :style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}"> v-for="(i,index) in feature.featureImgList" :key="index" v-if="index<3"
:style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
<tr> <tr>
<td @click="showImg(feature.featureImgList),initialIndex=index" v-for="(i,index) in feature.featureImgList" <td @click="showImg(feature.featureImgList),initialIndex=index"
:key="index" v-if="index>2&&index<6" :style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}"> v-for="(i,index) in feature.featureImgList" :key="index" v-if="index>2&&index<6"
:style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
<tr> <tr>
<td @click="showImg(feature.featureImgList),initialIndex=index" v-for="(i,index) in feature.featureImgList" <td @click="showImg(feature.featureImgList),initialIndex=index"
:key="index" v-if="index>5&&index<=8" :style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}"> v-for="(i,index) in feature.featureImgList" :key="index" v-if="index>5&&index<=8"
:style="{background:'url(' + i.url + ') no-repeat bottom left/100% auto'}">
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
...@@ -244,16 +260,16 @@ ...@@ -244,16 +260,16 @@
<div class="short-line"></div> <div class="short-line"></div>
<div class="english-title">Scheduling</div> <div class="english-title">Scheduling</div>
</div> </div>
<oneday v-if="item.details && item.details.length==1" :day='item' :dayNum="item.dayNum" :title="item.title" <oneday v-if="item.details && item.details.length==1" :day='item' :dayNum="item.dayNum"
:isDirect="isDirect"></oneday> :title="item.title" :isDirect="isDirect"></oneday>
<twoday v-if="item.details && item.details.length==2" :day='item' :dayNum="item.dayNum" :title="item.title" <twoday v-if="item.details && item.details.length==2" :day='item' :dayNum="item.dayNum"
:isDirect="isDirect"></twoday> :title="item.title" :isDirect="isDirect"></twoday>
<threeday v-if="item.details && item.details.length==3" :day='item' :dayNum="item.dayNum" :title="item.title" <threeday v-if="item.details && item.details.length==3" :day='item' :dayNum="item.dayNum"
:isDirect="isDirect"></threeday> :title="item.title" :isDirect="isDirect"></threeday>
<fourday v-if="item.details && item.details.length==4" :day='item' :dayNum="item.dayNum" :title="item.title" <fourday v-if="item.details && item.details.length==4" :day='item' :dayNum="item.dayNum"
:isDirect="isDirect"></fourday> :title="item.title" :isDirect="isDirect"></fourday>
<fiveday v-if="item.details && item.details.length>=5" :day='item' :dayNum="item.dayNum" :title="item.title" <fiveday v-if="item.details && item.details.length>=5" :day='item' :dayNum="item.dayNum"
:isDirect="isDirect"></fiveday> :title="item.title" :isDirect="isDirect"></fiveday>
</div> </div>
</div> </div>
<div v-else> <div v-else>
...@@ -519,7 +535,8 @@ ...@@ -519,7 +535,8 @@
<el-select class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="priceFlight.airLineID" <el-select class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="priceFlight.airLineID"
@change="airLineSelectChange(priceFlight.airLineID,priceFlight,1)"> @change="airLineSelectChange(priceFlight.airLineID,priceFlight,1)">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airLineList" :label="item.AlName" :value="item.AirLineId" :key="item.AirLineId"></el-option> <el-option v-for="item in airLineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
...@@ -530,9 +547,12 @@ ...@@ -530,9 +547,12 @@
:key="item.ID"></el-option> :key="item.ID"></el-option>
</el-select> </el-select>
</td> </td>
<td>{{priceFlight.departureAirPortName}} <template v-if="priceFlight.departureTime&& priceFlight.departureTime!=''">（{{priceFlight.departureTime}}）</template></td> <td>{{priceFlight.departureAirPortName}} <template
v-if="priceFlight.departureTime&& priceFlight.departureTime!=''">（{{priceFlight.departureTime}}）</template>
</td>
<td> <td>
{{priceFlight.arrivalAirPortName}}<template v-if="priceFlight.arrivalTime && priceFlight.arrivalTime!=''">（{{priceFlight.arrivalTime}}）</template> {{priceFlight.arrivalAirPortName}}<template
v-if="priceFlight.arrivalTime && priceFlight.arrivalTime!=''">（{{priceFlight.arrivalTime}}）</template>
</td> </td>
<td> <td>
<el-date-picker class="w110" :clearable="false" v-model="priceFlight.startDate" type="date" <el-date-picker class="w110" :clearable="false" v-model="priceFlight.startDate" type="date"
...@@ -547,12 +567,15 @@ ...@@ -547,12 +567,15 @@
<el-button type="danger" icon="el-icon-delete" @click="removePriceFlight(index,priceFlight,1)" <el-button type="danger" icon="el-icon-delete" @click="removePriceFlight(index,priceFlight,1)"
circle></el-button> circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" v-if="index!=0" style="margin-left:0" effect="dark" content="上移" placement="top-start"> <el-tooltip class="item" v-if="index!=0" style="margin-left:0" effect="dark" content="上移"
<el-button type="danger" icon="iconfont icon-shangyi" @click="MoveItem(priceFlight,index,0)" circle></el-button> placement="top-start">
<el-button type="danger" icon="iconfont icon-shangyi" @click="MoveItem(priceFlight,index,0)" circle>
</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" v-if="index!=editForm.travelOrderFlightList.length-1" style="margin-left:0" <el-tooltip class="item" v-if="index!=editForm.travelOrderFlightList.length-1" style="margin-left:0"
effect="dark" content="下移" placement="top-start"> effect="dark" content="下移" placement="top-start">
<el-button type="danger" icon="iconfont icon-xiayi1" @click="MoveItem(priceFlight,index,1)" circle></el-button> <el-button type="danger" icon="iconfont icon-xiayi1" @click="MoveItem(priceFlight,index,1)" circle>
</el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
...@@ -703,10 +726,10 @@ ...@@ -703,10 +726,10 @@
}, },
datatype: "jsonP", datatype: "jsonP",
success: function (data) { success: function (data) {
}, },
error: function () { error: function () {
} }
}); });
if (allNum !== document.querySelectorAll(cName).length) { if (allNum !== document.querySelectorAll(cName).length) {
...@@ -846,20 +869,26 @@ ...@@ -846,20 +869,26 @@
} }
this.editForm.travelOrderFlightList.push(obj) this.editForm.travelOrderFlightList.push(obj)
}, },
setDate: function (j) { setDate: function (j) {
let stDate = this.priceList[0].startDate let stDate = "";
if (this.priceList && this.priceList.length > 0) {
stDate = this.priceList[0].startDate;
}
if (j === 0) { if (j === 0) {
return stDate return stDate
} else { } else {
let d = new Date(stDate) if (stDate) {
d = d.getTime(d); let d = new Date(stDate)
let add = d + ((24 * 60 * 60 * 1000) * j) d = d.getTime(d);
let date = new Date(add); //时间戳为10位需*1000，时间戳为13位的话不需乘1000 let add = d + ((24 * 60 * 60 * 1000) * j)
let Y = date.getFullYear() + '-'; let date = new Date(add); //时间戳为10位需*1000，时间戳为13位的话不需乘1000
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; let Y = date.getFullYear() + '-';
let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' '; let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
return Y + M + D; let D = date.getDate() < 10 ? ('0' + date.getDate()) + ' ' : date.getDate() + ' ';
return Y + M + D;
} else {
return "";
}
} }
}, },
appendParent() { appendParent() {
...@@ -903,7 +932,7 @@ ...@@ -903,7 +932,7 @@
} }
this.pdfLoading = false this.pdfLoading = false
}).catch(err => { }).catch(err => {
}) })
}, },
ToWord: function (title, isPc) { ToWord: function (title, isPc) {
...@@ -973,17 +1002,16 @@ ...@@ -973,17 +1002,16 @@
this.orderMsg = data.orderMsg; this.orderMsg = data.orderMsg;
if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) { if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson); this.orderTripdiff.travelOrderFlightList = JSON.parse(this.orderTripdiff.flightInfoJson);
if(this.orderMsg.outNotice==1) if (this.orderMsg.outNotice == 1) {
{ if (this.orderTripdiff.travelOrderFlightList != null && this.orderTripdiff.travelOrderFlightList
if(this.orderTripdiff.travelOrderFlightList!=null && this.orderTripdiff.travelOrderFlightList.length>0) .length > 0) {
{ this.orderTripdiff.travelOrderFlightList.forEach(subItem => {
this.orderTripdiff.travelOrderFlightList.forEach(subItem=>{ subItem.flightState = 1;
subItem.flightState=1; });
}); }
}
} }
} }
//HK新加 //HK新加
this.SourceData.Id = 0; this.SourceData.Id = 0;
if (this.$route.query.orderId > 0) { if (this.$route.query.orderId > 0) {
...@@ -997,7 +1025,8 @@ ...@@ -997,7 +1025,8 @@
} }
this.SourceData.leaderInfo = str; this.SourceData.leaderInfo = str;
this.SourceData.gatheringTime = this.orderMsg.gatheringTime; this.SourceData.gatheringTime = this.orderMsg.gatheringTime;
this.SourceData.airportService = this.orderMsg.airportServicePerson + "/" + this.orderMsg.airportServicePhone; this.SourceData.airportService = this.orderMsg.airportServicePerson + "/" + this.orderMsg
.airportServicePhone;
this.SourceData.gatherIdent = this.orderMsg.bName; this.SourceData.gatherIdent = this.orderMsg.bName;
this.SourceData.emergencyContact = this.orderMsg.sellName + "/" + this.orderMsg.sellTel; this.SourceData.emergencyContact = this.orderMsg.sellName + "/" + this.orderMsg.sellTel;
this.SourceData.gatheringAddress = this.orderMsg.gatheringAddress; this.SourceData.gatheringAddress = this.orderMsg.gatheringAddress;
...@@ -1036,7 +1065,7 @@ ...@@ -1036,7 +1065,7 @@
this.airLineSelectChange(fItem.airLineID, fItem); this.airLineSelectChange(fItem.airLineID, fItem);
}); });
} }
this.title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游' this.title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游'
document.title = this.title; document.title = this.title;
//初始化行程 //初始化行程
...@@ -1221,7 +1250,7 @@ ...@@ -1221,7 +1250,7 @@
x.jiu2 = jiu2 x.jiu2 = jiu2
if (jin.length > 0) { if (jin.length > 0) {
details = jin details = jin
} }
// else if (jiu.length > 0) { // else if (jiu.length > 0) {
// // details = jiu // // details = jiu
// } // }
......
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