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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -37,7 +37,7 @@
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
-        <th colspan="15" class="bgwhite">车辆使用</th>
+        <th colspan="16" class="bgwhite">车辆使用</th>
       </tr>
       <tr class="title">
         <th width="100">使用时间</th>
@@ -55,6 +55,7 @@
         <th width="60">总金额</th>
         <th width="100">备注</th>
         <th width="60">凭证</th>
+        <th width="60">供应商</th>
       </tr>
       <tr v-for='(item,index) in list.BusList'>
         <td>{{item.PlanDateStr}}</td>
@@ -115,11 +116,16 @@
             </p>
           </div>
         </td>
+        <td>
+          <span>
+            <span>{{item.SupplierName}} <span v-if="item.SupplierPayType !== 0" :style="{'color': item.SupplierPayType == 2 ? '#E95252': '#111111'}">{{item.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
+          </span>
+        </td>
       </tr>
       <tr v-if="TotalNav.reimburseTotalPrice">
         <td>总金额</td>
-        <td colspan="14">
-          {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
+        <td colspan="15">
+          <span v-for="item in TotalNav.busPrice">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span>
         </td>
         <!-- <td>签单/预付/抵扣总金额</td>
         <td colspan="7">
@@ -129,7 +135,7 @@
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
-        <th colspan="15" class="bgwhite">酒店使用</th>
+        <th colspan="16" class="bgwhite">酒店使用</th>
       </tr>
       <tr class="title">
         <th width="100">使用时间</th>
@@ -147,6 +153,7 @@
         <th width="">总金额</th>
         <th width="">付款方式</th>
         <th width="100">备注</th>
+        <th width="100">供应商</th>
       </tr>
       <template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
         <template v-for="(subItem,subIndex) in outItem.HotelOrderList">
@@ -216,6 +223,9 @@
             <td v-if="childIndex==0" :rowspan="5">
               {{subItem.Remarks}}
             </td>
+            <td v-if="childIndex==0" :rowspan="5"> 
+              <span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"  :style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
+            </td>
           </tr>
         </template>
       </template>

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -141,7 +141,7 @@
                   <!-- style="display:none;" -->
                   <div >
                     <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p>
-                    <p style="cursor: pointer;color:blue;" @click="CreateHandBill(outItem)">手动生成单据</p>
+                    <p style="cursor: pointer;color:blue;margin-top:10px;" @click="CreateHandBill(outItem)">手动生成单据</p>
                   </div>
                 </td>