新增组件

src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue

@@ -97,17 +97,18 @@
                   <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
                 </el-select>
-              
+
               </td>
               <td width="80" class="txtRightCost">团队类型</td>
               <td>
-                
-                  <el-select class="multiple_input" v-model="postConfig.PriceTeamType">
+
+                <el-select class="multiple_input" v-model="postConfig.PriceTeamType">
                   <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
                   <template v-for="item in TeamListArr">
-                    <el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==9" :key="item.Id" :label="item.Name" :value="item.Id">
-                          </el-option>
-                        </template>
+                    <el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==9" :key="item.Id"
+                      :label="item.Name" :value="item.Id">
+                    </el-option>
+                  </template>
                 </el-select>
               </td>
               <td width="80" class="txtRightCost">线路</td>
@@ -125,16 +126,17 @@
               </td>
             </tr>
             <tr>
-              
+
               <td width="80" class="txtRightCost">系列</td>
               <td colspan="3">
-                <el-select style="width:100%;" v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
+                <el-select style="width:100%;" v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')"
+                  filterable>
                   <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                   <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
                   </el-option>
                 </el-select>
               </td>
-               <td width="80" class="txtRightCost">客户名称</td>
+              <td width="80" class="txtRightCost">客户名称</td>
               <td>
                 <el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200">
                 </el-input>
@@ -144,8 +146,8 @@
               <td colspan="6" style="height:20px;">
               </td>
             </tr>
-           
-           
+
+
             <tr>
               <td width="80" class="txtRightCost">出团公司</td>
               <td>
@@ -181,7 +183,7 @@
                 <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
                   placeholder="请填写团队标题" maxlength="200"></el-input>
               </td>
-             
+
             </tr>
           </table>
         </div>
@@ -228,8 +230,8 @@
           OtherPrice: {},
           teamPrice: {},
           CostNumberList: [],
-          TeamListArr:[]
         },
+        TeamListArr: [],
         orderList: [],
         queryMsg: {
           IsDefault: false,
@@ -238,10 +240,9 @@
           //人数
           PeopleNumber: ""
         },
-
         LineTeamList: [], //系列下拉列表
         companyList: [], //出团公司
-        teamList: [],//团队类型
+        teamList: [], //团队类型
         payTypeList: [{
           value: 1,
           label: '现金'
@@ -251,7 +252,7 @@
         }, {
           value: 3,
           label: '外站自理'
-        }, ]
+        }]
       }
     },
     computed: {
@@ -352,16 +353,16 @@
           }
         });
       },
-       //获取团队类型
-    getPriceTeamList() {
-      this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
-        if (res.data.resultCode == 1) {
-          this.TeamListArr = res.data.data;
-        } else {
-          this.Error(res.data.message);
-        }
-      }, err => {});
-    },
+      //获取团队类型
+      getPriceTeamList() {
+        this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
+          if (res.data.resultCode == 1) {
+            this.TeamListArr = res.data.data;
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {});
+      },
       createDayTripPrice() {
         for (let i = 0; i < this.orderList.length; i++) {
           this.orderList[i].dayCostPrice = this.createDayTripPriceItem([...this.orderList[i].dayCostPrice]);
@@ -485,10 +486,7 @@
       },
     },
     mounted() {
-      this.getAllCurrency();
-      this.getCompanyList();
-      this.getTeamList();
-      this.getPriceTeamList();
+
       this.getLineTeamList();
       if (!this.OfferArray.length) {
         this.createOrderList();
@@ -509,11 +507,16 @@
         this.orderList = this.OfferArray
         this.changeTabs()
       }
-      if(this.postConfig.DayNum>0){
+      if (this.postConfig.DayNum > 0) {
         this.createDayTripPrice()
       }
     },
-    created() {},
+    created() {
+      this.getAllCurrency();
+      this.getCompanyList();
+      this.getTeamList();
+      this.getPriceTeamList();
+    },
   };
 
 </script>

src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue

@@ -58,13 +58,15 @@
     height: auto !important;
   }
 
-.dinnerBtn .el-button{
-   width: 10px !important;
-}
-.dinnerBtn .el-icon-search{
-   width: 10px !important;
-   margin-left:-6px;
-}
+  .dinnerBtn .el-button {
+    width: 10px !important;
+  }
+
+  .dinnerBtn .el-icon-search {
+    width: 10px !important;
+    margin-left: -6px;
+  }
+
 </style>
 <template>
   <div class="Traveltrip-item-box">
@@ -94,23 +96,24 @@
               <img crossorigin="Anonymous" src="../../../assets/img/daily_lunch.png">
             </td>
             <td width="140" valign="middle">
-              <template v-if="PostConfig.LineId==14">
-                <el-input placeholder="请输入餐厅名称" v-model="dayObj.DinnerArray[1].DinnerName" class="input-with-select dinnerBtn">
-                   <el-button slot="append" icon="el-icon-search" @click="getDmcSourcePage(dayObj.DinnerArray[1].DinnerName)"></el-button>
+              <!-- <template v-if="PostConfig.LineId==14||PostConfig.LineId==118">
+                <el-input placeholder="请输入餐厅名称" v-model="dayObj.DinnerArray[1].DinnerName"
+                  class="input-with-select dinnerBtn">
+                  <el-button slot="append" icon="el-icon-search" @click="showDiningDig(dayObj.DinnerArray[1])">
+                  </el-button>
                 </el-input>
               </template>
-             <template v-else>
-              <el-select v-if="!dayObj.isRead&&IsDirect==1" class="" :placeholder="$t('pub.pleaseSel')" filterable
-                v-model="dayObj.DinnerArray[1].DinnerId" @visible-change="getDinnerList($event)"
-                @change="changeDinnerList(dayObj.DinnerArray[1])">
-                <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
-                <el-option v-for="item in QDinnerList" :label="item.Name" :value="item.ID" :key="item.ID">
-                  <span>{{ item.Name }}</span>
-                  <span class="TC-realSpan">{{item.RealName}}</span>
-                </el-option>
-              </el-select>
-             </template>
-             
+              <template v-else> -->
+                <el-select v-if="!dayObj.isRead&&IsDirect==1" class="" :placeholder="$t('pub.pleaseSel')" filterable
+                  v-model="dayObj.DinnerArray[1].DinnerId" @visible-change="getDinnerList($event)"
+                  @change="changeDinnerList(dayObj.DinnerArray[1])">
+                  <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
+                  <el-option v-for="item in QDinnerList" :label="item.Name" :value="item.ID" :key="item.ID">
+                    <span>{{ item.Name }}</span>
+                    <span class="TC-realSpan">{{item.RealName}}</span>
+                  </el-option>
+                </el-select>
+              <!-- </template> -->
               <el-input type="text" v-model="dayObj.DinnerArray[1].DinnerName" class=""
                 v-if="!dayObj.isRead&&IsDirect==0" @change="noDirectDinnerChange(1)"></el-input>
               <span class="TC-hotelName" v-if="dayObj.isRead">
@@ -148,8 +151,8 @@
             <!--酒店-->
             <el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="Ht_hotelSelect" size="mini"
               v-model="HotelChooseArray" multiple :multiple-limit="(TeamType==0||TeamType==3)?3:1"
-              @visible-change="getHotelList($event)" @change="changeHotelList()" filterable :placeholder="$t('pub.pleaseSel')"
-              :disabled="IsOpenHotel==1?true:false">
+              @visible-change="getHotelList($event)" @change="changeHotelList()" filterable
+              :placeholder="$t('pub.pleaseSel')" :disabled="IsOpenHotel==1?true:false">
               <el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
                 <span style="float: left">{{ getHotelItemLabel(item) }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
@@ -157,7 +160,7 @@
             </el-select>
             <span style="color:red;font-weight:bold;" v-if="IsOpenHotel==1">※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
             <span v-if="dayObj.isRead&&IsDirect==1">
-              <span v-for="item in hotelArray">
+              <span v-for="(item,index) in hotelArray" :key="`h_`+index">
                 {{item.HotelName}}
               </span>
               <span v-if="hotelArray.length>0">&nbsp;/或同级</span>
@@ -171,40 +174,16 @@
         </tr>
       </table>
     </div>
+    <el-dialog custom-class='w750' :title="dialogDiningTitle" :visible.sync="isShowDiningDig" center>
+      <travelDinner :Country="651"></travelDinner>
+    </el-dialog>
   </div>
-  <el-dialog custom-class='w750' :title="dialogTitle" :visible.sync="outerVisible" center  >
-    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
-      
-      <tr v-for="(item,index) in DinnerByKeyList">
-        <td>{{item.MenuName}}</td>
-        <td>{{item.MenuUrl}}</td>
-        <td>{{item.Tier | tierFormat(item.Tier)}}</td>
-        <td>{{item.MenuStatus==0?'开启':'关闭'}}</td>
-        <td>
-          {{item.GroupingCode}}
-        </td>
-        <td>
-          {{item.Sort}}
-        </td>
-        <td>
-          <el-row>
-            <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
-              <el-button @click="outerVisible = true,dialogTitle='修改权限菜单',updateData(index,item.MenuId)" type="primary"
-                icon="el-icon-edit" circle></el-button>
-            </el-tooltip>
-          </el-row>
-        </td>
-      </tr>
-    </table>
-    <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
-      layout="total,prev, pager, next, jumper" :page-size="searchParmeters.pageSize" :total='totalDinnerByKeyList'>
-    </el-pagination>
-  </el-dialog>
 
 </template>
 <script>
+  import travelDinner from '@/components/commonPage/travelDinner'
   export default {
-    props: ["PostConfig","dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig", "TeamType",
+    props: ["PostConfig", "dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig", "TeamType",
       "IsOpenHotel" //0可以添加删除酒店，1-不能修改酒店信息
     ],
     data() {
@@ -221,39 +200,22 @@
         otherDinner: [],
         hotelHotSpringDinner: [],
         isFirstInitDinner: false, //初始含有酒店列表，加载完酒店数据在初始化餐厅列表
-        searchParmeters:{
-          keywords: '',
-          platform: 2,
-          type: 2,
-          pageIndex: 1,
-          pageSize: 6,
-          Province: 0,
-          DiningType: 0,
-          DiningPriceType: 0,
-          UseType: [0]
-        },
-        DinnerByKeyList:[],
+        DinnerByKeyList: [],
         totalDinnerByKeyList: 0,
+        checlItem: {},
+        dialogDiningTitle: "选择餐厅",
+        isShowDiningDig: false, //是否显示餐弹窗
       };
     },
-    methods: {
-      //查询餐厅信息
-       getDmcSourcePage(keywords){
-        if (keywords === "") {
-            return ;
-          } else {
-            if(str.trim() === ""){
-              return ;
-            }
-          }
-          this.apipost("hotel_post_GetDmcSourcePage", msg, res => {
-            if (res.data.resultCode == 1) {
-              this.DinnerByKeyList = res.data.data.pageData;
-              this.DinnerByKeyList = res.data.data;
-            }
-          });
-        },
+    components: {
+      travelDinner: travelDinner,
 
+    },
+    methods: {
+      showDiningDig(item) {
+        this.checlItem = item;
+        this.isShowDiningDig = true;
+      },
       // 非直采酒店
       noDirectHotelChange: function () {
         if (this.hotelArray[0].MD5Sign === '') {