页面修改

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -246,7 +246,6 @@
         ) {
           //to do something
         } else {
-          //this.$set(this.FeatureData, "DayList", data);
           this.$refs.TravelFeature.setNewDate(data);
         }
       },

src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue

@@ -6,24 +6,28 @@
           <span class="TDTripType">{{$t('hotel.hotel')}}</span>
         </div>
         <span class="datePickContent" style="display:none">
-            <el-form-item >
-              <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')" v-model="subItemObj.childItem.TimeType">
+          <el-form-item>
+            <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')"
+              v-model="subItemObj.childItem.TimeType">
               <el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'>
               </el-option>
             </el-select>
           </el-form-item>
         </span>
         <div class="delSpan">
-            <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start" >
+          <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
             <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
           </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
+            v-if="!isOpenGroup">
             <i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i>
           </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
+            v-if="subIndex!=0 && !isOpenGroup">
             <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
           </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
+            v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
             <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
           </el-tooltip>
         </div>
@@ -31,9 +35,11 @@
           <div class="TDLeftPlan">
             <span>{{$t('sm.ruzhujiudian')}}</span>
             <span>
-                <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'" :rules="hotelTripRules.HotelId">
-                  <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelId"
-                  @visible-change="getHotelList($event)" @change="changeHotelList()">
+              <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'"
+                :rules="hotelTripRules.HotelId">
+                <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
+                  v-model="subItemObj.childItem.HotelId" @visible-change="getHotelList($event)"
+                  @change="changeHotelList()">
                   <el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option>
                   <el-option v-for="item in QHotelList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'>
                   </el-option>
@@ -41,13 +47,15 @@
               </el-form-item>
             </span>
             <span class="HD_hotelru">
-                <el-checkbox :disabled="isOpenGroup" v-model="subItemObj.childItem.IsSameLevel" :checked="subItemObj.childItem.IsSameLevel===CheckedVaule"
-                :true-label="CheckedVaule" :false-label="UnCheckedVaule" border size="mini">{{$t('sm.tongjijiudian')}}</el-checkbox>
+              <el-checkbox :disabled="isOpenGroup" v-model="subItemObj.childItem.IsSameLevel"
+                :checked="subItemObj.childItem.IsSameLevel===CheckedVaule" :true-label="CheckedVaule"
+                :false-label="UnCheckedVaule" border size="mini">{{$t('sm.tongjijiudian')}}</el-checkbox>
             </span>
             <span class="comTravelLeft">{{$t('sm.fangxingxz')}}</span>
             <span>
-                <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelProductId"
-                  @visible-change="getHotelProductList($event)" @change="changeHotelProductList()">
+              <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
+                v-model="subItemObj.childItem.HotelProductId" @visible-change="getHotelProductList($event)"
+                @change="changeHotelProductList()">
                 <el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option>
                 <el-option v-for="item in QHotelProductList" :label='item.Name' :value='item.ID' :key='item.ID'>
                 </el-option>
@@ -57,8 +65,8 @@
               <span class="TDhotelDiner">{{$t('sm.jiudianhancan')}}</span>
               <span>
                 <el-checkbox-group v-model="Diner.UseDinerCked">
-                    <el-checkbox v-for="item in Diner.UseDinnerArray" :disabled="isOpenGroup||!varCanChecked(item)" :label="item.Id"
-                      :key='item.Id'>{{item.Name}}</el-checkbox>
+                  <el-checkbox v-for="item in Diner.UseDinnerArray" :disabled="isOpenGroup||!varCanChecked(item)"
+                    :label="item.Id" :key='item.Id'>{{item.Name}}</el-checkbox>
                 </el-checkbox-group>
               </span>
             </span>
@@ -66,8 +74,9 @@
         </div>
       </div>
       <div class="TP_edit">
-        <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description"
-          v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
+        <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
+          v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
+          v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
       </div>
       <div class="SiencDiv clearfix">
         <div class="ScLeftImg">
@@ -76,16 +85,20 @@
             <img v-else :src="item.Url" />
             <div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)">
               <div class="clearfix" style="text-align:center;">
-                <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i></div>
-                <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)" v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div>
-                <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)" v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div>
+                <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i>
+                </div>
+                <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)"
+                  v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div>
+                <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)"
+                  v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div>
               </div>
             </div>
           </div>
         </div>
         <div class="rightAddImg">
-          <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg" :data="subItemObj.childItem"
-            :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
+          <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg"
+            :data="subItemObj.childItem" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
+            :show-file-list="false" action="">
             <i class="iconfont icon-img_haha"></i>
           </el-upload>
         </div>
@@ -99,16 +112,19 @@
           <span class="TDTripType">{{$t('hotel.hotel')}}</span>
         </div>
         <div class="delSpan">
-            <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" >
+          <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
             <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
           </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
+            v-if="!isOpenGroup">
             <i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i>
           </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
+            v-if="subIndex!=0 && !isOpenGroup">
             <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
           </el-tooltip>
-            <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
+          <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
+            v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
             <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
           </el-tooltip>
         </div>
@@ -139,13 +155,13 @@
         <div class="ScLeftImg">
           <div class="TFimgList" v-for="(item,index) in subItemObj.childItem.ImaArray" :key="item.subCode">
             <img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png" />
-            <img v-else :src="item.Url" @click="getPic(subItemObj.childItem.ImaArray,index)"/>
+            <img v-else :src="item.Url" @click="getPic(subItemObj.childItem.ImaArray,index)" />
           </div>
         </div>
       </div>
     </div>
     <div v-if="dspNone" class="viewBigPicLayer myPiclayer" @click="colseLayer">
-        <i @click="colseLayer" class="el-icon-circle-close-outline clolseViewBigPicLayer" ></i>
+      <i @click="colseLayer" class="el-icon-circle-close-outline clolseViewBigPicLayer"></i>
       <el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
         <el-carousel-item v-for="(item,index) in picObj" :key="index">
           <img style="width:100%;" :src="item.Url" />
@@ -155,8 +171,8 @@
   </div>
 </template>
 <script>
-import MyEdit from "../../EditTemplate.vue";
-export default {
+  import MyEdit from "../../EditTemplate.vue";
+  export default {
     props: [
       "subItemObj",
       "DefaultList",
@@ -192,8 +208,8 @@ export default {
           font: false, //字体
           narrative: true //叙述,
         },
-      dspNone:false,
-      initialIndex:0,
+        dspNone: false,
+        initialIndex: 0,
         //选中同级酒店
         CheckedVaule: 1,
         //不选中
@@ -206,8 +222,7 @@ export default {
         Diner: {
           DefaultSelectValue: 0,
           UseDinerCked: [],
-        UseDinnerType: [
-          {
+          UseDinnerType: [{
               Id: "1",
               Name: this.$t('sm.zao')
             },
@@ -225,18 +240,14 @@ export default {
         //酒店验证
         hotelTripRules: {
           //时间类型验证
-        TimeType: [
-          {
+          TimeType: [{
             validator: TimeTypeValidate,
             trigger: "change"
-          }
-        ],
-        HotelId: [
-          {
+          }],
+          HotelId: [{
             validator: HotelIdValidate,
             trigger: "change"
-          }
-        ]
+          }]
         },
         TheDayUserDinner: [] //当天餐厅用餐情况
       };
@@ -281,19 +292,15 @@ export default {
             that.Diner.UseDinnerArray = [];
             that.subItemObj.childItem.ImaArray = [];
             that.subItemObj.childItem.Description = obj.Descriptions;
-          if(obj.imgList&&obj.imgList.length>4)
-          {
-             obj.imgList.forEach((sItem,sIndex)=>{
-               if(sIndex<=3)
-               {
+            if (obj.imgList && obj.imgList.length > 4) {
+              obj.imgList.forEach((sItem, sIndex) => {
+                if (sIndex <= 3) {
                   that.subItemObj.childItem.ImaArray.push(sItem);
                 }
               })
-          }
-          else{
+            } else {
               that.subItemObj.childItem.ImaArray = obj.imgList;
             }
-         
             that.subItemObj.childItem.IsUseDinner = obj.IsUseDinner;
             that.subItemObj.childItem.HotelName = obj.Name;
             let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType;
@@ -350,8 +357,7 @@ export default {
       getHotelProductList(event) {
         if (event) {
           this.apipost(
-          "dict_post_HotelProduc_GetList",
-          {
+            "dict_post_HotelProduc_GetList", {
               Hotel_ID: this.subItemObj.childItem.HotelId
             },
             res => {
@@ -430,20 +436,20 @@ export default {
       },
       //左右移动
       toExchangeImg(dayNum, subIndex, imgIndex, IsMove) {
-      this.$parent.$parent.ExchangeImg(dayNum, subIndex, imgIndex,IsMove);
+        this.$parent.$parent.ExchangeImg(dayNum, subIndex, imgIndex, IsMove);
       },
-    colseLayer(){
-      this.dspNone=false;
+      colseLayer() {
+        this.dspNone = false;
       },
-    getPic(obj,index){
-      this.picObj=obj
-      this.dspNone=true;
+      getPic(obj, index) {
+        this.picObj = obj
+        this.dspNone = true;
         this.initialIndex = index;
       },
-    getItemLabel(item){
+      getItemLabel(item) {
         let returnName = item.Name;
-      if(item.Inventory>=0){
-        returnName = returnName+ "   " +item.Inventory;
+        if (item.Inventory >= 0) {
+          returnName = returnName + "   " + item.Inventory;
         }
         return returnName;
       }
@@ -469,7 +475,7 @@ export default {
     watch: {
       subItemObj: {
         //深度监听，可监听到对象、数组的变化
-      handler: function(val, oldVal) {
+        handler: function (val, oldVal) {
           this.subItemObj.childItem.HotelImg = JSON.stringify(
             this.subItemObj.childItem.ImaArray
           );
@@ -477,24 +483,25 @@ export default {
         deep: true
       },
       "Diner.UseDinerCked": {
-      handler: function(val, oldVal) {
+        handler: function (val, oldVal) {
           this.subItemObj.childItem.UseDinnerType = this.Diner.UseDinerCked.join(
             ","
           );
         }
       },
       DinnerList: {
-      handler: function(val, oldVal) {
+        handler: function (val, oldVal) {
           this.initTheDayUserDinner();
         },
         deep: true
       },
       "subItemObj.childItem.QCity": {
-      handler: function(val, oldVal) {
+        handler: function (val, oldVal) {
           this.getHotelList();
         },
         deep: true
       }
     }
-};
+  };
+
 </script>