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

src/assets/css/tripIndex.css

@@ -192,6 +192,7 @@
     overflow: hidden;
 }
 .trip-block .block-item .item .up img{
+    width: 490px;
     /* width: 100%; */
     /* zk新增 */
     position: relative;

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -102,7 +102,7 @@
   }
 
   .Team_Incontent {
-    margin-left:35px;
+    margin-left: 35px;
   }
 
   .Team_firstTitle span {
@@ -263,8 +263,10 @@
       <div class="Team_collection" v-loading="loading">
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">收入</div>
+          <template v-if="IsHaveAuth">
              <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn"  v-show="ishowBtn"
             @click="AddIncomeDetail" />
+          </template>
         </div>
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">团费收入：
@@ -575,7 +577,9 @@
       <div class="Team_collection" v-loading="loading">
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">成本</div>
+          <template v-if="IsHaveAuth">
               <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn"  v-show="ishowBtn" @click="AddOutDetail" />
+          </template>
         </div>
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">邀请函：
@@ -1057,7 +1061,10 @@
       <div class="Team_collection" v-loading="loading">
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">非成本</div>
+          <template v-if="IsHaveAuth">
             <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn"  v-show="ishowBtn" @click="AddOutDetail" />
+          </template>
+
         </div>
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">领队佣金：
@@ -1261,7 +1268,7 @@
         </table>
       </div>
     </div>
-    <div class="Team_BtnList">
+    <div class="Team_BtnList" v-if="IsHaveAuth">
       <input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn"  />
       <input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus"
         :value="(DataList&&DataList.TeamBalance&&DataList.TeamBalance.BrakeAccountStatus === 0) ? '关闭收支操作' : '开启收支操作'"
@@ -1299,6 +1306,7 @@
           TCNUM: '',
           FrIds: '',
         },
+        IsHaveAuth:false,//权限判断按钮是否显示
         zhuanLoading: false,
         moneyAll: {
           Moneyall: 0,
@@ -1713,12 +1721,31 @@
           },
           err => {}
         )
+      },
+      //权限验证
+      checkHasAuth() {
+         this.apipost(
+          'travel_get_CheckBalancePaymentAuth', {
+            TCID: this.TCID
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+               this.IsHaveAuth=true;
+            }
+            else
+            {
+              this.IsHaveAuth=false;
+            }
+          },
+          err => {}
+        )
       }
     },
     mounted() {
       this.TCID = this.$route.query.id;
-      this.OutBranchId = this.$route.query.OutBranchId
-      this.CloseIncomeBtn = this.$route.query.CloseIncomeBtn
+      this.OutBranchId = this.$route.query.OutBranchId;
+      this.CloseIncomeBtn = this.$route.query.CloseIncomeBtn;
+      this.checkHasAuth();
       this.getList();
       this.getAllCont();
       this.getHangingAccountByTCIDList();

src/components/administrative/ExaminationStatistics.vue

@@ -116,7 +116,7 @@ export default {
       if (filters.emName && filters.emName!=''){
         data = data.filter(item => item.emName.indexOf(filters.emName)!=-1);
       }
-      if (filters.periods && filters.periods!=''){
+      if (filters.periods && filters.periods!=''&& filters.periods!='__all__'){
         this.msg.Periods = filters.periods
         this.getList();
       } else{

src/components/commonPage/twoday.vue

@@ -22,8 +22,8 @@
                         <div class="twoday_item" v-for="item in day.details" :key="item.dayNum">
                             <div class="item">
                                 <div class="up">
-                                    <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, 325)'/>
-                                    <img  v-else :src='compressImg(item.img, "filt", 663, 325)' />
+                                    <img v-if="item.img!=''&& item.scenicJson" :style="{'top':item.scenicJson.y+'px'}" :src='compressImg(item.img, "filt", 663, "")'/>
+                                    <img  v-else :src='compressImg(item.img, "filt", 663, "")' />
                                 </div>
                                 <div class="down" style='padding:22px 0;'>
                                   <h4 v-if='item.title!=""' v-html="item.title" @click.stop="goUrl(item.url)" style="cursor: pointer" ></h4>

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -602,7 +602,6 @@
             res => {
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
-                console.log("tempData",tempData);
                 if (tempData.Feature != null) {
                   this.FeatureData.ID = tempData.Feature.ID;
                   this.FeatureData.ConfigId = tempData.Feature.ConfigId;

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -802,6 +802,7 @@
           <th>酒店</th>
           <th>占房时间</th>
           <th>更换酒店</th>
+          <th>操作</th>
         </tr>
         <tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
           <td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
@@ -811,11 +812,12 @@
                 {{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;
                 <span v-if="subItem.UseCount>0 && item.SubList.length==1">
                   <a style="color:green">{{subItem.Status==1?"【OK】":"【暂定】"}}</a>
-                  【<span style="color:green">本团使用库存：{{subItem.UseCount}}
+                  【<span style="color:green">本团使用：{{subItem.UseCount}}
                     {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】
                 </span>
-                【<span style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}}
+                【<span style="color:#E95252;" >剩余：{{subItem.RemainingInventory}}
                 </span>】
+
                 &nbsp;&nbsp;
                 <el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
                   @change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
@@ -837,11 +839,20 @@
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
                 <span style="float: left">{{subItem.Name}}</span>
-                <span style="float: right; color:red; font-size: 13px">剩余库存:{{subItem.Inventory}} /
+                <span style="float: right; color:red; font-size: 13px">剩余:{{subItem.Inventory}} /
                   价格:{{subItem.CostPrice}}</span>
               </el-option>
             </el-select>
           </td>
+          <td>
+            <div class="tp_divList" v-for="(subItem,index) in item.SubList">
+              <div>
+                <span v-if="subItem.UseCount>0 && item.SubList.length==1">
+                  <span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(item)">删除</span>
+                </span>
+              </div>
+            </div>
+          </td>
         </tr>
       </table>
       <div slot="footer" class="dialog-footer">
@@ -1613,8 +1624,29 @@
           },
           err => {}
         );
+      },
+      //删除占用的酒店库存信息
+      DeleteStock(item) {
+        var that = this;
+        this.Confirm("是否此酒店库存信息?", function () {
+          let delMsg = {
+            hotelId: item.SubList[0].HotelId,
+            TCID: item.TCID,
+            useTime: item.SubList[0].JourneyDate
+          };
+          that.apipost("hoteluse_post_DeleteHotelUse", delMsg, res => {
+              if (res.data.resultCode == 1) {
+                that.Success("操作成功!");
+                item.SubList[0].UseCount=0;
+              } else {
+                that.Error(res.data.message);
               }
             },
+            err => {}
+          );
+        });
+      },
+    },
     mounted() {
       var dateObj = this.$calendarUtils.getCurrentDate();
       this.currentYear = dateObj.CurrentYear;