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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -37,12 +37,13 @@
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
-        <th colspan="16" class="bgwhite">车辆使用</th>
+        <th colspan="17" class="bgwhite">车辆使用</th>
       </tr>
       <tr class="title">
         <th width="100">使用时间</th>
         <th width="80">司机姓名</th>
         <th width="80">司机电话</th>
+         <th width="80">车辆大小</th>
         <th width="100">车配号</th>
         <th width="100">车辆号</th>
         <th width="60">用车方式</th>
@@ -61,6 +62,7 @@
         <td>{{item.PlanDateStr}}</td>
         <td>{{item.DriverName}}</td>
         <td>{{item.DriverTel}}</td>
+        <td>{{item.BusPriceUseNum?item.BusPriceUseNum+"座":""}}</td>
         <td>{{item.BusCode}}</td>
         <td>{{item.BusNum}}</td>
         <td>

src/components/leaderPay2.vue

@@ -939,7 +939,7 @@ export default {
         TCIDList: TCIDARR,
         Money: obj.price,
       };
-      let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${templateID}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
+      let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${templateID}&companyID=${obj.OutBranchId}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
       let dom = document.querySelector("#blankLink");
       dom.href = `http://${window.location.host}/#${fullPath}`;
       dom.click();
@@ -1091,7 +1091,7 @@ export default {
       }, null)
     },
     goZhiDan: function(obj) { 
-      let id = [59];
+      let id = [59,63];
       let TCIDARR = [obj.TCIDS];
       let orderObj = {
         OrderID: 0,