Skip to content

S
SuperMan
Commit da2bee42 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

‘销售订单财务单据页面完成@@@’

parent e358b84d
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 61 deletions
src/components/SalesModule/SalesFinancialDetail.vue
View file @ da2bee42
......@@ -28,7 +28,7 @@
background-color: white;
padding: 15px;
border-radius: 4px;
width: 50%;
width: 800px;
}
.page_SalesFinancialDetail .sfd_header>ul>li {
float: left;
......@@ -76,8 +76,8 @@
<template>
<div class="page_SalesFinancialDetail">
<ul class="sfd_nav clearfix">
<li :class="activeTab==1?'_active':''" @click="activeTab=1,getList(1)">收款单</li>
<li :class="activeTab==2?'_active':''" @click="activeTab=2,getList(2)">付款单</li>
<li :class="activeTab===1?'_active':''" @click="activeTab=1,getList(1)">收款单</li>
<li :class="activeTab===2?'_active':''" @click="activeTab=2,getList(2)">付款单</li>
</ul>
<div v-loading="loading">
<div class="sfd_header">
......@@ -85,34 +85,76 @@
<li><span>团队编号：</span>{{tcnum}}</li>
<li><span>订单号：</span>{{orderId}}</li>
<li><span>业务员：</span>{{`王大毛`}}</li>
<li><span>应收金额：</span>{{moneyFormat(0)}}</li>
<li><span>实收金额：</span>{{moneyFormat(0)}}</li>
<li><span>代收金额：</span>{{moneyFormat(0)}}</li>
<li><span>{{activeTab===1 ? '应收' : '应付'}}金额：</span>{{moneyFormat(allMoney)}}</li>
<li><span>{{activeTab===1 ? '实收' : '实付'}}金额：</span>{{moneyFormat(shiMoney)}}</li>
<li><span>{{activeTab===1 ? '待收' : '待付'}}金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li>
</ul>
<input type="button" :value="`新增${activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()">
</div>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
<th width="10%">费用类型</th>
<th width="10%">交易方式</th>
<th width="10%">金额</th>
<th width="20%">交易日期</th>
<th width="10%">制单人员</th>
<th width="10%">主管审核</th>
<th>出纳审核</th>
<th width="10%">会计审核</th>
<th width="400">费用类型</th>
<th width="400">交易方式</th>
<th width="100">金额</th>
<th width="150">交易日期</th>
<th width="">制单人员</th>
<th width="">当前状态</th>
</tr>
<tr>
<td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"><span>666</span></th>
<td width="10%">吃饭</td>
<td width="10%">现金</td>
<td width="10%">{{moneyFormat(0)}}</td>
<td width="20%">2019-02-29</td>
<td width="10%">王大毛</td>
<td width="10%">王二毛</td>
<td>王三毛</td>
<td width="10%">王四毛</td>
<tr v-for="(item, index) in dataList">
<td width="100" @click="goUrl('财务单据','FinancialDocumentsDetail',item.frID,'')"><span>{{item.FrID}}</span></th>
<td width="">
<template v-for="(s,si) in item.CostTypeList">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</template>
</td>
<td width="">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList" style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 5px auto;width:230px">
<p><span style="font-weight: bold;color:#333333">{{tw.Alias}}</span><span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{item.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':tw.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{tw.AccountType==""?'无':tw.AccountType}}</span> </p>
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</template>
<template v-else>
<div class="_pad5">
无
</div>
</template>
</td>
<td width="">
<p style="line-height:20px">{{item.Type==1?'应收':'应付'}}：<span>{{moneyFormat(item.Money)}}</span></p>
<p style="line-height:20px">{{item.Type==1?'实收':'实付'}}：<span>{{moneyFormat(item.PayMoney)}}</span></p>
</td>
<td width="">{{item.TradeDate}}</td>
<td width="">{{item.EmName}}</td>
<td width="">
<i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
<i v-if="item.Status==4" class="iconfont icon-yiquxiao" style="color: #4BCA81"></i>
<i v-if="item.Status==2" class="iconfont icon-yiqueren" style="color: #959595"></i>
<i v-if="item.Status==3" class="iconfont icon-shenhebohui" style="color: #E95252"></i>
<i v-if="item.Status==0" class="iconfont icon-zancun" style="color: #FF9C01"></i>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div style="height: auto;max-height: 220px;background-color: #FFFFFF;">
<div class="changLog">
<p class="_log_t">流程日志</p>
<ul style="padding-left: 20px;max-height: 180px;overflow: auto;" v-if="GetFinancLogList" v-loading='LogLoading'>
<li style="border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
<ul v-else>
<li>暂无修改日志</li>
</ul>
</div>
</div>
<span slot="reference" style="cursor: pointer;" @click="Financial_post_GetFinancLogList(item.FrID)">{{item.StatusStr}}</span>
</el-popover>
</td>
</tr>
<tr v-if="dataList.length===0">
<td colspan="9" class="noDataNotice">
......@@ -136,56 +178,125 @@ export default {
noData: true,
activeTab: 1,
tcnum: '',
msg:{
pageIndex: 1,
pageSize: 999,
FrID: '',
sDate: '',
eDate: '',
Status: '-1',
TemplateId: '0',
RB_Branch_Id: '',
RB_Depart_Id: '',
sTradeDate: '',
eTradeDate: '',
ClientType: '',
RemitterName: '',
ClientID: '',
sMoney: '',
eMoney: '',
CurrencyId: '0',
CostTypeID: '',
Conditon: '',
TCID: '',
TradeWay: '0',
Type: '-1',
AccountType: '',
QEndDate: '',
QStartDate: '',
UpdateBy: '',
Sort: '2',
EmployeeId: '',
IsNotCancelFinance: 1,
},
GetFinancLogList: [],
LogLoading: true,
allMoney: 0,
shiMoney: 0,
}
}, methods: {
Financial_post_GetFinancLogList: function(id){ // 获取单据日志
if(this.checkboxShow) return
this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.LogLoading = false;
this.GetFinancLogList = data;
}
}, err => {})
},
goUrl: function (name, path, id, tcmun) {
this.$router.push({ name: path, query: { id: id, tcmun: tcmun, blank: 'y', tab: name} });
},
getList: function (type) {
this.loading = true
setTimeout(()=>{
this.apipost('', {ID: this.orderId}, res=>{
if (res.data.resultCode == 1) {
this.dataList = res.data.data
this.msg.Type = type;
if (!this.msg.ClientID) this.msg.ClientID=0;
if (!this.msg.ClientType) this.msg.ClientType=0;
if (!this.msg.CurrencyId) this.msg.CurrencyId=0;
if (!this.msg.CostTypeID) this.msg.CostTypeID=0;
if (!this.msg.TemplateId) this.msg.TemplateId=0;
if (!this.msg.RB_Branch_Id) this.msg.RB_Branch_Id=-1;
if (!this.msg.RB_Depart_Id) this.msg.RB_Depart_Id=0;
if (!this.msg.UpdateBy) this.msg.UpdateBy=0;
if (!this.msg.TCID) this.msg.TCID=0;
if (!this.msg.OrderID) this.msg.OrderID=0;
if (!this.msg.Status) this.msg.Status=0;
if (!this.msg.FrID) this.msg.FrID=0;
if (!this.msg.Conditon) this.msg.Conditon=1;
if (!this.msg.TradeWay) this.msg.TradeWay=0;
if (!this.msg.AccountType) this.msg.AccountType=0;
this.loading = true;
this.apipost('Financial_post_GetALLPageList', this.msg, res=>{
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;
this.allMoney = 0;
this.shiMoney = 0;
if (data.length === 0){
this.dataList = [];
} else {
this.$message.error("数据获取失败！");
data.forEach(x=>{
this.allMoney += x.Money
this.shiMoney += x.PayMoney
})
this.dataList = data;
}
this.loading = false
}, null)
}, 2000)
this.loading = false;
} else {
this.loading = false;
this.$message.error(res.data.message);
}
}, null)
},
addFinancialOrder: function () { // 新增单据方法
let TCIDARR = [this.tcid];
let orderObj = {
OrderID: this.orderId,
OrderSource: 8,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR
}
if (this.activeTab === 1) {
let orderObj = {
OrderID: obj.orderId,
OrderSource: 8,
Obj: {},
SourceID: obj.ID,
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": 1,
"companyID": obj.outBranchId,
"companyID": this.outBranchId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
}
});
} else if (this.activeTab === 2) {
let orderObj = {
OrderID: obj.orderId,
OrderSource: 8,
Obj: {},
SourceID: obj.ID,
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type": 2,
"companyID": obj.outBranchId,
"companyID": this.outBranchId,
"path": "",
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
......@@ -194,8 +305,10 @@ export default {
}
},
}, mounted() {
this.orderId = this.$route.query.orderId
this.orderId = this.msg.OrderID = this.$route.query.orderId
this.tcnum = this.$route.query.tcnum
this.tcid = this.$route.query.tcid
this.outBranchId = this.$route.query.outBranchId
this.getList(1)
}
}
......
src/components/SalesModule/groupTourOrder.vue
View file @ da2bee42
......@@ -1192,7 +1192,7 @@
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle">
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="120">单号&团号</th>
<th width="240">单号&团号</th>
<th width="120">客户信息</th>
<th width="70">类型</th>
<th width="150">系列&线路</th>
......@@ -1218,6 +1218,7 @@
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
<p style="min-width: 180px;">发团：{{item.startDate}}</p>
<p>下单时间：{{item.createDate}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
......@@ -1397,26 +1398,27 @@
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div>
<div @click="goUrlSFD('SalesFinancialDetail', item.orderId, '销售财务单据', item.tcnum, item.tcid, item.outBranchId)">
<div>收款单据：</div>
<div>
<span v-for="(item2,index2) in item.financeList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
<!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div>
<div>
<div @click="goUrlSFD('SalesFinancialDetail', item.orderId, '销售财务单据', item.tcnum, item.tcid, item.outBranchId)">
<div>付款单据：</div>
<div>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span>
<span v-if="item.refundFinanceList.length===0" style="cursor: default;">暂无数据</span>
</div>
......@@ -1943,6 +1945,12 @@ export default {
}
}
},
goUrlSFD: function (path, orderId, name, tcnum, tcid, outBranchId) {
this.$router.push({
name: path,
query: { orderId: orderId, blank: 'y', tab: name, tcnum: tcnum, tcid: tcid, outBranchId: outBranchId}
});
},
goUrlX(name, path, id, tcmun) {
this.$router.push({
name: path,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment