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>
+                <span>未上传现付、刷卡的酒店手配书无法制单</span>
+              </template>
             </template>
           </div>
         </td>

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"