Commit 371e8258 authored by youjie's avatar youjie

修复bug

parent 214b6248
...@@ -402,7 +402,6 @@ ...@@ -402,7 +402,6 @@
images: [], images: [],
destination: this.HotelInfo.location&&this.HotelInfo.location.destination&&this.HotelInfo.location.destination.name, destination: this.HotelInfo.location&&this.HotelInfo.location.destination&&this.HotelInfo.location.destination.name,
country: this.HotelInfo.location&&this.HotelInfo.location.country&&this.HotelInfo.location.country.name, country: this.HotelInfo.location&&this.HotelInfo.location.country&&this.HotelInfo.location.country.name,
CreateBy: createBy,//服务人员
} }
if (this.HotelInfo) { if (this.HotelInfo) {
if (this.HotelInfo.images && this.HotelInfo.images.length > 0) { if (this.HotelInfo.images && this.HotelInfo.images.length > 0) {
...@@ -416,7 +415,7 @@ ...@@ -416,7 +415,7 @@
} }
console.log("hotelRoom", pHotel); console.log("hotelRoom", pHotel);
uni.navigateTo({ uni.navigateTo({
url: `/pages/hotel/order?searchObj=${JSON.stringify(this.searchObj)}&dayObj=${JSON.stringify(this.dayObj)}&HotelInfo=${JSON.stringify(pHotel)}&RoomInfo=${JSON.stringify(subItem)}`, url: `/pages/hotel/order?searchObj=${JSON.stringify(this.searchObj)}&dayObj=${JSON.stringify(this.dayObj)}&HotelInfo=${JSON.stringify(pHotel)}&RoomInfo=${JSON.stringify(subItem)}&CreateBy=${createBy}`,
}); });
}, },
openPicture(item) { openPicture(item) {
......
...@@ -200,8 +200,12 @@ ...@@ -200,8 +200,12 @@
</scroll-view> </scroll-view>
</u-dropdown-item> </u-dropdown-item>
</u-dropdown> </u-dropdown>
<hotelRoom v-show="getQueryData.length>0" :dataList="dataList" :rooms="getQueryData" :roomMsg="roomMsg" :search="searchObj" <hotelRoom v-show="getQueryData.length>0" :dataList="dataList"
:day="dayObj" :qRoomType="qRoomTypeList" :qMealType="qMealTypeList"></hotelRoom> :rooms="getQueryData" :roomMsg="roomMsg"
:search="searchObj"
:day="dayObj" :qRoomType="qRoomTypeList"
:qMealType="qMealTypeList"
:createById="createBy"></hotelRoom>
</view> </view>
<u-empty v-show="getQueryData.length==0&&!loading" text="暂无空房间" mode="data" padding-top="5"></u-empty> <u-empty v-show="getQueryData.length==0&&!loading" text="暂无空房间" mode="data" padding-top="5"></u-empty>
</view> </view>
......
...@@ -815,13 +815,13 @@ ...@@ -815,13 +815,13 @@
if (this.customer && this.customer.erpBaseInfo && this.customer.erpBaseInfo.employeeId) { if (this.customer && this.customer.erpBaseInfo && this.customer.erpBaseInfo.employeeId) {
that.orderMsg.EmployeeIdStr = this.customer.erpBaseInfo.employeeId; that.orderMsg.EmployeeIdStr = this.customer.erpBaseInfo.employeeId;
} }
this.orderMsg.OrderSource = 7 // this.orderMsg.OrderSource = 7
// #endif // #endif
// #ifdef MP-AG // #ifdef MP-AG
CreateBy = this.CreateBy CreateBy = this.CreateBy
that.orderMsg.CustomerId = this.customer.customerId that.orderMsg.CustomerId = this.customer.customerId
this.orderMsg.OrderSource = 5 // this.orderMsg.OrderSource = 5
if (this.customer && this.customer.salesBaseInfo && this.customer.salesBaseInfo.employeeId) { if (this.customer && this.customer.salesBaseInfo && this.customer.salesBaseInfo.employeeId) {
this.orderMsg.EmployeeIdStr = this.customer.salesBaseInfo.employeeId this.orderMsg.EmployeeIdStr = this.customer.salesBaseInfo.employeeId
} }
......
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