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

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -776,13 +776,14 @@
       },
       getOrderDetail: function () { // 获取交易信息详情
         // let OrderResource = this.$route.query.InvoiceApplyType ? 10 : 8
-        let OrderResource
-        if(this.$route.query.InvoiceApplyType==2){
-          OrderResource = 10 // 签证
-        }else if (this.$route.query.InvoiceApplyType){
-          OrderResource = this.$route.query.InvoiceApplyType
-        }else {
-          OrderResource = 8 //团队订单
+        let OrderResource = 8 //团队订
+        if(this.$route.query.InvoiceApplyType){
+          if(this.$route.query.InvoiceApplyType == 1) query2.OrderType = 8 // 团队
+          if(this.$route.query.InvoiceApplyType == 2) query2.OrderType = 10 // 签证
+          if(this.$route.query.InvoiceApplyType == 4) query2.OrderType = 12 // 机票
+          if(this.$route.query.InvoiceApplyType == 5) query2.OrderType = 5 // 车
+          if(this.$route.query.InvoiceApplyType == 6) query2.OrderType = 1 // 酒店
+          if(this.$route.query.InvoiceApplyType == 7) query2.OrderType = 3 // 门票
         }
         this.apipost(
           'InvoiceApply_get_GetOrderFinanceList', {

src/components/LeaderManagement/leaderReimbursement.vue

@@ -928,7 +928,9 @@
                 @input="changePrice"></el-input>
             </template>
           </div>
-          <span style="color:red;font-weight:bold;">合团的请分别领款!</span>
+          <span style="color:red;font-weight:bold;">
+          注意：<span>1、合团的请分别领款!</span>  <span style="margin-left: 20px;">2、如需日本PIC付款，请选择PIC相关付款流程，请注意日本转账手续费</span>
+          </span>
         </td>
         <td>
           <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"