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

src/components/FinancialModule/BasicDocuments.vue

@@ -1614,11 +1614,15 @@ class="w135 _border_b_1">
                 </tr>
                 <tr>
                   <td>{{$t('fnc.jiaoyiriqi')}}</td>
-                  <td colspan="7">
+                  <td :colspan="GetDetail.RB_Branch_Id==1248&&GetDetail.Type==2?4:7">
                     <el-date-picker v-model="AuditOrRefundMsg.TradeDate" type="date"
                       :default-value="AuditOrRefundMsg.TradeDate" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
                     </el-date-picker>
                   </td>
+                    <td v-if="GetDetail.RB_Branch_Id==1248&&GetDetail.Type==2">永樂付款手续费</td>
+                     <td colspan="2" v-if="GetDetail.RB_Branch_Id==1248&&GetDetail.Type==2">
+                       <el-input v-model="AuditOrRefundMsg.CarPayFee" placeholder="请输入手续费" type="text"></el-input>
+                     </td>
                 </tr>
               </table>
               <div v-else class="jiaoyiriqi">
@@ -1993,11 +1997,15 @@ class="w135 _border_b_1">
                   </tr>
                   <tr>
                     <td>{{$t('fnc.jiaoyiriqi')}}</td>
-                    <td colspan="7">
+                    <td :colspan="GetDetail.RB_Branch_Id==1248&&GetDetail.Type==2?4:7">
                       <el-date-picker v-model="AuditOrRefundMsg.TradeDate" type="date"
                         :default-value="AuditOrRefundMsg.TradeDate" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
                       </el-date-picker>
                     </td>
+                    <td v-if="GetDetail.RB_Branch_Id==1248&&GetDetail.Type==2">永樂付款手续费</td>
+                     <td colspan="2" v-if="GetDetail.RB_Branch_Id==1248&&GetDetail.Type==2">
+                       <el-input v-model="AuditOrRefundMsg.CarPayFee" placeholder="请输入手续费" type="text"></el-input>
+                     </td>
                   </tr>
                   <!-- <tr v-if="GetDetail.RB_Branch_Id == 1220 && GetDetail.TemplateId == 245">
                     <td>返佣 &nbsp; <el-checkbox v-model="AuditOrRefundMsg.AutoFinanceType" :true-label="1" :false-label="0" ></el-checkbox></td>
@@ -2269,6 +2277,7 @@ class="w135 _border_b_1">
           Image: [],
           TemplateType: '',
           TradeDate: new Date().Format("yyyy-MM-dd"),
+          CarPayFee: '',
           tradeWays: [{
             ID: 0,
             CurrencyId: 0,