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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -408,7 +408,7 @@
       </template>
       <tr v-if="TotalNav.planPriceList">
         <td>总金额</td>
-        <td colspan="24">
+        <td colspan="25">
           <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
             {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
               <template v-if="IsShowRMB">
@@ -698,10 +698,15 @@
             <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
               <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
                 @click="goZhiDan(item, 2)" />
-              <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
-                <input type="button" v-if="item.hideZDBtn && ContractUrlCount == 0" value="制单" class="normalBtn"
-                  @click="goZhiDan(item,0,leadr,cur)" />
-              </el-tooltip>
+              <template  v-if="item.hideZDBtn && ContractUrlCount == 0" >
+                <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
+                  <input type="button" value="制单" class="normalBtn"
+                    @click="goZhiDan(item,0,leadr,cur)" />
+                </el-tooltip>
+              </template>
+              <template v-else-if="index2==0">
+                <span>未上传现付、刷卡的酒店手配书无法制单</span>
+              </template>
             </template>
           </div>
         </td>

src/components/SalesModule/CouponsList.vue

@@ -125,9 +125,9 @@
     font-size: 12px;
     color: #333333;
     font-weight: bold;
-    margin-bottom: 13px;
+    margin-bottom: 5px!important;
     }
-    .MyCoupon ._item ._bottom p._bottom_info{
+    .MyCoupon ._item ._bottom p._bottom_info{                                 
     color: #666666;
     font-weight: 300;
     }
@@ -269,7 +269,8 @@ export default {
         couponsType: "",
         couponStatus: 1,
         couponEffectStatus: 1,
-        couponsUseScope: 0
+        couponsUseScope: 0,
+        userId:'',
       },
       dataList: [],
       dataLoading: false,
@@ -280,7 +281,10 @@ export default {
   computed: {},
   created() {},
   mounted() {
-    this.getList()
+    this.getList();
+    if(this.$route.query.customerId){
+        this.msg.userId=this.$route.query.customerId;
+    }
   },
   methods: {
     // 获取数据

src/components/SalesModule/CustomerAnalysis.vue

@@ -65,7 +65,7 @@
               
           </div>
           </div>
-          <div @click="goCoupons" class="list">
+          <div @click="goCoupons(datainfo.CustomerAccountId)" class="list">
               <div class="Item moneyItem">
               <p>优惠券</p>
               <div class="des">
@@ -196,11 +196,12 @@ export default {
       
   },
   methods: {
-      goCoupons(){
+      goCoupons(id){
           this.$router.push({
             name: 'CouponsList',
             query: { 
                 blank: "y", 
+                "customerId": id,
                 tab:'优惠券列表' 
             }
          });

src/components/SalesModule/MyCustomer.vue

@@ -52,7 +52,7 @@
     background: #fff;
     padding-top: 20px;
     box-sizing: border-box;
-    overflow: hidden;
+    overflow: hidden!important;
     
   }
 
@@ -398,7 +398,7 @@
         <td>{{item.tradeTotal}}</td>
         <td>{{item.inquireCount}}</td>
         <td>{{item.allianceName}}</td>
-        <td><span style="cursor: pointer;" @click.stop="goUrC('CouponsList')">{{item.couponNum}}</span></td>
+        <td><span style="cursor: pointer;" @click.stop="goUrC('CouponsList',item.customerAccountId)">{{item.couponNum}}</span></td>
         <td>
             <el-tooltip class="item" effect="dark" content="账户管理" placement="top-start">
               <el-button style="padding:4px" @click.stop="goUrlT('empBankAccount',item.customerId)" type="danger" icon="iconfont icon-guanliyuan" circle></el-button>
@@ -956,7 +956,6 @@
         })
       },
       goUrC(path, customerId) {
-        if(customerId){
              this.$router.push({
             name: path,
             query: {
@@ -964,14 +963,6 @@
                 blank: 'y'
             }
             })
-        }else{
-            this.$router.push({
-            name: path,
-            query: {
-                blank: 'y'
-            }
-        })
-        }
         
       },
       goUrlT(path, id) {

src/components/SalesModule/customerMap.vue

@@ -52,9 +52,9 @@ export default {
         const marker = new BMap.Marker(point, { icon: icon });
         // const infoWindow = new BMap.InfoWindow('简易的信息窗口')
         //绑定事件，显示窗口
-        // marker.addEventListener("click", function(){
-        //   _this.markerClick(point, item)
-        // });
+        marker.addEventListener("click", function(){
+          _this.markerClick(point, item)
+        });
         markerClusterers[item.type || 0].push(marker)
         //添加点标注即添加覆盖物
         map.addOverlay(marker);
@@ -153,7 +153,8 @@ export default {
         data.NotVisit.map(x=>{
           x.type = 1
         })
-        let baiduMapData = [...data.ActivateList, ...data.InActiveList, ...data.NotVisit];
+        // let baiduMapData = [...data.ActivateList, ...data.InActiveList, ...data.NotVisit];
+        let baiduMapData = [...data.NotVisit, ...data.ActivateList];
         this.baiduMapData = baiduMapData
         this.creatMap()
       }

src/components/SalesModule/customerTransfer.vue

@@ -75,12 +75,12 @@
         </li>
         <li style="float:right;padding-top:10px;color:#111111">{{$t('salesModule.JYETJ')}}：{{datainfo.sumMoney}}</li>
         <li>
-          <!-- <input
+          <input
             type="button"
             class="hollowFixedBtn"
             :value="$t('ground.kehuditu')"
             @click="getMap()"
-          > -->
+          >
           <input
             type="button"
             class="hollowFixedBtn"

src/main.js

@@ -99,6 +99,15 @@ Date.prototype.Format = function (fmt) {
   }
   return fmt;
 };
+Vue.prototype.DateDiff = function (sDate1,  sDate2) { 
+  var  aDate,  oDate1,  oDate2,  iDays  
+  aDate  =  sDate1.split("-")  
+  oDate1  =  new  Date(aDate[1]  +  '-'  +  aDate[2]  +  '-'  +  aDate[0])   
+  aDate  =  sDate2.split("-")  
+  oDate2  =  new  Date(aDate[1]  +  '-'  +  aDate[2]  +  '-'  +  aDate[0])  
+  iDays  =  parseInt(Math.abs(oDate1  -  oDate2)  /  1000  /  60  /  60  /24)    //把相差的毫秒数转换为天数  
+  return  iDays
+}
 
 // 数组对比
 Array.prototype.equals = function (array) {