1

src/components/Restaurant/demesticRestaurantInfoManage.vue

@@ -1059,7 +1059,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="美食分类">
-            <!-- <el-select
+            <el-select
               v-model="addMsg.FoodType"
               class="multiple_input w300"
               :placeholder="$t('pub.pleaseSel')"
@@ -1073,8 +1073,8 @@
                 :value="item.ID"
               >
               </el-option>
-            </el-select> -->
-            <el-cascader :options="FoodTypeList" v-model="addMsg.FoodType" :props="FoodTypeProps"></el-cascader>
+            </el-select>
+            <!-- <el-cascader :options="FoodTypeList" v-model="addMsg.FoodType" :props="FoodTypeProps"></el-cascader> -->
           </el-form-item>
           <el-form-item :label="$t('Operation.Op_price')">
             <el-select
@@ -1326,7 +1326,7 @@
                  <div class="imgtag resTypeList">
                   <el-input v-model="item.TagName" 
                     ><div slot="prepend">标签</div></el-input>
-                </div>
+                 </div>
                 
                 
                 <div class="imgzhe">

src/components/scenicSpot/domesticScenicSpotInfoManage.vue

 <style>
+.scenicSpotInfoManage .imgtag{
+ height: 40px;
+ color: #000;
+} 
   .scenicSpotInfoManage .resourceImgAdd {
     width: 620px;
     margin: auto;
@@ -713,14 +717,25 @@
             <el-input type="text" v-model="addMsg.Name" maxlength="100" class="w300"></el-input>
           </el-form-item>
           <el-form-item label="景区类型" prop="FoodType">
-            <el-select placeholder="请选择景区类型" filterable v-model="addMsg.FoodType" class='multiple_input w300'>
-              <el-option label="不限" :value='0'></el-option>
-              <el-option v-for="item in scenicList" :key="item.ID" :label="item.Name"
-                :value="item.ID">
-              </el-option>
-            </el-select>
+            <el-cascader
+              placeholder="请选择景区类型"
+              :options="scenicList"
+              :props="{
+                checkStrictly:true,
+                emitPath:false,
+                label:'Name',
+                value:'ID',
+                children:'ChildrenList',
+              }"
+              filterable
+              :show-all-levels="false"
+              clearable
+              v-model="type"
+              @change="handleChange"
+             >
+            </el-cascader>
           </el-form-item>
-          <el-form-item label="是否上架" prop="FoodType">
+          <el-form-item label="是否上架" prop="IsShelves">
               <el-radio v-model="addMsg.IsShelves" :label="1">是</el-radio>
               <el-radio v-model="addMsg.IsShelves" :label="0">否</el-radio>
           </el-form-item>
@@ -1068,6 +1083,10 @@
               <div class="re-img" v-for="(item,index) in TicketCouponsImageArray" :key="item.subCode">
                 <img v-if="!item" src="../../assets/img/bg_c3@3x.png">
                 <img :src="item.ShowPath" :onerror='defaultImg' />
+                 <div class="imgtag resTypeList">
+                  <el-input v-model="item.TagName" 
+                    ><div slot="prepend">标签</div></el-input>
+                 </div>
                 <div class="imgzhe">
                   <div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
                   <div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
@@ -1105,7 +1124,8 @@
     </el-dialog>
 
     <el-dialog custom-class="mapList" title="地图选址" center :visible.sync="selectAddress">
-      <googleMap @refList="googleMap" v-on:headCallBack="headCall" v-bind:address="addMsg.Address"></googleMap>
+      <!-- <googleMap @refList="googleMap" v-on:headCallBack="headCall" v-bind:address="addMsg.Address"></googleMap> -->
+      <tencentMap @map-submit="mapEvent" :address="addMsg.Address"></tencentMap>
     </el-dialog>
 
     <div class="btn-list">
@@ -1119,9 +1139,10 @@
   </div>
 </template>
 <script>
-  import googleMap from "../commonPage/googleMap.vue";
+  // import googleMap from "../commonPage/googleMap.vue";
   import DMCchooseImg from "../commonPage/DMCchooseImg.vue";
   import MyEdit from "@/components/EditTemplate.vue";
+   import tencentMap from "../commonPage/tencentMap.vue";
   export default {
     data() {
       return {
@@ -1227,8 +1248,8 @@
                   StartDay:"",
                   EndDay:"",
                   IsNextYear:0,
-                  BusinessStartWeek:"",
-                  BusinessEndWeek:"",
+                  BusinessStartWeek:0,
+                  BusinessEndWeek:0,
                   StartTime:"",
                   EndTime:"",
                   StopTime:"",	
@@ -1236,6 +1257,7 @@
           ],
           FoodType:0,
           IsShelves:0,
+         
           
         },
         rules: {
@@ -1245,6 +1267,11 @@
             message: "请填写名称",
             trigger: "change"
           }],
+          FoodType: [{
+            required: true,
+            message: "请选择景区类型",
+            trigger: "change"
+          }],
           Address: [{
             required: true,
             message: "请选择地址",
@@ -1289,14 +1316,27 @@
         },
         DefaultList: [],
         placeholder: "请输入",
+        type:[]
       };
     },
     components: {
-      googleMap: googleMap,
+      // googleMap: googleMap,
       DMCchooseImg: DMCchooseImg,
-      MyEdit
+      MyEdit,
+      tencentMap
     },
     methods: {
+       handleChange(value) {
+        console.log(value);
+        this.addMsg.FoodType=value.slice(-1).join()
+        console.log(this.addMsg.FoodType);
+      },
+       //得到地图信息
+      mapEvent(e) {
+        this.addMsg.Lat = e.lat;
+        this.addMsg.Lng = e.long;
+        this.selectAddress = false;
+      },
       inited(viewer) {
         this.$viewer = viewer
       },
@@ -1362,6 +1402,7 @@
       },
       saveResource() {
         //保存餐厅信息
+        this.addMsg.FoodType=this.addMsg.FoodType.slice(-1).join()
         if (this.isBook) {
           this.addMsg.IsSelfBook = 1;
         } else {
@@ -1444,7 +1485,6 @@
           res => {
             if (res.data.resultCode == 1) {
               this.addMsg = res.data.data;
-              console.log(1283,this.addMsg)
               if (this.addMsg.Country > 0) {
                 this.GetSubAreaList(this.addMsg.Country, 1);
               }
@@ -1697,8 +1737,8 @@
     //   添加开放时间
       addOpenTime(){
           let obj={
-              BusinessEndWeek: "",
-              BusinessStartWeek: "",
+              BusinessEndWeek: 0,
+              BusinessStartWeek: 0,
               EndDay: "",
               EndTime: "",
               IsNextYear: 0,
@@ -1718,12 +1758,27 @@
         {ParentID:0,ClassType:1},
         (res) => {
           if (res.data.resultCode == 1) {
-            this.scenicList = res.data.data;
+           let newData= this.getTreeData(res.data.data,'ChildrenList')
+           this.scenicList = newData; 
           }
         },
         (err) => {}
       );
-      }
+      },
+      //递归景区类型列表级联菜单
+      getTreeData(data,childrenField){
+                // 循环遍历json数据
+                for(var i=0;i<data.length;i++){
+                    if(data[i][childrenField]===undefined||data[i][childrenField].length===0){
+                        // children若为空数组，则将children设为undefined
+                        data[i][childrenField]=undefined;
+                    }else {
+                        // children若不为空数组，则继续 递归调用 本方法
+                        this.getTreeData(data[i][childrenField],childrenField);
+                    }
+                }
+                return data;
+            }
     },
     mounted() {
       let userInfo = this.getLocalStorage()

src/components/scenicSpot/domesticScenicSpotList.vue

@@ -240,19 +240,19 @@
         <li>
           <span>
             <em>{{$t('system.quety_area')}}</em>
-            <el-select v-model="msg.QCountry" clearable class="w150" filterable
+            <!-- <el-select v-model="msg.QCountry" clearable class="w150" filterable
               @change="getProvinceList(msg.QCountry,1)" :placeholder="$t('hotel.hotel_country')">
               <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-            </el-select>
-            <el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
+            </el-select> -->
+            <el-select v-model="msg.QProvince" class="w150" clearable filterable @change="getProvinceList(msg.QProvince,2)"
               :placeholder="$t('hotel.hotel_province')">
               <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
-            <el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)"
+            <el-select v-model="msg.QCity" class="w150" clearable filterable @change="getProvinceList(msg.QCity,3)"
               :placeholder="$t('hotel.hotel_city')">
               <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
-            <el-select v-model="msg.QDistrict" class="w150" filterable :placeholder="$t('hotel.hotel_area')">
+            <el-select v-model="msg.QDistrict" class="w150" clearable filterable :placeholder="$t('hotel.hotel_area')">
               <el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
             </el-select>
           </span>
@@ -439,7 +439,7 @@
         } else if (type == 3) {
           this.msg.QDistrict = "";
         }
-        if (this.msg.QCountry !== "") {
+        // if (this.msg.QCountry !== "") {
           this.apipost(
             "dict_post_Destination_GetChildList",
             msg,
@@ -454,18 +454,18 @@
             },
             err => {}
           );
-        }
+        // }
       },
       //获取国家
-      getCountryList() {
-        this.apipost(
-          "dict_post_Destination_GetCountry", {},
-          res => {
-            this.countryList = res.data.data;
-          },
-          err => {}
-        );
-      },
+      // getCountryList() {
+      //   this.apipost(
+      //     "dict_post_Destination_GetCountry", {},
+      //     res => {
+      //       this.countryList = res.data.data;
+      //     },
+      //     err => {}
+      //   );
+      // },
       isdelete(ID) {
         var that = this;
         that.Confirm(that.$t('tips.shifoushanchu'), function () {
@@ -581,7 +581,8 @@
     },
     mounted() {
       this.getEmployeeList();
-      this.getCountryList();
+      // this.getCountryList();
+       this.getProvinceList(2,1);//获取国内省份
     },
     created() {
       if (this.$route.query.hasOwnProperty("cache")) {
@@ -608,6 +609,7 @@
         this.msg.ID = id;
       }
       this.selectResource();
+     
     }
   };
 

src/components/scenicSpot/domesticTicketManagement.vue

@@ -102,6 +102,9 @@
 }
 .ticketinfo_title{
   font-size: 16px;
+  color: #333;
+  padding-left: 5px;
+  border-left: 5px solid #f00;
 
 }
 </style>
@@ -303,6 +306,10 @@
             </el-option>
           </el-select>
         </el-form-item> -->
+        <el-form-item label="是否上架" prop="IsShelves">
+          <el-radio v-model="addMsg.IsShelves" :label="1">是</el-radio>
+          <el-radio v-model="addMsg.IsShelves" :label="0">否</el-radio>
+        </el-form-item>
         <el-form-item label="是否闪入园" prop="IsSameDayBuy">
           <el-radio v-model="addMsg.IsSameDayBuy" :label="1">是</el-radio>
           <el-radio v-model="addMsg.IsSameDayBuy" :label="0">否</el-radio>
@@ -690,6 +697,7 @@ export default {
         TicketName: "",
         TicketDesc: "",
         TicketCouponsType: "",
+        IsShelves:0,
         TicketSubName:"",//门票副标题
         IsSameDayBuy:0,//	是否闪入园
         DayBuyTime:"",//闪入园最晚购买时间
@@ -899,6 +907,7 @@ export default {
         TicketName: "",
         TicketDesc: "",
         TicketCouponsType: "",
+        IsShelves:0,
         TicketSubName:"",//门票副标题
         IsSameDayBuy:0,//	是否闪入园
         DayBuyTime:"",//闪入园最晚购买时间

src/router/config.js

@@ -1608,6 +1608,14 @@ export default {
                 title: '国内景区报价管理'
               },
             }, 
+            {
+              path: '/TicketClassification', //门票分类
+              name: 'TicketClassification',
+              component: resolve => require(['@/components/scenicSpot/TicketClassification'], resolve),
+              meta: {
+                title: '国内景区报价管理'
+              },
+            }, 
             {
               path: '/TicketManager', //机票列表
               name: 'TicketManager',