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

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -799,13 +799,16 @@ export default {
                     var zhifu=[];
                     wechat = OcrStr.match(/商户单号.\d+/);
                     zhifu = OcrStr.match(/商家可扫码退款或查询交易.\d+/);
-                    if(wechat==null&&zhifu==null){
+                    let barcode=x.data.Barcode;
+                    if(wechat==null&&zhifu==null&&barcode==""){
                           return;  
                     }
-                    if(zhifu==null&&wechat.length>0){
+                    if(zhifu==null&&wechat!=null&&wechat.length>0){
                         this.setCode = wechat[wechat.length-1].replace('商户单号','');
-                    }else if(wechat==null&&zhifu.length>0){
+                    }else if(wechat==null&&zhifu!=null&&zhifu.length>0){
                         this.setCode = zhifu[zhifu.length-1].replace('商家可扫码退款或查询交易','');
+                    }else if(barcode!=""){
+                        this.setCode=barcode;
                     }
                     this.$confirm('匹配到交易流水号是否替换?', '提示', {
                         confirmButtonText: '确定',

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -102,7 +102,7 @@
   }
 
   .Team_Incontent {
-    margin-left:35px;
+    margin-left: 35px;
   }
 
   .Team_firstTitle span {
@@ -224,13 +224,13 @@
                 </div>
                 <div class="Team_Incontent" style="height:80px;overflow:auto;">
                   <div>
-                     <div>提&nbsp;&nbsp;&nbsp;成</div>
-                     <div style="margin-bottom:6px;">
+                    <div>提&nbsp;&nbsp;&nbsp;成</div>
+                    <div style="margin-bottom:6px;">
                       <template v-for="subItem in DataList.ExpectedCutList">
                         <div style="margin-bottom:10px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
                       </template>
                     </div>
-                   </div>
+                  </div>
                   <div>联运成本<span>￥{{DataList.LYCB}}</span></div>
                 </div>
                 <div class="Team_firstTitle">
@@ -263,8 +263,10 @@
       <div class="Team_collection" v-loading="loading">
         <div class="clearfix TB_PrintDiv">
           <div class="TB_comtitle TB-Title">收入</div>
-          <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn"
+          <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>
-          <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
+          <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>
-          <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
+          <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,12 +1268,12 @@
         </table>
       </div>
     </div>
-    <div class="Team_BtnList">
-      <input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
+    <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) ? '关闭收支操作' : '开启收支操作'"
-        class="hollowFixedBtn" />
-      <input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
+        class="hollowFixedBtn"  />
+      <input type="button" value="导出" @click="ExportExcle" class="normalBtn"  />
       <input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" />
     </div>
     <el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg">
@@ -1299,6 +1306,7 @@
           TCNUM: '',
           FrIds: '',
         },
+        IsHaveAuth:false,//权限判断按钮是否显示
         zhuanLoading: false,
         moneyAll: {
           Moneyall: 0,
@@ -1582,7 +1590,7 @@
               }
               // 地接
               if ((that.isExists(item.CostTypeList, '地接费（领取）') || (that.isExists(item.CostTypeList,
-                '地接费（结算）'))) && item.Type == 2) {
+                  '地接费（结算）'))) && item.Type == 2) {
 
                 this.moneyAll.dijieyf += item.Money;
                 this.moneyAll.dijiesf += item.PayMoney;
@@ -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/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

@@ -798,10 +798,11 @@
     <el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
       <table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
         <tr>
-           <th>日期</th>
-           <th>酒店</th>
-           <th>占房时间</th>
-           <th>更换酒店</th>
+          <th>日期</th>
+          <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,7 +1624,28 @@
           },
           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();