Skip to content

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

'修改销售新需求@@@'

parent 733dd2c2
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 31 deletions
src/components/SalesModule/SalesFinancialDetail.vue
View file @ d9bc04d6
...@@ -73,32 +73,44 @@ ...@@ -73,32 +73,44 @@
.page_SalesFinancialDetail .color_red{ .page_SalesFinancialDetail .color_red{
color: #e95252 !important; color: #e95252 !important;
} }
.page_SalesFinancialDetail .sfd_header>ul:nth-child(1){
padding-bottom: 0;
}
.page_SalesFinancialDetail .sfd_header>ul:nth-child(2){
padding-top: 0;
}
</style> </style>
<template> <template>
<div class="page_SalesFinancialDetail"> <div class="page_SalesFinancialDetail">
<ul class="sfd_nav clearfix"> <!-- <ul class="sfd_nav clearfix">
<li :class="activeTab===1?'_active':''" @click="activeTab=1,getList(1)">收款单</li> <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===2?'_active':''" @click="activeTab=2,getList(2)">付款单</li>
</ul> </ul> -->
<div v-loading="loading"> <div v-loading="loading">
<div class="sfd_header"> <div class="sfd_header">
<ul class="clearfix"> <ul class="clearfix">
<li><span>团队编号：</span>{{tcnum}}</li> <li><span>团队编号：</span>{{tcnum}}</li>
<li><span>订单号：</span>{{orderId}}</li> <li><span>订单号：</span>{{orderId}}</li>
<li> </li> <li> </li>
<li><span>{{activeTab===1 ? '应收' : '应付'}}金额：</span>{{moneyFormat(allMoney)}}</li> <li><span>应收金额：</span>{{moneyFormat(allMoney)}}</li>
<li><span>{{activeTab===1 ? '实收' : '实付'}}金额：</span>{{moneyFormat(shiMoney)}}</li> <li><span>实收金额：</span>{{moneyFormat(shiMoney)}}</li>
<li><span>{{activeTab===1 ? '待收' : '待付'}}金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li> <li><span>待收金额：</span><span :class="{color_red:(allMoney-shiMoney)!==allMoney}">{{moneyFormat(allMoney-shiMoney)}}</span></li>
</ul>
<ul class="clearfix fukuan">
<li><span>应付金额：</span>{{moneyFormat(allMoneyP)}}</li>
<li><span>实付金额：</span>{{moneyFormat(shiMoneyP)}}</li>
<li><span>待付金额：</span><span :class="{color_red:(allMoneyP-shiMoneyP)!==allMoneyP}">{{moneyFormat(allMoneyP-shiMoneyP)}}</span></li>
</ul> </ul>
<input v-if="item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'" type="button" :value="`新增${activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()"> <input v-if="item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'" type="button" :value="`新增${activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()">
</div> </div>
<p class="sfd_tit clearfix">收款单 <input type="button" v-if="item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'" value="新增收款" class="normalBtn" @click="addFinancialOrder(1)"></p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable"> <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr> <tr>
<th width="100">单号</th> <th width="100">单号</th>
<th width="400">费用类型</th> <th width="200">费用类型</th>
<th width="400">交易方式</th> <th width="400">交易方式</th>
<th width="150">{{activeTab==1?'应收':'应付'}}</th> <th width="150">应收</th>
<th width="150">{{activeTab==1?'实收':'实付'}}</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>
...@@ -169,6 +181,84 @@ ...@@ -169,6 +181,84 @@
</td> </td>
</tr> </tr>
</table> </table>
<p class="sfd_tit clearfix">付款单 <input type="button" v-if="item.isOwn ===1 && item.orderState !== '4' && item.orderState !== '3'" value="新增付款" class="normalBtn" @click="addFinancialOrder(2)"></p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
<th width="200">费用类型</th>
<th width="400">交易方式</th>
<th width="150">应付</th>
<th width="150">实收</th>
<th width="150">交易日期</th>
<th width="">制单人员</th>
<th width="">当前状态</th>
</tr>
<tr v-for="(item, index) in dataListP">
<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"><span>{{moneyFormat(item.Money)}}</span></p>
</td>
<td>
<p style="line-height:20px"><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="dataListP.length===0">
<td colspan="9" class="noDataNotice">
<div>
<p class="iconfont icon-kong"></p>
<p class="text">{{`暂无数据`}}</p>
</div>
</td>
</tr>
</table>
</div> </div>
</div> </div>
</template> </template>
...@@ -178,6 +268,7 @@ export default { ...@@ -178,6 +268,7 @@ export default {
return { return {
orderId: 0, orderId: 0,
dataList: [], dataList: [],
dataListP: [],
loading: true, loading: true,
noData: true, noData: true,
activeTab: 1, activeTab: 1,
...@@ -217,6 +308,8 @@ export default { ...@@ -217,6 +308,8 @@ export default {
LogLoading: true, LogLoading: true,
allMoney: 0, allMoney: 0,
shiMoney: 0, shiMoney: 0,
allMoneyP: 0,
shiMoneyP: 0,
userId: null, userId: null,
item: {}, item: {},
} }
...@@ -261,23 +354,28 @@ export default { ...@@ -261,23 +354,28 @@ export default {
let data = res.data.data.pageData; let data = res.data.data.pageData;
this.allMoney = 0; this.allMoney = 0;
this.shiMoney = 0; this.shiMoney = 0;
if (data.length === 0){ if (type===1) {
this.dataList = [];
} else {
data.forEach(x=>{ data.forEach(x=>{
this.allMoney += x.Money this.allMoney += x.Money
this.shiMoney += x.PayMoney this.shiMoney += x.PayMoney
}) })
this.dataList = data; this.dataList = data;
this.getList(2)
} else {
data.forEach(x=>{
this.allMoneyP += x.Money
this.shiMoneyP += x.PayMoney
})
this.dataListP = data;
this.loading = false;
} }
this.loading = false;
} else { } else {
this.loading = false; this.loading = false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, null) }, null)
}, },
addFinancialOrder: function () { // 新增单据方法 addFinancialOrder: function (type) { // 新增单据方法
let TCIDARR = [this.tcid]; let TCIDARR = [this.tcid];
let orderObj = { let orderObj = {
OrderID: this.orderId, OrderID: this.orderId,
...@@ -286,7 +384,7 @@ export default { ...@@ -286,7 +384,7 @@ export default {
SourceID: 0, SourceID: 0,
TCIDList: TCIDARR TCIDList: TCIDARR
} }
if (this.activeTab === 1) { if (type === 1) {
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query:{ query:{
...@@ -297,7 +395,7 @@ export default { ...@@ -297,7 +395,7 @@ export default {
'orderObj': JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj)
} }
}); });
} else if (this.activeTab === 2) { } else if (type === 2) {
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query:{ query:{
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ d9bc04d6
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.groupTourOrderSearchTable tr:first-child td:first-child { .groupTourOrderSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.groupTourOrderSearchTable tr th { .groupTourOrderSearchTable tr th {
background: #e6e6e6; background: #e6e6e6;
...@@ -618,6 +618,9 @@ ...@@ -618,6 +618,9 @@
color: red; color: red;
font-size: 15px; font-size: 15px;
} }
.not_border tr,.not_border tr td {
border-bottom: none !important;
}
</style> </style>
<template> <template>
...@@ -1376,7 +1379,6 @@ ...@@ -1376,7 +1379,6 @@
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0"> <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="150">单号</th> <th width="150">单号</th>
<th width="100">业务员</th>
<th width="100">客户信息</th> <th width="100">客户信息</th>
<th width="100">人数/机位数</th> <th width="100">人数/机位数</th>
<th width="80">单价</th> <th width="80">单价</th>
...@@ -1392,28 +1394,26 @@ ...@@ -1392,28 +1394,26 @@
<th width="200">操作</th> <th width="200">操作</th>
</tr> </tr>
<tr> <tr>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td> <td v-show="list.length==0" colspan="14" align="center">暂无数据</td>
</tr> </tr>
<template v-for="op in list"> <template v-for="op in list">
<tbody> <tbody class="not_border">
<tr> <tr>
<td colspan="15">类型：<span style="color: #e95252;">{{op.groupName}}</span></td> <td colspan="14">类型：<span style="color: #e95252;">{{op.groupName}}</span></td>
</tr> </tr>
</tbody> </tbody>
<tbody v-for="(item,index) in op.list" :key="index"> <tbody v-for="(item,index) in op.list" :key="index">
<tr> <tr>
<td rowspan="2" style="position:relative;"> <td rowspan="3" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p> <p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p> <p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<div>
{{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
</div>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>下单时间：{{item.createDate}}</p> <p>下单时间：{{item.createDate}}</p>
</td> </td>
<td> <td>
<img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/>
<img v-if='item.createPhoto' :onerror="defaultImg" :src='item.createPhoto'/>
{{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
</td>
<td>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p> <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168 || isUpdateOrder'class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12">{{item.contactMobile}}</p> <p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12">{{item.contactMobile}}</p>
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p> <p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
...@@ -1515,7 +1515,7 @@ ...@@ -1515,7 +1515,7 @@
<span v-if="item.waitFNum>0" style="margin: 0 5px 0 0;">{{item.waitFNum}}(F)</span> <span v-if="item.waitFNum>0" style="margin: 0 5px 0 0;">{{item.waitFNum}}(F)</span>
</div> </div>
</td> </td>
<td> <td>
<span v-if='item.confirmFileList.length>0' class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)"> <span v-if='item.confirmFileList.length>0' class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
确认函下载 确认函下载
</span> </span>
...@@ -1523,7 +1523,7 @@ ...@@ -1523,7 +1523,7 @@
<el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5' :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" aciton=''> <el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5' :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" aciton=''>
<el-button size="small" type="danger" @click='getItem(item)'>上传</el-button> <el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
</el-upload> </el-upload>
</td> </td>
<td class="groupTourOrderIcon"> <td class="groupTourOrderIcon">
<el-button-group v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'> <el-button-group v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder'>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start"> <el-tooltip class="item" effect="dark" content="修改" placement="top-start">
...@@ -1568,7 +1568,18 @@ ...@@ -1568,7 +1568,18 @@
</el-button-group> </el-button-group>
<payurlItem v-if='item.isOwn==1' :item="item" :showID="showID" v-show="item.orderState!='4'&&item.orderState!='3'" v-on:childByValue="childByValue"></payurlItem> <payurlItem v-if='item.isOwn==1' :item="item" :showID="showID" v-show="item.orderState!='4'&&item.orderState!='3'" v-on:childByValue="childByValue"></payurlItem>
</td> </td>
</tr> </tr>
<tr style="height:20px">
<td colspan="14" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
</span>
<span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span>
</span>
</td>
</tr>
<tr> <tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
...@@ -1597,7 +1608,7 @@ ...@@ -1597,7 +1608,7 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;"> <td colspan="5" class="groupTourOrder_tickets" style="height: 40px;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ d9bc04d6
...@@ -1159,7 +1159,7 @@ ...@@ -1159,7 +1159,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总额" prop="PreferPrice"> <el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' @keyup.native="checkInteger(addMsg,'PreferPrice')" @input.native='getTicheng()' <el-input v-model='addMsg.PreferPrice' type="number" @input.native='getTicheng()'
:disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input> :disabled="!this.OrderDataList.IsUpdateOrderMoney"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
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