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

src/components/Supplier/AddSupplierComplaints.vue

@@ -95,11 +95,13 @@
   .Supplier_AC_content .w757 {
     width: 757px !important;
   }
-
+  .Supplier_TouSu .el-textarea__inner{
+    height:300px;
+  }
 </style>
 
 <template>
-  <div class="Supplier_AC_content">
+  <div class="Supplier_AC_content Supplier_TouSu">
     <div class="Supplier_AC_inputGroup">
       <el-input placeholder="请输入团号/编号" class="w757" v-model="QMsg.TCID">
         <el-button slot="append" @click="CheckTCID()">验证</el-button>
@@ -133,9 +135,9 @@
       <el-input type="textarea" style="margin-top:10px;" :rows="5" v-model="EditMsg.ComplainContent"
         placeholder="具体问题描述"></el-input>
     </div>
-    <p style="text-align: center; margin: 10px 0 15px 0;">
+    <p style="text-align: center; margin: 35px 0 15px 0;">
       <input type="button" class="normalBtn" value="保存" @click="SaveData()" />
-      <input type="button" class="normalBtn" value="取消" />
+      <input type="button" class="normalBtn" value="取消" @click="goUrl('roomQuery2')" />
     </p>
   </div>
 </template>
@@ -260,6 +262,12 @@
             this.Error(res.data.message);
           }
         }, err => {});
+      },
+      goUrl(path) {
+        this.$router.push({
+          path: path,
+          query: {}
+        });
       }
     },
     created() {

src/components/Supplier/HotelProductManage.vue

 <template>
-  <div class="hotelProductManage2">
+  <div class="hotelProductManage2" style="padding:20px;">
     <div class="hotelProductManage2_condition">
       <div>
         <em>起始月</em>
@@ -7,7 +7,7 @@
           placeholder="选择月"></el-date-picker>
       </div>
       <input type="button" class="normalBtn" value="查询" @click="getMonths()"/>
-      <input type="button" class="normalBtn" value="批量编辑" @click="goEdit('1')"/>
+      <input type="button" class="normalBtn" value="批量编辑" style="margin-right:10px;" @click="goEdit('1')"/>
     </div>
     <div class="hotelProductManage2_tableBox">
       <table class="hotelProductManage2_table" border="0" cellspacing="0" cellpadding="0">
@@ -266,7 +266,7 @@
       </el-form>
     </div>
     <!-- 弹出编辑 -->
-    <div class="hotelProductManage2_edit" v-show="editShow">
+    <div class="hotelProductManage2_edit" v-show="editShow" style="left:0;">
       <div class="hotelProductManage2_edit_header">
         <div>报价管理</div>
         <div>
@@ -1150,10 +1150,6 @@
 </script>
 
 <style>
-  .hotelProductManage2 {
-    padding: 20px 0;
-  }
-
   .hotelproductCkbox {
     width: 10%;
     height: 30px;

src/components/Supplier/HotelQueryList.vue

@@ -136,7 +136,7 @@
 
     </div>
 
-    <div class="combottomDiv HqCom_bottom" v-if="showNotice">
+    <div class="combottomDiv HqCom_bottom" v-if="showNotice" style="left:0;">
       <el-form label-width="80px">
         <el-row>
           <el-col :span="20">