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

src/components/Hotel/HotelSupplier.vue

@@ -91,6 +91,15 @@
                             <el-form-item :label="$t('hotel.table_HotelAddress')" prop="Address">
                                 <el-input type="text" class="w300" maxlength="50" v-model="addMsg.Address" :placeholder="$t('hotel.table_areaDetail')"></el-input>
                             </el-form-item>
+                            <el-form-item label="付款方式" prop="Address">
+                                <el-select v-model="addMsg.PayType"  filterable placeholder="请选择" class="w300">
+                                    <el-option v-for='item in PayTypeList'
+                                        :key="item.Id" 
+                                        :label="item.name"
+                                        :value="item.Id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
                             <el-form-item :label="$t('hotel.table_tel')" prop="Tel">
                                 <el-input type="text" class="w300" maxlength="20" v-model="addMsg.Tel"></el-input>
                             </el-form-item>
@@ -186,8 +195,17 @@ export default {
         Contact: "",
         Fax: "",
         Remark: "",
-        Type: "1"
+        Type: "1",
+        PayType:""
       },
+      //付款方式
+      PayTypeList:[{
+          name:'现付',
+          Id:1
+        },{
+          name:'签单',
+          Id:2
+      }],
       rules: {
         Name: [
           { required: true, message: "请输入供应商名称", trigger: "blur" }
@@ -287,7 +305,8 @@ export default {
         Contact: "",
         Fax: "",
         Remark: "",
-        Type: 1
+        Type: 1,
+        PayType:""
       }),
         (this.provinceList = "");
       this.cityList = "";

src/components/Hotel/roomReservationsDetails.vue

@@ -127,7 +127,6 @@
                   <tr>
                     <td width="70" style="text-align:center;" colspan="2">
                       <span style="color:green">{{subItem.NewHotelName}}</span>
-                       <!-- v-if="subItem.OPState!=1" -->
                       <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
                         <comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
                           :UseDate="item.UseTimeStr">
@@ -138,9 +137,6 @@
                           酒店选择
                         </el-button>
                       </el-popover>
-                      <!-- <template v-else>
-                        <br /> <span class="Hotel_red">OP-指定，不能更换酒店.</span>
-                      </template> -->
                     </td>
                   </tr>
                   <tr>
@@ -373,13 +369,6 @@
                   <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
                     @click="GetHotelLog(subItem,index,subIndex)">日志</div>
                 </el-popover>
-                <br />
-                <!-- <el-popover width="700" trigger="click" popper-class="DMC_HotelPop">
-                  <commonPHInfo :name='"dmccomPriceHotelInfo"+index+subIndex'
-                    :ref='"dmccomPriceHotelInfo"+index+subIndex'></commonPHInfo>
-                  <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;"
-                    @click="GetHotelUsePriceList(subItem.HotelId,item.UseTimeStr,index,subIndex)">库存情况</span>
-                </el-popover> -->
               </td>
             </tr>
           </template>
@@ -471,7 +460,7 @@
               if (objData.list && objData.list.length > 0) {
                 var str = "";
                 objData.list.forEach((cItem, cIndex) => {
-                  str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + "使用了" + cItem.LastUseNum+"间";
+                  str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + "使用了" + cItem.LastUseNum + "间";
                 });
                 if (str != "") {
                   this.Info(str);
@@ -479,7 +468,7 @@
               }
             }
             //库存充足或没有酒店库存的情况
-            else if(objData.isOverStock == 1||objData.isOverStock == -1){
+            else if (objData.isOverStock == 1 || objData.isOverStock == -1) {
               this.list[this.findex].HotelOrderList[this.childIndex].Address = ckedObj.Address;
               this.list[this.findex].HotelOrderList[this.childIndex].NewHotelName = ckedObj.Name;
               this.list[this.findex].HotelOrderList[this.childIndex].Tel = ckedObj.Tel;