Skip to content

S
SuperMan
Commit ab365ef9 authored by youjie's avatar youjie
Browse files
Options

修复

parent 567d2d3e
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 8 deletions
src/components/SalesModule/passengerListSale.vue
View file @ ab365ef9
...@@ -141,10 +141,10 @@ ...@@ -141,10 +141,10 @@
</div> </div>
<div class="PAL_CONT"> <div class="PAL_CONT">
<div class="PAL_List" v-for="(item,index) in list" v-if="item.houseNo=='未分配'" :draggable="item.isDrag" @dragstart="drag(item)" :key='index'> <div class="PAL_List" v-for="(item,index) in list" v-if="item.isHouse==0" :draggable="item.isDrag" @dragstart="drag(item)" :key='index'>
<div class="PAL_Name"> <div class="PAL_Name">
<div> <div>
<span>{{item.surName}}{{item.name}}</span>{{item.isDrag}} <span>{{item.surName}}{{item.name}}</span>
<span :style="item.isBed==0?'background-color: #254AC3;':'background-color: #D4311B;'">{{item.houseNo}}-({{item.isBed==0?$t('op.NoneedBed'):$t('op.TakeBed')}})</span> <span :style="item.isBed==0?'background-color: #254AC3;':'background-color: #D4311B;'">{{item.houseNo}}-({{item.isBed==0?$t('op.NoneedBed'):$t('op.TakeBed')}})</span>
<div class="PAL_RightHeader" v-show="!isOverdue"> <div class="PAL_RightHeader" v-show="!isOverdue">
<i class="iconfont icon-shanchu" @click="pal_del(item)"></i> <i class="iconfont icon-shanchu" @click="pal_del(item)"></i>
...@@ -315,6 +315,7 @@ export default { ...@@ -315,6 +315,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
} }
else{ else{
this.$message.warning(this.$t('objFill.gaifjzcym')) this.$message.warning(this.$t('objFill.gaifjzcym'))
...@@ -324,6 +325,7 @@ export default { ...@@ -324,6 +325,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
} }
else{ else{
this.$message.warning(this.$t('objFill.fangjbzcrsbdzc')) this.$message.warning(this.$t('objFill.fangjbzcrsbdzc'))
...@@ -347,6 +349,7 @@ export default { ...@@ -347,6 +349,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
} }
else{ else{
this.$message.warning(this.$t('objFill.gaifjzcym')) this.$message.warning(this.$t('objFill.gaifjzcym'))
...@@ -356,6 +359,7 @@ export default { ...@@ -356,6 +359,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
} }
else{ else{
this.$message.warning(this.$t('objFill.fangjbzcrsbdzc')) this.$message.warning(this.$t('objFill.fangjbzcrsbdzc'))
...@@ -378,6 +382,7 @@ export default { ...@@ -378,6 +382,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
} }
else{ else{
this.$message.warning(this.$t('objFill.gaifjzcym')) this.$message.warning(this.$t('objFill.gaifjzcym'))
...@@ -387,6 +392,7 @@ export default { ...@@ -387,6 +392,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
} }
else{ else{
this.$message.warning(this.$t('objFill.fangjbzcrsbdzc')) this.$message.warning(this.$t('objFill.fangjbzcrsbdzc'))
...@@ -423,6 +429,7 @@ export default { ...@@ -423,6 +429,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
}else{ }else{
this.$message.warning(this.$t('objFill.nimzydygbf')) this.$message.warning(this.$t('objFill.nimzydygbf'))
} }
...@@ -432,6 +439,7 @@ export default { ...@@ -432,6 +439,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
}else{ }else{
this.$message.warning(this.$t('objFill.youkezcxbbtqcfp')) this.$message.warning(this.$t('objFill.youkezcxbbtqcfp'))
} }
...@@ -442,6 +450,7 @@ export default { ...@@ -442,6 +450,7 @@ export default {
this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id}) this.orderHouseList[_index1].orderGuestHouse.push({"isBed":this.moveObj.isBed,"userName":this.moveObj.surName+this.moveObj.name,"id":0,"orderId":this.orderId,'sex':this.moveObj.sex,'houseId':obj.id,'houseType':obj.houseType,'guestId':this.moveObj.id})
this.list[_index].houseNo=obj.houseNo this.list[_index].houseNo=obj.houseNo
this.list[_index].isDrag=false this.list[_index].isDrag=false
this.list[_index].isHouse=1
} }
else{ else{
this.$message.warning(this.$t('objFill.fangjbzcrsbdzc')) this.$message.warning(this.$t('objFill.fangjbzcrsbdzc'))
...@@ -468,7 +477,8 @@ export default { ...@@ -468,7 +477,8 @@ export default {
if(_index!=-1){ if(_index!=-1){
this.list[_index].isDrag=true this.list[_index].isDrag=true
this.list[_index].houseNo=this.$t('objFill.v101.busManagement.weifenpei') this.list[_index].houseNo=this.$t('objFill.v101.busManagement.weifenpei')
this.list[_index].houseType=0 this.list[_index].houseNoNew = '未分配'
this.list[_index].isHouse=0
} }
if(_index1!=-1){ if(_index1!=-1){
this.orderHouseList[index].orderGuestHouse.splice(_index1,1) this.orderHouseList[index].orderGuestHouse.splice(_index1,1)
...@@ -478,7 +488,8 @@ export default { ...@@ -478,7 +488,8 @@ export default {
if(_index!=-1){ if(_index!=-1){
this.list[_index].isDrag=true this.list[_index].isDrag=true
this.list[_index].houseNo=this.$t('objFill.v101.busManagement.weifenpei') this.list[_index].houseNo=this.$t('objFill.v101.busManagement.weifenpei')
this.list[_index].houseType=0 this.list[_index].houseNoNew = '未分配'
this.list[_index].isHouse=0
// this.$forceUpdate() // this.$forceUpdate()
} }
if(_index1!=-1){ if(_index1!=-1){
...@@ -506,7 +517,8 @@ export default { ...@@ -506,7 +517,8 @@ export default {
if(_index!=-1){ if(_index!=-1){
this.list[_index].isDrag=true this.list[_index].isDrag=true
this.list[_index].houseNo=this.$t('objFill.v101.busManagement.weifenpei') this.list[_index].houseNo=this.$t('objFill.v101.busManagement.weifenpei')
this.list[_index].houseType=0 this.list[_index].houseNoNew = '未分配'
this.list[_index].isHouse=0
} }
if(_index1!=-1){ if(_index1!=-1){
this.orderHouseList[index].orderGuestHouse.splice(_index1,1) this.orderHouseList[index].orderGuestHouse.splice(_index1,1)
...@@ -516,7 +528,8 @@ export default { ...@@ -516,7 +528,8 @@ export default {
if(_index!=-1){ if(_index!=-1){
this.list[_index].isDrag=true this.list[_index].isDrag=true
this.list[_index].houseNo=this.$t('objFill.v101.busManagement.weifenpei') this.list[_index].houseNo=this.$t('objFill.v101.busManagement.weifenpei')
this.list[_index].houseType=0 this.list[_index].houseNoNew = '未分配'
this.list[_index].isHouse=0
// this.$forceUpdate() // this.$forceUpdate()
} }
if(_index1!=-1){ if(_index1!=-1){
...@@ -541,7 +554,8 @@ export default { ...@@ -541,7 +554,8 @@ export default {
this.data=res.data.data this.data=res.data.data
let arrList = function(list){ let arrList = function(list){
list.forEach(x=>{ list.forEach(x=>{
x.houseType = '' x.isHouse = ''
x.houseNoNew = ''
x.isDrag = false x.isDrag = false
}) })
} }
...@@ -560,7 +574,10 @@ export default { ...@@ -560,7 +574,10 @@ export default {
this.isOverdue=false this.isOverdue=false
} }
this.list.forEach(item=>{ this.list.forEach(item=>{
if(item.houseNo=='未分配') item.houseNoNew = item.houseNo
if(item.houseNoNew=='未分配') item.isHouse = 0
else item.isHouse = 1
if(item.isHouse==0)
{ {
item['isDrag']=true item['isDrag']=true
}else{ }else{
......
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