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

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2366,7 +2366,8 @@
                   </span>
                 </p>
                 <span style="display: block">房间信息<span v-if="item.oneSex > 0"
-                    style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span>：
+                    style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span><span v-if="item.chirdNoNeedBedNum > 0"
+                  style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人 ）</span>：
                   {{ item.orderGuestHouseStr }}
                   <el-popover trigger="click" popper-class="KT_Scenic">
                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -2951,7 +2952,8 @@
                 </span>
               </p>
               <span style="display: block">房间信息<span v-if="item.oneSex > 0"
-                  style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span>：{{ item.orderGuestHouseStr }}</span>
+                  style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span><span v-if="item.chirdNoNeedBedNum > 0"
+                  style="color: #e95252">（儿童不占床{{ item.chirdNoNeedBedNum }}人 ）</span>：{{ item.orderGuestHouseStr }}</span>
               <span v-if="item.tipMoney" style="color: red">（小费：{{ item.tipMoney }}）</span>
             </td>
           </tr>

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -130,10 +130,10 @@
                     {{subItem.TCNUMS}}({{subItem.TCID}})
                   </td>
                   <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
-                    {{subItem.LeaderName}}
+                    {{subItem.LeaderName}}<span style="color:red;">{{subItem.IsLeaderDaiTuan==1?"(带团)":"(不带团)"}}</span>
                   </td>
                   <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
-                    {{subItem.GuideName}}
+                    {{subItem.GuideName}}<span style="color:red;">{{subItem.IsGuideDaiTuan==1?"(带团)":"(不带团)"}}</span>
                   </td>
                 </template>
                 <template v-else>
@@ -144,10 +144,10 @@
                     {{subItem.TCNUMS}}({{subItem.TCID}})
                   </td>
                   <td>
-                    {{subItem.LeaderName}}
+                    {{subItem.LeaderName}}<span style="color:red;">{{subItem.IsLeaderDaiTuan==1?"(带团)":"(不带团)"}}</span>
                   </td>
                   <td>
-                    {{subItem.GuideName}}
+                    {{subItem.GuideName}}<span style="color:red;">{{subItem.IsGuideDaiTuan==1?"(带团)":"(不带团)"}}</span>
                   </td>
                 </template>
                 <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' width="180"

src/components/ShoppingStore/ShoppingStore.vue

@@ -736,10 +736,18 @@
               </td>
               <td>{{item.EnterTime}}</td>
               <td :class="{'redType':item.GuideID==0}">
-                <span>{{item.GuideName}}</span>
+                <span>{{item.GuideName}}
+                <span v-if="(item.GuideID>0||item.GuideName.length>0)&&item.TCIDExist>-1">
+                  {{item.IsGuideDaiTuan==1?"（带团）":"(不带团)"}}
+                </span>
+                </span>
               </td>
               <td :class="{'redType':item.LeaderID==0}">
-                <span>{{item.LeaderName}}</span>
+                <span>{{item.LeaderName}}
+                  <span v-if="(item.LeaderID>0||item.LeaderName.length>0)&&item.TCIDExist>-1">
+                  {{item.IsLeaderDaiTuan==1?"（带团）":"(不带团)"}}
+                </span>
+                </span>
               </td>
               <td>{{item.TotalPrice}}</td>
               <td>{{item.GroupExtract}}</td>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2698,7 +2698,8 @@
                 <span style="display: block">
                   {{ $t("salesModule.RoomInfo")
                   }}<span v-if="childItem.OneSex > 0"
-                    style="color: #e95252">（{{ childItem.OneSex == 1 ? "单男" : "单女" }}）</span>：{{ childItem.OrderGuestHouseStr }}
+                    style="color: #e95252">（{{ childItem.OneSex == 1 ? "单男" : "单女" }}）</span><span v-if="childItem.ChirdNoNeedBedNum > 0"
+                  style="color: #e95252">（儿童不占床{{ childItem.ChirdNoNeedBedNum }}人 ）</span>：{{ childItem.OrderGuestHouseStr }}
                   <el-popover trigger="click" popper-class="RL_Scenic">
                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
                       <tr class="_color_666" style="text-align: center">

src/components/dmc/manager/dmcTotalTable.vue

@@ -286,14 +286,14 @@
                   <p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
                     {{$t('ground.peizhilingdui')}}</p>
                   <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
-                    {{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
+                    {{item.LeaderName}}{{item.IsLeaderDaiTuan==1?"(带团)":"(不带团)"}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
                 </div>
               </td>
               <td>
                 <div class="link">
                   <p v-if='!item.GuideName' @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">
                     {{$t('ground.daituananpai')}}</p>
-                  <p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">{{item.GuideName}}</p>
+                  <p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">{{item.GuideName}}{{item.IsGuideDaiTuan==1?"(带团)":"(不带团)"}}</p>
                 </div>
               </td>
               <td>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -703,11 +703,29 @@
                       <template slot="prepend">{{$t('sm.Leadernum')}}</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item>
+                    <span class="TP_Sendprepend" style="margin:3px -1px 0 0">领队带团/不带团</span>
+                      <el-select class="w180" v-model="priceData.IsLeaderDaiTuan">
+                        <template v-for="item in DaiTuanList">
+                          <el-option :key="item.Id"  :label="item.name" :value="item.Id">
+                          </el-option>
+                        </template>
+                      </el-select>
+                  </el-form-item>
                   <el-form-item>
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w260" v-model="priceData.GuideNum">
                       <template slot="prepend">导游人数(不占团队机位)</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item>
+                    <span class="TP_Sendprepend" style="margin:3px -1px 0 0">导游带团/不带团</span>
+                      <el-select class="w180" v-model="priceData.IsGuideDaiTuan">
+                        <template v-for="item in DaiTuanList">
+                          <el-option :key="item.Id"  :label="item.name" :value="item.Id">
+                          </el-option>
+                        </template>
+                      </el-select>
+                  </el-form-item>
                   <el-form-item>
                     <el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum"
                       maxlength="2" @keyup.native="checkInteger(priceData,'CanSellTicketNum')"
@@ -1192,6 +1210,15 @@
             name: "主推团"
           }
         ],
+        DaiTuanList: [{
+            Id: 1,
+            name: "带团"
+          },
+          {
+            Id: 0,
+            name: "不带团"
+          }
+        ],
         currentPriceIndex: 0, //当前团期索引位置
         showPriceList: [],
         priceShowCount: 6, //团期展示条数
@@ -1381,6 +1408,8 @@
                 EmergencyContact: "", //紧急联系人
                 IsNeedAirportShuttle: 0, //是否需要接送服务
                 GuideNum: 0, //导游人数
+                IsLeaderDaiTuan:1,//领队带团/不带团
+                IsGuideDaiTuan:1,//导游带团/不带团
               };
             }
             this.returnPriceList.push(objItem);

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -709,6 +709,15 @@
                       <template slot="prepend">{{$t('sm.Leadernum')}}</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item>
+                    <span class="TP_Sendprepend" style="margin:3px -1px 0 0">领队带团/不带团</span>
+                      <el-select class="w180" v-model="priceData.IsLeaderDaiTuan">
+                        <template v-for="item in DaiTuanList">
+                          <el-option :key="item.Id"  :label="item.name" :value="item.Id">
+                          </el-option>
+                        </template>
+                      </el-select>
+                  </el-form-item>
                   <el-form-item>
                     <el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum"
                       maxlength="2" @keyup.native="checkInteger(priceData,'CanSellTicketNum')"
@@ -1142,7 +1151,7 @@
             Name: ""
           },
           SaleBranchIdArray: [],
-          OutGroupType: 0
+          OutGroupType: 0,
         },
         OutGroupTypeList: [{
             Name: '常规',
@@ -1196,6 +1205,15 @@
             name: "主推团"
           }
         ],
+        DaiTuanList: [{
+            Id: 1,
+            name: "带团"
+          },
+          {
+            Id: 0,
+            name: "不带团"
+          }
+        ],
         currentPriceIndex: 0, //当前团期索引位置
         showPriceList: [],
         priceShowCount: 6, //团期展示条数
@@ -1387,6 +1405,7 @@
                 EmergencyContact: "", //紧急联系人
                 IsNeedAirportShuttle: 0, //是否需要接送服务
                 GuideNum:0,//导游人数
+                IsLeaderDaiTuan:1,//领队带团/不带团
               };
             }
             this.returnPriceList.push(objItem);
@@ -1690,6 +1709,7 @@
         let showPriceList = [];
         let getCount = 0; //获取到得数量
         this.showPriceList = showPriceList;
+        
         for (
           let i = this.currentPriceIndex; i < this.returnPriceList.length && getCount < this.priceShowCount; i++
         ) {
@@ -2055,7 +2075,7 @@
                 priceList.push(x);
               }
             });
-            this.returnPriceList = priceList;
+            if(priceList.length>0) this.returnPriceList = priceList;
           }
           this.returnPriceList.sort(
             this.$commonUtils.createComprisonFunction("StartDate")

src/router/config.js

@@ -4052,6 +4052,13 @@ export default {
               meta: {
                 title: '发票详情'
               },
+            }, { //财务 PPT发票管理
+              path: '/PPTInvoicesManager',
+              name: 'PPTInvoicesManager',
+              component: resolve => require(['@/components/FinancialModule/PPTInvoicesManager'], resolve),
+              meta: {
+                title: 'PPT发票管理'
+              },
             }, { //财务 财务单据 收款查询管理
               path: '/RecPayQuery',
               name: 'RecPayQuery',