预付款冲抵

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -102,6 +102,7 @@
         tradeWay:'',
         platformAccount:'',
         Handmsg:{},
+        czmsg:{},
       }
     },
     computed: {
@@ -123,12 +124,21 @@
           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{
+          }
+          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){
+          // 领队报账  预付款冲抵
+          if(this.$route.query.czmsg){
+            this.$router.push({ name: path,query:{"czmsg":this.czmsg,"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: 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){
           this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
         }else {
@@ -273,6 +283,8 @@
       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;
+      this.czmsg = this.$route.query.czmsg?this.$route.query.czmsg:this.czmsg;
+      
       this.Financial_post_GetList();
     },components: {
       "my-FlowChartModule": myFlowChartModule

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -559,6 +559,8 @@
             </div>
             <p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
             <div class="_tit _tit2 w890px">
+                <!-- 预付款冲抵 -->
+                <czBillModule :FrID='ID' />
                 <myGuanBill :ID="FrID" :FrID='FrID'  :TemplateId='GetDetail.TemplateId' v-if="(((GetDetail.TemplateId === 36 || GetDetail.TemplateId === 37) && LeadState) || GetDetail.TemplateId === 63 || GetDetail.TemplateId === 59 || GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53 || GetDetail.TemplateId === 56) && showModel" />
                 <myJiPiaoBill :ID="FrID" :FrID='FrID'  :TemplateId='GetDetail.TemplateId' v-if="GetDetail.TemplateId === 2 || GetDetail.TemplateId === 12 && showModel" />
             </div>
@@ -570,7 +572,7 @@
                             <span class="_btn" v-if="tableShowTeam" @click="tableShowTeam=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
                             <span class="_btn" v-else @click="tableShowTeam=true">展开 <i class="iconfont icon-gengduo"></i> </span>
                         </p>
-                        <div v-show="tableShowTeam" >
+                        <div v-show="tableShowTeam">
                             <div>
                                 <teamProductModule :ID="sonTCIDList"></teamProductModule>
                             </div>
@@ -858,6 +860,7 @@ import ChongDiPage from "../commonPage/ChongDiPage.vue";
 import myDJieBill from "./FinancialSubmodule/DjieMergeBillModule.vue";
 import myGuanBill from "./FinancialSubmodule/GuanBillModule.vue";
 import myJiPiaoBill from "./FinancialSubmodule/JiPiaoBillModule.vue";
+import czBillModule from "./FinancialSubmodule/czBillModule.vue";
 export default {
     data(){
         return{
@@ -947,7 +950,8 @@ export default {
         'myDJieBill': myDJieBill,
         'ChongDiPage': ChongDiPage,
         'myGuanBill': myGuanBill,
-        'myJiPiaoBill': myJiPiaoBill
+        'myJiPiaoBill': myJiPiaoBill,
+        "czBillModule":czBillModule
     },
     created(){
         this.ID = this.$route.query.id;

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

+<style>
+ @import url('../../../assets/css/domestic/TicketingModule.css');
+ .sanjiao-box{
+    position: relative;
+ }
+  .sanjiao-box .Receipt_table td{
+    padding: 0 10px;
+  }
+  .hover_text span{
+    cursor: pointer;
+    text-decoration: underline;
+  }
+</style>
+<template> 
+   <div class="m_TicketingModule">
+        <div  v-if="OtherType==7">
+            <div class="_tit">
+                <span class="_text">预付款单据</span>
+                <div>
+                    <span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
+                    <span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
+                </div>
+            </div>
+            <div v-show="tableShow" class="sanjiao-box _padding_20_15">
+                <table border="1" class="_border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
+                    <tr>
+                        <th>单号</th>
+                        <th>公司</th>
+                        <th>费用类型</th>
+                        <th>币种</th>
+                        <th>汇率</th>
+                        <th>金额</th>
+                        <th>冲抵金额</th>
+                    </tr>
+                    <tr class="_color_b" v-for="(item,index) in czList" :key="index">
+                        <td>{{item.FrID}}</td>
+                        <td>{{item.BranchName}}</td>
+                        <td>{{item.CostTypeName}}</td>
+                        <td>{{item.CurrencyName}}</td>
+                        <td>{{item.Rate}}</td>
+                        <td>{{item.Money}}</td>
+                        <td>{{item.MatchMoney}}</td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+        <div v-if="IsAdvanceFinance==1" style="border-top: 1px solid #DDDDDD;">
+            <div class="_tit">
+                <span class="_text">冲抵单据</span>
+                <div>
+                    <span class="_btn" v-if="tableShow1" @click="tableShow1=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
+                    <span class="_btn" v-else @click="tableShow1=true">展开 <i class="iconfont icon-gengduo"></i> </span>
+                </div>
+            </div>
+            <div v-show="tableShow1" class="sanjiao-box _padding_20_15">
+                <table border="1" class="_border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
+                    <tr>
+                        <th>单号</th>
+                        <th>公司</th>
+                        <th>费用类型</th>
+                        <th>币种</th>
+                        <th>汇率</th>
+                        <th>状态</th>
+                        <th>金额</th>
+                        
+                    </tr>
+                    <tr class="_color_b" v-for="(item,index) in czTableList" :key="index">
+                        <td>{{item.FrID}}</td>
+                        <td>{{item.BranchName}}</td>
+                        <td>{{item.CostTypeName}}</td>
+                        <td>{{item.CurrencyName}}</td>
+                        <td>{{item.Rate}}</td>
+                        <td>{{item.StatusStr}}</td>
+                        <td>{{item.Money}}</td>
+                        
+                    </tr>
+                    <tr class="_color_b">
+                        <td colspan="6">合计</td>
+                        <td>{{cdtotal}}</td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props:["FrID"],
+    data(){
+        return{
+          tableShow: true,
+          tableShow1: true,
+          tit: '',
+          details: [],
+          loading: true,
+          czList:[],
+          czTableList:[],
+          GetDetail:{},
+          OtherType:0,
+          ReFinanceId:0,
+          IsAdvanceFinance:-1,
+          cdtotal:0,
+        }
+    },watch:{
+        
+    },created(){
+      
+      
+      
+    },mounted(){
+        this.getDataDes();
+        
+
+    },
+    methods:{
+        getDataDes(){
+          this.apipost('Financial_post_GetDetail', {ID:this.FrID,Type:1}, res => {
+            this.loading = false
+            if (res.data.resultCode == 1) {
+                let data=res.data.data;
+                this.OtherType=data.OtherType;
+                this.ReFinanceId=data.ReFinanceId;
+                this.IsAdvanceFinance=data.IsAdvanceFinance;
+                if(this.OtherType==7){
+                    this.getDetails()
+                }else{
+                    this.getczTableList();
+                }
+            }
+        }, err => {})
+          
+      },
+      goDetail(id){
+        this.$router.push({ name: 'FinancialDocumentsDetail',query:{"id":id,blank:'y',tab:'单据详情'} })
+      },
+      getczTableList(){
+        this.loading = true
+        let msg={
+          pageIndex:1,
+          pageSize:100,
+          ReFinanceId:this.FrID
+        };
+        this.cdtotal=0;
+        this.apipost('Financial_get_GetAdvanceMatchFinancePageList', msg, res => {
+            this.loading = false
+            if (res.data.resultCode == 1) {
+                let data=res.data.data.pageData;
+                this.czTableList=data;
+                data.forEach(item => {
+                    this.cdtotal+=item.Money;
+                });
+                
+            }
+            else{
+                this.Error(res.data.message)
+            }
+        }, err => {})
+      },
+      getDetails(){
+        this.loading = true;
+        let msg={
+            pageIndex:1,
+            pageSize:20,
+            FrID:this.ReFinanceId,
+            CostTypeID:'',
+            sTradeDate:'',
+            eTradeDate:'',
+        };
+        this.apipost('Financial_get_GetAdvanceFinancePageList', msg, res=>{ 
+          if(res.data.resultCode == 1) {
+            this.loading = false
+            let data= res.data.data.pageData; 
+            this.czList = data;
+          }
+        }, null)
+      }
+    }
+}
+</script>

src/components/FinancialModule/JumpReport.vue

@@ -592,6 +592,7 @@ Vue.component('table-Money',{  //金额
         <span>
             <p style="line-height:20px">{{rowData.Type==1?'应收':'应付'}}：<span>{{rowData.Money}}</span></p>
             <p style="line-height:20px">{{rowData.Type==1?'实收':'实付'}}：<span>{{rowData.PayMoney}}</span></p>
+            <p v-if="rowData.IsAdvanceFinance==1" style="line-height:20px">冲抵：<span>{{rowData.MatchMoney}}</span></p>
         </span>`,
     props:{
         rowData:{

src/components/FinancialModule/RecPayQuery.vue

@@ -688,6 +688,7 @@ Vue.component('table-Money',{  //金额
         <span>
             <p style="line-height:20px">{{rowData.Type==1?'应收':'应付'}}：<span>{{rowData.Money}}</span></p>
             <p style="line-height:20px">{{rowData.Type==1?'实收':'实付'}}：<span>{{rowData.PayMoney}}</span></p>
+            <p v-if="rowData.IsAdvanceFinance==1" style="line-height:20px">冲抵：<span>{{rowData.MatchMoney}}</span></p>
         </span>`,
     props:{
         rowData:{

src/components/FinancialModule/addFinancialDocuments.vue

@@ -666,6 +666,8 @@ export default {
             SelectDisablsed:0,
             SelectState:false,
             XSTC: false,
+            czmsg:{},
+            czmsgState:false,
         }
     },
     methods:{
@@ -937,6 +939,12 @@ export default {
           }
           this.loading = true;
           this.msg.Description=this.Description;
+        //   预付款冲抵
+          if(this.czmsgState){
+            this.msg.ReFinanceId=this.czmsg.ReFinanceId;
+            this.msg.OtherType=this.czmsg.OtherType;
+
+          }
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
                   //清除旅客名单数据
@@ -1087,6 +1095,15 @@ export default {
         getRate(cID,i,t,index){  // 根据选择币种获取汇率
                 this.coinGetList.forEach(x=>{
                     if(x.ID==i){
+                        if(this.czmsgState){
+                            if(t==1){
+                                this.detailList.Rate = this.czmsg.Rate;
+                                this.detailList.currenName = x.Name;
+                            }else{
+                                this.msg.detailList[index].Rate = this.czmsg.Rate;
+                                this.msg.detailList[index].currenName = x.Name;
+                            }
+                        }else{
                             if(t==1){
                                 this.detailList.Rate = cID === 57 ? x.PayRateHistory : x.PayRate;
                                 this.detailList.currenName = x.Name;
@@ -1094,9 +1111,12 @@ export default {
                                 this.msg.detailList[index].Rate = cID === 57 ? x.PayRateHistory : x.PayRate;
                                 this.msg.detailList[index].currenName = x.Name;
                             }
+                        }
+                        
                         this.$forceUpdate();
                     }
                 })
+            
             this.Calculation(t,index+1)
         },
         financeinfo_post_GetClientTypeList(){  // 获取对象类型
@@ -1291,8 +1311,8 @@ export default {
                     }else{
                          this.Description=this.GetDetail.Description;
                     }
-                   
                     if(this.orderObj){
+                        
                         this.msg.OrderID = this.orderObj.OrderID?this.orderObj.OrderID:0;
                         this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
                         this.msg.TCID = this.orderObj.TCID?this.orderObj.TCID:0;
@@ -1585,6 +1605,10 @@ export default {
             this.msg.FrID = this.$route.query.FrID;
             this.Financial_post_Get(this.$route.query.FrID,0);
         }else{
+            if(this.$route.query.czmsg){
+                this.czmsg = JSON.parse(this.$route.query.czmsg);
+                this.czmsgState=true;
+            }
             this.msg.TemplateId = this.$route.query.id;
             if(this.$route.query.id==90 || this.$route.query.id==91){
                 this.msg.IsPublic=10;
@@ -1599,6 +1623,7 @@ export default {
             this.returnCode = this.$route.query.Conditon;
         }
         
+        
         // this.admin_get_DepartmentGetList();
 
     },components: {

src/components/index.vue

@@ -191,6 +191,11 @@
                       合同管理
                        <i class="iconfont icon-right1"></i>
                     </el-dropdown-item>
+                    <!-- <el-dropdown-item class="clearfix _dropdown_other"  @click.native="goUrlZC()">
+                      <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
+                      资产管理
+                       <i class="iconfont icon-right1"></i>
+                    </el-dropdown-item> -->
 
                     <!-- <el-dropdown-item class="clearfix _dropdown_other"  @click.native="settingSys">
                       <i class="iconfont icon-menu-shezhi1" style="color:#2c3e50"></i>
@@ -3597,6 +3602,15 @@ export default {
     goUrlContract() {
         this.$router.push({ path: 'ContractManage', query: {blank:'y' } });
     },
+    goUrlZC(){
+      let url='';
+      if (!this.isOnline()) {
+          url="http://www.test.com:8080/#/Home";
+      }else{
+          url="http://zcyx.oytour.com/#/Home";
+      }
+      window.open(url)
+    },
 
     //跳转至个人信息设置
     goUrlPersonal(){