Skip to content

S
SuperMan
Commit 8f2fc75d authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 0944be75 9d78738e
Hide whitespace changes
Inline Side-by-side
Showing with 344 additions and 32 deletions
src/App.vue
View file @ 8f2fc75d
......@@ -228,7 +228,7 @@
</script>
<style>
@import "//at.alicdn.com/t/c/font_635492_z2m4iopdl1a.css";
@import "//at.alicdn.com/t/c/font_2077629_fcjjwy7e29k.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
/* @import "./assets/css/fileIcon.css"; */
......
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ 8f2fc75d
......@@ -264,6 +264,31 @@
</table>
</div>
</div>
<div v-if="OtherType==82">
<div class="_tit">
<span class="_text">车辆信息</span>
<div>
<span class="_btn" v-if="tableShow" @click="tableShow=false">{{$t('fnc.shouqi')}} <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow=true">{{$t('fnc.zhankai')}} <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
<div v-show="tableShow" class="sanjiao-box _padding_20_15">
<table border="1" class="czBillModule _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>
</tr>
<tr class="_color_b">
<td>{{JapanCarModel.CarName}}</td>
<th>{{JapanCarModel.CarNo}}</th>
<th>{{JapanCarModel.CarSeatNum}}</th>
<th>{{JapanCarModel.SupplierName}}</th>
</tr>
</table>
</div>
</div>
</div>
</template>
......@@ -293,7 +318,8 @@ export default {
ReceiptModel:{},
IsFinancePermission:false,
Area_Name: '',
matchTransferList: []
matchTransferList: [],
JapanCarModel: {}
}
},watch:{
'GetDetail': {
......@@ -369,6 +395,8 @@ export default {
this.getyfTableList()
}else if(this.IsAdvanceFinance ==1){
this.getczTableList();
}else if(this.OtherType ==82){
this.getJapanCarDetails();
}
},
goTravelControlList(id){
......@@ -433,7 +461,6 @@ export default {
},
// OtherType=7详情
getDetails(){
console.log('---====22')
this.loading = true;
let msg={
pageIndex:1,
......@@ -451,6 +478,21 @@ export default {
this.czList = data;
}
}, null)
},
//获取车行车辆信息
getJapanCarDetails(){
this.loading = true;
let msg={
Id:this.ReFinanceId
};
this.apipost('JapanCar_get_GetCar', msg, res=>{
this.loading = false
if(res.data.resultCode == 1) {
let data= res.data.data;
this.JapanCarModel = data;
}
}, null)
}
}
}
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 8f2fc75d
......@@ -2242,6 +2242,218 @@ export default {
isResize: true
}
],
columnsCar:[{
field: "LineName",
title: "车辆",
width: 120,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: true
},
{
field: "TCID",
title: "编号",
width: 75,
titleAlign: "left",
columnAlign: "left",
isResize: true,
isFrozen: true,
componentName: "TCIDJump"
},
{
field: "TCNUM",
title: "团号",
width: 125,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: "",
filterMultiple: false,
type: "text",
isFrozen: true,
componentName: "TCNUMJump"
},
{
field: "DMCNUM",
formatter: this.moneyFormat,
title: "地接团号",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YingShou",
formatter: this.moneyFormat,
title: "应收金额",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ShiShou",
formatter: this.moneyFormat,
title: "实收金额",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TuiKuan",
formatter: this.moneyFormat,
title: "退款",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "PingTaiShuiJin",
formatter: this.moneyFormat,
title: "平台税金",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ZaiTu",
formatter: this.moneyFormat,
title: "在途",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "DaiShou",
formatter: this.moneyFormat,
title: "待收金额",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YiShou",
formatter: this.moneyFormat,
title: "溢收金额",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "CheZi",
formatter: this.moneyFormat,
title: "车资",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "RoomFee",
formatter: this.moneyFormat,
title: "房费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "MealFee",
formatter: this.moneyFormat,
title: "油费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TicketFee",
formatter: this.moneyFormat,
title: "过路停车费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YingFu",
formatter: this.moneyFormat,
title: "应付金额",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "MaoLi",
formatter: this.moneyFormat,
title: "毛利",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "MaoLiRate",
// formatter: this.moneyFormat,
title: "毛利率",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ShiJiLiRun",
formatter: this.moneyFormat,
title: "实际利润",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "Remark",
title: "备注",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "BName",
title: "公司别",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
],
columnsOld:[],
footer: [],
pageSize: 6,
pageIndex: 1,
......@@ -2405,6 +2617,8 @@ export default {
});
}
this.columnsOld = this.columns;
this.financeinfo_post_GetList()
this.getCompanyList();
this.getLineList();
......@@ -3151,6 +3365,14 @@ export default {
getPageList() {
// 获取列表数据
this.loading = true;
//判断一下公司别
if(this.msg.OutBranchId==1248){
this.columns = this.columnsCar;
}else{
this.columns = this.columnsOld;
}
if (!this.msg.StartCityId) this.msg.StartCityId = 0;
if (!this.msg.LineId) this.msg.LineId = 0;
if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 8f2fc75d
......@@ -194,11 +194,11 @@
<th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('fnc.a_zhaiyao')}}</th>
<th>费用科目</th>
<th>制单人</th>
<th>单据状态</th>
<th width="300px">{{$t('fnc.a_hkrfkduixiang')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th>
<th width="350px">{{$t('fnc.a_hkrfkduixiang')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>原币种</th>
<th>原币收款</th>
<th>原币付款</th>
......@@ -228,22 +228,22 @@
<span class="cursorpointer" :class=" item.Type === 1 ? 'CAcc_bg_green' : 'CAcc_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span>
</td>
<td>
<p>{{item.CostTypeName}}</p>
<p v-for="qitem in item.CostTypeList">{{qitem}}</p>
<!-- <p>{{item.CostTypeName}}</p> -->
</td>
<td>
<p v-for=" ( son , sIndex ) in item.TCIDAndTCNUMList"> <span>{{ son.TCNUM }} ( <span> {{ son.TCID }} </span> )</span> </p>
</td>
<td>{{item.EmName}}</td>
<td>{{item.AuditDescription}}</td>
<td>
<span v-if=" item.Type == 1">{{$t('fnc.hnrdanwei')}}：{{ item.RemitterName }}</span>
<span v-if=" item.Type == 2">{{ item.ClientTypeName }}：{{ item.RemitterName }}</span>
<span v-if=" item.Type == 1">{{$t('fnc.hnrdanwei')}}：{{ item.RemitterName }} {{ item.AccountNumber }}</span>
<span v-if=" item.Type == 2">{{ item.ClientTypeName }}：{{ item.RemitterName }} {{ item.AccountNumber }}</span>
</td>
<td>
<span v-if=" item.Type == 1">{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span>
<span v-if=" item.Type == 2">{{$t('fnc.a_fkshijian')}}：{{ item.TradeDate }}</span>
</td>
<td>
{{ item.AccountNumber }}
</td>
<td> {{ item.CurrencyName }} </td>
<td>{{ item.Type == 1 ? moneyFormat(item.OriginalMoney) : '' }}</td>
<td>{{ item.Type == 2 ? moneyFormat(item.OriginalMoney) : '' }}</td>
......
src/components/FinancialModule/groupApproval.vue
View file @ 8f2fc75d
......@@ -4,7 +4,7 @@
<ul>
<li>
<em>出团公司</em>
<el-select filterable v-model='msg.OutBranchId'
<el-select class="permiss-input w160" filterable v-model='msg.OutBranchId'
@change='getControlList()'>
<el-option :label="$t('pub.unlimitedSel')" :value="-1" :key="-1"></el-option>
<el-option
......@@ -18,7 +18,7 @@
<li>
<span>
<em>团类型</em>
<el-select class="w200" v-model="msg.PriceTeamType" filterable :placeholder="$t('pub.pleaseImport')"
<el-select class="permiss-input w160" v-model="msg.PriceTeamType" filterable :placeholder="$t('pub.pleaseImport')"
@change="getControlList()">
<el-option :label="$t('pub.unlimitedSel')" value="-1">
</el-option>
......@@ -30,18 +30,32 @@
<li>
<span>
<em>团号</em>
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w160"
@keyup.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>编号</em>
<el-input maxlength="6" v-model="msg.TCID" class="permiss-input 200"
<el-input maxlength="6" v-model="msg.TCID" class="permiss-input w160"
@keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"
@keyup.native="checkInteger(msg,'TCID')"></el-input>
</span>
</li>
<li>
<span>
<em>出团日期</em>
<el-date-picker
style="height: 34px;"
value-format="yyyy-MM-dd"
v-model="DatelistBM"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesBM">
</el-date-picker>
</span>
</li>
<li v-if="userinfo.ActionMenuCode.indexOf('Finance_clumpSeeAll')!=-1">
<span><em>只看待我审核</em>
<el-switch
......@@ -280,6 +294,8 @@
OutBranchId: -1,
OutGroupAuditState: 1,
OutGroupAuditEmpId: 0,//当前登录用户id ， 如果有查询所有的权限 则=0
QStartDate: '',
QEndDate: ''
},
TeamListArr:[],
total:0,
......@@ -295,7 +311,8 @@
RB_Group_Id:'0',
Status:'0',
},
userinfo: {}
userinfo: {},
DatelistBM:[]
}
},
components: {
......@@ -326,6 +343,15 @@
},
methods: {
getDatesBM(){
if(this.DatelistBM){
this.msg.QStartDate = this.DatelistBM[0];
this.msg.QEndDate = this.DatelistBM[1];
}if(!this.DatelistBM){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
}
},
getPendingMyTrial(){
let ActionMenuCode=this.userinfo.ActionMenuCode;
if(ActionMenuCode.indexOf('Finance_clumpSeeAll')!=-1){
......
src/components/automaticLogin.vue
View file @ 8f2fc75d
......@@ -58,7 +58,8 @@
path: data.parameter.path,
query
});
this.getLogin()
let loginState = localStorage.userInfo?'登录成功':''
this.getLogin(loginState)
}
},
created() {
......
src/components/sale/sale.vue
View file @ 8f2fc75d
<style lang="less" scoped>
@import "../../assets/css/main.less";
@import "../../assets/css/home/Saleshomepage_1920.css";
.HiddenNum{
position: relative;
top: 13px;
}
.saleChartCont {
width: 100%;
height: 95%;
......@@ -74,12 +77,19 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.totalCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.totalCommission:'***'}}</span>
<div style="width: 20px;height: auto; position: absolute;right: -30px;top: 15px; cursor: pointer;color: #232323;"
@click.stop="isView=!isView">
<el-icon class="iconfont"
:class="[isView?'icon-view':'icon-yincang']"
></el-icon>
</div>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.periodsName}}期<el-tag
v-if="data.peopelBonus" size="mini" type="danger" effect="dark"
style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">
奖+{{data.peopelBonus}}</el-tag>
style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;"
:class="[isView?'':'HiddenNum']">
奖+{{isView?data.peopelBonus:'***'}}</el-tag>
</p>
</div>
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
......@@ -96,7 +106,7 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.gnSaleCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.gnSaleCommission:'***'}}</span>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.gnPeriodsName}}期</p>
</div>
......@@ -109,7 +119,7 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.dxSaleCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.dxSaleCommission:'***'}}</span>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.dxPeriodsName}}期</p>
</div>
......@@ -117,7 +127,6 @@
<span>历史单项提成</span>
</div>
</div>
<el-tooltip class="item" effect="dark" content="预期提成" placement="top">
<img src="../../assets/img/xiaosouYQ.png" @click="goAnticipate(4)"
style="width: 20px;height: auto; position: absolute;right: -0;top: -13px;cursor: pointer;color: #33B3FF;"></img>
......@@ -590,6 +599,7 @@
export default {
data() {
return {
isView: false,
tichengDialog: false,
PMMsg: {
RB_Branch_Id: -1,
......@@ -1031,4 +1041,4 @@
this.Financial_post_GetNotDealCount(); //待处理财务单据的个数
},
}
</script>
\ No newline at end of file
</script>
src/components/temp/operation.vue
View file @ 8f2fc75d
......@@ -2,7 +2,10 @@
@import "../../assets/css/main.less";
/* @import "../../assets/css/cssReset.css"; */
@import "../../assets/css/home/Saleshomepage_1920.css";
.HiddenNum{
position: relative;
top: 13px;
}
.saleChartCont {
width: 100%;
height: 95%;
......@@ -279,12 +282,19 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.OPCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.OPCommission:'***'}}</span>
<div style="width: 20px;height: auto; position: absolute;right: -30px;top: 15px; cursor: pointer;color: #232323;"
@click.stop="isView=!isView">
<el-icon class="iconfont"
:class="[isView?'icon-view':'icon-yincang']"
></el-icon>
</div>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.PeriodsName}}期<el-tag
v-if="data.PeopelBonus" size="mini" type="danger" effect="dark"
style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;">
奖+{{data.PeopelBonus}}</el-tag>
style="color: #ffff;position: absolute;left: 70px;bottom: 23px;font-size: 11px;"
:class="[isView?'':'HiddenNum']">
奖+{{isView?data.PeopelBonus:'***'}}</el-tag>
</p>
</div>
<div stye="font-size: 16px;color: #666666;display: block;display: inline-block;">
......@@ -296,7 +306,7 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.GNOPCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.GNOPCommission:'***'}}</span>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.GNPeriodsName}}期</p>
</div>
......@@ -309,7 +319,7 @@
<div class="tc">
<p>
<span>￥</span>
<span>{{data.DXOPCommission}}</span>
<span :class="[isView?'':'HiddenNum']">{{isView?data.DXOPCommission:'***'}}</span>
</p>
<p style="color: #BDBDBD;font-size: 13px;padding: 0 0 5px 0;">{{data.DXPeriodsName}}期</p>
</div>
......@@ -609,6 +619,7 @@
export default {
data() {
return {
isView: false,
userInfo: {},
isBranchCompany: false,
isVisa: false,
......
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