财务新增挂账，修改领队用款计划页面，新增发票相关页面

src/components/FinancialModule/BasicDocuments.vue

@@ -262,12 +262,15 @@
     <div class="page_bdm" v-if="GetDetail" v-loading="loading">
         <p class="_tit">{{GetDetail.FinanceName}}</p>
         <div class="_conten">
-            <template v-if="GetDetail.Type!=1">
+            <template v-if="GetDetail.Type===2">
                 <my-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
             </template>
-            <template v-else>
+            <template v-else-if="GetDetail.Type===1">
                 <my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
             </template>
+            <template v-else-if="GetDetail.Type===7">
+                <my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-GZ-Bill>
+            </template>
             <div class="_explain">
                 <p>附加说明：</p>
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
@@ -302,7 +305,7 @@
                 </table>
                 <!-- <p>附加说明</p> -->
                 <div>
-                    <p>费用归属部门：<span>{{GetDetail.DepartName}}</span></p>
+                    <p v-if="GetDetail.Type!==7">费用归属部门：<span>{{GetDetail.DepartName}}</span></p>
                   <div>
                     <el-popover
                       popper-class="detailsIT_Journal"
@@ -997,6 +1000,7 @@
 <script>
 import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
 import myBill from "./FinancialSubmodule/BillModule.vue";
+import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
 import teamProductModule from "../commonPage/teamProductModule.vue";
@@ -1104,11 +1108,13 @@ export default {
           LogLoading:false,
           userId:0,
           RB_Post_Id: 0,
+          ISGZ: false,
         }
     },components:{
         "my-FlowChartModule": myFlowChartModule,
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,
+        "my-GZ-Bill": myGZBill,
         'TicketingModule':TicketingModule,
         'teamProductModule':teamProductModule,
         'SaleOrderModule':SaleOrderModule,
@@ -1584,7 +1590,11 @@ export default {
                 if(res.data.resultCode==1){
                     this.$message.success(res.data.message);
                     // let _this = this;
+                    if (this.$route.query.ISGZ){
+                        this.$router.push({name:'FinancialAccounting',query:{}})
+                    } else {
                         this.$router.push({name:'FinancialDocuments',query:{'returnCode':3,"pageIndex":this.pageIndex}})
+                    }
                     // setTimeout(function () {
                     //   _this.MsgBus.$emit('msg');
                     // },500)
@@ -1694,6 +1704,7 @@ export default {
         if(this.$route.query.pageIndex){
             this.pageIndex = this.$route.query.pageIndex;
         }
+        this.ISGZ = this.$route.query.ISGZ ? true : false
     },mounted(){
         let userInfo=this.getLocalStorage();
         this.userId = userInfo.EmployeeId;

src/components/FinancialModule/CapitalAllocation.vue

@@ -60,13 +60,13 @@
     <el-form label-width="100px" class="form">
       <el-row :gutter="20">
         <el-col :span="4">
-          <el-form-item label="单据编号">
+          <el-form-item :label="$t('fnc.djbianhao')">
             <el-input v-model="msg.FrID"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="公司">
-            <el-select v-model="msg.RB_Branch_Id" placeholder="请选择公司" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
+          <el-form-item :label="$t('system.table_company')">
+            <el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
               <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in CompanyList'
                 :label='item.BName'
@@ -77,8 +77,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="部门">
-            <el-select v-model="msg.RB_Depart_Id" placeholder="请选择部门" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
+          <el-form-item :label="$t('admin.admin_Department')">
+            <el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
               <el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in DepartmentList'
                 :label='item.DepartmentName'
@@ -89,7 +89,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="制单人">
+          <el-form-item :label="$t('fnc.zhidanren')">
             <el-select  filterable  v-model='msg.UpdateBy'>
               <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in EmployeeList'
@@ -101,7 +101,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="制单日期">
+          <el-form-item :label="$t('fnc.zdriqi')">
             <el-date-picker
               @change="timeAdd(1)"
               v-model="productionDate"
@@ -126,13 +126,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="交易日期">
+          <el-form-item :label="$t('fnc.jiaoyiriqi')">
             <el-date-picker
               @change="timeAdd(2)"
               v-model="productionDate2"
               type="daterange"
               value-format="yyyy-MM-dd"
-              range-separator="至">
+              :range-separator="$t('restaurant.res_To')">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -141,13 +141,13 @@
     <div class="page_CapitalAllocation_list">
       <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
         <tr>
-          <th>单号</th>
-          <th>金额</th>
+          <th>{{$t('fnc.danhao')}}</th>
+          <th>{{$t('fnc.jine')}}</th>
           <!-- <th>实付</th> -->
           <!-- <th>原币金额</th> -->
           <!-- <th>交易日期</th> -->
-          <th>创建时间</th>
-          <th>创建人</th>
+          <th>{{$t('fnc.cjshijian')}}</th>
+          <th>{{$t('active.cl_addPp')}}</th>
           <!-- <th>备注</th> -->
           <th>{{$t('admin.admin_status')}}</th>
           <th>{{$t('system.table_operation')}}</th>
@@ -173,7 +173,7 @@
               trigger="click">
                 <div class="InfoChangeLog" >
                   <div class="changLog">
-                    <p class="_log_t">流程日志</p>
+                    <p class="_log_t">{{$t('fnc.lcrizhi')}}</p>
                     <ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'>
                       <li class="changLogList_l" v-for="(log,li) in GetFinancLogList">
                           <span style="background-color: #47BF8C"  class="_radius_green"></span>
@@ -182,7 +182,7 @@
                       </li>
                     </ul>
                     <ul v-else>
-                      <li>暂无修改日志</li>
+                      <li>{{$t('hotel.hotel_zanwu')}}</li>
                     </ul>
                   </div>
                 </div>
@@ -190,16 +190,16 @@
             </el-popover>
           </td>
           <td>
-            <el-tooltip class="item" effect="dark" content="修改"  placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
+            <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')"  placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
               <i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
             </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="详情"  placement="top">
+            <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')"  placement="top">
               <i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID)"></i>
             </el-tooltip>
           </td>
         </tr>
       </table>
-      <div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
+      <div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
       <div>
             <el-pagination
                 background
@@ -259,7 +259,9 @@ export default {
       GetFinancLogList: [],
       loading: true,
       LogLoading: true,
-      EmId:0
+      EmId:0,
+      total: 0,
+      currentPage: 0
     }
   },
   created(){
@@ -304,7 +306,7 @@ export default {
             if(!this.msg.Status)this.msg.Status=0;
             if(!this.msg.FrID)this.msg.FrID=0;
             this.msg.EmployeeId=this.EmId;
-            this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,"资金调拨报表.xls");} ,        
+            this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,        
     getCompanyList: function () { //获取公司列表
       this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
         if(res.data.resultCode==1){

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -24,10 +24,12 @@
     <ul class="_nav clearfix" v-if="showTab==0">
       <li :class="active==1?'_active':''" @click="active=1,tabData(1)">{{$t('fnc.shoukuandan')}}</li>
       <li :class="active==2?'_active':''" @click="active=2,tabData(2)">{{$t('fnc.fukuandan')}}</li>
+      <li :class="active==3?'_active':''" @click="active=3,tabData(3)">挂账单</li>
     </ul>
     <ul class="_nav clearfix" v-else>
       <li :class="active==1?'_active':''"  v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li>
       <li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li>
+      <li :class="active==3?'_active':''" v-else>挂账单</li>
     </ul>
     <ul class="_conten">
       <li v-for="(item,index) in GetList">
@@ -76,6 +78,7 @@
         },
         collectList:[],
         payList:[],
+        GZList: [],
         total:0,
         currentPage:1,
         noData:false,
@@ -87,8 +90,10 @@
       goUrl(path,id,Name,Type,IsUploadPic) {
         if(this.active==1){
           this.$router.push({ name: "addReceivablesDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
-        }else{
+        }else if(this.active==2){
           this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
+        }else {
+          this.$router.push({ name: "addFinancialGZDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}})
         }
       },
       getFlowChart(id){  //获取流程图
@@ -106,8 +111,10 @@
       tabData(t){  //切换
         if(t==1){
           this.GetList = this.collectList;
-        }else{
+        }else if (t==2){
           this.GetList = this.payList;
+        }else if (t==3) {
+          this.GetList = this.GZList;
         }
         if(this.GetList.length<1){
           this.noData = true;
@@ -123,13 +130,16 @@
               data.forEach(x => {
                 if(x.Type==1){
                   this.collectList.push(x);
-                }else{
+                }else if (x.Type==2){
                   if(this.active===2){
                      if(x.Id!=11){
                        this.payList.push(x);
                      }
                   }else{
-                  this.payList.push(x);}
+                    this.payList.push(x);
+                  }
+                }else if (x.Type==7){
+                  this.GZList.push(x);
                 }
               });
             }
@@ -150,6 +160,8 @@
       this.showTab = this.$route.query.Type?this.$route.query.Type:0;
       if(this.showTab==1){
         this.GetList = this.collectList;
+      } else if(this.showTab==1){
+        this.GetList = this.GZList;
       }else{
         this.GetList = this.payList;
       }

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -14,7 +14,7 @@
     .page_bdm{padding: 20px 0;}
     ._tit{padding-left: 10px;border-left: 3px solid #E95252;font-size: 14px}
     ._conten{position: relative}
-    ._conten,._process{margin-top: 20px;width: 830px;}
+    ._conten,._process{margin-top: 20px;width: 890px;}
     ._explain{padding: 20px 15px;border-top: 1px dashed #BFBFBF;border-bottom: 1px dashed #BFBFBF;background-color: white;}
     ._explain>p{color: #1273BC;font-size: 12px;}
     ._explain>div{display: flex;justify-content: space-between;font-size: 12px;color: #333333;margin-top: 10px;align-items: center;}
@@ -90,7 +90,7 @@
     ._upload_tips{font-size: 12px;position: absolute;top: 66%;width: 100%;left: 0;text-align: center;color: #949494;}
     ._log_t{padding: 10px;}
     ._time_n{float: right;}
-    .w830px{width: 830px;padding: 0;margin: 0;}
+    .w890px{width: 890px;padding: 0;margin: 0;}
     .w600px{
         width: 600px;
         padding: 15px;
@@ -120,7 +120,7 @@
     }
     ._fujian_box{
         position: fixed;
-        left: 914px;
+        left: 961px;
         top: 141px;
         width: 440px;
     }
@@ -149,7 +149,7 @@
         display: flex;
     }
     ._splic{
-        width: 830px;
+        width: 890px;
         overflow: hidden;
         font-size: 12px;
         color: #929292;
@@ -336,8 +336,9 @@
             <span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
             <p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p>
             <div class="_conten">
-                <my-Bill v-if="GetDetail.Type!==1 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-Bill>
-                <my-RVB-Bill v-else :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
+                <my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-Bill>
+                <my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
+                <my-GZ-Bill v-else-if="GetDetail.Type===7" :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-GZ-Bill>
                 <div class="_explain">
                     <p>附加说明：</p>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
@@ -372,7 +373,7 @@
                         </tr>
                     </table>
                     <div>
-                      <p>费用归属部门：<span class="_font_bold">{{GetDetail.DepartName}}</span></p>
+                      <p v-if="GetDetail.Type!==7">费用归属部门：<span class="_font_bold">{{GetDetail.DepartName}}</span></p>
                       <div>
                         <el-popover
                               popper-class="detailsIT_Journal"
@@ -509,8 +510,8 @@
             </div>
             <p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
             <template v-if="sonTCIDList">
-                <div class="w830px">
-                    <div class="_tit _tit2 w830px _border_bottom_none">
+                <div class="w890px">
+                    <div class="_tit _tit2 w890px _border_bottom_none">
                         <p>
                             <span class="_text">团队</span>
                             <span class="_btn" v-if="tableShowTeam" @click="tableShowTeam=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
@@ -524,13 +525,13 @@
                     </div>
                 </div>
             </template>
-            <div class="w830px">
+            <div class="w890px">
                 <SaleOrderModule v-if="OrderSource==10&&SourceID&&OrderID" :SourceID='SourceID' :OrderID='OrderID'/>
                 <TicketFinace v-if="OrderSource==4&&SourceID&&Callback&&ID" :SourceID='SourceID' :Callback='Callback' :id='ID'/>
                 <TicketingModule v-if="OrderSource==9&&FrID&&ID" :FrID='FrID' :id='ID'/>
             </div>
 
-            <div class="_tit _tit2 w830px">
+            <div class="_tit _tit2 w890px">
                 <p>
                     <span class="_text">审核流程</span>
                     <span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
@@ -745,6 +746,7 @@ import myBill from "./FinancialSubmodule/BillModule.vue";
 import myCBill from "./FinancialSubmodule/CashierBillModule.vue";
 import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
+import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 import teamProductModule from "../commonPage/teamProductModule.vue";
 import TicketFinace from "../commonPage/TicketFinace.vue";
 import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
@@ -808,6 +810,7 @@ export default {
         'my-C-Bill': myCBill,
         'my-RVB-Bill':myrbvBill,
         'my-HB-Bill':myhrBill,
+        "my-GZ-Bill": myGZBill,
         'teamProductModule':teamProductModule,
         'TicketingModule':TicketingModule,
         'SaleOrderModule':SaleOrderModule,

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -116,7 +116,7 @@
             </div>
             <div class="rb_top_row _r_mb5" v-if="isPrintPage">
                 <p>
-                    <span class="">{{$t('fnc.v_tuanhao')}}：
+                    <span class="">{{$t('visa.v_tuanhao')}}：
                       <template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
                          <span v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" >{{o.TCNUM}}（{{o.TCID}}）</span>
                       </template>

src/components/FinancialModule/addFinancialDocuments.vue

@@ -290,7 +290,7 @@
                         </tr>
                         <tr v-else @keyup.enter="addList(2,daIn+1)">
                             <td height="26px">
-                                <el-select  filterable  v-model='da.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId),addList(2,daIn+1)"  class=" _border_b_1">
+                                <el-select  filterable  v-model='da.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(da.CostTypeId, daIn),addList(2,daIn+1)"  class=" _border_b_1">
                                     <el-option v-for='item in GetCostTypeList'
                                         :label='item.Name'
                                         :value='item.ID'
@@ -991,11 +991,15 @@ export default {
                 }
             }
         },
-        getCostTypeName(i){  // 根据支出费用类型获取费用类型名称 列表展示用
+        getCostTypeName(i, t){  // 根据支出费用类型获取费用类型名称 列表展示用
             this.GetCostTypeList.forEach(x=>{
                 if(x.ID == i){
+                    if (t>=0) {
+                        this.msg.detailList[t].CostTypeName = x.Name;
+                    }else{
                         this.detailList.CostTypeName = x.Name;
                     }
+                }
             })
         },
         getRate(i,t,index){  // 根据选择币种获取汇率
@@ -1118,6 +1122,9 @@ export default {
                             })
                         })
                     }
+                    if (this.orderObj && this.orderObj.CostType) {
+                        this.getCostTypeName(this.detailList.CostTypeId)
+                    }
                 }
             }, err => {})
         },
@@ -1194,6 +1201,9 @@ export default {
                         this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
                         this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
                         this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
+                        this.detailList.CostTypeId = this.orderObj.CostType?this.orderObj.CostType: '';
+                        this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
+                        this.detailList.Number = this.orderObj.CostType ? 1 : 0
                     }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
@@ -1204,6 +1214,9 @@ export default {
                     if(this.msg.TCIDAndTCNUMList==null){
                         this.msg.TCIDAndTCNUMList = [];
                     }
+                    if (this.orderObj && this.orderObj.CostType) {
+                        this.Calculation(1)
+                    }
                     this.msg.URL = this.$route.query.path;
                     this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
                     this.$forceUpdate();

src/components/FinancialModule/addFinancialProcess.vue

@@ -319,6 +319,8 @@
 					<el-radio v-model="radio" v-else @change="getCostTypeList(1),CostIdS=[],accListShow=true" :label="1">{{$t('restaurant.res_income')}}</el-radio>
 					<el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled" :label="2">{{$t('restaurant.res_outcome')}}</el-radio>
 					<el-radio v-model="radio" v-else @change="getCostTypeList(2),CostIdS=[],accListMsg=[],accListShow=false" :label="2">{{$t('restaurant.res_outcome')}}</el-radio>
+					<el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled" :label="7">{{$t('fnc.guazhang')}}</el-radio>
+					<el-radio v-model="radio" v-else @change="getCostTypeList(2),CostIdS=[],accListMsg=[],accListShow=false" :label="7">{{$t('fnc.guazhang')}}</el-radio>
 				</el-form-item>
 				<el-form-item :label="$t('fnc.scfujian')">
 					<el-radio v-model="addMsg.IsUploadPic" :label="0">{{$t('fnc.buqiyong')}}</el-radio>
@@ -402,7 +404,7 @@
 		</div>
 		<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible" center>
 			<div class="fl" style="width: 300px; margin: 0 20px;">
-				<p style="margin: 0 0 10px 0;">{{$t('fnc.xuanze')}}： <el-input class='w200' :placeholder="$t('fnc.srgjzjxguolv')"  v-model="filterText">
+				<p style="margin: 0 0 10px 0;">{{$t('fnc.xuanze')}}： <el-input class='w200' :placeholder="$t('tips.srgjzjxguolv')"  v-model="filterText">
 				</el-input>
 				</p>
 				<el-tree class='ApprovalProcessBg'
@@ -430,7 +432,7 @@
 		</el-dialog>
 		<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible1" center>
 			<div class="fl" style="width: 300px; margin: 0 20px;">
-				<p style="margin: 0 0 10px 0;">{{$t('fnc.xzgangwei')}}： <el-input class='w200' :placeholder="$t('fnc.srgjzjxguolv')" v-model="filterText1">
+				<p style="margin: 0 0 10px 0;">{{$t('fnc.xzgangwei')}}： <el-input class='w200' :placeholder="$t('tips.srgjzjxguolv')" v-model="filterText1">
 				</el-input>
 				</p>
 				<el-tree class='ApprovalProcessBg'
@@ -536,7 +538,7 @@ export default {
 				},
 				{
 					id:5,
-					name: this.$t('fnc.kjiedian')
+					name: this.$t('fnc.cnchuangkou')
 				},
 				{
 					id:6,

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -221,7 +221,7 @@
                         </tr>
                         <tr v-else @keyup.enter="addList(2,daIn+1)" style="border-right:none;">
                             <td height="26px">
-                                <el-select  filterable  v-model='da.CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId),addList(2,daIn+1)"  class="w200 _border_b_1">
+                                <el-select  filterable  v-model='da.CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(da.CostTypeId, daIn),addList(2,daIn+1)"  class="w200 _border_b_1">
                                     <el-option v-for='item in GetCostTypeList'
                                         :label='item.Name'
                                         :value='item.ID'
@@ -1237,11 +1237,15 @@ export default {
             this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee);
             this.$forceUpdate();
         },
-        getCostTypeName(i){  // 根据支出费用类型获取费用类型名称 列表展示用
+        getCostTypeName(i, t){  // 根据支出费用类型获取费用类型名称 列表展示用
             this.GetCostTypeList.forEach(x=>{
                 if(x.ID == i){
+                    if (t>=0) {
+                        this.msg.detailList[t].CostTypeName = x.Name;
+                    }else{
                         this.detailList.CostTypeName = x.Name;
                     }
+                }
             })
         },
         Financial_post_GetCostTypeList(id,type){  //获取支出费用类型

src/components/FinancialModule/invoicesManager.vue

+<style>
+.page_iisMg ._nav {
+  margin: 20px 0 0 0;
+  background-color: #f5f5f5;
+}
+.page_iisMg ._nav li {
+  float: left;
+  font-size: 14px;
+  color: #666666;
+  padding: 15px 20px;
+  cursor: pointer;
+  position: relative;
+  background-color: #f1f1f1;
+  margin-right: 5px;
+}
+.page_iisMg ._nav li._active {
+  background-color: #ffffff;
+  color: #333333;
+}
+.page_iisMg ._nav li._active::after {
+  content: "";
+  width: 20px;
+  height: 3px;
+  background-color: #e95252;
+  display: inline-block;
+  position: absolute;
+  bottom: 0;
+  left: 38%;
+}
+.page_iisMg .query-box {
+  padding-bottom: 0;
+}
+.page_iisMg .iis_info_box {
+  padding-top: 15px;
+}
+.page_iisMg .el-date-editor .el-range-separator {
+  width: 9% !important;
+}
+</style>
+<template>
+  <div class="page_iisMg">
+    <ul class="_nav clearfix">
+      <li :class="active==1?'_active':''" @click="active=1,msg.Conditon=1,getPageList()">全部发票</li>
+      <li :class="active==2?'_active':''" @click="active=2,msg.Conditon=2,getPageList()">已开发票</li>
+      <li :class="active==3?'_active':''" @click="active=3,msg.Conditon=3,getPageList()">欠票发票</li>
+    </ul>
+    <div class="query-box">
+      <el-form class="iis_info_box clearfix" label-width="110px">
+        <el-row>
+          <el-col :span="4" :gutter="35">
+            <el-form-item label="团号">
+              <el-input placeholder v-model="msg.TCID"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" :gutter="35">
+            <el-form-item label="订单号">
+              <el-input placeholder v-model="msg.TCID"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" :gutter="35" v-if="active !== 3">
+            <el-form-item label="单据状态">
+              <el-select v-model="msg.InvoiceApplyState" filterable>
+                <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option :value="1" label="申请中"></el-option>
+                <el-option :value="2" label="取消"></el-option>
+                <el-option :value="3" label="通过"></el-option>
+                <el-option :value="4" label="拒绝"></el-option>
+                <el-option :value="5" label="欠票"></el-option>
+                <el-option :value="6" label="发票追回"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" :gutter="35">
+            <el-form-item label="开票日期">
+              <el-date-picker
+                class="h34"
+                @change="timeAdd"
+                v-model="productionDate"
+                type="daterange"
+                value-format="yyyy-MM-dd"
+                :range-separator="$t('restaurant.res_To')"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <ul>
+        <li>
+          <button
+            class="hollowFixedBtn"
+            @click="resetPageIndex(),getPageList()"
+          >{{$t('pub.searchBtn')}}</button>
+          <!-- <button
+            class="normalBtn"
+            @click="goUrlAdd('invoicesManagerAdd')"
+          >{{$t('pub.addBtn')}}</button> -->
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      active: 1,
+      msg: {
+        TCID: 0,
+        OrderId: 0,
+        AccountInfo: '',
+        ApplyMoney: 0,
+        AactualMoney: 0,
+        CompanyName: '',
+        DutyParagraph: '',
+        InvoiceApplyState: 0,
+        pageIndex: 1,
+        pageSize: 10
+      },
+      productionDate: []
+    };
+  },
+  methods: {
+    timeAdd() {
+      // 日期格式
+      if (!this.productionDate) {
+        this.msg.sTradeDate = "";
+        this.msg.eTradeDate = "";
+        return;
+      }
+      this.msg.sTradeDate = this.productionDate[0];
+      this.msg.eTradeDate = this.productionDate[1];
+    },
+    getPageList: function() {},
+    goUrlAdd: function (path) {
+      this.$router.push({
+        name: path,
+        query: { blank: "y",}
+      });
+    }
+  },
+  mounted() {}
+};
+</script>

src/components/FinancialModule/invoicesManagerAdd.vue

+<style scoped>
+.page_iisMgadd {
+  width: 830px;
+  background-color: white;
+  padding: 10px;
+}
+.page_iisMgadd > p {
+  font-size: 18px;
+  text-align: center;
+  padding-bottom: 15px;
+}
+.page_iisMgadd .page_iisMgadd_table {
+  width: 100%;
+  font-size: 14px;
+  text-align: center;
+}
+.page_iisMgadd .page_iisMgadd_table td {
+  padding: 10px;
+}
+.page_iisMgadd .page_iisMgadd_table .page_iisMgadd_bank td._bank_td{
+  width: 679px;
+}
+.iis_save{
+  text-align: right;
+  padding: 10px 0 0 0;
+}
+.page_iisMgadd .page_iisMgadd_table tr td.text-align-left{
+  font-weight: 800;
+}
+</style>
+<template>
+  <div class="page_iisMgadd">
+    <p>发票开具申请单</p>
+    <table
+      data-v-ca5157c2
+      border="1"
+      class="page_iisMgadd_table"
+      style="border-collapse: collapse;"
+    >
+      <tr>
+        <td width="130">部门</td>
+        <td>{{DepartName}}</td>
+        <td width="130">申请人</td>
+        <td>{{emName}}</td>
+      </tr>
+      <tr>
+        <td>开具金额</td>
+        <td>
+          <el-input placeholder v-model="msg.ApplyMoney"></el-input>
+        </td>
+        <td>到账金额</td>
+        <td>
+          <el-input placeholder v-model="msg.AactualMoney"></el-input>
+        </td>
+      </tr>
+      <tr class="page_iisMgadd_bank">
+        <td>到账银行</td>
+        <td colspan="3" class="_bank_td">
+          <el-select v-model="msg.AccountInfo" class="width100b">
+            <el-option v-for="(a, i) in accountList" :key="i" :value="a.ID" :label="a.allName"></el-option>
+          </el-select>
+        </td>
+      </tr>
+      <tr>
+        <td>申请日期</td>
+        <td>
+          {{new Date().Format('yyyy-MM-dd')}}
+        </td>
+        <td>到账日期</td>
+        <td>
+          {{new Date().Format('yyyy-MM-dd')}}
+        </td>
+      </tr>
+      <tr>
+        <td>团号</td>
+        <td colspan="3" class="w600 text-align-left">
+          {{msg.TCID}}
+        </td>
+      </tr>
+      <tr>
+        <td>平台ID</td>
+        <td colspan="3" class="w600 text-align-left">
+          {{msg.OrderId}}
+        </td>
+      </tr>
+      <tr>
+        <td rowspan="2">开具内容</td>
+        <td>公司名称</td>
+        <td colspan="2">
+          <el-input placeholder v-model="msg.CompanyName"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>税号</td>
+        <td colspan="2">
+          <el-input placeholder v-model="msg.DutyParagraph"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>备注</td>
+        <td colspan="3">
+          <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>
+        </td>
+      </tr>
+    </table>
+    <div class="iis_save">
+      <button class="normalBtn" @click="Addiis()">{{$t('fnc.tijiao')}}</button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      msg: {
+        TCID: 0,
+        OrderId: 0,
+        AccountInfo: '',
+        ApplyMoney: 0,
+        AactualMoney: 0,
+        CompanyName: '',
+        DutyParagraph: '',
+        InvoiceApplyState: 1
+      },
+      DepartName: "",
+      emName: "",
+      accountList: [],
+    };
+  },
+  methods: {
+    Addiis: function () {
+      if (this.msg.AccountInfo === '') return this.$message.error('请选择到账银行！')
+      if (this.msg.CompanyName === '') return this.$message.error('请填写公司名称！')
+      if (this.msg.DutyParagraph === '') return this.$message.error('请填写税号！')
+      this.apipost(
+        "InvoiceApply_get_SetInvoiceApply",
+        this.msg,
+        res => {
+          if (res.data.resultCode == 1) {
+            setTimeout(()=>{
+              this.$router.push({
+                name: 'invoicesManager'
+              });
+            },1000)
+          } else {
+            this.$message.error(res.data.message)
+          }
+        },
+        err => {}
+      );
+    },
+    getAccountList() {
+      //获取账户类型对应下的账户列表
+      this.apipost(
+        "FinancialInstitutions_post_GetALLAccountList",
+        { TypeId: 3 },
+        res => {
+          if (res.data.resultCode == 1) {
+            let data = res.data.data;
+            data.forEach(x => {
+              x.allName = `${x.Alias}-${x.BackNo}`
+            });
+            this.accountList = data;
+          }
+        },
+        err => {}
+      );
+    }
+  },
+  mounted() {
+    let userInfo = this.getLocalStorage();
+    this.DepartName = userInfo.DepartName;
+    this.emName = userInfo.emName;
+    this.msg.OrderId = this.$route.query.OrderId;
+    this.msg.TCID = this.$route.query.TCID;
+    this.getAccountList();
+  }
+};
+</script>

src/components/FinancialModule/invoicesManagerDetail.vue

+<style scoped>
+
+</style>
+<template>
+  <div class="page_iisMgdetail">
+    
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return { 
+      msg: {
+        TCID: 0,
+        OrderId: 0,
+        AccountInfo: 0,
+        ApplyMoney: 0,
+        AactualMoney: 0,
+        CompanyName: 0,
+        DutyParagraph: 0,
+        InvoiceApplyState: 0,
+      },
+    };
+  },
+  methods: {
+     
+  },
+  mounted() {}
+};
+</script>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -4,13 +4,14 @@
       <tr>
         <th width="8%">出发地</th>
         <th width="30%">行程名称</th>
-        <th width="10%">团号</th>
-        <th width="10%">定团号</th>
-        <th width="10%">出发时间</th>
-        <th width="8%">天数</th>
-        <th width="8%">出团人数</th>
-        <th width="8%">领队</th>
-        <th width="8%">导游</th>
+        <th width="150">团号</th>
+        <th width="150">定团号</th>
+        <th width="150">出发时间</th>
+        <th width="">天数</th>
+        <th width="">出团人数</th>
+        <th width="">领队</th>
+        <th width="">导游</th>
+        <th width="120">操作</th>
       </tr>
       <tr v-for='item in nav'>
         <td>{{item.StartCityNames}}</td>
@@ -24,6 +25,11 @@
         <td>{{item.TotalSeat}}人</td>
         <td>{{item.LeaderName}}</td>
         <td>{{item.GuideName}}</td>
+        <td class="_go_detail">
+          <p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'roomReservationsDetails')">酒店</p>
+          <p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'bookDinnerStatisticsDetails')">餐食</p>
+          <p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'admissionStatisticsDetails')">景点</p>
+        </td>
       </tr>
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -41,7 +47,7 @@
         <td width="60">停车费</td>
         <td width="60">金额小计</td>
         <td width="60">总金额</td>
-        <td>备注</td>
+        <td width="100">备注</td>
       </tr>
       <tr v-for='(item,index) in list.BusList'>
         <td>{{item.PlanDateStr}}</td>
@@ -80,6 +86,12 @@
           </div>
         </td>
       </tr>
+      <tr>
+        <td>总金额</td>
+        <td colspan="12">
+          {{TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice}}
+        </td>
+      </tr>
       </tbody>
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -87,23 +99,23 @@
       <tr class="title">
         <td width="80" class="bgwhite" :rowspan="list.HotelOrderListReport.length+1">酒店使用</td>
         <td width="100">使用时间</td>
-        <td width="30%">酒店名称</td>
+        <td width="180" style="line-height: inherit;">酒店名称</td>
         <td width="100">占床/不占床</td>
         <td width="80">实际用房数</td>
-        <td width="100">房间类型</td>
-        <td width="60">房间数</td>
-        <td width="60">免费人数</td>
-        <td width="60">单价/人</td>
-        <td width="60">金额小计</td>
-        <td width="60">返佣</td>
-        <td width="60">总金额</td>
-        <td>备注</td>
+        <td width="">房间类型</td>
+        <td width="">房间数</td>
+        <td width="">免费人数</td>
+        <td width="">单价/人</td>
+        <td width="">金额小计</td>
+        <td width="">返佣</td>
+        <td width="">总金额</td>
+        <td width="100">备注</td>
       </tr>
 
       <tr class="HotelTr " v-for='(outItem,outIndex) in list.HotelOrderListReport'>
         <td>{{outItem.UseTimeStr}}</td>
         <td>
-          <div   v-for="subItem in outItem.HotelOrderList">
+          <div   v-for="subItem in outItem.HotelOrderList" style="line-height: inherit;">
             {{subItem.HotelName}}
           </div>
         </td>
@@ -190,6 +202,12 @@
           </div>
         </td>
       </tr>
+      <tr>
+        <td>总金额</td>
+        <td colspan="12">
+          {{TotalNav.reimburseTotalPrice.ExpendTotalPrice}}
+        </td>
+      </tr>
       </tbody>
       
     </table>
@@ -198,15 +216,15 @@
       <tr class="title">
         <td width="80" class="bgwhite" :rowspan="list.DiningList.length+1">餐食使用</td>
         <td width="100">使用时间</td>
-        <td width="30%">餐厅名称</td>
-        <td width="60">类别</td>
-        <td width="100">用餐人数</td>
-        <td width="60">免费人数</td>
-        <td width="60">单价</td>
-        <td width="60">金额小计</td>
-        <td width="60">返佣</td>
-        <td width="60">总金额</td>
-        <td>备注</td>
+        <td width="180" style="line-height: inherit;">餐厅名称</td>
+        <td width="100">类别</td>
+        <td width="">用餐人数</td>
+        <td width="">免费人数</td>
+        <td width="">单价</td>
+        <td width="">金额小计</td>
+        <td width="">返佣</td>
+        <td width="">总金额</td>
+        <td width="100">备注</td>
       </tr>
       <tr class="splitP ScenicTr" v-for='(item,index) in list.DiningList'>
         <td>{{item.UseTimeStr}}</td>
@@ -264,6 +282,12 @@
           {{item.Remarks}}
         </td>
       </tr>
+      <tr>
+        <td>总金额</td>
+        <td colspan="10">
+          {{TotalNav.reimburseTotalPrice.IncomeTotalPrice}}
+        </td>
+      </tr>
       </tbody>
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -271,15 +295,15 @@
       <tr class="title">
         <td width="80" class="bgwhite" :rowspan="list.ScenicList.length+1">门票使用</td>
         <td width="100">使用时间</td>
-        <td width="30%">景点名称</td>
-        <td width="60">总人数</td>
-        <td width="60">门票类别</td>
-        <td width="60">免费人数</td>
-        <td width="60">单价</td>
-        <td width="60">金额小计</td>
-        <td width="60">返佣</td>
-        <td width="60">总金额</td>
-        <td>备注</td>
+        <td width="180" style="line-height: inherit;">景点名称</td>
+        <td width="100">总人数</td>
+        <td width="">门票类别</td>
+        <td width="">免费人数</td>
+        <td width="">单价</td>
+        <td width="">金额小计</td>
+        <td width="">返佣</td>
+        <td width="">总金额</td>
+        <td width="100">备注</td>
       </tr>
       <tr class="splitP ScenicTr" v-for='(item,index) in list.ScenicList'>
         <td>{{item.UseTimeStr}}</td>
@@ -340,10 +364,26 @@
 
         </td>
       </tr>
+      <tr>
+        <td>总金额</td>
+        <td colspan="10">
+          {{TotalNav.reimburseTotalPrice.OtherTotalPrice}}
+        </td>
+      </tr>
       </tbody>
     </table>
-   
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
+      <tr v-for='(item, index) in nav' >
+        <td rowspan="2" width="180" v-if="index===0">总金额： {{TotalNav.reimburseTotalPrice.PlanPrice * 0.98}}</td>
+        <td>{{item.TCNUMS}}</td>
+        <td>
+          <span v-if="item.LeaderGetPrice>0">{{item.LeaderGetPrice}}</span>
+          <el-input v-else class="w300" type="number" v-model="LeaderGetPrice"></el-input>
+        </td>
+        <td width="80" class="_zhidan" @click="goZhiDan(item)">制单</td>
+      </tr>
+    </table>
+      <!-- <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
         <tbody>
         <tr class="title">
           <td width="80" class="bgwhite" :rowspan="list.OtherOrderReportList.OtherList.length+1">其他费用</td>
@@ -531,7 +571,7 @@
           </td>
         </tr>
         </tbody>
-      </table>
+      </table> -->
   
     <p class="alcenter">
       <input type="button" v-if="isUpdate=='true'" value="保存" class="normalBtn" @click="saveData()" />
@@ -570,9 +610,51 @@
         UseCount:'',
         //定团号
         NewCombinationNum:'',
+        TotalNav: [],
+        LeaderGetPrice: 0,
       }
     },
     methods: {
+      goHotelDetail: function (id, num, TCNUM, path) {
+         this.$router.push({
+          name: path,
+          query:{
+            "id": id,
+            "NewCombinationNum": num,
+            "TCNUM": TCNUM,
+            'blank': 'y',
+          }
+        });
+      },
+      goZhiDan: function (obj) {
+        let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.98
+        let totailMoney = 0
+        this.nav.forEach(x=>{
+          totailMoney += x.LeaderGetPrice
+        })
+        if ((allMoney - totailMoney)<=0) return this.$message.error('总制单金额已大于等于总金额，无法制单！')
+        if (!this.LeaderGetPrice || this.LeaderGetPrice<=0) return this.$message.error('请输入金额！')
+        let TCIDARR = [obj.TCIDS]
+        let orderObj = {
+          OrderID: 0,
+          OrderSource:8,
+          Obj: {},
+          SourceID: 0,
+          TCIDList: TCIDARR,
+          CostType: 56,
+          Money: this.LeaderGetPrice,
+        }
+        this.$router.push({
+          name: 'ChoiceAddFinancialDocuments',
+          query:{
+            "Type":2,
+            "companyID":obj.OutBranchId,
+            "path": "",
+            'blank':'y',
+            'orderObj':JSON.stringify(orderObj),
+          }
+        });
+      },
       addOtherList(index,id) {
         this.list.OtherOrderReportList.OtherList.push({
           OrderType: '1',
@@ -715,6 +797,15 @@
           }
         },err=>{})
       },
+      getTotalNav(){
+        this.apipost('dmcstatistics_post_GetNewPlanTotalPrice',{TCIDs:this.$route.query.id},res=>{
+          if(res.data.resultCode==1){
+            this.TotalNav=res.data.data
+          }else{
+            this.$message.error(res.data.message)
+          }
+        },err=>{})
+      },
       getList(){
         this.loading=true
         this.apipost('dmcstatistics_post_GetGroupLeaderUserMoneyPlan',this.msg,res=>{
@@ -745,6 +836,7 @@
       this.NewCombinationNum = this.$route.query.NewCombinationNum;
       this.getNav()
       this.getList()
+      this.getTotalNav()
     }
 
   }
@@ -790,4 +882,11 @@
   .leaderReimbursementTable .jdtd>div{height: auto!important; padding: 0 10px;}
   .leaderReimbursementTable .leaderPayTable .el-input__prefix{display: none;}
   .leaderReimbursementTable .HotelTr td div.alcenter>div:nth-child(2) { border-top: 1px solid #ccc;}
+  .leaderReimbursementTable td._zhidan{
+    cursor: pointer;
+  }
+  .leaderReimbursementTableNav ._go_detail p{
+    cursor: pointer;
+    line-height: 25px;
+  }
 </style>

src/components/PrintPage.vue

@@ -19,7 +19,7 @@
 <template v-loading="loading">
     <div class="_PrintPage">
         <div class="_PrintPage_box">
-            <template v-if="type!=='1'&&(Merge==='0'||Merge===null)">
+            <template v-if="type==='2'&&(Merge==='0'||Merge===null)">
                 <div class="_border_1" v-for="(item,index) in loopNumT">
                     <my-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-Bill>
                 </div>
@@ -29,6 +29,11 @@
                     <my-RVB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill>
                 </div>
             </template>
+            <template v-if="type==='7'&&(Merge==='0'||Merge===null)">
+                <div class="_border_1" v-for="(item,index) in loopNumT">
+                    <my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>
+                </div>
+            </template>
             <template v-if="Merge==='1'">
               <div class="_border_1" v-for="(item,index) in loopNumN">
                 <my-HB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
@@ -41,6 +46,7 @@
 import myBill from "./FinancialModule/FinancialSubmodule/BillModule.vue";
 import myrbvBill from "./FinancialModule/FinancialSubmodule/ReceivablesModule.vue";
 import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModule.vue";
+import myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
 export default {
     data(){
         return{
@@ -60,6 +66,7 @@ export default {
         'my-Bill': myBill,
         'my-RVB-Bill':myrbvBill,
         'my-HB-Bill':myhrBill,
+        'my-GZ-Bill': myGZBill
     },methods:{
         numAdd(){
             alert(111)

src/components/confirmationOrderDownLoad.vue

@@ -2,6 +2,9 @@
   .confirmOrder{
     width:950px;
   }
+  .travelControlTrip .hangban-info tr td,.travelControlTrip .hangban-info tr th{
+    padding-left: 0 !important;
+  }
 </style>
 
 <template>

src/components/dmc/manager/teamReimbursement.vue

@@ -382,9 +382,9 @@
               <td width="240" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3">
                 <div class="d7">
                   <el-button-group>
-                    <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
+                    <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">用款计划</el-button>
                     <!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 -->
-                    <el-button v-show="outItem.TravelPriceList.LeaderApplyStatus==1" @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
+                    <el-button v-show="outItem.ReaultPlanState==1" @click.native="goUrl('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
 
                     </el-button>
                   </el-button-group>

src/components/leaderPay2.vue

@@ -46,6 +46,9 @@
         width:1000px;
         margin:0 auto;
     }
+    .LeaderPrintDiv .childDiv ._Titles{
+        font-size: 14px;
+    }
     .wLeader2 .el-textarea__inner{
         height:130px;
     }
@@ -69,25 +72,29 @@
         <div class="childDiv">
             <table border="0" cellspacing='1' class="leaderPayTable">
                 <tr>
-                    <th width="110">出发地</th>
-                    <th width="290">行程名称</th>
-                    <th width="13%">团号</th>
-                    <th width="13%">出发时间</th>
-                    <th width="8%">天数</th>
-                    <th width="8%">出团人数</th>
-                    <th width="8%">领队</th>
-                    <th width="8%">导游</th>
+                    <th width="130">团号</th>
+                    <th width="250">行程名称</th>
+                    <th width="110">出发时间</th>
+                    <th width="90">行程天数</th>
+                    <th width="90">成人</th>
+                    <th width="90">占床小孩</th>
+                    <th width="90">不占床小孩</th>
+                    <th width="90">婴儿人数</th>
+                    <th width="110">人数</th>
+                    <th width="110">领队</th>
                 </tr>
                 <tr v-for="item in nav">
-                    <td>{{item.StartCityNames}}</td>
+                    <td>{{item.NewCombinationNum}}</td>
+                    <td class="_Titles">{{item.Titles}}</td>
                     <td>
-                        <div class="LeaderTitle">{{item.Titles}}</div>
+                        {{item.StartDateStr}}
                     </td>
-                    <td>{{item.TCNUMS}}</td>
-                    <td>{{item.FlightDate}}</td>
-                    <td>{{item.DayNum}}天</td>
-                    <td>{{item.TotalSeat}}人</td>
-                    <td>{{item.LeaderName}}</td>
+                    <td>{{item.DayNum}}</td>
+                    <td>{{item.CommonReport.HouseStatistics.ManNum}}人</td>
+                    <td>{{item.CommonReport.HouseStatistics.NeedBed}}人</td>
+                    <td>{{item.CommonReport.HouseStatistics.NoNeedBed}}人</td>
+                    <td>{{item.CommonReport.HouseStatistics.BabyNum}}人</td>
+                    <td>{{item.CommonReport.HouseStatistics.RealityNum}}人</td>
                     <td>{{item.GuideName}}</td>
                 </tr>
             </table>
@@ -223,7 +230,25 @@
                     <td>{{totalHotelPrice}}</td>
                 </tr>
             </table>
-            <el-input type="textarea" v-show="dataList.LeaderApply.Status==1" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/>
+            <table border="0" cellspacing='1' class="leaderPayTable" v-if="TotalPriceData.length>0">
+                <tr>
+                    <th>币种</th>
+                    <th>预付合计</th>
+                    <th>实际领款</th>
+                    <th>实付合计</th>
+                    <th>领队退款</th>
+                </tr>
+                <tr v-for="item in TotalPriceData" v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice > 0">
+                    <td>{{item.CurrencyStr}}</td>
+                    <td>{{item.PlanPrice}}</td>
+                    <td>{{item.PlanTotalPrice}}</td>
+                    <td>{{item.ExpendTotalPrice}}</td>
+                    <td>{{item.PlanTotalPrice - item.ExpendTotalPrice}}</td>
+                </tr>
+            </table>
+            <template v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1">
+                <el-input type="textarea"  placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/>
+            </template>
             <div class="btnListDiv" >
                 <input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过" v-show="dataList.LeaderApply.Status==1"/>
                 <input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过" v-show="dataList.LeaderApply.Status==1"/>
@@ -256,6 +281,7 @@ export default {
 
             totalList:[],
             isShowRemark:false,
+            TotalPriceData: [],
         }
  	},
     methods: {
@@ -287,7 +313,7 @@ export default {
         },
         //获取顶部数据
         getNav() {
-            this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
+            this.apipost('dmcstatistics_post_GetNewStaticsByTCIDs', {
                 TCIDs: this.$route.query.id
                 }, res => {
                 if (res.data.resultCode == 1) {
@@ -297,6 +323,18 @@ export default {
                 }
             }, err => {})
         },
+        // 获取总金额
+        getTotalPrice: function(){
+            this.apipost('dmcstatistics_post_GetNewTotalPrice', {
+                TCIDs: this.$route.query.id
+                }, res => {
+                if (res.data.resultCode == 1) {
+                    this.TotalPriceData = res.data.data;
+                } else {
+                    this.Error(res.data.message)
+                }
+            }, err => {})
+        },
         //获取总额
         getTotal(obj) {
             let totalPrice = 0
@@ -348,6 +386,7 @@ export default {
       this.getNav();
       this.getList();
       this.getTotalMoney();
+      this.getTotalPrice();
     },
 }
 </script>

src/plug/index.js

@@ -117,8 +117,8 @@ export default {
       Vue.prototype.domainManager = function () {
         let domainUrl = '';
         let locationName = window.location.hostname;
-        // domainUrl = "http://192.168.2.65:8025"; //214主域名
-        domainUrl = "http://192.168.2.214:8082"; //214主域名
+        domainUrl = "http://192.168.2.65:8025"; //214主域名
+        // domainUrl = "http://192.168.2.214:8082"; //214主域名
         // domainUrl = "http://192.168.0.119:8082";
         // domainUrl = "http://192.168.2.16:8083";
         if (locationName.indexOf('oytour') !== -1) {

src/router/config.js

@@ -2265,7 +2265,7 @@ export default {
               name: 'FinancialAccounting',
               component: resolve => require(['@/components/FinancialModule/FinancialAccounting'], resolve),
               meta: {
-                title: '我的财务单据'
+                title: '财务挂账单据'
               },
             }, { //财务 发票管理
               path: '/invoicesManager',
@@ -2433,7 +2433,7 @@ export default {
               name: 'addFinancialGZDocuments',
               component: resolve => require(['@/components/FinancialModule/addFinancialGZDocuments'], resolve),
               meta: {
-                title: '新增收款单据'
+                title: '新增挂账单据'
               },
             }, { //财务 流程列表
               path: '/ProcessList',