update

src/components/FinancialModule/BasicDocuments.vue

@@ -353,7 +353,7 @@
                         <td v-else-if="OrderSource==4&&GetDetail.SourceID>0"@click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
                         <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
                             || GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
-                            || GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58
+                            || GetDetail.TemplateId === 54 || GetDetail.TemplateId === 55 || GetDetail.TemplateId === 57|| GetDetail.TemplateId === 58 || GetDetail.TemplateId === 98 || GetDetail.TemplateId === 99
                             || GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td>
                         <!-- <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56|| GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderReimbursement',o.TCID)"> <span class="_jump_page _font_bold">用款计划</span> </td> -->
                         <td v-if="GetDetail.IsShowPlanUrl === 1" @click="jumpPlanPage('leaderPay2',o.TCID)"> <span class="_jump_page _font_bold">领队报账</span> </td>

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -101,6 +101,7 @@
         visaShowTab:false,
         tradeWay:'',
         platformAccount:'',
+        Handmsg:{},
       }
     },
     computed: {
@@ -118,7 +119,14 @@
     methods:{
       goUrl(path,id,Name,Type,IsUploadPic) {
         if(this.active==1){
+          // 手配费
+          if(this.$route.query.Handmsg){
+            this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"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: "addReceivablesDocuments",query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"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 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 if(this.active==4){
@@ -237,7 +245,8 @@
           }
         },err=>{})
       },
-    },mounted(){
+    }
+    ,mounted(){
       let userInfo = this.getLocalStorage();
       this.DepartID = userInfo.RB_Department_Id;
       this.EmployeeId = userInfo.EmployeeId;
@@ -260,8 +269,11 @@
       else if(this.showTab==4){
         this.GetList = this.ZRList;
       }
+      
       this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
       this.orderObj = this.$route.query.orderObj;
+      this.Handmsg = this.$route.query.Handmsg?this.$route.query.Handmsg:this.Handmsg;
+      console.log("this.Handmsg",this.Handmsg)
       this.Financial_post_GetList();
     },components: {
       "my-FlowChartModule": myFlowChartModule

src/components/FinancialModule/FinancialDocuments.vue

@@ -395,6 +395,7 @@
                     <button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
                     <button class="normalBtn"  @click="method5()">{{$t('visa.v_daochu')}}</button>
                     <button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
+                    <button class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
                     <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false" v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
                     <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
                     <button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false" v-if="msg.Conditon === 3">{{BOSSBtn2 ? '关闭一键转交' : '一键转交'}}</button>
@@ -717,6 +718,22 @@
                 </div>
             </template>
         </el-dialog>
+        <el-dialog custom-class='w400' title="手配费" :visible.sync="HandState" center>
+            <template>
+                <el-form label-width="100px">
+                    <el-form-item label="团号">
+                        <el-input v-model="HandMsg.TCNUM" class="w200"></el-input>
+                    </el-form-item>
+                    <el-form-item label="单据号">
+                        <el-input v-model="HandMsg.ReFinanceId" class="w200"></el-input>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <button class="hollowFixedBtn" @click="HandState=false">{{$t('pub.cancelBtn')}}</button>
+                    <button class="normalBtn" type="primary" @click="setHand">{{$t('pub.sureBtn')}}</button>
+                </div>
+            </template>
+        </el-dialog>
     </div>
 </template>
 <script>
@@ -727,6 +744,12 @@ import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 export default {
     data(){
         return{
+            HandMsg:{
+                TCNUM:"",
+                ReFinanceId:'',
+                OtherType:6,
+            },
+            HandState:false,
             widthSon:'700px',
             colorSon:"#f5f5f5",
             showID:false,
@@ -883,12 +906,14 @@ export default {
         allW = document.documentElement.clientWidth;
         cH = allH-380; //298 = 顶部导航 50 面包屑83 查询框75 table表头41 分页49
         this.minHeight = cH;
-    },components: {
+    },
+    components: {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,
         "my-HB-Bill":myhrBill,
         "my-GZ-Bill": myGZBill,
-    },mounted(){
+    },
+    mounted(){
         let userInfo=this.getLocalStorage();
         let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
         this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
@@ -911,6 +936,29 @@ export default {
         this.AccountType_post_GetList();        
     },
     methods:{
+        setHand(){
+            if(this.HandMsg.TCNUM==''){
+                this.Error("请输入团号!");
+                return;
+            }
+            if(this.HandMsg.ReFinanceId==''){
+                this.Error("请输入单据号!");
+                return;
+            }
+            let msg=JSON.stringify(this.HandMsg);
+            this.HandState=false;
+            this.$router.push({ name: 'ChoiceAddFinancialDocuments',query:{Handmsg:msg,blank:'y',tab:'新增财务单据'} })
+
+        },
+        // 手配费
+        Handwithfee(){
+            this.HandMsg={
+                TCNUM:"",
+                ReFinanceId:'',
+                OtherType:6,
+            }
+            this.HandState=true;
+        },
         // 催审
         cuishen: function (cmd, id) {
             this.$confirm('确定催审？', this.$t('tips.tips'), {

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -398,6 +398,10 @@
                         <span v-if="CostTypeState" @click="GourlCostType('VisitRecord',1)" style="margin:0 10px;cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">拜访记录</span>
                         <span v-if="CostTypeState" @click="GourlCostType('yingyanMap',2)" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">鹰眼轨迹</span>
                         <span v-if="GetDetail.OtherType==5" @click="GourlHotelZr" style="cursor: pointer;float: right;color: #000;font-size: 14px;text-decoration: underline;">酒店折让</span>
+                        <span v-if="GetDetail.OtherType==6" style="cursor: pointer;float: right;color: #000;font-size: 12px;">
+                            <span style="text-decoration: underline;margin-right:10px" @click="goHand(1,GetDetail)">团号：{{GetDetail.TCNUM}}</span>    
+                            <span style="text-decoration: underline;" @click="goHand(2,GetDetail)">相关单据：{{GetDetail.ReFinanceId}}</span>    
+                        </span>
                     </p>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                         <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
@@ -928,7 +932,8 @@ export default {
           CostTypeState:false,
           huijiShow:false,
         }
-    },components:{
+    },
+    components:{
         'my-FlowChartModule': myFlowChartModule,
         'my-Bill': myBill,
         'my-C-Bill': myCBill,
@@ -954,6 +959,30 @@ export default {
             this.huijiShow=true;
         }
     },methods:{
+        goHand(type,GetDetail){
+            if(type==1){
+                this.$router.push({
+                    name: 'TeamBalancePayment',
+                    query: { 
+                        id:GetDetail.TCID,
+                        IsHaveAuth:true,
+                        blank: "y", 
+                        tab: "团队收支明细" 
+                    }
+                }); 
+            }
+            else{
+                this.$router.push({
+                    name: 'FinancialDocumentsDetail',
+                    query: { 
+                        id:GetDetail.ReFinanceId,
+                        blank: "y", 
+                        tab: "单据详情" 
+                    }
+                }); 
+            }
+             
+        },
         GourlHotelZr(){
             this.$router.push({
                 name: 'HotelDiscount',

src/components/FinancialModule/JumpReport.vue

@@ -865,10 +865,16 @@ export default {
                 })
             }
         }
-    },components: {
+        if(this.$route.query.ReTCID){
+            this.msg.ReTCID=parseInt(this.$route.query.ReTCID);
+        }
+        
+    },
+    components: {
         "my-Bill": myBill,
         "my-RVB-Bill":myrbvBill,
-    },mounted(){
+    },
+    mounted(){
         let userInfo=this.getLocalStorage();
         this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
         this.DepartIDs = userInfo.RB_Department_Id;

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -530,6 +530,7 @@ tr._item_list td:last-child {
                 <el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
                 <el-option value="13" label="机票折让收入"></el-option>
                 <el-option value="14" label="单机票收入"></el-option>
+                <el-option value="15" label="手配费收入"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -666,6 +667,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===10">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===11">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===14" @click="goSAirRec('TicketManager',rowData)">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===15">{{rowData.TCID}}</span>
   </div>
   
   `,
@@ -711,6 +713,7 @@ Vue.component("TCNUMJump", {
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9" @click="goHotelOrder('HotelOrderTotal',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10" @click="goHotelOrder('ScenTicketOrder',rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===11" @click="goHotelOrder('FoodOrder',rowData)">{{rowData.TCNUM}}</span>
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===15" @click="goHand('JumpReport',rowData)">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {
@@ -724,6 +727,14 @@ Vue.component("TCNUMJump", {
     }
   },
   methods: {
+    goHand(path,rowData){
+      let TCID=rowData.TCID;
+      let BranchId=rowData.OutBranchId;
+      this.$router.push({
+        path: "/" + path,
+        query: {'ReTCID':TCID,"BranchId":BranchId,blank: "y"}
+      });
+    },
     goHotelOrder(path,rowData){
       let TCID=rowData.TCID;
       if(rowData.DataType==9){

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -487,6 +487,7 @@ export default {
       return{
         Description: '',
         msg:{
+            ReFinanceId:'',
             FrID:0,
             ClientType:0,
             ClientID:0,
@@ -615,6 +616,7 @@ export default {
       shouxufei: 0,
       tradeWay:'',
       platformAccount:'',
+      Handmsg:{},
     }
   },
   methods:{
@@ -1050,6 +1052,11 @@ export default {
             e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
         },
         AddFinancial(z){  //保存
+            if(this.Handmsg!=null){
+                this.msg.ReFinanceId=this.Handmsg.ReFinanceId;
+                this.msg.TCNUM=this.Handmsg.TCNUM;
+                
+            }
             if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
                 let tipguestInfo = JSON.parse(sessionStorage.getItem("TipGuestList"));
                 this.msg.TipGuestList=tipguestInfo;
@@ -1092,6 +1099,7 @@ export default {
           this.msg.OrderTradeWay=this.tradeWay;
           this.msg.PlatformAccountId=this.platformAccount;
           this.loading = true;
+          console.log("this.msg",this.msg)
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
                     this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
@@ -1426,6 +1434,10 @@ export default {
                             
                         }
                     }
+
+                    if(this.Handmsg){
+                        this.msg.OtherType = this.Handmsg.OtherType ? this.Handmsg.OtherType:0;
+                    }
                     if(data.VorcherInos){
                         data.VorcherInos.forEach(x=>{
                             x.Url = x.Content;
@@ -1524,6 +1536,8 @@ export default {
         this.tradeWay = this.$route.query.tradeWay?this.$route.query.tradeWay:0;
         this.platformAccount = this.$route.query.platformAccount?this.$route.query.platformAccount:0;
         this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
+        this.Handmsg = this.$route.query.Handmsg?JSON.parse(this.$route.query.Handmsg):null;
+        
         if(this.orderObj!=null&&this.orderObj.OrderSource===8&&this.orderObj.tipObj==1){
           that.Description="旅客名单：";
           that.describeList=JSON.parse(sessionStorage.getItem("TipGuestList"));