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

src/App.vue

@@ -113,7 +113,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_dxcl6yumgsq.css";
+  @import "//at.alicdn.com/t/font_635492_p5609mvb4qe.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/LeaderManagement/leaderReimbursement.vue

@@ -37,8 +37,8 @@
         <th width="100">车配号</th>
         <th width="100">车辆号</th>
         <th width="60">用车方式</th>
-        <th width="60">车费</th>
-        <th width="120">车费付款方式</th>
+        <!-- <th width="60">车费</th>
+        <th width="120">车费付款方式</th> -->
         <th width="80">高速公路费</th>
         <th width="120">高速费用付款方式</th>
         <th width="60">停车费</th>
@@ -58,17 +58,17 @@
           <span v-if='index!=0&&index!=list.BusList.length-1'>{{item.AirportPickUpStr}}</span>
           <span v-if='index==list.BusList.length-1'>送机</span>
         </td>
-        <td>
-          {{moneyFormat(item.CostPrice)}}
+        <!-- <td>
+          {{ item.PayType === 1 ? moneyFormat(item.CostPrice) : 0}}
         </td>
         <td>
           <span v-if="item.PayType === 1">现付</span>
           <span v-else-if="item.PayType === 2">公司结算</span>
           <span v-else-if="item.PayType === 3">预付</span>
           <span v-else>暂无</span>
-        </td>
+        </td> -->
         <td>
-          {{moneyFormat(item.HighSpeedPrice)}}
+          {{item.HighSpeedPayType === 1 ? moneyFormat(item.HighSpeedPrice) : 0}}
         </td>
         <td>
           <span v-if="item.HighSpeedPayType === 1">现付</span>
@@ -80,7 +80,7 @@
           {{moneyFormat(item.StopPrice)}}
         </td>
         <td>
-          {{moneyFormat(Number(item.CostPrice)+Number(item.StopPrice))}}
+          {{moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0)+Number(item.StopPrice))}}
         </td>
         <td v-if='index==0' :rowspan='list.BusList.length'>
           {{busTotalPrice(list.BusList)}}
@@ -98,13 +98,13 @@
       </tr>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="7">
+        <td colspan="13">
           {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
         </td>
-        <td>签单/预付/抵扣总金额</td>
+        <!-- <td>签单/预付/抵扣总金额</td>
         <td colspan="7">
           {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}}
-        </td>
+        </td> -->
       </tr>
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -189,13 +189,13 @@
       </template>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="6">
+        <td colspan="14">
           {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
         </td>
-        <td>签单/预付/抵扣总金额</td>
+        <!-- <td>签单/预付/抵扣总金额</td>
         <td colspan="7">
           {{moneyFormat(TotalNav.reimburseTotalPrice.BalanceTotalPrice)}}
-        </td>
+        </td> -->
       </tr>
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -238,13 +238,13 @@
               </p>
             </td>
             <td>
-              {{moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice)}}
+              {{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
             </td>
             <td>
               {{childItem.DiscountPrice}}%
             </td>
             <td v-if="childIndex==0" :rowspan="3">
-              {{diningTotalPrice(subItem.DiningPriceList)}}
+              {{diningTotalPrice(subItem, subItem.DiningPriceList)}}
             </td>
             <td v-if="childIndex==0" :rowspan="3">
               <span v-if="subItem.PayStyle === 1">现付</span>
@@ -260,13 +260,13 @@
       </template>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="5">
+        <td colspan="11">
           {{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}}
         </td>
-        <td>签单/预付/抵扣总金额</td>
+        <!-- <td>签单/预付/抵扣总金额</td>
         <td colspan="5">
           {{moneyFormat(TotalNav.reimburseTotalPrice.TipTotalPrice)}}
-        </td>
+        </td> -->
       </tr>
     </table>
 
@@ -311,13 +311,13 @@
               </p>
             </td>
             <td>
-              {{moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice)}}
+              {{subItem.PayStyle === 1 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
             </td>
             <td>
               {{childItem.DiscountPrice}}%
             </td>
             <td v-if="childIndex==0" :rowspan="3">
-              {{scenicTotalPrice(subItem.TicketPriceList)}}
+              {{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
             </td>
             <td v-if="childIndex==0" :rowspan="3">
               <span v-if="subItem.PayStyle === 1">现付</span>
@@ -333,13 +333,13 @@
       </template>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="5">
+        <td colspan="11">
           {{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
         </td>
-        <td>签单/预付/抵扣总金额</td>
+        <!-- <td>签单/预付/抵扣总金额</td>
         <td colspan="5">
           {{moneyFormat(TotalNav.reimburseTotalPrice.PlanTotalPrice)}}
-        </td>
+        </td> -->
       </tr>
 
     </table>
@@ -364,7 +364,7 @@
           <span>{{item.HangingAccountsTypeStr}}</span>
         </td>
         <td>
-          <span>{{item.RemitterName}}：{{item.AccountNumber}}</span>
+          <span>{{item.RemitterName}}{{item.AccountNumber}}</span>
         </td>
         <td>
           <span>{{item.StatusStr}}</span>
@@ -583,29 +583,39 @@
       busTotalPrice(obj) {
         let totalPrice = 0
         obj.forEach(item => {
-          totalPrice += Number(item.CostPrice) + Number(item.HighSpeedPrice) + Number(item.StopPrice)
+          totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0) + Number(item.StopPrice)
         })
         return this.moneyFormat(totalPrice)
       },
       hotelTotalPrice(obj) {
         let totalPrice = 0
         obj.forEach(x => {
+          if(x.PayStyle === 1){
             totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1 - x.RebateRatio / 100)
+          } else {
+            totalPrice += 0
+          }
         })
         return this.moneyFormat(totalPrice)
       },
-      diningTotalPrice(obj) {
+      diningTotalPrice(sObj, obj) {
         let totalPrice = 0
         obj.forEach(x => {
           totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
         })
+        if(sObj.PayStyle !== 1) {
+          totalPrice = 0
+        }
         return this.moneyFormat(totalPrice)
       },
-      scenicTotalPrice(obj) {
+      scenicTotalPrice(sObj, obj) {
         let totalPrice = 0
         obj.forEach(x => {
           totalPrice += x.PeoplePrice * (x.UsePeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
         })
+        if(sObj.PayStyle !== 1) {
+          totalPrice = 0
+        }
         return this.moneyFormat(totalPrice)
       },
       otherTotalPrice(obj) {

src/main.js

@@ -17,6 +17,7 @@ import vueQuillEditor from 'vue-quill-editor'
 import 'quill/dist/quill.core.css'
 import 'quill/dist/quill.snow.css'
 import echarts from 'echarts'
+Vue.prototype.$echarts = echarts
 // import VueWebsocket from "vue-websocket"
 // import global_ from './components/Global'
 //import VueAMap from 'vue-amap'