编辑旅游路线

src/views/modal/editorTool.vue

@@ -122,13 +122,6 @@
       }
     },
     mounted() {
-      debugger
-//      switch(this.activeName2){
-//        case "first":
-//          this.myQuillEditor="myQuillEditorExplain";
-//            break;
-//
-//      };
       let tt = this.$refs;
       this.quill = tt[this.myQuillEditor].quill;
       console.log(this.quill);

src/views/tourManage/index.vue

@@ -514,6 +514,7 @@
        * 旅游modal传递回来的数据
        * */
       oneTourDialogEvent(e){
+        this.oneTourDialogVisible = false;
         if(!e){//关闭编辑
           this.oneTourDialogVisible = e;
         } else if(e){

src/views/tourManage/modal/destinationModal.vue

@@ -23,6 +23,13 @@
       <el-form-item label="详细地址" prop="address">
         <el-input v-model="form.address" placeholder="请输入详细地址"></el-input>
       </el-form-item>
+      <el-row>
+        <el-col :span="8" v-if="form.headTitle == '途径地名称'">
+          <el-form-item label="排序">
+            <el-input style="width: 150px;" type="number" min="0" v-model="form.rank" placeholder="请输入排序"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="8">
           <el-form-item label="经度">
@@ -95,7 +102,7 @@
           <el-button type="primary" size="mini" @click="deleteHandler()">确定</el-button>
         </div>
       </el-popover>
-      <el-button type="danger" v-popover:popover5>删除</el-button>
+      <el-button  v-if="form.headTitle == '途径地名称'" type="danger" v-popover:popover5>删除</el-button>
       <el-button type="primary" @click="okHandler('form')">确 定</el-button>
     </div>
   </el-dialog>

src/views/tourManage/modal/oneTourModal.vue

@@ -44,7 +44,7 @@
         <!--<el-col :span="24">-->
           <el-form-item label="出发地" prop="departure">
             <el-input style="display: inline-block;margin-right: 10px;width: 240px;" v-model="item.name"  v-for="item in departureList"
-                      :key="item.id" readonly placeholder="请输入内容" :on-icon-click="deleteDeparture"></el-input>
+                      :key="item.id" readonly placeholder="请输入内容"></el-input>
             <el-button size="small" class="el-button el-button--primary" type="button" icon="edit" @click="editDeparture(departureList)">编辑</el-button>
             <!--<el-autocomplete-->
               <!--v-for="item in departureList"-->
@@ -413,41 +413,74 @@
         //旅游标签
         let tagDTOS = [];
         this.form.tagDTOS.map(function(item){
-          tagDTOS.push({tagId: item.id});
+          if(item.tagId){
+            tagDTOS.push({tagId: item.tagId});
+          } else {
+            tagDTOS.push({tagId: item.id});
+          }
+
         });
         //轮播图
-        let bannerDTOS = [];
-        this.form.bannerDTOS.map(function(item){
-          bannerDTOS.push({cover: item.cover});
-        });
+//        let bannerDTOS = [];
+//        this.form.bannerDTOS.map(function(item){
+//          bannerDTOS.push({cover: item.cover});
+//        });
 
         let siteDTOS = [];
 //        {"name":"ssssss","address":"ssssss","companyId":2,"province":1000,"provinceName":10002,"city":10001,"cityName":10002,"longitude":12.00000,"latitude":23.6552,"type":0,"rank":1}
         //出发地
         this.departureList.map(function(item){
           let p = {
-            name: item.p,
-            address: item.address,
-            companyId: item.companyId,
-            province: item.addrProvince,
-            city: item.addrCity,
+            name: item.name,
+            departTime:item.departTime?item.departTime:0,
+            address: item.addrDetail?item.addrDetail: item.address,
+            companyId: item.id,
+            province: item.addrProvince?item.addrProvince:item.province,
+            provinceName:item.provinceName?item.provinceName:'',
+            cityName: item.cityName?item.cityName:'',
+            city: item.addrCity?item.addrCity: item.city,
             longitude: item.longitude,
             latitude: item.latitude,
             type: 0,
             rank: item.rank
           };
-          item.type = 0;
-          siteDTOS.push(item);
+          siteDTOS.push(p);
         });
         //途径地
         this.pathway.map(function(item){
-          item.type = 1;
-          siteDTOS.push(item);
+          let p = {
+            name: item.name,
+            address: item.addrDetail?item.addrDetail: item.address,
+//            companyId: item.id,
+            province: item.addrProvince?item.addrProvince:item.province,
+            provinceName:item.provinceName?item.provinceName:'',
+            cityName: item.cityName?item.cityName:'',
+            city: item.addrCity?item.addrCity: item.city,
+            longitude: item.longitude,
+            latitude: item.latitude,
+            type: 1,
+            rank: item.rank
+          };
+          siteDTOS.push(p);
         });
         //destinationObj目的地
-        siteDTOS.push(this.destinationObj);
+        let destinationObj = this.destinationObj;
+        let p = {
+          name: destinationObj.name,
+          address: destinationObj.addrDetail?destinationObj.addrDetail: destinationObj.address,
+          province: destinationObj.addrProvince?destinationObj.addrProvince:destinationObj.province,
+          provinceName:destinationObj.provinceName?destinationObj.provinceName:'',
+          cityName: destinationObj.cityName?destinationObj.cityName:'',
+          city: destinationObj.addrCity?destinationObj.addrCity: destinationObj.city,
+          longitude: destinationObj.longitude,
+          latitude: destinationObj.latitude,
+          type: 2
+        };
+        siteDTOS.push(p);
+//        siteDTOS.push(this.destinationObj);
 
         let params = {
+          id: this.form.id,
           name: this.form.name,//旅游路线名称
           cover: this.form.cover,//封面图
           price: this.form.price,//成人价
@@ -464,7 +497,7 @@
           stock: this.form.stock,//库存
           unit: this.form.unit,//单位
           number: this.form.number,//活动天数
-          bannerDTOS: bannerDTOS,//banner轮播图
+          bannerDTOS: this.form.bannerDTOS,//banner轮播图
           siteDTOS: siteDTOS,//出发地type=0,途径地type=1,目的地type=2
           priceDTOS: this.form.tourDepartTimeVo,//活动日期
           tagDTOS: tagDTOS//旅游标签
@@ -534,7 +567,7 @@
       /**
        * 关闭途径地弹框
        * */
-      pathWayEvent(obj){debugger
+      pathWayEvent(obj){
         this.showPathWayVisible = false;
         if(obj){
           if(obj.showTitle == "途径地编辑"){
@@ -644,7 +677,7 @@
           this.form = response.data;
           this.allLabelList.map(function(b){
             response.data.tagDTOS.map(function(item){
-              if(item.id == b.id){
+              if(item.tagId == b.id){
                 arr.push(item.name);
               }
             });

src/views/tourManage/modal/tourTime.vue

@@ -148,6 +148,7 @@
         let arr = [];
         this.list.map(function(item){
           let t = {
+            id: item.id?item.id:undefined,
             startTime: item.startTime,
             endTime: item.endTime,
             stock: item.stock