单男单女、用款计划用车总金额问题

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

@@ -2263,7 +2263,7 @@
     },
     methods: {
       setDanren(e){
-        e === this.addMsg.OneSex ? this.addMsg.OneSex = '' : this.addMsg.OneSex = e
+        e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
       },
       gourlTip(path,id){
         this.$router.push({

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/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">
@@ -2945,6 +2948,7 @@
           //订单归属【HK新加，报名清单页面修改使用】
           CreateBy: 0,
           RefuseVisaNum: 0, //拒签人数
+          OneSex: ""
         },
         //行程下载使用
         travelControlTripLayerShow: false,
@@ -3217,6 +3221,9 @@
       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 "领兼地"