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

src/components/TravelManager/Lxy/directorOrderList.vue

@@ -213,7 +213,7 @@
                         v-if="TenantId==1">
                         <el-dropdown trigger="click" style="margin-left: 50px">
                           <span class="el-dropdown-link">{{$t('objFill.preparedocument')}}</span>
-                          <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                          <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                             <el-dropdown-item @click.native="goCollection(item,list)">
                               {{$t('objFill.v101.shouruzhid')}}
                             </el-dropdown-item>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1436,7 +1436,7 @@
                       <span class="el-dropdown-link">{{ $t("pub.updateMsg") }}
                         <i class="el-icon-arrow-down el-icon--right"></i>
                       </span>
-                      <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                      <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                         <template v-if="
                             item.RelationPriceList && item.RelationPriceList.length > 0
                           ">
@@ -1516,7 +1516,7 @@
                     <span class="el-dropdown-link">{{ $t("Operation.Op_moreOperation") }}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="SetGroupRecommendType(item, 1)" v-if="
                           item.b2b &&
                           item.GroupRecommendType == 0 &&

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1042,7 +1042,7 @@
                     <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
                         <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
                           {{$t('Operation.Op_xilieModyfi')}}</el-dropdown-item>
@@ -1112,7 +1112,7 @@
                     <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
                       <el-dropdown-item @click.native="goUrlR(item)">

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -739,7 +739,7 @@
                     <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <template v-if="item.RelationPriceList&&item.RelationPriceList.length>0">
                         <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
                           {{$t('Operation.Op_xilieModyfi')}}
@@ -812,7 +812,7 @@
                     <span class="el-dropdown-link">{{$t('Operation.Op_moreOperation')}}
                       <i class="el-icon-arrow-down el-icon--right"></i>
                     </span>
-                    <el-dropdown-menu slot="dropdown" class="TC-dropdown">
+                    <el-dropdown-menu slot="dropdown" class="TC-dropdown" style="max-height: 410px;overflow: auto;">
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}
                       </el-dropdown-item>

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -181,20 +181,25 @@
                 <el-input type="textarea" resize="none" style="width:180px;" v-model="subItem.Title"></el-input>
               </td>
               <td>
-                <el-select filterable remote :remote-method="(query) => remoteSearchAdGroup(query, subItem)"
-                  v-model='subItem.HotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading"
-                  @change="getHotel(subItem,subItem.HotelId)" style="width:135px;">
-                  <el-option v-for="(x) in subItem.HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
-                    <template v-if="x.Inventory>0||x.CostPrice>0">
-                      <span style="float: left">{{ x.Name }}</span>
-                      <span style="float: right; font-size: 13px">
-                        <font style="color:blue">库存/剩余:{{ x.Inventory }}&nbsp;/&nbsp;{{x.RemainingInventory}}
-                        </font>
-                        &nbsp;<font style="color:#67C23A">价格:{{x.CostPrice}}</font>
-                      </span>
-                    </template>
-                  </el-option>
-                </el-select>
+                <template v-if="postConfig.LineId==90">
+                  <el-input v-model="subItem.HotelName"></el-input>
+                </template>
+                <template v-else>
+                  <el-select filterable remote :remote-method="(query) => remoteSearchAdGroup(query, subItem)"
+                    v-model='subItem.HotelId' :placeholder="$t('objFill.qingshurujdmc')" :loading="loading"
+                    @change="getHotel(subItem,subItem.HotelId)" style="width:135px;">
+                    <el-option v-for="(x) in subItem.HotelList" :key="x.ID" :label="x.Name" :value='x.ID'>
+                      <template v-if="x.Inventory>0||x.CostPrice>0">
+                        <span style="float: left">{{ x.Name }}</span>
+                        <span style="float: right; font-size: 13px">
+                          <font style="color:blue">库存/剩余:{{ x.Inventory }}&nbsp;/&nbsp;{{x.RemainingInventory}}
+                          </font>
+                          &nbsp;<font style="color:#67C23A">价格:{{x.CostPrice}}</font>
+                        </span>
+                      </template>
+                    </el-option>
+                  </el-select>
+                </template>
                 <el-form-item :label="$t('objFill.v101.hancan')">
                   <el-select v-model='subItem.ContainDinnerType' style="width:100px;"
                     :placeholder="$t('objFill.v101.hancanlxin')" @change="DinnerTypeChange(subItem)">
@@ -305,44 +310,75 @@
                 </template>
               </td>
               <td>
-                <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
-                  <template v-if="scenicIndex==0">
-                    <el-select :key="`d_`+subIndex+`_sn_`+scenicIndex" filterable remote
-                      :remote-method="(query) => remoteSearchTicket(query, scenicItem)" :loading="loading"
-                      @change="changeTicket(scenicItem)" v-model="scenicItem.TicketId" value-key="TicketId">
-                      <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
-                      <el-option v-for="(x) in scenicItem.TicketSourceList" :key="x.TicketId" :label="x.TicketName"
-                        :value='x.TicketId'>
-                      </el-option>
-                    </el-select>
+                <template v-if="postConfig.LineId==90">
+                  <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
+                    <template v-if="scenicIndex==0">
+                      <el-input v-model="scenicItem.TicketName"></el-input>
+                    </template>
+                    <template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketName!=''">
+                      <el-input v-model="scenicItem.TicketName"></el-input>
+                    </template>
                   </template>
-                  <template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketId>0">
-                    <el-select :key="`d_`+subIndex+`_sn_`+scenicIndex" filterable remote
-                      :remote-method="(query) => remoteSearchTicket(query, scenicItem)" :loading="loading"
-                      @change="changeTicket(scenicItem)" v-model="scenicItem.TicketId" value-key="TicketId">
-                      <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
-                      <el-option v-for="(x) in scenicItem.TicketSourceList" :key="x.TicketId" :label="x.TicketName"
-                        :value='x.TicketId'>
-                      </el-option>
-                    </el-select>
+                </template>
+                <template v-else>
+                  <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
+                    <template v-if="scenicIndex==0">
+                      <el-select :key="`d_`+subIndex+`_sn_`+scenicIndex" filterable remote
+                        :remote-method="(query) => remoteSearchTicket(query, scenicItem)" :loading="loading"
+                        @change="changeTicket(scenicItem)" v-model="scenicItem.TicketId" value-key="TicketId">
+                        <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
+                        <el-option v-for="(x) in scenicItem.TicketSourceList" :key="x.TicketId" :label="x.TicketName"
+                          :value='x.TicketId'>
+                        </el-option>
+                      </el-select>
+                    </template>
+                    <template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketId>0">
+                      <el-select :key="`d_`+subIndex+`_sn_`+scenicIndex" filterable remote
+                        :remote-method="(query) => remoteSearchTicket(query, scenicItem)" :loading="loading"
+                        @change="changeTicket(scenicItem)" v-model="scenicItem.TicketId" value-key="TicketId">
+                        <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
+                        <el-option v-for="(x) in scenicItem.TicketSourceList" :key="x.TicketId" :label="x.TicketName"
+                          :value='x.TicketId'>
+                        </el-option>
+                      </el-select>
+                    </template>
                   </template>
                 </template>
               </td>
               <td>
-                <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
-                  <template v-if="scenicIndex==0">
-                    <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
-                      class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
-                      :placeholder="$t('objFill.v101.jindianjiag')">
-                    </el-input>
+                <template v-if="postConfig.LineId==90">
+                  <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
+                    <template v-if="scenicIndex==0">
+                      <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
+                        class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
+                        :placeholder="$t('objFill.v101.jindianjiag')">
+                      </el-input>
+                    </template>
+                    <template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketName!=''">
+                      <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
+                        class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
+                        :placeholder="$t('objFill.v101.jindianjiag')">
+                      </el-input>
+                    </template>
                   </template>
-                  <template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketId>0">
-                    <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
-                      class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
-                      :placeholder="$t('objFill.v101.jindianjiag')">
-                    </el-input>
+                </template>
+                <template v-else>
+                  <template v-for="(scenicItem,scenicIndex) in subItem.ScenicList">
+                    <template v-if="scenicIndex==0">
+                      <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
+                        class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
+                        :placeholder="$t('objFill.v101.jindianjiag')">
+                      </el-input>
+                    </template>
+                    <template v-else-if="scenicIndex!=0 && subItem.ScenicList[scenicIndex-1].TicketId>0">
+                      <el-input :key="`d_`+subIndex+`_sc_`+scenicIndex" type='text' v-model="scenicItem.TicketCostPrice"
+                        class="w70" @keyup.native="checkPrice(scenicItem,'TicketCostPrice'),getchange(1)"
+                        :placeholder="$t('objFill.v101.jindianjiag')">
+                      </el-input>
+                    </template>
                   </template>
                 </template>
+
               </td>
               <td>
                 <el-input type="text" v-model='subItem.OtherName' class="w70"

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -168,6 +168,29 @@
                 </el-input>
               </td>
             </tr>
+            <tr v-if="postData.LineId==90">
+              <td colspan="6" style="height:20px;">
+              </td>
+            </tr>
+            <tr v-if="postData.LineId==90">
+              <td width="80" class="txtRightCost">客户电话</td>
+              <td>
+                <el-input v-model="postData.CustomerTel" type="text" placeholder="客户电话"
+                  maxlength="200">
+                </el-input>
+              </td>
+              <td width="80" class="txtRightCost">领队人数</td>
+              <td>
+                <el-input v-model="postData.LeaderNum" type="text" :placeholder="$t('fnc.khmingcheng')" maxlength="200">
+                </el-input>
+              </td>
+              <td width="80" class="txtRightCost">自动下单</td>
+              <td>
+                <el-switch v-model="postData.IsCreateOrder" active-color="#13ce66" inactive-color="#ff4949"
+                  :active-value="1" :inactive-value="0">
+                </el-switch>
+              </td>
+            </tr>
             <tr>
               <td colspan="6" style="height:20px;">
               </td>
@@ -272,7 +295,10 @@
           OPId: "",
           AssistantList: [],
           dayCostPriceList: [], //行程报价
-          OfferArray: []
+          OfferArray: [],
+          CustomerTel: "", //客户电话
+          LeaderNum: 0, //领队数量
+          IsCreateOrder: 0, //是否自动生成订单
         },
         isSubmit: true,
         LineList: [], //线路列表
@@ -675,6 +701,15 @@
               if (tempData.OutBranchName && tempData.OutBranchName != '') {
                 this.postData.OutBranchId = Number(tempData.OutBranchId);
               }
+              if (tempData.OutBranchName && tempData.OutBranchName != '') {
+                this.postData.CustomerTel = tempData.CustomerTel;
+              }
+              if (tempData.LeaderNum && tempData.LeaderNum != 0) {
+                this.postData.LeaderNum = Number(tempData.LeaderNum);
+              }
+              if (tempData.IsCreateOrder && tempData.IsCreateOrder != 0) {
+                this.postData.IsCreateOrder = Number(tempData.IsCreateOrder);
+              }
               if (tempData.IsRoll) {
                 this.postData.IsRoll = tempData.IsRoll;
               }

src/plug/index.js

@@ -124,6 +124,7 @@ export default {
         let ocrUrl = "http://192.168.5.46:8888";
         // domainUrl = "http://192.168.5.214";
         domainUrl = "http://192.168.5.39:8083"
+        // domainUrl = "http://192.168.5.204:8030"
         // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";