Skip to content

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

改了领队报账的一些东西

parent bcc638c0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 27 deletions
src/components/LeaderManagement/leaderManagement.vue
View file @ 64b82111
......@@ -111,7 +111,7 @@
color: #333;
}
.guideMg .midList {
margin-top: 16px;
margin-top: 0;
}
.guideMg .icon-dianhua ,.guideMg .icon-zuoji{
color: #47bf8c;
......@@ -309,7 +309,7 @@
</ul>
</div>
<div class="contentDiv clearfix">
<div class="listDiv" v-for="item in DataList" :key="item.Code">
<div class="listDiv" v-for="(item, index) in DataList" :key="index">
<div class="topInfo clearfix" v-if="item.Type === 3">
<div class="_sanjiao_" v-if="item.LeaderGuidClass==1"></div>
<div class="leftImg">
......@@ -334,11 +334,11 @@
</div>
<div class="nainfo" v-if="!item.LeaderGuidClass">{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div>
<div class="midList" v-if="!item.LeaderGuidClass">{{$t('system.table_sex')}}：{{item.Sex==0?'男/M':'女/F'}}</div>
<div v-if="!item.LeaderGuidClass">{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<div v-if="!item.LeaderGuidClass">{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" popper-class="max-w200" v-if="!item.LeaderGuidClass">
<div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}}
</div>
</el-tooltip>
</el-tooltip>
</div>
<div class="clearfix botmInfo" v-if="!item.LeaderGuidClass">
<div class="leftCode">
......@@ -375,6 +375,7 @@
<div class="nainfo" >{{$t('admin.admin_ming')}}：<span class="naIn">{{item.Name}}/{{item.EnName}}</span></div>
<div class="midList">{{$t('system.table_sex')}}：{{item.Sex==0?'男/M':'女/F'}}</div>
<div>{{$t('system.query_goCoun')}}：{{item.CountryName}}</div>
<div>带团数：{{item.TourNum}}</div>
<el-tooltip class="item" effect="dark" :content="item.LanguageName" placement="top-start" popper-class="max-w200" >
<div class="lagurage" v-if="item.Type==3">{{$t('system.query_Language')}}：{{item.LanguageName}}
</div>
......
src/components/SalesModule/CustomerCertification.vue
View file @ 64b82111
<template>
<div class="CertificationDetail">
<div>
<div>
<div
:class="{salesApprovalLayercontentDiv:showlayer,rightZero:isTransition}"
class="ownScrollbarStyle"
......@@ -81,6 +81,19 @@
type="date"
></el-date-picker>
</li>
<li>
<span>
<em>{{$t('system.query_company')}}</em>
<el-select filterable v-model='msg.RB_Branch_Id' >
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>状态</em>
......@@ -113,18 +126,20 @@
<th width="10%">门店名称</th>
<th width="10%">联系人</th>
<th width="10%">电话</th>
<th width="10%">交易金额</th>
<th width="10%">地址</th>
<th width="10%">申请时间</th>
<th width="10%">申请状态</th>
<th width="10%">操作</th>
</tr>
<tr>
<td colspan="6" align="center" v-show="list.length==0">暂无数据</td>
<td colspan="8" align="center" v-show="list.length==0">暂无数据</td>
</tr>
<tr v-for="(item,index) in list">
<td>{{item.CustomerName}}</td>
<td>{{item.Customer}}</td>
<td>{{item.ContactPhone}}</td>
<td>{{item.TradeMoney}}</td>
<td>{{item.Addres}}</td>
<td>{{item.CreateDateStr}}</td>
<td>
......@@ -164,7 +179,8 @@ export default {
pageSize: 10,
SDate: "",
EDate: "",
ApplyState: "-1"
ApplyState: "-1",
RB_Branch_Id: -2,
},
Reason:"",
showlayer: false,
......@@ -173,10 +189,22 @@ export default {
currentPage: 1,
total: 0,
answerDetailList: [],
list: []
list: [],
CompanyList: [],
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
Status:'0',
},
};
},
methods: {
getCompanyList(){ //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.CompanyList=res.data.data;
}else{}
},err=>{})
},
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.SDate > this.msg.EDate && this.msg.EDate !== "") {
......@@ -264,7 +292,10 @@ export default {
}
},
mounted() {
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= userInfo.RB_Group_id; //集团ID
this.getList();
this.getCompanyList()
}
};
</script>
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 64b82111
......@@ -152,7 +152,7 @@
<tr>
<th colspan="11">公司通用信息</th>
<th colspan="5">团队需求表</th>
<th colspan="8">地接op操作</th>
<th colspan="9">地接op操作</th>
</tr>
<tr>
<th width="130">序号</th>
......@@ -177,6 +177,7 @@
<th width="60">餐食</th>
<th width="60">车辆</th>
<th width="60">领队<br />报账</th>
<th width="60">领队人头费</th>
<th width="120">操作</th>
</tr>
<tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}">
......@@ -338,8 +339,23 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' style="width: 150px;">
<el-popover width="100" trigger="click" popper-class="DMC_HotelPop">
<table style="width: 100%;" border="0" cellspacing="1" class="dmcTotalTable">
<tr>
<th>单号</th>
<th>金额</th>
</tr>
<tr v-for="(fnc, findex) in outItem.FinanceIds">
<td class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', fnc.FinanceId)">{{fnc.FinanceId}}</td>
<td>{{moneyFormat(fnc.OriginalMoney)}}</td>
</tr>
</table>
<span slot="reference" style="cursor:pointer;text-decoration:underline;">{{outItem.TotalPrice}}</span>
</el-popover>
</td>
<td>
<div class="w250">
<div style="width: 150px;">
<el-button-group>
<el-tooltip class="item" effect="dark" content="地接信息" placement="top-start">
<el-popover placement="bottom" width="300" trigger="click">
......@@ -448,7 +464,7 @@
</td>
</tr>
<tr>
<td colspan="22" style="text-align: left!important;padding:0 20px;">
<td colspan="21" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
......@@ -471,6 +487,7 @@
</div>
</div>
</td>
<td></td>
</tr>
</template>
</tbody>
......@@ -742,6 +759,15 @@
})
window.open(routeData.href, '_blank');
},
goFncUrl: function(path, id) {
this.$router.push({
name: path,
query: {
id: id,
blank: 'y',
}
})
},
goUrlR(path, obj, title) {
this.$router.push({
name: path,
......
src/components/leaderPay2.vue
View file @ 64b82111
This diff is collapsed.
src/router/config.js
View file @ 64b82111
......@@ -2147,12 +2147,12 @@ export default {
meta: {
title: '路线'
},
}, { //财务 现金账户
}, { //财务 实名认证
path: '/CustomerCertification',
name: 'CustomerCertification',
component: resolve => require(['@/components/SalesModule/CustomerCertification'], resolve),
meta: {
title: '现金账户'
title: '实名认证'
},
},
{ // 销售 我的任务
......
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