修改单地接房间计算

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -3963,11 +3963,16 @@
         }
       },
       getHouseNo() {
-        //算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量
+        //算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量 8.7新增单地接儿童不占床  减去 儿童不占床
+        let etbzc = 0
+        if (this.addMsg.GroupType == 4) {
+          etbzc = this.addMsg.ChirdNoNeedBedNum ? Number(this.addMsg.ChirdNoNeedBedNum) : 0
+        }
         this.addMsg.PredictRoomNum =
           (Number(this.addMsg.AirticketNum) +
             (Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNeedBedNum) +
+              Number(this.addMsg.ChirdNeedBedNum) -
+              etbzc +
               Number(this.addMsg.OldPeopleNum)) -
             Number(this.addMsg.TripleRoomNum) * 3 -
             Number(this.addMsg.SingleRoomNum)) /

src/components/SalesModule/productQuery.vue

@@ -1688,12 +1688,22 @@
 
       },
       getHouseNo() {
-        //算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量
+        //算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量 8.7新增单地接儿童不占床  减去 儿童不占床
+        let etbzc = 0
+        if (this.addMsg.GroupType == 4) {
+          etbzc = this.addMsg.ChirdNoNeedBedNum ? Number(this.addMsg.ChirdNoNeedBedNum) : 0
+        }
         this.addMsg.PredictRoomNum = (Number(this.addMsg.AirticketNum) + (Number(this.addMsg.ManNum) + Number(this.addMsg
-          .ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum)) - Number(this.addMsg.TripleRoomNum) * 3 - Number(
+          .ChirdNeedBedNum) - etbzc + Number(this.addMsg.OldPeopleNum)) - Number(this.addMsg.TripleRoomNum) * 3 - Number(
           this.addMsg.SingleRoomNum)) / 2 + Number(this.addMsg.SingleRoomNum) + Number(this.addMsg.TripleRoomNum)
       },
       getNumber() {
+        if (this.addMsg.GroupType == 4 && this.addMsg.ChirdNoNeedBedNum > this.addMsg.AirticketNum) {
+          this.addMsg.ChirdNoNeedBedNum = 0
+          this.$message.error('儿童不占床数不能大于单地接人数！')
+          this.$forceUpdate()
+          return
+        }
         this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
         this.addMsg.VisaNum = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
           Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -3901,11 +3901,16 @@
         }
       },
       getHouseNo() {
-        //算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量
+        //算法：((成人+儿童占床数+老人-（三人房数量*3）)-单房数)/2+单房数+三人房数量 8.7新增单地接儿童不占床  减去 儿童不占床
+        let etbzc = 0
+        if (this.addMsg.GroupType == 4) {
+          etbzc = this.addMsg.ChirdNoNeedBedNum ? Number(this.addMsg.ChirdNoNeedBedNum) : 0
+        }
         this.addMsg.PredictRoomNum =
           (Number(this.addMsg.AirticketNum) +
             (Number(this.addMsg.ManNum) +
-              Number(this.addMsg.ChirdNeedBedNum) +
+              Number(this.addMsg.ChirdNeedBedNum) -
+              etbzc +
               Number(this.addMsg.OldPeopleNum)) -
             Number(this.addMsg.TripleRoomNum) * 3 -
             Number(this.addMsg.SingleRoomNum)) /