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

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -978,7 +978,8 @@
             var objItem = "";
             if (this.returnPriceList.length > 0) {
               objItem = JSON.parse(JSON.stringify(this.returnPriceList[0]));
-              objItem.OPRemark = "";
+              //HK 03-16注释
+              //objItem.OPRemark = "";
               objItem.AirTicketId = 0;
               objItem.AirticketBindList = [];
               objItem.Checked = false;
@@ -1057,7 +1058,9 @@
                 //选中的酒店数组
                 ChooseHotelArray: [],
                 //非中国大陆护照报价
-                ForeignPassportPrice: 0
+                ForeignPassportPrice: 0,
+                //OP备注
+                OPRemark:"",
               };
             }
             this.returnPriceList.push(objItem);
@@ -1132,6 +1135,7 @@
               TCSaleState: 1,
               VisaPrice: 0,
               YSeat: 0,
+              OPRemark:"",
             }
             this.returnPriceList.push(obj);
           })