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

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -103,9 +103,9 @@
           <button class="hollowFixedBtn" @click="getStatement">
             {{ $t("pub.searchBtn") }}
           </button>
-          <button class="normalBtn" @click="exportExcel">
+          <!-- <button class="normalBtn" @click="exportExcel">
             导出
-          </button>
+          </button> -->
         </li>
       </ul>
     </div>

src/components/Hotel/HotelProductManage2.vue

@@ -2,7 +2,7 @@
   <div class="hotelProductManage2">
     <div class="hotelProductManage2_btnList">
       <div class="btn_check" @click="getMonths()">{{$t('pub.searchBtn')}}</div>
-      <div class="btn_check" @click="goEdit('1')">{{$t('ground.piliangbianji')}}</div>
+      <div class="btn_check" @click="goEdit('1')" style="display:none;">{{$t('ground.piliangbianji')}}</div>
     </div>
     <div class="hotelProductManage2_condition">
       <div>
@@ -166,9 +166,11 @@
         <div>
           <input type="button" :value="$t('objFill.jdzr')" @click="goHotelDiscount('HotelDiscount')"
             class="hollowbtn" />
-          <input type="button" :value="$t('ground.piliangshanchu')" @click="delete2Reset()" class="hollowbtn" />
-          <input type="button" :value="$t('ground.chongzhi')" @click="edit2Reset()" class="hollowFixedBtn" />
-          <el-button type="primary" size="small" class="normalBtn" :loading="saveLoading" @click="edit2Save()">
+          <el-button type="primary" size="small" class="hollowbtn" @click="delete2Reset()">
+            {{$t('ground.piliangshanchu')}}</el-button>
+          <el-button type="primary" size="small" class="normalBtn" @click="edit2Reset()">{{$t('ground.chongzhi')}}
+          </el-button>
+          <el-button type="primary" size="small" class="normalBtn" @click="edit2Save()" :loading="saveLoading">
             {{$t('pub.saveBtn')}}</el-button>
         </div>
       </div>
@@ -263,7 +265,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
+        <el-row style="padding: 10px 0 0 0;border-top: 1px dashed #ccc;">
           <el-col :span="6">
             <el-form-item :label="$t('ground.kucunleixing')">
               <el-select v-model="msg2.InventoryType" :placeholder="$t('pub.pleaseSel')">
@@ -418,7 +420,7 @@
           </el-col>
         </el-row>
 
-        <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;" v-if="userInfo&&userInfo.RB_Group_id==2">
+        <el-row style="padding: 10px 0 0 0;border-top: 1px dashed #ccc;" v-if="userInfo&&userInfo.RB_Group_id==2">
           <el-col :span="6">
             <el-form-item :label="$t('ground.zhoumojiajia')">
               <el-input v-model="msg2.WeekendAddPrice" @keyup.native="checkPrice(msg2,'WeekendAddPrice')"
@@ -446,7 +448,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
+        <el-row style="padding: 10px 0 0 0;border-top: 1px dashed #ccc;">
           <el-col :span="6">
             <el-form-item :label="$t('hotel.hotel_Supplier')">
               <el-select v-model="msg2.Supplier" :placeholder="$t('pub.pleaseSel')">
@@ -961,6 +963,10 @@
     padding: 20px 0;
   }
 
+  .hotelProductManage2 .el-form-item {
+    margin-bottom: 12px !important;
+  }
+
   .hotelproductCkbox {
     height: 30px;
     float: right;