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

src/assets/utils/tripUtils.js

@@ -350,6 +350,8 @@ var tripUtils = {
         IntroduceTitle: "", //行程介绍标题
         IntroduceImage: ViittoFileUrl+"/Upload/DefalutImage/DMC/defaultairline.png", //行程介绍图片
         IntroduceDetail: "", //行程介绍详细信息
+        TrafficType:0,//交通类型
+        TrafficContent:""//交通详情
       }
     };
   },
@@ -396,7 +398,9 @@ var tripUtils = {
       ScenicJson:{
         x:0,//初始位移x
         y:0 //初始位移y
-      }
+      },
+      TrafficType:0,//交通类型(1-飞机,2-专车,3-地铁,4-步行)
+      TrafficContent:"",//交通内容
     };
   },
   //行程-酒店对象

src/components/administrative/LianMengManagementList.vue

@@ -32,6 +32,9 @@
             <el-tooltip class="item" effect="dark" content="设置主门店" placement="top">
               <i class="iconfont icon-guanli2"@click="setAdmin(item)"></i>
             </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="移除门店" placement="top">
+              <i class="iconfont icon-img_delete_small icon-guanli2" @click="DelAllianceChild(item)"></i>
+            </el-tooltip>
           </td>
       </tr>
     </table>
@@ -82,6 +85,31 @@ export default {
           message: '已取消'
         });          
       });
+    },
+     DelAllianceChild: function(obj) {
+      let ParentId = this.$route.query.id
+      this.$confirm('确认移除“'+ obj.CustomerName + '”门店？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.apipost(
+          "app_customer_DelAllianceChild",
+          { Id: obj.ID},
+          res => {
+            if (res.data.resultCode === 1) {
+              this.$message.success(res.data.message)
+              this.getList(ParentId);
+            }
+          },
+          null
+        );
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });          
+      });
     },
     getList: function (id) {
       this.loading = true

src/components/newTravelmanager/travelLineTrip/ScenicTraffic.vue

+<style>
+  .ScenicTraffic table td {
+    height: 25px;
+    line-height: 25px;
+  }
+
+  .St_mainDiv {
+    width: 100%;
+    height: 100%;
+    margin: 10px;
+    padding: 0 20px;
+    border-left: 2px solid #E4E7ED;
+    position: relative;
+  }
+
+  .St_radioDiv {
+    position: absolute;
+    width: 12px;
+    height: 12px;
+    background-color: rgb(11, 189, 135);
+    left: -27px;
+    top: 3px;
+    border-radius: 50%;
+  }
+
+  .St_current {
+    position: relative;
+  }
+
+  .St_current:last-child {
+    margin-bottom: 0 !important;
+  }
+
+  .St_current:last-child .St_radioDiv {
+    top: 7px;
+  }
+
+  .Str1 {
+    top: 0;
+  }
+
+</style>
+<template>
+  <div class="TC-ScenicTraffic">
+    <div class="St_mainDiv">
+      <div v-if="!ishasScenic">
+        <div v-if="CurrentDayNum!=1" class="St_current" style="margin-bottom:20px;">
+          <div class="St_radioDiv Str1"></div>
+          酒店出发
+        </div>
+        <div class="St_current" style="margin-bottom:10px">
+          <template
+            v-if="trafficObj.trafficIntroduce.IntroduceTitle">{{trafficObj.trafficIntroduce.IntroduceTitle}}</template>
+          <template v-else>机场</template>
+          <div class="St_radioDiv Str1"></div>
+        </div>
+        <div>
+          <el-select :placeholder="$t('pub.pleaseSel')" v-model="trafficObj.trafficIntroduce.TrafficType">
+            <el-option v-for="item in ArrivalTypeArray" :value="item.ID" :key="item.ID" :label="item.Name">
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="CurrentDayNum!=totalDayNum" class="St_current" style="margin:10px 0">
+          <div class="St_radioDiv"></div>
+          回酒店
+        </div>
+      </div>
+      <div v-else>
+        <div v-if="CurrentDayNum!=1" class="St_current" style="margin-bottom:20px;">
+          <div class="St_radioDiv Str1"></div>
+          酒店出发
+        </div>
+        <div v-for="(item,index) in ScenicArray" :key="index">
+          <div style="margin:10px 0" class="St_current">
+            <div class="St_radioDiv"></div>
+            {{item.CouponsName}}
+          </div>
+          <div>
+            <el-select :placeholder="$t('pub.pleaseSel')" v-model="item.TrafficType">
+              <el-option v-for="subItem in ArrivalTypeArray" :value="subItem.ID" :key="subItem.ID"
+                :label="subItem.Name">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div v-if="CurrentDayNum!=totalDayNum" class="St_current" style="margin:20px 0">
+          <div class="St_radioDiv"></div>
+          回酒店
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import MyEdit from "../../EditTemplate.vue";
+  export default {
+    props: [
+      "trafficObj", //交通信息
+      "ScenicArray", //景点数组
+      "ishasScenic", //是否有景点
+      "CurrentDayNum", //当前天数
+      "totalDayNum", //总天数
+    ],
+    data() {
+      return {
+        subItemObj: [],
+        //下拉框默认值
+        DefaultSelectValue: 0,
+        //编辑器选项
+        toolbar: {
+          clean: false, //加粗
+          font: false, //字体
+          narrative: true //叙述,
+        },
+        //交通类型数组
+        ArrivalTypeArray: [{
+            ID: 1,
+            Name: "飞机",
+            ClassStr: "iconfont icon-feiji"
+          }, //飞机
+          {
+            ID: 2,
+            Name: "专车",
+            ClassStr: "iconfont icon-dabaxiaoba"
+          }, //汽车
+          {
+            ID: 3,
+            Name: "地铁",
+            ClassStr: "iconfont icon-lunchuan"
+          }, //轮船
+          {
+            ID: 4,
+            Name: "步行",
+            ClassStr: "iconfont icon-huoche"
+          } //火车
+        ],
+      };
+    },
+    components: {
+      "my-edit": MyEdit
+    },
+    methods: {
+
+    },
+    mounted() {},
+    created() {},
+    watch: {
+
+    }
+  };
+
+</script>

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -161,7 +161,16 @@
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
               </el-option>
             </el-select>
-            <ul class="scenicCheck_check" v-if="ishasScenic&&NoticeParameters.IsDirect==0">
+             <el-popover placement="right" width="500" trigger="click" >
+                        <scenicTraffic :ref="'scenicTraffic'+dayObj.DayNum+''" :ScenicArray="dayObj.ScenicArray"  
+                        :trafficObj="dayObj.TrafficObj" :ishasScenic="ishasScenic"
+                        :CurrentDayNum="dayObj.DayNum" :totalDayNum="subConfig.DayNum"
+                        >
+                        </scenicTraffic>
+                         <span slot="reference" class="TC-tripTitle" style="padding-left:5px;cursor:pointer;">选择交通信息</span>
+                      </el-popover>
+
+            <ul class="scenicCheck_check" v-if="ishasScenic&& NoticeParameters.IsDirect==0">
               <li>
                 <img src="../../../assets/img/trip/t_c1.png" v-if="scenicCheck===1" alt>
                 <img src="../../../assets/img/trip/t_1.png" @click="scenicCheck=1,NoDirectScenicCheck(1)" v-else alt>
@@ -262,6 +271,7 @@
   import fivedayList from "../TravelTripPreview/fivedayList";
   import trifficTrip from "../travelLineTrip/trifficTrip";
   import MyEdit from "../../EditTemplate.vue";
+  import ScenicTraffic from  "../travelLineTrip/ScenicTraffic";
 
   export default {
     props: [
@@ -690,6 +700,7 @@
       trifficTrip,
       noScenic,
       "my-edit": MyEdit,
+       scenicTraffic:ScenicTraffic
     }
   };