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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -98,7 +98,7 @@
           {{item.StopPrice >= 0 && item.StopPrice !== null ? moneyFormat(item.StopPrice) : ''}}
         </td>
         <td>
-          {{moneyFormat((item.PayType === 1 ? (item.HighSpeedPayType === 1 ? item.HighSpeedPrice + Number(item.CostPrice) : Number(item.CostPrice)) : 0) + Number(item.StopPrice))}}
+          {{moneyFormat( item.HighSpeedPrice + Number(item.CostPrice) + Number(item.StopPrice))}}
           <!-- {{Number(moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))) <= 0 ? '' : moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))}} -->
         </td>
         <td v-if='index==0' :rowspan='list.BusList.length'>
@@ -747,11 +747,10 @@
       deleteSelfPlayingExpendList(outIndex, index) {
         this.list.OtherOrderReportList.SelfPlayingExpendList.splice(index, 1)
       },
-      busTotalPrice(obj) {
+      busTotalPrice(obj) { 
         let totalPrice = 0
         obj.forEach(item => {
-          totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(
-            item.HighSpeedPrice) : 0) + Number(item.StopPrice)
+          totalPrice += Number(item.CostPrice) +  Number(item.HighSpeedPrice) +  Number(item.StopPrice)
         })
         return this.moneyFormat(totalPrice)
       },

src/components/SalesModule/groupTourOrder.vue

@@ -932,8 +932,8 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="单男单女">
-              <el-radio v-model="addMsg.OneSex" :label="1">男</el-radio>
-              <el-radio v-model="addMsg.OneSex" :label="2">女</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" :label="1">男</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(2)" :label="2">女</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
@@ -2262,6 +2262,9 @@
       }
     },
     methods: {
+      setDanren(e){
+        e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
+      },
       gourlTip(path,id){
         this.$router.push({
           name: path,

src/components/SalesModule/investigationYouDetail.vue

@@ -33,13 +33,10 @@
 </style>
 <template>
   <div class="investigationYouDetail">
-    <div v-if="details.GuestTravelLableList" v-for="(item, index) in details.GuestTravelLableList" :key="index" class="item">
+    <div v-for="(item, index) in details.GuestTravelLableList" :key="index" class="item">
       <div class="_lable" v-if="item.Name">{{item.Name}}：</div>
       <div :class="{_content: item.Name}">{{item.Content}}</div>
     </div>
-    <div v-else>
-      <p>未填写</p>
-    </div>
     <el-row class="img-box" :gutter="15">
       <el-col :span="8" v-for="(item, index) in details.NotesPics" :key="index">
         <img :src="item"  @click="showImg(item)" alt>

src/components/SalesModule/productQuery.vue

@@ -340,8 +340,8 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="单男单女">
-              <el-radio v-model="addMsg.OneSex" label="1">男</el-radio>
-              <el-radio v-model="addMsg.OneSex" label="2">女</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" label="1">男</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" label="2">女</el-radio>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1174,6 +1174,9 @@
       }
     },
     methods: {
+      setDanren(e){
+        e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
+      },
       groupTypeChange: function (val) {
         if (val === '4') {
           this.addMsg.ManNum = 0

src/components/TravelManager/TravelLeader/Leader.vue

@@ -195,7 +195,7 @@
   z-index: 20;
 }
 .Leader ._sanjiao_:after {
-  content: '外';
+  content: '同';
   position: absolute;
   top: -15px;
   left: -14px;

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -294,8 +294,8 @@
         <th>订单号</th>
         <th>第三方订单号</th>
         <th>房间数</th>
-        <th>总价</th>
-        <th>已收</th>
+        <th>总额</th>
+        <th>实收</th>
         <th>大红包</th>
         <th>优惠金额</th>
         <th>待收金额</th>

src/components/TravelManager/TravelList/OpHotelOrder.vue

@@ -73,8 +73,8 @@
         <th>订单号</th>
         <th>客户信息</th>
         <th>房间数</th>
-        <th>总价格</th>
-        <th>总收入</th>
+        <th>总额</th>
+        <th>实收</th>
         <th>抵扣金额</th>
         <th>优惠金额</th>
         <th>待收金额</th>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1397,7 +1397,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            &nbsp;
+            <el-form-item label="单男单女">
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" :label="1">男</el-radio>
+              <el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(2)" :label="2">女</el-radio>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
@@ -2482,7 +2485,7 @@
             <div class="RL_ListDiv">
               <div class="LeaderSpan" :class="{'ckedClass':ckedIndex==index}" v-for="(item,index) in leaderListArr"
                 @click="getLeaderInfo(index,item.LeaderId)" :key="item.subCode">
-                <span class="RL_LeaderName">{{item.LeaderName}}【{{item.Type==2?"领兼导":"领队"}}】</span>
+                <span class="RL_LeaderName">{{item.LeaderName}}【{{getLeaderTypeStr(item.Type, item.LeaderGuidClass)}}】</span>
               </div>
             </div>
           </div>
@@ -2945,6 +2948,7 @@
           //订单归属【HK新加，报名清单页面修改使用】
           CreateBy: 0,
           RefuseVisaNum: 0, //拒签人数
+          OneSex: ""
         },
         //行程下载使用
         travelControlTripLayerShow: false,
@@ -3217,6 +3221,20 @@
       commonShouSun: commonShouSun
     },
     methods: {
+      setDanren(e){
+        e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
+      },
+      getLeaderTypeStr: function (type, clas){
+        if (type == 2) {
+          return "领兼地"
+        } else if (type == 1 && clas == 0) {
+          return "领队"
+        } else if (type == 1 && clas == 1) {
+          return "同行领队"
+        } else if (type == 1 && clas == 2) {
+          return "临时领队"
+        }
+      },
       gourlTip(path,id){
         this.$router.push({
           name: path,

src/components/dmc/manager/dmcTotalTable.vue

@@ -257,7 +257,7 @@
               <td>
                 <div class="link">
                   <p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">配置领队</p>
-                  <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}</p>
+                  <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
                 </div>
               </td>
               <td>
@@ -683,6 +683,13 @@
       commonTeamInfo
     },
     methods: {
+      getLeaderTypeStr: function (clas){
+        if (clas == 1) {
+          return "（同行领队）"
+        } else if (clas == 2) {
+          return "（临时领队）"
+        }
+      },
       getJourney(id, title) {
         var that = this;
         this.tripTitle = title;

src/router/config.js

@@ -3533,6 +3533,14 @@ export default {
                                 title: '轮播图管理'
                             }
                         },
+                        {
+                            path: '/PersonnelManagement',
+                            name: 'PersonnelManagement',
+                            component: resolve => require(['@/components/activity/PersonnelManagement'], resolve),
+                            meta: {
+                                title: '人员管理'
+                            }
+                        },
                         {
                             path: '/BmenuManagement',
                             name: 'BmenuManagement',
@@ -3661,7 +3669,8 @@ export default {
                             meta: {
                                 title: '票务规则配置'
                             }
-                        }
+                        },
+                        
                     ]
                 },
                 {
@@ -3705,6 +3714,7 @@ export default {
                 title: '领队报账'
             }
         },
+        
         {
             path: '/supplierLogin', //供应商登录
             name: 'supplierLogin',