Skip to content

S
SuperMan
Commit 30fb65ac authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 701bc1ce
Show whitespace changes
Inline Side-by-side
Showing with 724 additions and 770 deletions
src/components/FinancialModule/HandFee/HandFeeQuery.vue
View file @ 30fb65ac
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="手配费公司："> <el-form-item label="手配费公司：">
<el-select filterable v-model='msg.KingdeeBranchId' :disabled="!isRB_Depart_Id" class=""> <el-select filterable v-model='msg.KingdeeBranchId' :disabled="!isRB_Depart_Id" class="">
<!-- <el-option :value="-1" label="不限"></el-option> -->
<el-option v-for='item in GetHandFeeList' :label='item.BranchName' :value='item.BranchId' <el-option v-for='item in GetHandFeeList' :label='item.BranchName' :value='item.BranchId'
:key='item.BranchId'> :key='item.BranchId'>
</el-option> </el-option>
...@@ -22,7 +21,8 @@ ...@@ -22,7 +21,8 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发团日期："> <el-form-item label="发团日期：">
<el-date-picker class="h34" v-model="missionDate" type="daterange" value-format="yyyy-MM-dd"> <el-date-picker class="h34" v-model="missionDate" type="daterange" value-format="yyyy-MM-dd"
@input="getdatalist">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
</div> </div>
<div class="_fnDm_content" v-loading='loading'> <div class="_fnDm_content" v-loading='loading'>
<el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%" row-key="FinanceId"> <el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%" row-key="FinanceId">
<el-table-column prop="" label="公司" width="120"> <el-table-column prop="" label="公司" width="150">
<template slot-scope="scope">{{ scope.row.BranchName }}</template> <template slot-scope="scope">{{ scope.row.BranchName }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="团队信息" width="180"> <el-table-column prop="" label="团队信息" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.OtherType==0"> <template v-if="scope.row.OtherType==0">
{{ scope.row.TCNUM }}({{scope.row.TCID}}) {{ scope.row.TCNUM }}({{scope.row.TCID}})
...@@ -49,49 +49,61 @@ ...@@ -49,49 +49,61 @@
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="类型" width="120"> <el-table-column prop="" label="类型" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-for="(subItem,subIndex) in scope.row.CostTypeList"> <template v-for="(subItem,subIndex) in scope.row.CostTypeList">
<span :key="subIndex"> {{subItem.CostTypeName}} <span :key="subIndex"> {{subItem.CostTypeName}}
</span> </span>
<br :key="subIndex+10000" />
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="数量" width="120"> <el-table-column prop="" label="数量" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-for="(subItem,subIndex) in scope.row.CostTypeList"> <template v-for="(subItem,subIndex) in scope.row.CostTypeList">
<span :key="subIndex"> <span :key="subIndex">
{{subItem.Number}} {{subItem.Number}}
</span> </span>
<br :key="subIndex+20000" />
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="酒店信息" width="120"> <el-table-column prop="" label="金额" width="150">
<template slot-scope="scope">
<template v-for="(subItem,subIndex) in scope.row.CostTypeList">
<span :key="subIndex">
{{subItem.Money}}
</span>
<br :key="subIndex+30000" />
</template>
</template>
</el-table-column>
<el-table-column prop="" label="酒店信息">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.OtherType==0 && scope.row.HotelList&&scope.row.HotelList.length>0"> <template v-if="scope.row.OtherType==0 && scope.row.HotelList&&scope.row.HotelList.length>0">
<el-popover width="980" trigger="click" placement="right"> <template v-for="(subItem,subIndex) in scope.row.HotelList">
<commonHotelInfo :HotelObj="scope.row.HotelList" :showHotelObj="showHotelObj" :TCID="scope.row.TCID" <span :key="subIndex+40000"> {{subItem.UseDay}}
:TCNUM="scope.row.TCNUM"></commonHotelInfo> <template v-if="subItem.SubList&&subItem.SubList.length>0">
<div slot="reference" style="cursor:pointer;"> <template v-for="(childItem) in subItem.SubList">
酒店使用情况 【{{childItem.NewHotelName}}】
</div> </template>
</el-popover> </template>
</span>
<br :key="subIndex+50000" />
</template>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="总金额" width="120"> <el-table-column prop="" label="总金额" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.TotalMoney}} {{ scope.row.TotalMoney}}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
export default { export default {
data() { data() {
return { return {
...@@ -121,10 +133,12 @@ ...@@ -121,10 +133,12 @@
created() { created() {
let sDate = this.FormartDate(new Date(this.getBeforeDate(1))); let sDate = this.FormartDate(new Date(this.getBeforeDate(1)));
let eDate = this.FormartDate(new Date(this.getBeforeDate(0))); let eDate = this.FormartDate(new Date(this.getBeforeDate(0)));
sDate = '2023-07-01'; var now = new Date();
var firstDay = new Date(now.getFullYear(), now.getMonth(), 1)
sDate = this.FormartDate(firstDay);
//sDate = '2023-06-01'
this.missionDate = [sDate, eDate] this.missionDate = [sDate, eDate]
this.msg.QStartDate = sDate; this.msg.QStartDate = sDate;
this.msg.QEndDate = eDate; this.msg.QEndDate = eDate;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
...@@ -134,13 +148,12 @@ ...@@ -134,13 +148,12 @@
this.getHandFeeBranch(); this.getHandFeeBranch();
}, },
components: { components: {
commonHotelInfo,
}, },
mounted() { mounted() {
}, },
methods: { methods: {
//获取手配费公司 //获取手配费公司
getHandFeeBranch() { getHandFeeBranch() {
this.apipost( this.apipost(
...@@ -165,19 +178,16 @@ ...@@ -165,19 +178,16 @@
); );
}, },
getdatalist() { getdatalist() {
console.log("this.missionDate", this.missionDate) if (this.missionDate && this.missionDate.length == 2) {
if (this.missionDate) {
this.msg.QStartDate = this.missionDate[0]; this.msg.QStartDate = this.missionDate[0];
this.msg.QEndDate = this.missionDate[1]; this.msg.QEndDate = this.missionDate[1];
} }
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"Financial_post_GetJanpanHandFeeMonthBoard", this.msg, "Financial_post_GetJanpanHandFeeMonthBoard", this.msg,
res => { res => {
this.loading = false; this.loading = false;
console.log("res", res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DataList = res.data.data; this.DataList = res.data.data;
} }
...@@ -187,7 +197,6 @@ ...@@ -187,7 +197,6 @@
} }
); );
} }
} }
} }
......
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
View file @ 30fb65ac
<style scoped> <style scoped>
/deep/.el-table th.el-table__cell{ /deep/.el-table th.el-table__cell {
background-color: #E6E6E6; background-color: #E6E6E6;
} }
</style> </style>
<template > <template>
<div class="page_RecPayQuery"> <div class="page_RecPayQuery">
<div class="query-box"> <div class="query-box">
<el-form class="_info_box clearfix" label-width="110px"> <el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;"> <el-row style="padding:15px 20px 0 0;">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="单号："> <el-form-item label="单号：">
<el-input clearable placeholder="" class="" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')"></el-input> <el-input clearable placeholder="" class="" v-model="msg.FrID" @keyup.native="checkInteger(msg,'FrID')">
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="手配费公司："> <el-form-item label="手配费公司：">
<el-select filterable v-model='msg.KingdeeBranchId' <el-select filterable v-model='msg.KingdeeBranchId' :disabled="!isRB_Depart_Id" class="">
:disabled="!isRB_Depart_Id" class=""> <el-option v-for='item in GetHandFeeList' :label='item.BranchName' :value='item.BranchId'
<!-- <el-option :value="-1" label="不限"></el-option> -->
<el-option v-for='item in GetHandFeeList'
:label='item.BranchName'
:value='item.BranchId'
:key='item.BranchId'> :key='item.BranchId'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -31,10 +29,7 @@ ...@@ -31,10 +29,7 @@
<el-form-item label="公司："> <el-form-item label="公司：">
<el-select filterable v-model='msg.RB_Branch_Id'> <el-select filterable v-model='msg.RB_Branch_Id'>
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList' :label='item.BName' :value='item.Id' :key='item.Id'>
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -42,20 +37,18 @@ ...@@ -42,20 +37,18 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="费用类型："> <el-form-item label="费用类型：">
<el-select filterable v-model='msg.CostTypeID' > <el-select filterable v-model='msg.CostTypeID'>
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option> <el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="付款对象："> <el-form-item label="付款对象：">
<el-select filterable v-model='msg.ClientID' > <el-select filterable v-model='msg.ClientID'>
<el-option value="" label="不限"></el-option> <el-option value="" label="不限"></el-option>
<el-option v-for='item in ClientAccountList' <el-option v-for='item in ClientAccountList' :label='item.AccountAlias' :value='item.ID' :key='item.ID'>
:label='item.AccountAlias'
:value='item.ID'
:key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -73,35 +66,24 @@ ...@@ -73,35 +66,24 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-col>
<template v-if="heightQueryBox"></template> <template v-if="heightQueryBox"></template>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="制单日期："> <el-form-item label="制单日期：">
<el-date-picker class="h34" <el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="交易日期："> <el-form-item label="交易日期：">
<el-date-picker class="h34" <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
v-model="transactionDate"
@change="timeAdd(3)"
type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="发团日期："> <el-form-item label="发团日期：">
<el-date-picker class="h34" <el-date-picker class="h34" v-model="missionDate" @change="timeAdd(4)" type="daterange"
v-model="missionDate"
@change="timeAdd(4)"
type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
...@@ -111,12 +93,10 @@ ...@@ -111,12 +93,10 @@
</el-form> </el-form>
<ul class="clearfix"> <ul class="clearfix">
<li class="hight_query"> <li class="hight_query">
<!-- <span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span> -->
<button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="DocumentMaking">制单</button> <button class="normalBtn" @click="DocumentMaking">制单</button>
<button class="normalBtn" @click="method5()">导出</button> <button class="normalBtn" @click="method5()">导出</button>
<button class="normalBtn" @click="GoToDetails()">明细查询</button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -139,10 +119,8 @@ ...@@ -139,10 +119,8 @@
<div style="display: flex;flex-wrap: wrap;"> <div style="display: flex;flex-wrap: wrap;">
<span>已选数据：</span> <span>已选数据：</span>
<template v-if="multipleSelection.length>0"> <template v-if="multipleSelection.length>0">
<el-tag size="mini" closable <el-tag size="mini" closable style="margin-right: 5px;margin-bottom: 5px;"
style="margin-right: 5px;margin-bottom: 5px;" v-for="(x,index) in multipleSelection" :key="x.FinanceId" @close="handleClose([multipleSelection[index]])">
v-for="(x,index) in multipleSelection"
:key="x.FinanceId" @close="handleClose([multipleSelection[index]])">
{{x.FinanceId}}/{{x.CurrencyName+':'+x.OriginalMoney}} {{x.FinanceId}}/{{x.CurrencyName+':'+x.OriginalMoney}}
</el-tag> </el-tag>
</template> </template>
...@@ -155,99 +133,53 @@ ...@@ -155,99 +133,53 @@
</div> </div>
</div> </div>
<div class="_fnDm_content" v-loading='loading'> <div class="_fnDm_content" v-loading='loading'>
<el-table <el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%" row-key="FinanceId"
ref="multipleTable" @selection-change="handleSelectionChange">
:data="DataList" <el-table-column type="selection" :reserve-selection="true" :selectable="selectable" width="55">
tooltip-effect="dark"
style="width: 100%"
row-key="FinanceId"
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
:reserve-selection="true"
:selectable="selectable"
width="55">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="" label="公司" width="120">
prop=""
label="公司"
width="120">
<template slot-scope="scope">{{ scope.row.BranchName }}</template> <template slot-scope="scope">{{ scope.row.BranchName }}</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="FinanceId" label="单号" width="80">
prop="FinanceId"
label="单号"
width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="cursor: pointer;color: #00C6FF;" @click="openDetails(scope.row)">{{ scope.row.FinanceId }}</span> <span style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row)">{{ scope.row.FinanceId }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="CostTypeName" label="费用类型">
prop="CostTypeName"
label="费用类型">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="" label="关联信息" width="200">
prop=""
label="关联信息"
width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.TCNUM">{{scope.row.TCNUM}}</template> <template v-if="scope.row.TCNUM">{{scope.row.TCNUM}}</template>
<template v-if="scope.row.TCID">({{scope.row.TCID}})</template> <template v-if="scope.row.TCID">({{scope.row.TCID}})</template>
<template v-if="!scope.row.TCNUM||!scope.row.TCID">-</template> <template v-if="!scope.row.TCNUM||!scope.row.TCID">-</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="" label="付款对象" show-overflow-tooltip>
prop=""
label="付款对象"
show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.AccountNumber}}</p> <p>{{scope.row.AccountNumber}}</p>
<!-- <p>{{scope.row.TradeDate}}</p> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="TradeDate" label="交易日期" show-overflow-tooltip width="100">
prop="TradeDate"
label="交易日期"
show-overflow-tooltip width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.TradeDate?scope.row.TradeDate:'-'}}</p> <p>{{scope.row.TradeDate?scope.row.TradeDate:'-'}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="CurrencyName" label="币种" width="80">
prop="CurrencyName"
label="币种"
width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="OriginalMoney" label="原币金额" width="100">
prop="OriginalMoney"
label="原币金额"
width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="Rate" label="汇率" width="80">
prop="Rate"
label="汇率"
width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="Money" label="本位币金额" width="100">
prop="Money"
label="本位币金额"
width="100">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="" label="制单人员" width="100">
prop=""
label="制单人员" width="100">
<template slot-scope="scope">{{scope.row.CreateByName}} <template slot-scope="scope">{{scope.row.CreateByName}}
<p>{{scope.row.CreateDate}}</p> <p>{{scope.row.CreateDate}}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
prop="Remark" <el-table-column prop="" label="状态">
label="备注"
show-overflow-tooltip></el-table-column>
<el-table-column
prop=""
label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.Status==1" style="color: red;">审核中</span> <span v-if="scope.row.Status==1" style="color: red;">审核中</span>
<span v-if="scope.row.Status==2" style="color: #2BB87C;">通过</span> <span v-if="scope.row.Status==2" style="color: #2BB87C;">通过</span>
...@@ -256,19 +188,14 @@ ...@@ -256,19 +188,14 @@
<span v-if="scope.row.Status==5" style="color: #00C6FF">出纳暂存</span> <span v-if="scope.row.Status==5" style="color: #00C6FF">出纳暂存</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="HandFeeFrId" label="关联代付单" width="120">
prop="HandFeeFrId"
label="关联代付单" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.HandFeeFrId">{{scope.row.HandFeeFrId}}</template> <template v-if="scope.row.HandFeeFrId">{{scope.row.HandFeeFrId}}</template>
<p v-else style="cursor: pointer;color: #00C6FF;" @click="isshezhiBox=true,shezhiMsg.FinanceId=scope.row.FinanceId">设置关联</p> <p v-else style="cursor: pointer;color: #00C6FF;"
@click="isshezhiBox=true,shezhiMsg.FinanceId=scope.row.FinanceId">设置关联</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="" label="关联手配费收入单" show-overflow-tooltip width="150">
prop=""
label="关联手配费收入单"
show-overflow-tooltip
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.HandFeeIncomeFrId?scope.row.HandFeeIncomeFrId:'-'}} {{scope.row.HandFeeIncomeFrId?scope.row.HandFeeIncomeFrId:'-'}}
</template> </template>
...@@ -317,110 +244,110 @@ ...@@ -317,110 +244,110 @@
</div> </div>
</template> </template>
<script> <script>
import myBill from "../FinancialSubmodule/BillModule.vue"; import myBill from "../FinancialSubmodule/BillModule.vue";
import myrbvBill from "../FinancialSubmodule/ReceivablesModule.vue"; import myrbvBill from "../FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "../FinancialSubmodule/MergeBillModule.vue"; import myhrBill from "../FinancialSubmodule/MergeBillModule.vue";
import Vue from 'vue' import Vue from 'vue'
import selectListData from "./components/selectListData"; import selectListData from "./components/selectListData";
export default { export default {
data(){ data() {
return{ return {
showDialog: false, showDialog: false,
shezhiMsg:{ shezhiMsg: {
FinanceId:0, FinanceId: 0,
HandFeeFrId:null HandFeeFrId: null
}, },
isshezhiBox: false, isshezhiBox: false,
GetHandFeeList:[], GetHandFeeList: [],
multipleSelection: [], multipleSelection: [],
showID:false, showID: false,
active:1, active: 1,
userId:0, userId: 0,
iszhidanBox:false, iszhidanBox: false,
searchList:[], searchList: [],
ClientAccountList: [],//付款对象 ClientAccountList: [], //付款对象
msg:{ msg: {
FrID:'', FrID: '',
CostTypeID:0,//费用类型ID CostTypeID: 0, //费用类型ID
RB_Branch_Id:-1,// 公司ID RB_Branch_Id: -1, // 公司ID
sDate:'',//制单起始日期 sDate: '', //制单起始日期
eDate:'', eDate: '',
sTradeDate:'',//交易起始日期 sTradeDate: '', //交易起始日期
eTradeDate:'', eTradeDate: '',
QEndDate:'',//出团起始日期 QEndDate: '', //出团起始日期
QStartDate:'', QStartDate: '',
ClientID:'',//付款对象ID ClientID: '', //付款对象ID
Status:'-1',//状态 Status: '-1', //状态
KingdeeBranchId: 0,//当前登录人的公司 KingdeeBranchId: 0, //当前登录人的公司
HandFeeFrId: 0 HandFeeFrId: 0
}, },
isRB_Depart_Id: false, isRB_Depart_Id: false,
getCompanyMsg:{ // 公司 getCompanyMsg: { // 公司
RB_Group_Id:'0', RB_Group_Id: '0',
Status:'0', Status: '0',
}, },
getDepartmentMsg:{// 部门 getDepartmentMsg: { // 部门
RB_Group_Id:'', RB_Group_Id: '',
RB_Branch_Id:'', RB_Branch_Id: '',
Status:0, Status: 0,
ParentId:-1, ParentId: -1,
Tier:0, Tier: 0,
}, },
employeeMsg:{ // 员工 employeeMsg: { // 员工
GroupId:'', GroupId: '',
BranchId:-1, BranchId: -1,
DepartmentId:0, DepartmentId: 0,
PostId:0, PostId: 0,
IsLeave:0, IsLeave: 0,
}, },
zhuanMsg:{ zhuanMsg: {
AuditEmId:null, AuditEmId: null,
WorkFlowId:0, WorkFlowId: 0,
}, },
//转交信息 //转交信息
zhuanjiaoMsg:{ zhuanjiaoMsg: {
CreateBy:'', CreateBy: '',
FrIDList:[] FrIDList: []
}, },
DataList:[], DataList: [],
GetFinancLogList:[], GetFinancLogList: [],
StatusList:[], StatusList: [],
accountList:[], accountList: [],
CompanyList:[], CompanyList: [],
productionDate:[], productionDate: [],
approvalDate:[], approvalDate: [],
transactionDate:[], transactionDate: [],
missionDate:[], missionDate: [],
GetCostTypeList:[], GetCostTypeList: [],
checkList:[], checkList: [],
checkAllList:[], checkAllList: [],
dateStart:'', dateStart: '',
dateEnd:'', dateEnd: '',
dateArr:'', dateArr: '',
status:'1', status: '1',
type:'1', type: '1',
loading:false, loading: false,
LogLoading:false, LogLoading: false,
currentPage:1, currentPage: 1,
total:0, total: 0,
totalYB:0, totalYB: 0,
totalBW:0, totalBW: 0,
totalBW2:0, totalBW2: 0,
totalZD:0, totalZD: 0,
totalBWZD:0, totalBWZD: 0,
ChineseStr:'', ChineseStr: '',
mathNumber:'', mathNumber: '',
DepartIDs:'', DepartIDs: '',
tableData: [], tableData: [],
heightQueryBox:false, heightQueryBox: false,
BillMakingMsg: { BillMakingMsg: {
OtherType: 0, OtherType: 0,
StandardCurrencyName: "", StandardCurrencyName: "",
Money: 0, Money: 0,
IsUploadPic: 1, IsUploadPic: 1,
}, },
rules:{ rules: {
HandFeeFrId: [{ HandFeeFrId: [{
required: true, required: true,
message: '请输入关联手配费单号', message: '请输入关联手配费单号',
...@@ -429,53 +356,60 @@ export default { ...@@ -429,53 +356,60 @@ export default {
} }
} }
}, },
created(){ created() {
if(this.$route.query.FrID){ if (this.$route.query.FrID) {
this.msg.FrID = this.$route.query.FrID; this.msg.FrID = this.$route.query.FrID;
} }
if(this.$route.query.HandFeeFrId){ if (this.$route.query.HandFeeFrId) {
this.msg.HandFeeFrId = this.$route.query.HandFeeFrId this.msg.HandFeeFrId = this.$route.query.HandFeeFrId
}else{ } else {
let sDate= this.FormartDate(new Date(this.getBeforeDate(1))); let sDate = this.FormartDate(new Date(this.getBeforeDate(1)));
let eDate= this.FormartDate(new Date(this.getBeforeDate(0))); let eDate = this.FormartDate(new Date(this.getBeforeDate(0)));
this.productionDate = [sDate,eDate] this.productionDate = [sDate, eDate]
this.msg.sDate= sDate; this.msg.sDate = sDate;
this.msg.eDate= eDate; this.msg.eDate = eDate;
} }
}, },
components: { components: {
"my-Bill": myBill, "my-Bill": myBill,
"my-RVB-Bill":myrbvBill, "my-RVB-Bill": myrbvBill,
selectListData selectListData
}, },
mounted(){ mounted() {
let userInfo=this.getLocalStorage(); let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode; let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('F_Query_AllIncomPay') != -1 ||ActionMenuCode.indexOf('S_CheckAllOrder') != -1){ if (ActionMenuCode.indexOf('F_Query_AllIncomPay') != -1 || ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
this.isRB_Depart_Id = true this.isRB_Depart_Id = true
} }
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo
.RB_Group_id; //集团ID
this.DepartIDs = userInfo.RB_Department_Id; this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.financeinfo_post_GetCostTypeList(); this.financeinfo_post_GetCostTypeList();
this.getCompanyList();//获取公司列表 this.getCompanyList(); //获取公司列表
this.FinancialFlowTemplate_post_GetStatusList(); this.FinancialFlowTemplate_post_GetStatusList();
this.getFKList()//付款对象 this.getFKList() //付款对象
this.GetHandFee()//手配费公司 this.GetHandFee() //手配费公司
}, },
methods:{ methods: {
getMoney(){ //跳转到明细
GoToDetails() {
var path = "/HandFeeQuery";
var params = {};
this.OpenNewPage(path, params)
},
getMoney() {
let Money = 0 let Money = 0
let totalZD = 0 let totalZD = 0
let totalBWZD = 0 let totalBWZD = 0
this.multipleSelection.forEach(x=>{ this.multipleSelection.forEach(x => {
totalZD+= (x.OriginalMoney*100) totalZD += (x.OriginalMoney * 100)
totalBWZD+= (x.Money*100) totalBWZD += (x.Money * 100)
}) })
this.totalZD = totalZD/100 this.totalZD = totalZD / 100
this.totalBWZD = totalBWZD/100 this.totalBWZD = totalBWZD / 100
}, },
handleClose(rows){ handleClose(rows) {
if (rows) { if (rows) {
rows.forEach(row => { rows.forEach(row => {
this.$refs.multipleTable.toggleRowSelection(row); this.$refs.multipleTable.toggleRowSelection(row);
...@@ -496,46 +430,48 @@ export default { ...@@ -496,46 +430,48 @@ export default {
}); });
}, },
// 设置手配费关联 // 设置手配费关联
setHandFeeFr(){ setHandFeeFr() {
this.$refs['shezhiMsg'].validate((valid) => { this.$refs['shezhiMsg'].validate((valid) => {
if (valid) { if (valid) {
this.apipost('Financial_post_SetFinanceHandFeeRelevance',this.shezhiMsg,res=>{ this.apipost('Financial_post_SetFinanceHandFeeRelevance', this.shezhiMsg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.isshezhiBox = false this.isshezhiBox = false
this.getPageList() this.getPageList()
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
},err=>{}) }, err => {})
} else { } else {
return false; return false;
} }
}); });
}, },
DocumentMaking(){ DocumentMaking() {
let ids = this.multipleSelection.map(x=>{ return x.FinanceId}) let ids = this.multipleSelection.map(x => {
if(ids.length==0){ return x.FinanceId
})
if (ids.length == 0) {
return this.$message.error('请勾选需要制单的数据'); return this.$message.error('请勾选需要制单的数据');
} }
this.getMoney() this.getMoney()
this.BillMakingMsg.Money = this.totalZD this.BillMakingMsg.Money = this.totalZD
this.iszhidanBox = true this.iszhidanBox = true
this.apipost('Financial_post_SetFinanceHandFeeCode',{ this.apipost('Financial_post_SetFinanceHandFeeCode', {
FrIds: ids.join(',') FrIds: ids.join(',')
},res=>{ }, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.BillMakingMsg.StandardCurrencyName = res.data.data this.BillMakingMsg.StandardCurrencyName = res.data.data
// this.showDialog = true // this.showDialog = true
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
},err=>{}) }, err => {})
}, },
selectable(row, index) { selectable(row, index) {
if(!row.HandFeeIncomeFrId){ if (!row.HandFeeIncomeFrId) {
return true return true
}else{ } else {
return false return false
} }
}, },
...@@ -545,17 +481,18 @@ export default { ...@@ -545,17 +481,18 @@ export default {
}, },
GetHandFee() { GetHandFee() {
this.apipost( this.apipost(
"handfee_post_GetHandFeeList", "handfee_post_GetHandFeeList", {
{BranchId:-1}, BranchId: -1
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.GetHandFeeList = res.data.data; this.GetHandFeeList = res.data.data;
this.GetHandFeeList.forEach(x=>{ this.GetHandFeeList.forEach(x => {
if(x.BranchId==this.msg.KingdeeBranchId){ if (x.BranchId == this.msg.KingdeeBranchId) {
this.msg.KingdeeBranchId = x.BranchId this.msg.KingdeeBranchId = x.BranchId
} }
}) })
if(this.msg.KingdeeBranchId<=0){ if (this.msg.KingdeeBranchId <= 0) {
this.msg.KingdeeBranchId = this.GetHandFeeList[0].BranchId this.msg.KingdeeBranchId = this.GetHandFeeList[0].BranchId
} }
this.getPageList(); this.getPageList();
...@@ -567,10 +504,10 @@ export default { ...@@ -567,10 +504,10 @@ export default {
//获取付款列表 //获取付款列表
getFKList() { getFKList() {
let msg = { let msg = {
ID:0, ID: 0,
Type:0, Type: 0,
ObjID:0, ObjID: 0,
CardNum:'' CardNum: ''
} }
this.apipost( this.apipost(
"financeinfo_post_GetClientAccountList", msg, "financeinfo_post_GetClientAccountList", msg,
...@@ -582,16 +519,16 @@ export default { ...@@ -582,16 +519,16 @@ export default {
); );
}, },
//设置转交 //设置转交
getMaking(){ getMaking() {
this.iszhidanBox = false; this.iszhidanBox = false;
this.makeAdocument(1) this.makeAdocument(1)
}, },
// 制作单据 // 制作单据
makeAdocument( num,StandardCurrencyName ) { makeAdocument(num, StandardCurrencyName) {
let type = 0 let type = 0
if(num==3){ if (num == 3) {
type = 2 type = 2
}else{ } else {
type = num type = num
} }
this.BillMakingMsg.OtherType = 71; this.BillMakingMsg.OtherType = 71;
...@@ -620,61 +557,63 @@ export default { ...@@ -620,61 +557,63 @@ export default {
query query
}); });
}, },
resetPageIndex(){ // 重置页码 resetPageIndex() { // 重置页码
this.msg.pageIndex=1; this.msg.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
this.getPageList() this.getPageList()
}, },
getPageList(){ // 获取列表数据 getPageList() { // 获取列表数据
this.loading= true; this.loading = true;
this.apipost('Financial_post_GetFinanceHandFeeList',this.msg,res=>{ this.apipost('Financial_post_GetFinanceHandFeeList', this.msg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data let data = res.data.data
this.total = 0; this.total = 0;
this.totalYB = 0 this.totalYB = 0
this.totalBW = 0 this.totalBW = 0
this.totalBW2 = 0 this.totalBW2 = 0
this.DataList = data; this.DataList = data;
this.DataList.forEach(x=>{ this.DataList.forEach(x => {
this.totalYB+=x.OriginalMoney this.totalYB += x.OriginalMoney
if(x.HandFeeIncomeFrId){ if (x.HandFeeIncomeFrId) {
this.totalBW+=x.OriginalMoney this.totalBW += x.OriginalMoney
}else{ } else {
this.totalBW2+=x.OriginalMoney this.totalBW2 += x.OriginalMoney
} }
this.total+=x.Money this.total += x.Money
}) })
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);
} }
},err=>{}) }, err => {})
}, },
method5() { method5() {
let msg = JSON.parse(JSON.stringify(this.msg)) let msg = JSON.parse(JSON.stringify(this.msg))
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
msg.EmployeeId = userInfo.EmployeeId msg.EmployeeId = userInfo.EmployeeId
this.GetLocalFile("Financial_post_GetFinanceHandFeeListToExcel", msg,"手配费用单据.xls"); this.GetLocalFile("Financial_post_GetFinanceHandFeeListToExcel", msg, "手配费用单据.xls");
} , },
FinancialFlowTemplate_post_GetStatusList(){ // 获取审核状态枚举 FinancialFlowTemplate_post_GetStatusList() { // 获取审核状态枚举
this.apipost('FinancialFlowTemplate_post_GetStatusList',{}, res => { this.apipost('FinancialFlowTemplate_post_GetStatusList', {}, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.StatusList = res.data.data; this.StatusList = res.data.data;
} }
}, err => {}) }, err => {})
}, },
getAccountList(i,t){ //收款账户 getAccountList(i, t) { //收款账户
let accountList = []; let accountList = [];
if(t==1){ // 银行 if (t == 1) { // 银行
this.apipost('bankaccount_post_GetList',{TypeId:i}, res => { this.apipost('bankaccount_post_GetList', {
if(res.data.resultCode == 1) { TypeId: i
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ data.forEach(x => {
let obj = { let obj = {
ID:x.ID, ID: x.ID,
Name:x.Alias, Name: x.Alias,
Nom:0, Nom: 0,
} }
accountList.push(obj) accountList.push(obj)
}) })
...@@ -682,21 +621,21 @@ export default { ...@@ -682,21 +621,21 @@ export default {
} }
}, err => {}) }, err => {})
} }
if(t==2){ //平台账户 if (t == 2) { //平台账户
let msg = { let msg = {
BackId:0, BackId: 0,
TypeId:i, TypeId: i,
BranchId:-1, BranchId: -1,
Alias:'' Alias: ''
} }
this.apipost('BankAccount_post_GetPlatformList',msg, res => { this.apipost('BankAccount_post_GetPlatformList', msg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ data.forEach(x => {
let obj = { let obj = {
ID:x.ID, ID: x.ID,
Name:x.Alias, Name: x.Alias,
Nom:x.PlatformNo Nom: x.PlatformNo
} }
accountList.push(obj) accountList.push(obj)
}) })
...@@ -704,20 +643,20 @@ export default { ...@@ -704,20 +643,20 @@ export default {
} }
}, err => {}) }, err => {})
} }
if(t==3){ //现金账户 if (t == 3) { //现金账户
let msg = { let msg = {
TypeId:i, TypeId: i,
BranchId:-1, BranchId: -1,
Alias:'' Alias: ''
} }
this.apipost('BankAccount_post_GetCashAccountList',msg, res => { this.apipost('BankAccount_post_GetCashAccountList', msg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ data.forEach(x => {
let obj = { let obj = {
ID:x.ID, ID: x.ID,
Name:x.Alias, Name: x.Alias,
Nom:0 Nom: 0
} }
accountList.push(obj) accountList.push(obj)
}) })
...@@ -725,20 +664,20 @@ export default { ...@@ -725,20 +664,20 @@ export default {
} }
}, err => {}) }, err => {})
} }
if(t==4){ //资金池账户 if (t == 4) { //资金池账户
let msg = { let msg = {
TypeId:i, TypeId: i,
BranchId:-1, BranchId: -1,
Alias:'' Alias: ''
} }
this.apipost('BankAccount_post_GetCashPoolList',msg, res => { this.apipost('BankAccount_post_GetCashPoolList', msg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
data.forEach(x=>{ data.forEach(x => {
let obj = { let obj = {
ID:x.ID, ID: x.ID,
Name:x.Alias, Name: x.Alias,
Nom:0 Nom: 0
} }
accountList.push(obj) accountList.push(obj)
}) })
...@@ -748,25 +687,29 @@ export default { ...@@ -748,25 +687,29 @@ export default {
} }
}, },
getCompanyList(){ //获取公司列表 getCompanyList() { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ this.apipost('admin_get_BranchGetList', this.getCompanyMsg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.CompanyList=res.data.data; this.CompanyList = res.data.data;
}else{} } else {}
},err=>{}) }, err => {})
}, },
financeinfo_post_GetCostTypeList(){ // 费用类型 financeinfo_post_GetCostTypeList() { // 费用类型
this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{ this.apipost('financeinfo_post_GetCostTypeList', {
if(res.data.resultCode==1){ Name: '',
type: 0,
DepartIDs: this.DepartIDs
}, res => {
if (res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data; this.GetCostTypeList = res.data.data;
}else{ } else {
} }
},err=>{}) }, err => {})
}, },
timeAdd(t){ // 日期格式 timeAdd(t) { // 日期格式
if(t==1){ //制单日期 if (t == 1) { //制单日期
if(!this.productionDate){ if (!this.productionDate) {
this.msg.sDate = ''; this.msg.sDate = '';
this.msg.eDate = ''; this.msg.eDate = '';
return return
...@@ -774,16 +717,17 @@ export default { ...@@ -774,16 +717,17 @@ export default {
this.msg.sDate = this.productionDate[0]; this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1]; this.msg.eDate = this.productionDate[1];
} }
if(t==2){ //审批日期 if (t == 2) { //审批日期
if(!this.approvalDate){ if (!this.approvalDate) {
this.dateStart = ''; this.dateStart = '';
this.dateEnd = ''; this.dateEnd = '';
return return
} }
this.dateStart = this.approvalDate[0]; this.dateStart = this.approvalDate[0];
this.dateEnd = this.approvalDate[1]; this.dateEnd = this.approvalDate[1];
}if(t==3){ //交易日期 }
if(!this.transactionDate){ if (t == 3) { //交易日期
if (!this.transactionDate) {
this.msg.sTradeDate = ''; this.msg.sTradeDate = '';
this.msg.eTradeDate = ''; this.msg.eTradeDate = '';
return return
...@@ -791,8 +735,8 @@ export default { ...@@ -791,8 +735,8 @@ export default {
this.msg.sTradeDate = this.transactionDate[0]; this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1]; this.msg.eTradeDate = this.transactionDate[1];
} }
if(t==4){ //发团日期 if (t == 4) { //发团日期
if(!this.missionDate){ if (!this.missionDate) {
this.dateStart = ''; this.dateStart = '';
this.dateEnd = ''; this.dateEnd = '';
return return
...@@ -803,5 +747,6 @@ export default { ...@@ -803,5 +747,6 @@ export default {
}, },
} }
} }
</script> </script>
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