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

src/components/Hotel/roomReservationsDetails.vue

@@ -596,19 +596,22 @@
               this.list[this.findex].HotelOrderList[this.childIndex].NewHotelId = ckedObj.ID;
               this.list[this.findex].HotelOrderList[this.childIndex].PayStyle = ckedObj.PayStyle;
               this.list[this.findex].HotelOrderList[this.childIndex].PayStyleExt = ckedObj.PayStyle;
-              this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach((subItem,subIndex) => {
+              //判断供应商编号是否大于0
+              if (ckedObj.Supplier > 0) {
+                this.list[this.findex].HotelOrderList[this.childIndex].SupplierId = ckedObj.Supplier;
+              }
+               this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach((subItem,
+                subIndex) => {
                 //判断是否有库存价格
-                if(subIndex==1 && ckedObj.CostPrice>0)
-                {
-                  subItem.IsHaveStockPrice=1;
-                }
-                else
-                {
-                   subItem.IsHaveStockPrice=0;
+                if (subIndex == 1 && ckedObj.CostPrice > 0) {
+                  subItem.IsHaveStockPrice = 1;
+                } else {
+                  subItem.IsHaveStockPrice = 0;
                 }
                 subItem.UnitPrice = ckedObj.CostPrice;
                 subItem.RebateRatio = ckedObj.RebateRatio;
               });
+
               this.calculationPrice(this.list[this.findex].HotelOrderList[this.childIndex]);
             }
           } else {
@@ -673,29 +676,6 @@
           }
         });
       },
-
-      //联系op
-      downLoadPZ: function (src) {
-        let dom = document.querySelector("#blankLink")
-        dom.href = src
-        dom.click()
-      },
-      //删除
-      deleteFile(item, index) {
-        item.ContractUrlArray.splice(index, 1);
-        var str = "";
-        item.ContractUrlArray.forEach(subItem => {
-          str += subItem + ",";
-        })
-        item.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
-      },
-      openChart() {
-        this.MsgBus.$emit('openChat', {
-          account: this.CreateByAccount,
-          alias: this.CreateByName,
-          avatar: this.CreateByPhoto
-        })
-      },
       goUrl(path, obj, name) {
         this.$router.push({
           path: path,
@@ -839,34 +819,6 @@
         }
         this.$forceUpdate();
       },
-      getHotelList(obj) {
-        this.apipost('hotel_post_GetHasStockHotelList', {
-          //1-只查询有库存的酒店
-          IsMoreThanZero: 0,
-          Country: "651",
-          IsAllHotel: 1,
-          sDate: obj.CheckInDateStr
-        }, res => {
-          if (res.data.resultCode == 1) {
-            obj.hotelList = res.data.data;
-          } else {
-            this.$message.error(res.data.message);
-          }
-        }, err => {})
-      },
-      sendValue(obj) {
-        if (obj.hotelList.length > 0) {
-          let ckedObj = obj.hotelList.find(item => item.ID == obj.NewHotelId);
-          obj.Address = ckedObj.Address;
-          obj.Tel = ckedObj.Tel;
-          obj.NewHotelName = ckedObj.Name;
-          obj.PayStyle = ckedObj.PayStyle;
-          obj.PayStyleExt = ckedObj.PayStyle;
-        } else {
-          obj.Address = '';
-          obj.Tel = '';
-        }
-      },
       saveList(type) {
         if (type == 0) {
           this.list.forEach(item => {
@@ -970,26 +922,7 @@
           }
         }, err => {})
       },
-      //合同上传
-      uploadFileBtn(file) {
-        if (file.file.size > 1024 * 1024 * 100) {
-          this.$message.warning("文件大小不能超过100M！");
-          return;
-        }
-        let newArr = [];
-        newArr.push(file.file);
-        let path = "/Upload/DMC/";
-        this.$message.info("上传中...");
-        this.UploadSelfFileT(path, newArr, x => {
-          var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
-          this.ClickItem.ContractUrlArray.push(fileUrl);
-          var str = "";
-          this.ClickItem.ContractUrlArray.forEach(subItem => {
-            str += subItem + ",";
-          })
-          this.ClickItem.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
-        });
-      },
+
       // 获取供应商
       initSupplier() {
         this.apipost("supplier_post_GetAllList", {

src/components/commonPage/comCheckHotel.vue

@@ -74,7 +74,11 @@
           <div class="clearfix comCheckHotel">
               <div class="comCk_list" v-for="(subItem,subIndex) in item.HotelList">
                 <input :id="'H'+index+'_'+subIndex" type="checkbox" v-model="subItem.isChecked" @click="getCheck(item.HotelList,subIndex)"/>
-                <label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.Name}}</label>
+                <label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.Name}}
+                  <template v-if="subItem.Supplier>0">
+                     【{{subItem.SupplierName}}】
+                  </template>
+                </label>
                 <span class="cm_Inventory">{{subItem.Inventory}}</span>
                 <span class="cm_Inventory">剩余:{{subItem.RemainingInventory}}</span>
                 <span class="ck_goUrl" @click="goUrl(subItem.ID)">新增库存</span>
@@ -155,6 +159,7 @@
             ckHotelObj.RebateRatio=this.ckedHotel.RebateRatio;
             ckHotelObj.RebateCount=this.ckedHotel.RebateCount;
             ckHotelObj.CostPrice=this.ckedHotel.CostPrice;
+            ckHotelObj.Supplier=this.ckedHotel.Supplier;
         }
         this.$emit("childHotel", ckHotelObj);
       },