1 发票合并申请

src/components/FinancialModule/invoicesManager.vue

@@ -233,15 +233,20 @@
       </tr>
       <template v-for="(item, index) in dataList" v-loading="loading">
         <tr>
-          <td class="cursorpointer" @click="goUrlT('productQuery', item.TCNUM, '产品查询')"
+          <td v-if="item.Type==1">合并发票</td>
+          <td v-else class="cursorpointer" @click="goUrlT('productQuery', item.TCNUM, '产品查询')"
             :rowspan="item.InvoiceApplyList.length">
             {{item.TCNUM}}
             <!-- ({{item.TCID}}) -->
           </td>
-          <td class="cursorpointer" :rowspan="item.InvoiceApplyList.length" @click="goUrlO(item.OrderId)">
+          <td v-if="item.Type==1">-</td>
+          <td v-else class="cursorpointer" :rowspan="item.InvoiceApplyList.length" @click="goUrlO(item.OrderId)">
             {{item.OrderId}}</td>
           <td :rowspan="item.InvoiceApplyList.length">{{item.CreateByStr}}</td>
-          <td :rowspan="item.InvoiceApplyList.length">{{item.CustomerName}}:{{item.CustomerContact}}</td>
+          <td v-if="item.Type==1" :rowspan="item.InvoiceApplyList.length">{{item.CustomerName}}:
+            <span class="cursorpointer" v-for="(qitem,qindex) in item.InvoiceOrderList" @click="goUrlO(qitem)">{{qitem+(qindex<(item.InvoiceOrderList.length-1)?"，":"")}}</span>
+            </td>
+          <td v-else :rowspan="item.InvoiceApplyList.length">{{item.CustomerName}}:{{item.CustomerContact}}</td>
           <td :rowspan="item.InvoiceApplyList.length">{{item.ApplyTotalPrice}}</td>
           <td :rowspan="item.InvoiceApplyList.length">
             <span>{{item.DpreadPrice - item.ApplyTotalPrice}}</span>
@@ -260,7 +265,7 @@
               <i class="iconfont icon-sousuo" @click="goIisDetail(item.InvoiceApplyList[0].ID)"></i>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.zuihuifp')" placement="top">
-              <span v-if="item.ApplyTotalPrice!=0" class="_zhuihui"
+              <span v-if="item.ApplyTotalPrice!=0 && item.InvoiceApplyList[0].InvoiceApplyState != 1" class="_zhuihui"
                 @click="zhuihui(item.InvoiceApplyList[0].ID)">{{$t('objFill.chase')}}</span>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.querenzh')" placement="top">
@@ -289,7 +294,7 @@
               <i class="iconfont icon-sousuo" @click="goIisDetail(item2.ID)"></i>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.zuihuifp')" placement="top">
-              <span v-if="item.ApplyTotalPrice!=0" class="_zhuihui"
+              <span v-if="item.ApplyTotalPrice!=0 && item2.InvoiceApplyState!=1" class="_zhuihui"
                 @click="zhuihui(item2.ID)">{{$t('objFill.chase')}}</span>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.querenzh')" placement="top">

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -130,7 +130,7 @@
           <el-input placeholder v-model="msg.ApplyMoney" @keyup.native="checkPrice(msg,'ApplyMoney')"></el-input>
         </td>
         <td>{{$t('ios.dzjine')}}</td>
-        <td>{{orderList.moneyStr}}</td>
+        <td>{{orderList.moneyStr}}{{(orderList.fee?'(手续费 '+orderList.fee+')':'')}}</td>
       </tr>
       <tr class="page_iisMgadd_bank">
         <td>{{$t('ios.dzyinhang')}}</td>
@@ -145,7 +145,30 @@
         <td>{{orderList.TradeDateStr}}</td>
       </tr>
 
+      <tr v-if="batchOrder">
+        <td>{{$t('hotel.order_Number')}} </td>
+        <td :colspan="3">
+          <table>
             <tr>
+              <td>序号</td>
+              <td>财务单号</td>
+              <td>订单号</td>
+              <td>团号</td>
+              <td>申请金额</td>
+              <td>当前手续费</td>
+            </tr>
+            <tr v-for="(qitem,qindex) in batchOrder">
+              <td>{{qindex+1}}</td>
+              <td>{{qitem.FrID}}</td>
+              <td>{{qitem.OrderID}}</td>
+              <td><p><span v-for="(i,ix) in qitem.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}）</span></p></td>
+              <td>{{qitem.Money}}</td>
+              <td>{{qitem.Fee}}</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr v-else>
         <td v-if="msg.TCID>0">{{$t('visa.v_tuanhao')}}</td>
         <td v-if="msg.TCID>0">{{msg.TCID}}</td>
         <td>{{$t('hotel.order_Number')}} </td>
@@ -298,7 +321,8 @@
           title: false
         },
         saveMsg: [],
-        crmOrderObj:null
+        crmOrderObj:null,
+        batchOrder: []
       };
     },
     methods: {
@@ -415,6 +439,39 @@
           this.msg.IsDefaultInfo = 0;
         }
         this.msg.ApplyPics = this.saveMsg
+        if(this.batchOrder && this.batchOrder.length>0){
+          this.msg.InvoiceOrderList=[];
+          this.batchOrder.forEach(x=>{
+            this.msg.InvoiceOrderList.push({
+              Type:1,
+              OrderId: x.OrderID,
+              FinanceId: x.FrID,
+              Money: x.Money
+            });
+          });
+
+          this.apipost(
+          "InvoiceApply_get_SetInvoiceApply_V2",
+          this.msg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.$message.success(res.data.message);
+              let path = ''
+              if(this.msg.InvoiceApplyType == 1){
+                path = 'platformFinancialSale'
+              }
+              setTimeout(() => {
+                  this.$router.push({
+                    name: path
+                  });
+              }, 1000);
+            } else {
+              this.$message.error(res.data.message);
+            }
+          },
+          err => {}
+        );
+        }else{
         this.apipost(
           "InvoiceApply_get_SetInvoiceApply_V2",
           this.msg,
@@ -453,6 +510,7 @@
           },
           err => {}
         );
+        }
       },
       getAccountList: function () {
         //获取账户类型对应下的账户列表
@@ -543,6 +601,23 @@
           this.loading = false
         }, null)
       },
+      getBatchOrderDetail(frIds){
+        this.apipost('Financial_post_GetSalePlatformList',{FrIDs:frIds},res=>{
+              if(res.data.resultCode == 1) {
+                  this.batchOrder = res.data.data.list;
+                  this.orderList={
+                    moneyStr : res.data.data.TotalMoney,
+                    TradeDateStr:'/',
+                    AccountNumber:'-',
+                    FrIDs:'-',
+                    fee : res.data.data.TotalFee,
+                  };
+                  this.msg.ApplyMoney = res.data.data.InvoiceMoney;
+              }else{                  
+                  this.$message.error(res.data.message);
+              }
+          },err=>{})
+      }
     },
     mounted() {
       let userInfo = this.getLocalStorage();
@@ -561,7 +636,12 @@
         this.msg.InvoiceApplyType = crmOrderObj.InvoiceApplyType;
       }
       this.getAccountList();
+      if(this.$route.query.batch){
+        //查询批量订单
+        this.getBatchOrderDetail(this.$route.query.batch);
+      }else{
         this.getOrderDetail();
+      }
       this.getCustomerInvoiceList();
       if (this.$route.query.edit) {
         this.msg.ID = this.$route.query.id

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -261,7 +261,8 @@
     <table data-v-ca5157c2 border="1" class="page_iisMgdetail_table" style="border-collapse: collapse;">
       <tr>
         <td width="130">{{$t('ios.bumen')}}</td>
-        <td>{{detail.deptName}}</td>
+        <td v-if="detail.Type && detail.Type==1" width="220">{{detail.deptName}}</td>
+        <td v-else>{{detail.deptName}}</td>
         <td width="130">{{$t('ios.sqren')}}</td>
         <td>{{detail.CreateBy}}</td>
       </tr>
@@ -281,7 +282,7 @@
           </template>
         </td>
       </tr>
-      <tr>
+      <tr v-if="!(detail.Type && detail.Type==1)">
         <td>{{$t('fnc.yszonge')}}</td>
         <td class="w600  font-weight cursorpointer">
           <span @click="goUrlO(detail.OrderId)">{{detail.PreferPrice}}</span>
@@ -315,7 +316,7 @@
           {{orderList.TradeDateStr}}
         </td>
       </tr>
-      <tr>
+      <tr v-if="!(detail.Type && detail.Type==1)">
         <template v-if="$route.query.InvoiceApplyType&&$route.query.InvoiceApplyType!=4">
           <td>{{$t('ios.tuanhao')}}</td>
           <td class="text-align-left font-weight cursorpointer" @click="goUrlT('productQuery', detail.TCNUM, '产品查询')">
@@ -329,7 +330,30 @@
         </td>
       </tr>
 
+      <tr v-if="detail.Type && detail.Type==1">
+        <td>{{$t('ios.cwdanju')}}</td>
+        <td colspan="3">
+          <table>
             <tr>
+              <td>序号</td>
+              <td>财务单号</td>
+              <td>订单号</td>
+              <td>团号</td>
+              <td>申请金额</td>
+              <td>当前手续费</td>
+            </tr>
+            <tr v-for="(qitem,qindex) in batchOrder">
+              <td>{{qindex+1}}</td>
+              <td>{{qitem.FrID}}</td>
+              <td><span class="cursorpointer" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', qitem.OrderID, qitem.TCIDAndTCNUMList[0].TCNUM, qitem.TCIDAndTCNUMList[0].TCID)">{{qitem.OrderID}}</span></td>
+              <td><p><span v-for="(i,ix) in qitem.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}）</span></p></td>
+              <td>{{qitem.Money}}</td>
+              <td>{{qitem.Fee}}</td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr v-else>
         <td>{{$t('ios.cwdanju')}}</td>
         <td colspan="3" class="w600 text-align-left font-weight cursorpointer">
           <template v-for="(item,index) in orderList.FrIDs">
@@ -555,6 +579,7 @@
         saveMsg: [],
         F_GeneralManager: false,
         IsDetail:0,
+        batchOrder: []
       };
     },
     methods: {
@@ -787,8 +812,12 @@
               })
             }
             this.detail = detail
+            if(this.detail.Type && this.detail.Type==1){
+              this.getBatchOrderDetail(this.detail.FrIds);
+            }else{
             this.getOrderDetail();
             }
+          }
           this.loading = false
         }, null)
       },
@@ -837,6 +866,23 @@
           }
         })
       },
+      getBatchOrderDetail(frIds){
+        this.apipost('Financial_post_GetSalePlatformList',{FrIDs:frIds},res=>{
+              if(res.data.resultCode == 1) {
+                  this.batchOrder = res.data.data.list;
+                  this.orderList={
+                    moneyStr : res.data.data.TotalMoney,
+                    TradeDateStr:'/',
+                    AccountNumber:'-',
+                    FrIDs:'-',
+                    fee : res.data.data.TotalFee,
+                  };
+                  this.msg.ApplyMoney = res.data.data.InvoiceMoney;
+              }else{                  
+                  this.$message.error(res.data.message);
+              }
+          },err=>{})
+      }
     },
     created(){
       let userInfo = this.getLocalStorage();

src/components/FinancialModule/platformFinancial.vue

@@ -156,6 +156,14 @@
           </el-tooltip>
             </template>
           </el-table-column>
+          <el-table-column
+            label="发票编号"
+            width="80">
+            <template slot-scope="scope">
+              <span style="cursor: pointer;color: #00C6FF;"
+             >{{ (scope.row.InvoiceState>0?scope.row.InvoiceState:'-') }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             :label="$t('system.query_company')"
             width="80">

src/router/config.js

@@ -4330,6 +4330,14 @@ export default {
                 title: '平台在途查询'
               },
             },
+            { //销售 财务单据 平台在途查询
+              path: '/platformFinancialSale',
+              name: 'platformFinancialSale',
+              component: resolve => require(['@/components/FinancialModule/platformFinancialSale'], resolve),
+              meta: {
+                title: '平台发票申请'
+              },
+            },
             { //财务 财务单据 报账合并结算
               path: '/ConsolidationOfAccounts',
               name: 'ConsolidationOfAccounts',