Commit 8cc1a0e8 authored by zhengke's avatar zhengke

修改

parent 768fbdec
<template> <template>
<div class="flexOne page_PlatformAccount" style="height:100%"> <div class="flexOne page_PlatformAccount" style="height:100%">
<div class="query-box" style="padding:0 0 10px 0 "> <div class="query-box" style="padding:0 0 10px 0 ">
<ul>
<div style="text-align: right"> <li>
<input <em>账户别名</em>&nbsp;
type="button" <el-input v-model="msg.Alias" @keyup.enter.native="getList()"></el-input>
class="normalBtn" </li>
value="查询" <li>
@click="" <em>校区</em>&nbsp;
> <el-select filterable v-model="msg.RB_Branch_Id">
<input <el-option label="不限" value="-1"></el-option>
type="button" <el-option
class="normalBtn" v-for="item in CompanyList"
:value="$t('pub.addBtn')" :label="item.SName"
@click="addShow=true,text=$t('pub.addBtn'),ed=false" :value="item.SId"
> :key="item.SId"
></el-option>
</el-select>
</li>
<li>
<em>开户人</em>&nbsp;
<el-input v-model="msg.Accountholder" @keyup.enter.native="getList()"></el-input>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList()">
<input type="button" class="normalBtn" :value="$t('pub.addBtn')"
@click="addShow=true,text=$t('pub.addBtn'),ed=false">
<input type="button" class="normalBtn" @click="downMuban()" :value="$t('visa.v_daochu')"> <input type="button" class="normalBtn" @click="downMuban()" :value="$t('visa.v_daochu')">
</div> </li>
<div> </ul>
<div>
<em>账户:</em>
<el-input v-model="msg.Alias" width="200px"></el-input>
</div>
</div>
</div> </div>
<!-- <v-table--> <!-- <v-table-->
<!-- v-if="isReady"--> <!-- v-if="isReady"-->
<!-- is-horizontal-resize--> <!-- is-horizontal-resize-->
<!-- column-width-drag--> <!-- column-width-drag-->
<!-- style="width:100%;"--> <!-- style="width:100%;"-->
<!-- :columns="columns"--> <!-- :columns="columns"-->
<!-- :table-data="DataList"--> <!-- :table-data="DataList"-->
<!-- :filter-method="filterMethod"--> <!-- :filter-method="filterMethod"-->
<!-- :total="total"--> <!-- :total="total"-->
<!-- :pageSize="msg.pageSize"--> <!-- :pageSize="msg.pageSize"-->
<!-- :pageIndex="msg.pageIndex"--> <!-- :pageIndex="msg.pageIndex"-->
<!-- :handleCurrentChange="handleCurrentChanges"--> <!-- :handleCurrentChange="handleCurrentChanges"-->
<!-- :multiple-sort="multipleSort"--> <!-- :multiple-sort="multipleSort"-->
<!-- :is-loading="loading"--> <!-- :is-loading="loading"-->
<!-- sort-always--> <!-- sort-always-->
<!-- @sort-change="sortChange"--> <!-- @sort-change="sortChange"-->
<!-- @on-custom-comp='customCompFunc'--> <!-- @on-custom-comp='customCompFunc'-->
<!-- :row-click="rowClick"--> <!-- :row-click="rowClick"-->
<!-- ></v-table>--> <!-- ></v-table>-->
<el-table <el-table :data="DataList" border style="width: 100%;font-size: 12px">
:data="DataList"
border
style="width: 100%;font-size: 12px">
<el-table-column prop="Alias" label="账户" width="100"></el-table-column> <el-table-column prop="Alias" label="账户" width="100"></el-table-column>
<el-table-column prop="allName" label="校区" width="150"></el-table-column> <el-table-column prop="allName" label="校区" width="150"></el-table-column>
<el-table-column prop="Accountholder" label="开户人"></el-table-column> <el-table-column prop="Accountholder" label="开户人"></el-table-column>
<el-table-column prop="Initialbalance" label="账户余额"> <el-table-column prop="Initialbalance" label="账户余额">
<template slot-scope="scope"> <template slot-scope="scope">
<span style='color:red;font-weight:bold' v-if="scope.row.Initialbalance>=scope.row.RiskLimitMoney&&scope.row.Initialbalance!=0"> <span style='color:red;font-weight:bold'
v-if="scope.row.Initialbalance>=scope.row.RiskLimitMoney&&scope.row.Initialbalance!=0">
{{scope.row.Initialbalance?scope.row.Initialbalance.toFixed(2):0}} <span style="margin-left:12px">超限</span> {{scope.row.Initialbalance?scope.row.Initialbalance.toFixed(2):0}} <span style="margin-left:12px">超限</span>
</span> </span>
<span style='color:red;font-weight:bold' v-else>{{scope.row.Initialbalance?scope.row.Initialbalance.toFixed(2):0}}</span> <span style='color:red;font-weight:bold'
v-else>{{scope.row.Initialbalance?scope.row.Initialbalance.toFixed(2):0}}</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -71,7 +75,8 @@ ...@@ -71,7 +75,8 @@
<el-table-column prop="Royalty" label="平台使用费"></el-table-column> <el-table-column prop="Royalty" label="平台使用费"></el-table-column>
<el-table-column prop="HaveContract" label="合同"> <el-table-column prop="HaveContract" label="合同">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{'color':scope.row.HaveContract==0?'red':'blue'}">{{scope.row.HaveContract==0?'无合同':'有合同'}} </span> <span :style="{'color':scope.row.HaveContract==0?'red':'blue'}">{{scope.row.HaveContract==0?'无合同':'有合同'}}
</span>
<span>{{scope.row.ContraceDateRange?scope.row.ContraceDateRange:''}} </span> <span>{{scope.row.ContraceDateRange?scope.row.ContraceDateRange:''}} </span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -81,8 +86,10 @@ ...@@ -81,8 +86,10 @@
<el-table-column prop="Remark" label="操作"> <el-table-column prop="Remark" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-button type="primary" size='mini' icon="el-icon-edit" circle @click="customCompFunc(scope.row,1)"></el-button> <el-button type="primary" size='mini' icon="el-icon-edit" circle @click="customCompFunc(scope.row,1)">
<el-button type="danger" size='mini' icon="el-icon-delete" circle @click="customCompFunc(scope.row,2)"></el-button> </el-button>
<el-button type="danger" size='mini' icon="el-icon-delete" circle @click="customCompFunc(scope.row,2)">
</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -93,25 +100,12 @@ ...@@ -93,25 +100,12 @@
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p> <p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
</el-col> </el-col>
<el-col :span="4" class="_add_saveBtn"> <el-col :span="4" class="_add_saveBtn">
<button <button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button>
type="button" <button class="hollowFixedBtn" type="button"
class="normalBtn" @click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
@click="submitForm('addMsg',1)"
>{{$t('pub.saveBtn')}}</button>
<button
class="hollowFixedBtn"
type="button"
@click="cancelEdit(),resetForm('addMsg'),addShow=false"
>{{$t('pub.cancelBtn')}}</button>
</el-col> </el-col>
</el-row> </el-row>
<el-form <el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">
class="_info_box clearfix"
:model="addMsg"
ref="addMsg"
:rules="rules"
label-width="110px"
>
<el-row> <el-row>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')" prop="Alias"> <el-form-item :label="$t('fnc.accBming')" prop="Alias">
...@@ -122,25 +116,16 @@ ...@@ -122,25 +116,16 @@
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')" prop="TypeId"> <el-form-item :label="$t('fnc.accType')" prop="TypeId">
<el-select filterable v-model="addMsg.TypeId" class> <el-select filterable v-model="addMsg.TypeId" class>
<el-option <el-option v-for="item in AccountTypeList" :label="item.Name" :value="item.ID" :key="item.ID">
v-for="item in AccountTypeList" </el-option>
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.ptjigou')" prop="BackId"> <el-form-item :label="$t('fnc.ptjigou')" prop="BackId">
<el-select filterable v-model="addMsg.BackId" class> <el-select filterable v-model="addMsg.BackId" class>
<el-option <el-option v-for="item in FinancialList" v-if="item.Type == 1" :label="item.Name" :value="item.ID"
v-for="item in FinancialList" :key="item.ID"></el-option>
v-if="item.Type == 1"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -210,25 +195,16 @@ ...@@ -210,25 +195,16 @@
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhbizhong')" prop="CurrencyId"> <el-form-item :label="$t('fnc.zhbizhong')" prop="CurrencyId">
<el-select filterable v-model="addMsg.CurrencyId" class> <el-select filterable v-model="addMsg.CurrencyId" class>
<el-option <el-option v-for="item in financeinfoList" :label="item.Name" :value="item.ID" :key="item.ID">
v-for="item in financeinfoList" </el-option>
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35" class="_BranchIdS"> <el-col :span="4" :gutter="35" class="_BranchIdS">
<el-form-item label="校区" prop="BranchIdS"> <el-form-item label="校区" prop="BranchIdS">
<el-select filterable v-model="addMsg.BranchIdS" collapse-tags > <el-select filterable v-model="addMsg.BranchIdS" collapse-tags>
<el-option <el-option v-for="item in CompanyList" :label="item.SName" :value="item.SId" :key="item.SId"
v-for="item in CompanyList" :disabled="item.disabled"></el-option>
:label="item.SName"
:value="item.SId"
:key="item.SId"
:disabled="item.disabled"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -244,19 +220,9 @@ ...@@ -244,19 +220,9 @@
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.bdyhzhanghu')" prop="BindBankID"> <el-form-item :label="$t('fnc.bdyhzhanghu')" prop="BindBankID">
<el-select <el-select v-model="addMsg.BindBankID" filterable remote :placeholder="$t('fnc.qsryhzhgjc')"
v-model="addMsg.BindBankID" :remote-method="remoteQueryBankMethod" :loading="remoteLoading" class="minmargin-box">
filterable <el-option v-for="item in bankList" :key="item.ID" :label="item.Alias" :value="item.ID">
remote
:placeholder="$t('fnc.qsryhzhgjc')"
:remote-method="remoteQueryBankMethod"
:loading="remoteLoading"
class="minmargin-box">
<el-option
v-for="item in bankList"
:key="item.ID"
:label="item.Alias"
:value="item.ID">
<span style="float: left">{{ item.Alias }}</span> <span style="float: left">{{ item.Alias }}</span>
<span class="right-tag">{{ item.BranchName }}</span> <span class="right-tag">{{ item.BranchName }}</span>
</el-option> </el-option>
...@@ -275,8 +241,7 @@ ...@@ -275,8 +241,7 @@
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="期初应用日期"> <el-form-item label="期初应用日期">
<el-date-picker type="date" v-model="addMsg.BeginTimeStr" <el-date-picker type="date" v-model="addMsg.BeginTimeStr" value-format="yyyy-MM-dd"></el-date-picker>
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -289,31 +254,20 @@ ...@@ -289,31 +254,20 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div <div class="_vMG_edit _scrollbar" v-if="addCuren == false" :class="addCuren==false?'edHeight_t':''">
class="_vMG_edit _scrollbar"
v-if="addCuren == false"
:class="addCuren==false?'edHeight_t':''"
>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<p class="_tit">{{$t('fnc.qmtiaohui')}}</p> <p class="_tit">{{$t('fnc.qmtiaohui')}}</p>
</el-col> </el-col>
<el-col :span="4" class="_add_saveBtn"> <el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button> <button type="button" class="normalBtn"
<button @click="submitForm('SetProfitLossMsg',2)">{{$t('fnc.qrtijiao')}}</button>
class="hollowFixedBtn" <button class="hollowFixedBtn" type="button"
type="button" @click="cancelEdit(),resetForm('SetProfitLossMsg')">{{$t('pub.cancelBtn')}}</button>
@click="cancelEdit(),resetForm('SetProfitLossMsg')"
>{{$t('pub.cancelBtn')}}</button>
</el-col> </el-col>
</el-row> </el-row>
<el-form <el-form class="_info_box clearfix" :model="SetProfitLossMsg" ref="SetProfitLossMsg" :rules="rules"
class="_info_box clearfix" label-width="100px">
:model="SetProfitLossMsg"
ref="SetProfitLossMsg"
:rules="rules"
label-width="100px"
>
<el-row> <el-row>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.sqhuilv')"> <el-form-item :label="$t('fnc.sqhuilv')">
...@@ -327,24 +281,14 @@ ...@@ -327,24 +281,14 @@
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.xzqishu')" prop="TermNum"> <el-form-item :label="$t('fnc.xzqishu')" prop="TermNum">
<el-date-picker <el-date-picker v-model="SetProfitLossMsg.TermNum" value-format="yyyy-MM-dd" type="month" class="_wAuto"
v-model="SetProfitLossMsg.TermNum" :placeholder="$('admin.admin_choDate')"></el-date-picker>
value-format="yyyy-MM-dd"
type="month"
class="_wAuto"
:placeholder="$('admin.admin_choDate')"
></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35" v-if="costType.length"> <el-col :span="4" :gutter="35" v-if="costType.length">
<el-form-item :label="$t('fnc.fyleixing')" prop="CostTypeID"> <el-form-item :label="$t('fnc.fyleixing')" prop="CostTypeID">
<el-select filterable v-model="SetProfitLossMsg.CostTypeID"> <el-select filterable v-model="SetProfitLossMsg.CostTypeID">
<el-option <el-option v-for="item in costType" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
v-for="item in costType"
:label="item.Name"
:value="item.ID"
:key="item.ID"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -368,22 +312,22 @@ ...@@ -368,22 +312,22 @@
</div> </div>
</template> </template>
<script> <script>
import Vue from 'vue' import Vue from 'vue'
import { import {
getSchoolPage getSchoolDropdown
} from '../../api/school/index' } from '../../api/school/index'
export default { export default {
data() { data() {
return { return {
columns: [], columns: [],
remoteLoading:false, remoteLoading: false,
total: 0, total: 0,
tableData: [], tableData: [],
bankList:[], bankList: [],
isReady: false, isReady: false,
multipleSort: false, multipleSort: false,
loading: true, loading: true,
CompanySelect:[], CompanySelect: [],
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
...@@ -413,17 +357,17 @@ export default { ...@@ -413,17 +357,17 @@ export default {
OutCharge: 0, OutCharge: 0,
InCharge: 0, InCharge: 0,
RiskLowerLimitMoney: "", RiskLowerLimitMoney: "",
SettlementType:'1', SettlementType: '1',
Royalty:0, Royalty: 0,
Bond:0, Bond: 0,
SigningLine:'', SigningLine: '',
Remark:'', Remark: '',
BindBankID:null, BindBankID: null,
HaveContract:'0', HaveContract: '0',
ContraceDateRange:'', ContraceDateRange: '',
AccountStartMoney:0, AccountStartMoney: 0,
AccountStartWBMoney:0, AccountStartWBMoney: 0,
BeginTimeStr:'', BeginTimeStr: '',
}, },
getCompanyMsg: { getCompanyMsg: {
...@@ -447,57 +391,91 @@ export default { ...@@ -447,57 +391,91 @@ export default {
InitTimeFun: "", InitTimeFun: "",
rules: { rules: {
//表单必填验证 //表单必填验证
Alias: [{ required: true, message: this.$t('rule.qsrzhbieming'), trigger: "blur" }], Alias: [{
TypeId: [ required: true,
{ required: true, message: this.$t('rule.qxzzhleixing'), trigger: "change" } message: this.$t('rule.qsrzhbieming'),
], trigger: "blur"
BackId: [ }],
{ required: true, message: this.$t('rule.qxzyhjigou'), trigger: "change" } TypeId: [{
], required: true,
Accountholder: [ message: this.$t('rule.qxzzhleixing'),
{ required: true, message: this.$t('rule.qsrkhuren'), trigger: "blur" } trigger: "change"
], }],
PlatformNo: [ BackId: [{
{ required: true, message: this.$t('rule.qsrptzhanghao'), trigger: "blur" } required: true,
], message: this.$t('rule.qxzyhjigou'),
Commission: [ trigger: "change"
{ required: true, message: this.$t('rule.qsrptsxufei'), trigger: "blur" }, }],
Accountholder: [{
required: true,
message: this.$t('rule.qsrkhuren'),
trigger: "blur"
}],
PlatformNo: [{
required: true,
message: this.$t('rule.qsrptzhanghao'),
trigger: "blur"
}],
Commission: [{
required: true,
message: this.$t('rule.qsrptsxufei'),
trigger: "blur"
},
{ {
pattern: /^\d+(\.\d{0,8})?$/, pattern: /^\d+(\.\d{0,8})?$/,
message: this.$t('rule.qsrzqxufei') message: this.$t('rule.qsrzqxufei')
} }
], ],
BranchIdS: [ BranchIdS: [{
{ required: true, message: this.$t('rule.qszssgongsi'), trigger: "change" } required: true,
], message: this.$t('rule.qszssgongsi'),
CurrencyId: [ trigger: "change"
{ required: true, message: this.$t('rule.qxzzhbizhong'), trigger: "change" } }],
], CurrencyId: [{
Initialbalance: [ required: true,
{ required: true, message: this.$t('rule.qsrcsyue'), trigger: "blur" }, message: this.$t('rule.qxzzhbizhong'),
trigger: "change"
}],
Initialbalance: [{
required: true,
message: this.$t('rule.qsrcsyue'),
trigger: "blur"
},
{ {
pattern: /^(\-|\+?)\d+(\.\d+)?$/, pattern: /^(\-|\+?)\d+(\.\d+)?$/,
message: this.$t('rule.qsrzqdyue') message: this.$t('rule.qsrzqdyue')
} }
], ],
OutCharge: [ OutCharge: [{
{ required: true, message: this.$t('rule.szfzeren'), trigger: "change" } required: true,
], message: this.$t('rule.szfzeren'),
InCharge: [ trigger: "change"
{ required: true, message: this.$t('rule.fkfzeren'), trigger: "change" } }],
], InCharge: [{
CostTypeID: [ required: true,
{ required: true, message: this.$t('rule.qxzfyleixing'), trigger: "change" } message: this.$t('rule.fkfzeren'),
], trigger: "change"
Royalty:[ }],
{ required: true, message: this.$t('rule.qtxptsyongfei'), trigger: "change" } CostTypeID: [{
], required: true,
Bond:[ message: this.$t('rule.qxzfyleixing'),
{ required: true, message: this.$t('rule.qtxptbzhengjin'), trigger: "change" } trigger: "change"
], }],
BindBankID:[ Royalty: [{
{ required: true, message: this.$t('rule.qxzbdyinhang'), trigger: "change" } required: true,
] message: this.$t('rule.qtxptsyongfei'),
trigger: "change"
}],
Bond: [{
required: true,
message: this.$t('rule.qtxptbzhengjin'),
trigger: "change"
}],
BindBankID: [{
required: true,
message: this.$t('rule.qxzbdyinhang'),
trigger: "change"
}]
}, },
addCuren: true, addCuren: true,
ed: false, ed: false,
...@@ -532,49 +510,44 @@ export default { ...@@ -532,49 +510,44 @@ export default {
Source: 2, Source: 2,
CostTypeID: "" CostTypeID: ""
}, },
costType: [], costType: []
schoolMsg:{
pageIndex: 1,
pageSize: 9999,
rowsPerPage: 12,
SName: "",
Status: '-1'
}
}; };
}, },
methods: { methods: {
rowClick(rowIndex,rowData,column){ rowClick(rowIndex, rowData, column) {
let path='PlatformAccDetail'; let path = 'PlatformAccDetail';
if(column.title=="账户余额"){ if (column.title == "账户余额") {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
TypeId: rowData.TypeId, TypeId: rowData.TypeId,
ID:rowData.ID, ID: rowData.ID,
blank: "y", blank: "y",
} }
}); });
} }
}, },
remoteQueryBankMethod(query){ remoteQueryBankMethod(query) {
if(query!=''){ if (query != '') {
this.remoteLoading=true this.remoteLoading = true
this.apipost('bankbase_get_searchbyalias',{query},x=>{ this.apipost('bankbase_get_searchbyalias', {
this.remoteLoading=false query
this.bankList=x.data.data }, x => {
this.remoteLoading = false
this.bankList = x.data.data
}) })
} }
}, },
customCompFunc(params,index){ customCompFunc(params, index) {
console.log(params) console.log(params)
if (index == '2'){ if (index == '2') {
this.financeinfoRemove(params.ID,params.Alias) this.financeinfoRemove(params.ID, params.Alias)
}else if (index =='1'){ } else if (index == '1') {
this.editCurency(params.ID) this.editCurency(params.ID)
this.text= this.$t('pub.updateMsg') this.text = this.$t('pub.updateMsg')
this.addShow=true this.addShow = true
this.addCuren=true this.addCuren = true
} }
}, },
initColums() { initColums() {
...@@ -632,14 +605,11 @@ export default { ...@@ -632,14 +605,11 @@ export default {
isResize: true, isResize: true,
width: 80, width: 80,
orderBy: "desc", orderBy: "desc",
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function (rowData, rowIndex, pagingIndex, field) {
if(rowData["Initialbalance"]>=rowData["RiskLimitMoney"] && rowData["Initialbalance"]!=0) if (rowData["Initialbalance"] >= rowData["RiskLimitMoney"] && rowData["Initialbalance"] != 0) {
{
let text = that.$t('fnc.chaoxian') let text = that.$t('fnc.chaoxian')
return `<span style='color:red;font-weight:bold'>${rowData["Initialbalance"].toFixed(2)}</span><span style='color:red;margin-left:12px;'>${text}</span>`; return `<span style='color:red;font-weight:bold'>${rowData["Initialbalance"].toFixed(2)}</span><span style='color:red;margin-left:12px;'>${text}</span>`;
} } else {
else
{
return rowData["Initialbalance"].toFixed(2) return rowData["Initialbalance"].toFixed(2)
} }
} }
...@@ -651,16 +621,15 @@ export default { ...@@ -651,16 +621,15 @@ export default {
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
width: 80, width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function (rowData, rowIndex, pagingIndex, field) {
let text = that.$t('hotel.hotel_people') let text = that.$t('hotel.hotel_people')
return rowData.SettlementType == 1 return rowData.SettlementType == 1 ?
? rowData.Commission.toFixed(2) + "%" rowData.Commission.toFixed(2) + "%" :
: rowData.Commission + "/" + text; rowData.Commission + "/" + text;
}, },
filterMultiple: true, filterMultiple: true,
result: [], result: [],
filters: [ filters: [{
{
label: that.$t('fnc.jyebfenbi'), label: that.$t('fnc.jyebfenbi'),
value: "1" value: "1"
}, },
...@@ -679,7 +648,7 @@ export default { ...@@ -679,7 +648,7 @@ export default {
isResize: true, isResize: true,
width: 80, width: 80,
orderBy: "", orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function (rowData, rowIndex, pagingIndex, field) {
return rowData.Royalty.toFixed(2); return rowData.Royalty.toFixed(2);
} }
}; };
...@@ -690,7 +659,7 @@ export default { ...@@ -690,7 +659,7 @@ export default {
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
width: 80, width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function (rowData, rowIndex, pagingIndex, field) {
let whetong = that.$t('fnc.whetong') let whetong = that.$t('fnc.whetong')
let yhetong = that.$t('fnc.yhetong') let yhetong = that.$t('fnc.yhetong')
return `<span style='color:${ return `<span style='color:${
...@@ -703,8 +672,7 @@ export default { ...@@ -703,8 +672,7 @@ export default {
}, },
filterMultiple: true, filterMultiple: true,
result: [], result: [],
filters: [ filters: [{
{
label: that.$t('fnc.whetong'), label: that.$t('fnc.whetong'),
value: "1" value: "1"
}, },
...@@ -742,7 +710,7 @@ export default { ...@@ -742,7 +710,7 @@ export default {
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
width: 80, width: 80,
formatter: function(rowData, rowIndex, pagingIndex, field) { formatter: function (rowData, rowIndex, pagingIndex, field) {
return `<span style='color:gray'>${rowData.Remark?rowData.Remark:''}</span>`; return `<span style='color:gray'>${rowData.Remark?rowData.Remark:''}</span>`;
}, },
}; };
...@@ -752,7 +720,7 @@ export default { ...@@ -752,7 +720,7 @@ export default {
columnAlign: "left", columnAlign: "left",
width: 80, width: 80,
isResize: false, isResize: false,
componentName:'table-operation' componentName: 'table-operation'
}; };
this.columns = []; this.columns = [];
this.columns.push(Alias); this.columns.push(Alias);
...@@ -782,8 +750,8 @@ export default { ...@@ -782,8 +750,8 @@ export default {
}, },
filterMethod(filters) { filterMethod(filters) {
this.msg.Alias = filters.Alias; this.msg.Alias = filters.Alias;
if(filters.allName=='__all__'){ if (filters.allName == '__all__') {
filters.allName='-1' filters.allName = '-1'
} }
this.msg.RB_Branch_Id = filters.allName; this.msg.RB_Branch_Id = filters.allName;
this.msg.SettlementType = this.msg.SettlementType =
...@@ -833,13 +801,13 @@ export default { ...@@ -833,13 +801,13 @@ export default {
}, },
getTemplateCostTypeList(t) { getTemplateCostTypeList(t) {
this.apipost( this.apipost(
"financeinfo_post_GetCostTypeList", "financeinfo_post_GetCostTypeList", {
{ Type: t }, Type: t
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.costType = res.data.data; this.costType = res.data.data;
} else { } else {}
}
}, },
err => {} err => {}
); );
...@@ -848,8 +816,9 @@ export default { ...@@ -848,8 +816,9 @@ export default {
if (query !== "") { if (query !== "") {
this.loadingPeople = true; this.loadingPeople = true;
this.apipost( this.apipost(
"admin_Get_Chat_All_SelectEmpName", "admin_Get_Chat_All_SelectEmpName", {
{ EmName: query }, EmName: query
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.showEmployeeList = res.data.data; this.showEmployeeList = res.data.data;
...@@ -866,8 +835,9 @@ export default { ...@@ -866,8 +835,9 @@ export default {
if (query !== "") { if (query !== "") {
this.loadingPeople = true; this.loadingPeople = true;
this.apipost( this.apipost(
"admin_Get_Chat_All_SelectEmpName", "admin_Get_Chat_All_SelectEmpName", {
{ EmName: query }, EmName: query
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.showEmployeeList2 = res.data.data; this.showEmployeeList2 = res.data.data;
...@@ -901,13 +871,13 @@ export default { ...@@ -901,13 +871,13 @@ export default {
getfinanceinfoList() { getfinanceinfoList() {
//获取币种列表 //获取币种列表
this.apipost( this.apipost(
"financeinfo_post_GetList", "financeinfo_post_GetList", {
{ Name: "" }, Name: ""
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.financeinfoList = res.data.data; this.financeinfoList = res.data.data;
} else { } else {}
}
}, },
err => {} err => {}
); );
...@@ -915,20 +885,21 @@ export default { ...@@ -915,20 +885,21 @@ export default {
getFinancialList() { getFinancialList() {
//获取机构列表 //获取机构列表
this.apipost( this.apipost(
"FinancialInstitutions_post_GetList", "FinancialInstitutions_post_GetList", {
{ Type: -1 }, Type: -1
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.FinancialList = res.data.data; this.FinancialList = res.data.data;
} else { } else {}
}
}, },
err => {} err => {}
); );
}, },
getCompanyList() { getCompanyList() {
getSchoolPage(this.schoolMsg).then(res => { getSchoolDropdown({}).then(res => {
this.CompanyList = res.Data.PageData; this.CompanyList = res.Data;
console.log(res,'数据');
}).catch(() => { }).catch(() => {
}) })
...@@ -936,8 +907,9 @@ export default { ...@@ -936,8 +907,9 @@ export default {
editCurency(id) { editCurency(id) {
// 修改根据ID 获取信息 // 修改根据ID 获取信息
this.apipost( this.apipost(
"BankAccount_post_GetPlatform", "BankAccount_post_GetPlatform", {
{ ID: id }, ID: id
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data; let data = res.data.data;
...@@ -946,8 +918,8 @@ export default { ...@@ -946,8 +918,8 @@ export default {
this.remoteMethod2(data.OutemName); this.remoteMethod2(data.OutemName);
this.addMsg = data; this.addMsg = data;
this.addMsg.HaveContract = this.addMsg.HaveContract.toString() this.addMsg.HaveContract = this.addMsg.HaveContract.toString()
this.addMsg.SettlementType =this.addMsg.SettlementType.toString() this.addMsg.SettlementType = this.addMsg.SettlementType.toString()
this.addMsg.BindBankID = this.addMsg.BindBankID==-1?null:this.addMsg.BindBankID this.addMsg.BindBankID = this.addMsg.BindBankID == -1 ? null : this.addMsg.BindBankID
this.remoteQueryBankMethod(this.addMsg.BindBankName) this.remoteQueryBankMethod(this.addMsg.BindBankName)
} else { } else {
this.tips(res.data.message, "error"); this.tips(res.data.message, "error");
...@@ -974,9 +946,9 @@ export default { ...@@ -974,9 +946,9 @@ export default {
OutCharge: 0, OutCharge: 0,
InCharge: 0, InCharge: 0,
RiskLowerLimitMoney: "", RiskLowerLimitMoney: "",
AccountStartMoney:0, AccountStartMoney: 0,
AccountStartWBMoney:0, AccountStartWBMoney: 0,
BeginTimeStr:'', BeginTimeStr: '',
}; };
this.SetProfitLossMsg = { this.SetProfitLossMsg = {
ID: 0, ID: 0,
...@@ -1002,8 +974,7 @@ export default { ...@@ -1002,8 +974,7 @@ export default {
getAccountTypeList() { getAccountTypeList() {
//获取账户类型(平台账户只能获取对公账户类型) //获取账户类型(平台账户只能获取对公账户类型)
this.apipost( this.apipost(
"AccountType_post_GetList", "AccountType_post_GetList", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.AccountTypeList = res.data.data; this.AccountTypeList = res.data.data;
...@@ -1051,9 +1022,9 @@ export default { ...@@ -1051,9 +1022,9 @@ export default {
}, },
//导出 //导出
downMuban() { downMuban() {
let msg=this.msg; let msg = this.msg;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
msg.UId=userInfo.Id; msg.UId = userInfo.Id;
this.GetLocalFile( this.GetLocalFile(
"BankAccount_post_OutToExcelPlatform", "BankAccount_post_OutToExcelPlatform",
msg, msg,
...@@ -1074,7 +1045,7 @@ export default { ...@@ -1074,7 +1045,7 @@ export default {
ID: 0, ID: 0,
Type: 2, Type: 2,
RB_Branch_Id: this.addMsg.BranchIdS, RB_Branch_Id: this.addMsg.BranchIdS,
RB_BranchName:obj.SName RB_BranchName: obj.SName
}; };
this.addMsg.BranchList.push(msg); this.addMsg.BranchList.push(msg);
...@@ -1098,8 +1069,7 @@ export default { ...@@ -1098,8 +1069,7 @@ export default {
//删除 //删除
this.$confirm( this.$confirm(
this.$t('tips.shifoudui') + "“" + text + "”" + this.$t('tips.zhshanchu'), this.$t('tips.shifoudui') + "“" + text + "”" + this.$t('tips.zhshanchu'),
this.$t('tips.tips'), this.$t('tips.tips'), {
{
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning" type: "warning"
...@@ -1117,8 +1087,9 @@ export default { ...@@ -1117,8 +1087,9 @@ export default {
}, },
deletInstitutions(id) { deletInstitutions(id) {
this.apipost( this.apipost(
"BankAccount_post_RemovePlatform", "BankAccount_post_RemovePlatform", {
{ ID: id }, ID: id
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.innerVisible = false; this.innerVisible = false;
...@@ -1215,13 +1186,18 @@ export default { ...@@ -1215,13 +1186,18 @@ export default {
goUrl(path, id, name, source, CurrencyId) { goUrl(path, id, name, source, CurrencyId) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { id: id, name: name, source: source, CurrencyId: CurrencyId } query: {
id: id,
name: name,
source: source,
CurrencyId: CurrencyId
}
}); });
}, },
InitTime() { InitTime() {
}, },
calcPageSize(itemHeight){ calcPageSize(itemHeight) {
let yuHeight = itemHeight let yuHeight = itemHeight
try { try {
let obj = null let obj = null
...@@ -1231,7 +1207,8 @@ export default { ...@@ -1231,7 +1207,8 @@ export default {
} }
}) })
let dom = obj.offsetHeight let dom = obj.offsetHeight
yuHeight = dom - (obj.querySelector('.v-table-header') ? obj.querySelector('.v-table-header').offsetHeight : 39) - 50 //减去面包屑,减去表格头部,减去分页,减去偏量 yuHeight = dom - (obj.querySelector('.v-table-header') ? obj.querySelector('.v-table-header').offsetHeight :
39) - 50 //减去面包屑,减去表格头部,减去分页,减去偏量
//减去其它同级元素 //减去其它同级元素
obj.childNodes[0].childNodes.forEach(x => { obj.childNodes[0].childNodes.forEach(x => {
if (x.className && x.className.indexOf('v-table-views') == -1) { if (x.className && x.className.indexOf('v-table-views') == -1) {
...@@ -1263,58 +1240,70 @@ export default { ...@@ -1263,58 +1240,70 @@ export default {
this.getfinanceinfoList(); this.getfinanceinfoList();
}, },
created() { created() {
Vue.component('table-operation',{ Vue.component('table-operation', {
template:`<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-edit" circle @click="update(rowData,index)"></el-button><el-button type="danger" size='mini' icon="el-icon-delete" circle @click="deleteRow(rowData,index)"></el-button></div>`, template: `<div style='width:80px;height:40px;background:#fff;text-align:center;position: relative;left:-5px;padding-top: 6px;padding-top:6px;'><el-button type="primary" size='mini' icon="el-icon-edit" circle @click="update(rowData,index)"></el-button><el-button type="danger" size='mini' icon="el-icon-delete" circle @click="deleteRow(rowData,index)"></el-button></div>`,
props:{ props: {
rowData:{ rowData: {
type:Object type: Object
}, },
field:{ field: {
type:String type: String
}, },
index:{ index: {
type:Number type: Number
} }
}, },
methods:{ methods: {
update(){ update() {
let params = {type:'edit',id:this.rowData.ID}; let params = {
this.$emit('on-custom-comp',params); type: 'edit',
id: this.rowData.ID
};
this.$emit('on-custom-comp', params);
}, },
deleteRow(){ deleteRow() {
let params = {type:'delete',id:this.rowData.ID,alias:this.rowData.Alias}; let params = {
this.$emit('on-custom-comp',params); type: 'delete',
id: this.rowData.ID,
alias: this.rowData.Alias
};
this.$emit('on-custom-comp', params);
} }
} }
}) })
} }
}; };
</script> </script>
<style scoped> <style scoped>
@import "css/cssReset.css"; @import "css/cssReset.css";
.page_PlatformAccount .query-box li label {
.page_PlatformAccount .query-box li label {
display: inline-block; display: inline-block;
min-width: 80px; min-width: 80px;
text-align: right; text-align: right;
font-style: normal; font-style: normal;
margin: 0 20px 0 0; margin: 0 20px 0 0;
} }
._scrollbar::-webkit-scrollbar {
._scrollbar::-webkit-scrollbar {
width: 4px; width: 4px;
height: 8px; height: 8px;
} }
._scrollbar::-webkit-scrollbar-thumb {
._scrollbar::-webkit-scrollbar-thumb {
border-radius: 4px; border-radius: 4px;
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9; background: #c9c9c9;
} }
._scrollbar::-webkit-scrollbar-track {
._scrollbar::-webkit-scrollbar-track {
box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px; border-radius: 4px;
background: #ededed; background: #ededed;
} }
.page_PlatformAccount ._vMG_edit {
.page_PlatformAccount ._vMG_edit {
overflow: auto; overflow: auto;
display: none; display: none;
position: fixed; position: fixed;
...@@ -1326,38 +1315,46 @@ export default { ...@@ -1326,38 +1315,46 @@ export default {
padding: 10px; padding: 10px;
/* width: 100%; */ /* width: 100%; */
margin-left: 180px; margin-left: 180px;
} }
.page_PlatformAccount ._vMG_edit ._tit {
.page_PlatformAccount ._vMG_edit ._tit {
padding-left: 10px; padding-left: 10px;
border-left: 3px solid #e95252; border-left: 3px solid #e95252;
font-size: 16px; font-size: 16px;
color: #000000; color: #000000;
} }
.page_PlatformAccount ._vMG_edit ._tit span {
.page_PlatformAccount ._vMG_edit ._tit span {
color: #666666; color: #666666;
font-size: 14px; font-size: 14px;
} }
.cm_content {
.cm_content {
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow-x: auto; overflow-x: auto;
} }
._edHeight {
._edHeight {
height: 400px; height: 400px;
} }
.edHeight {
.edHeight {
display: block !important; display: block !important;
height: 300px; height: 300px;
} }
.edHeight_t {
.edHeight_t {
display: block !important; display: block !important;
height: 152px; height: 152px;
} }
.page_PlatformAccount ._info_box ul li {
.page_PlatformAccount ._info_box ul li {
float: left; float: left;
margin-right: 12px; margin-right: 12px;
} }
.instMg_list_item {
.instMg_list_item {
width: 296px; width: 296px;
height: auto; height: auto;
border-radius: 4px; border-radius: 4px;
...@@ -1367,78 +1364,93 @@ export default { ...@@ -1367,78 +1364,93 @@ export default {
overflow: hidden; overflow: hidden;
margin-right: 15px; margin-right: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }
.instMg_list_item:hover {
.instMg_list_item:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1); box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s; transition: all linear 0.5s;
} }
._tips {
._tips {
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
padding: 15px 0; padding: 15px 0;
} }
._top {
._top {
text-align: center; text-align: center;
height: 50px; height: 50px;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
overflow: hidden; overflow: hidden;
padding: 10px 0; padding: 10px 0;
} }
._top img {
._top img {
height: 100%; height: 100%;
} }
._bt {
._bt {
padding: 20px; padding: 20px;
font-size: 14px; font-size: 14px;
} }
._bt_t {
._bt_t {
border-radius: 4px; border-radius: 4px;
background-color: #47bf8c; background-color: #47bf8c;
color: #ffffff; color: #ffffff;
} }
._bt_t > p {
._bt_t>p {
padding: 10px 0; padding: 10px 0;
text-align: center; text-align: center;
} }
._bt_t > p > span {
._bt_t>p>span {
display: inline-block; display: inline-block;
padding: 3px 10px; padding: 3px 10px;
background-color: #ffa200; background-color: #ffa200;
border-radius: 4px; border-radius: 4px;
} }
._bt_t ._btt_b {
._bt_t ._btt_b {
padding: 14px; padding: 14px;
background-color: #32b37c; background-color: #32b37c;
} }
._bt_t ._btt_b > div:nth-child(1) {
._bt_t ._btt_b>div:nth-child(1) {
display: flex; display: flex;
text-align: center; text-align: center;
padding: 0 0 9px 0; padding: 0 0 9px 0;
} }
._bt_t ._btt_b > div > p {
._bt_t ._btt_b>div>p {
flex: 1; flex: 1;
} }
._bt_t ._btt_b > div:nth-child(1) > p:nth-child(2) {
._bt_t ._btt_b>div:nth-child(1)>p:nth-child(2) {
border-left: 2px solid #4fc794; border-left: 2px solid #4fc794;
max-width: 100%; max-width: 100%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
padding: 0 5px; padding: 0 5px;
} }
.icon-img-ren {
.icon-img-ren {
color: #4fc794; color: #4fc794;
} }
._bt_t ._btt_b .PingFangSC {
._bt_t ._btt_b .PingFangSC {
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
padding: 5px 0; padding: 5px 0;
border: 1px solid rgba(79, 199, 148, 1); border: 1px solid rgba(79, 199, 148, 1);
border-radius: 4px; border-radius: 4px;
width: 162px; width: 162px;
} }
.icon-qiehuan,
.icon-ico-renwuyaoqiu { .icon-qiehuan,
.icon-ico-renwuyaoqiu {
background-color: #e7e7e7; background-color: #e7e7e7;
border-radius: 50%; border-radius: 50%;
color: #999999; color: #999999;
...@@ -1449,33 +1461,40 @@ export default { ...@@ -1449,33 +1461,40 @@ export default {
text-align: center; text-align: center;
line-height: 19px; line-height: 19px;
cursor: pointer; cursor: pointer;
} }
.icon-ico-renwuyaoqiu {
.icon-ico-renwuyaoqiu {
font-size: 10px; font-size: 10px;
} }
.icon-qiehuan:hover,
.icon-ico-renwuyaoqiu:hover { .icon-qiehuan:hover,
.icon-ico-renwuyaoqiu:hover {
background-color: #e95252; background-color: #e95252;
color: white; color: white;
} }
._bt_b {
._bt_b {
padding: 15px 0 0 0; padding: 15px 0 0 0;
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
} }
._bt_b > p {
._bt_b>p {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-bottom: 10px; padding-bottom: 10px;
} }
._bt_b > p span._name {
._bt_b>p span._name {
color: #333333; color: #333333;
font-size: 12px; font-size: 12px;
} }
._btn {
._btn {
padding: 20px 30px 0 30px; padding: 20px 30px 0 30px;
text-align: center; text-align: center;
} }
._btn span {
._btn span {
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
background-color: #e7e7e7; background-color: #e7e7e7;
...@@ -1484,34 +1503,41 @@ export default { ...@@ -1484,34 +1503,41 @@ export default {
border-radius: 14px; border-radius: 14px;
cursor: pointer; cursor: pointer;
margin-left: 10px; margin-left: 10px;
} }
._btn span:hover {
._btn span:hover {
background-color: #e95252; background-color: #e95252;
color: white; color: white;
} }
.fc_green {
.fc_green {
color: #47bf8c !important; color: #47bf8c !important;
} }
.fc_red {
.fc_red {
color: #e95252 !important; color: #e95252 !important;
} }
.page_PlatformAccount .PingFangSC,
._bold, .page_PlatformAccount .PingFangSC,
.PingFangCom { ._bold,
.PingFangCom {
font-weight: bold; font-weight: bold;
} }
._no_bold {
._no_bold {
font-weight: normal; font-weight: normal;
} }
._max_wd {
._max_wd {
max-width: 80px; max-width: 80px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
} }
._bt_t .PingFangCom {
._bt_t .PingFangCom {
font-family: "PingFangSC-fine" !important; font-family: "PingFangSC-fine" !important;
text-align: center; text-align: center;
padding: 6px 2px; padding: 6px 2px;
...@@ -1523,15 +1549,18 @@ export default { ...@@ -1523,15 +1549,18 @@ export default {
white-space: nowrap; white-space: nowrap;
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
} }
._btt_b > div:nth-child(1).over_ellipsis {
._btt_b>div:nth-child(1).over_ellipsis {
max-width: 107px; max-width: 107px;
} }
._add_saveBtn {
._add_saveBtn {
text-align: right; text-align: right;
margin-bottom: 10px; margin-bottom: 10px;
} }
._cp_name {
._cp_name {
width: 185px; width: 185px;
display: inline-block; display: inline-block;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -1539,34 +1568,43 @@ export default { ...@@ -1539,34 +1568,43 @@ export default {
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
text-align: right; text-align: right;
} }
._underline {
._underline {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.page_PlatformAccount .el-button-group .el-button {
.page_PlatformAccount .el-button-group .el-button {
padding: 4px; padding: 4px;
} }
._yingkui {
._yingkui {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
padding-left: 20px; padding-left: 20px;
} }
.page_PlatformAccount .query-box {
.page_PlatformAccount .query-box {
padding: 20px 0 0; padding: 20px 0 0;
} }
.page_PlatformAccount ._wAuto {
.page_PlatformAccount ._wAuto {
width: auto; width: auto;
} }
.el-date-editor.el-input {
.el-date-editor.el-input {
width: 100% !important; width: 100% !important;
} }
.page_PlatformAccount .el-input-group__append,.page_PlatformAccount .el-input-group__prepend{
.page_PlatformAccount .el-input-group__append,
.page_PlatformAccount .el-input-group__prepend {
border-radius: 0px; border-radius: 0px;
} }
.right-tag{
.right-tag {
float: right; float: right;
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
font-size: 12px; font-size: 12px;
...@@ -1576,12 +1614,14 @@ export default { ...@@ -1576,12 +1614,14 @@ export default {
height: 22px; height: 22px;
line-height: 18px; line-height: 18px;
margin-top: 7px; margin-top: 7px;
} }
.el-select-dropdown__item.selected{
.el-select-dropdown__item.selected {
font-weight: unset; font-weight: unset;
} }
.minmargin-box .el-select-dropdown__item{
.minmargin-box .el-select-dropdown__item {
padding: 0 5px; padding: 0 5px;
} }
</style>
</style>
<style scoped> <style scoped>
@import "../css/cssReset.css"; @import "../css/cssReset.css";
.page_fnDm{background-color: white} .page_fnDm {
.query-box{overflow: inherit} background-color: white
.query-box{border: none} }
.query-box ul {overflow: initial;}
.query-box li:last-child{float: left} .query-box {
.query-box>ul>li:last-child{float: right;} overflow: inherit
.query-box .hight_query ul .el-input{width: inherit } }
.page_CashReport .query-box li:last-child{
.query-box {
border: none
}
.query-box ul {
overflow: initial;
}
.query-box li:last-child {
float: left
}
.query-box>ul>li:last-child {
float: right;
}
.query-box .hight_query ul .el-input {
width: inherit
}
.page_CashReport .query-box li:last-child {
top: 35px; top: 35px;
} }
.page_CashReport ._fnDm_content{
.page_CashReport ._fnDm_content {
width: 100%; width: 100%;
} }
.page_CashReport .singeRowTable tr th{
.page_CashReport .singeRowTable tr th {
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
} }
</style> </style>
<template > <template>
<div class="page_fnDm page_CashReport" @keyup.enter="getList()"> <div class="page_fnDm page_CashReport" @keyup.enter="getList()">
<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-form-item label="交易方式:">
<el-select filterable v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''" >
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in BranchAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="银行账户:">
<el-select filterable v-model='msg.BankID'>
<el-option :value="-1" label="不限"></el-option>
<el-option v-for='item in accountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</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="transactionDate" @change="timeAdd(3)" type="daterange" value-format="yyyy-MM-dd"> <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -68,7 +69,6 @@ ...@@ -68,7 +69,6 @@
<table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);"> <table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
<tr> <tr>
<th colspan="16">{{branchName}}资金日报表</th> <th colspan="16">{{branchName}}资金日报表</th>
</tr> </tr>
<tr> <tr>
<th>校区</th> <th>校区</th>
...@@ -106,8 +106,10 @@ ...@@ -106,8 +106,10 @@
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoOutCome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoOutCome}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
<td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptWBMoney}}</td> <td>{{subItem.ReceiptWBMoney}}</td>
<td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td> <td>{{subItem.ReceiptMoney}}</td>
<!-- <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptWBMoney}}</td>
<td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td> -->
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoIncom}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoIncom}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
<!-- <a style="cursor:pointer;" @click="goUrl('CashAccDetail',subItem.BankID,subItem.TradeWay)"> --> <!-- <a style="cursor:pointer;" @click="goUrl('CashAccDetail',subItem.BankID,subItem.TradeWay)"> -->
...@@ -167,47 +169,49 @@ ...@@ -167,47 +169,49 @@
<script> <script>
// 自定义列组件 // 自定义列组件
export default { export default {
data(){ data() {
return{ return {
showID:false, showID: false,
active:1, active: 1,
userId:0, userId: 0,
msg:{ msg: {
BankID:-1, BankID: -1,
TradeWay:-1, TradeWay: -1,
sTradeDate:new Date().Format('yyyy-MM-dd'), sTradeDate: new Date().Format('yyyy-MM-dd'),
eTradeDate:new Date().Format('yyyy-MM-dd'), eTradeDate: new Date().Format('yyyy-MM-dd'),
EmployeeId:0, EmployeeId: 0,
//1-银行,2-现金 //1-银行,2-现金
IsBank: 2, IsBank: 2,
}, },
accountList:[], accountList: [],
BranchAccountList:[], BranchAccountList: [],
transactionDate:[new Date().Format('yyyy-MM-dd'),new Date().Format('yyyy-MM-dd')], transactionDate: [new Date().Format('yyyy-MM-dd'), new Date().Format('yyyy-MM-dd')],
AccList:[], AccList: [],
loading:false, loading: false,
currentPage:1, currentPage: 1,
total:0, total: 0,
dataList:[], dataList: [],
dataObj: {}, dataObj: {},
branchName: '' branchName: ''
} }
},created(){ },
created() {
},components: { },
},mounted(){ components: {},
let userInfo=this.getLocalStorage(); mounted() {
let userInfo = this.getLocalStorage();
this.getList(); this.getList();
this.branchName = userInfo.GroupName this.branchName = userInfo.GroupName
this.msg.EmployeeId= userInfo.EmployeeId; this.msg.EmployeeId = userInfo.EmployeeId;
}, },
methods:{ methods: {
goUrlNew(obj){ goUrlNew(obj) {
this.$router.push({ this.$router.push({
name: "DocumentStatistics", path: "DocumentStatistics",
query:{ query: {
"AccountId": obj.BankID, "AccountId": obj.BankID,
"StartTime": this.msg.sTradeDate, "StartTime": this.msg.sTradeDate,
"EndTime": this.msg.eTradeDate, "EndTime": this.msg.eTradeDate,
...@@ -218,42 +222,42 @@ ...@@ -218,42 +222,42 @@
}, },
goUrl(obj) { goUrl(obj) {
this.$router.push({ this.$router.push({
name: "CashAccDetail", path: "CashAccDetail",
query:{ query: {
"Is_Cashier":1, "Is_Cashier": 1,
"TypeId": obj.TypeId, "TypeId": obj.TypeId,
"BankID": obj.BankID, "BankID": obj.BankID,
"sTradeDate": this.msg.sTradeDate, "sTradeDate": this.msg.sTradeDate,
"eTradeDate": this.msg.eTradeDate, "eTradeDate": this.msg.eTradeDate,
"DayReport":1, "DayReport": 1,
"blank": 'y', "blank": 'y',
"tab": '现金账户明细' "tab": '现金账户明细'
} }
}) })
}, },
getList: function () { getList: function () {
this.loading=true; this.loading = true;
this.dataObj={}; this.dataObj = {};
this.apipost('Financial_post_GetReportList',this.msg,res=>{ this.apipost('Financial_post_GetReportList', this.msg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.dataObj = res.data.data; this.dataObj = res.data.data;
}else{ } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
this.loading = false; this.loading = false;
},err=>{}) }, err => {})
}, },
AccountType_post_GetList(){ //获取账户类型下拉 AccountType_post_GetList() { //获取账户类型下拉
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{ this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.AccList = res.data.data; this.AccList = res.data.data;
}else{ } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
},err=>{}) }, err => {})
}, },
timeAdd(t){ // 日期格式 timeAdd(t) { // 日期格式
if(!this.transactionDate){ if (!this.transactionDate) {
this.msg.sTradeDate = ''; this.msg.sTradeDate = '';
this.msg.eTradeDate = ''; this.msg.eTradeDate = '';
return return
...@@ -261,15 +265,15 @@ ...@@ -261,15 +265,15 @@
this.msg.sTradeDate = this.transactionDate[0]; this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1]; this.msg.eTradeDate = this.transactionDate[1];
}, },
queryInfoInit(){ // 初始化msg queryInfoInit() { // 初始化msg
}, },
resetPageIndex(){ // 重置页码 resetPageIndex() { // 重置页码
this.msg.pageIndex=1; this.msg.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
}, },
method5: function() { method5: function () {
this.GetLocalFile("Financial_post_CashOutToGetReportList", this.msg,"现金日报表.xls"); this.GetLocalFile("Financial_post_CashOutToGetReportList", this.msg, "现金日报表.xls");
}, },
// goUrl(path,id,type,typeid){ // goUrl(path,id,type,typeid){
// this.$router.push({ // this.$router.push({
...@@ -279,4 +283,5 @@ ...@@ -279,4 +283,5 @@
// }, // },
} }
} }
</script> </script>
...@@ -90,8 +90,10 @@ ...@@ -90,8 +90,10 @@
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoMoney}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoMoney}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
<td @click="goUrlNew('Manfunds',subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td> <td>{{subItem.ReceiptMoney}}</td>
<td @click="goUrlNew('OutstandingAccounts',subItem)" style="cursor: pointer">{{subItem.NONPaymentMoney}}</td> <td>{{subItem.NONPaymentMoney}}</td>
<!-- <td @click="goUrlNew('Manfunds',subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
<td @click="goUrlNew('OutstandingAccounts',subItem)" style="cursor: pointer">{{subItem.NONPaymentMoney}}</td> -->
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.IncomeCount}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.IncomeCount}}</td>
<td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutComeCount}}</td> <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutComeCount}}</td>
...@@ -186,7 +188,7 @@ ...@@ -186,7 +188,7 @@
goUrlNew(path,obj){ goUrlNew(path,obj){
let name = path; let name = path;
this.$router.push({ this.$router.push({
name: name, path: name,
query:{ query:{
"BankType": obj.TradeWay, "BankType": obj.TradeWay,
"BankID": obj.BankID, "BankID": obj.BankID,
...@@ -210,7 +212,7 @@ ...@@ -210,7 +212,7 @@
name = 'PoolAccDetail' name = 'PoolAccDetail'
} }
this.$router.push({ this.$router.push({
name: name, path: name,
query:{ query:{
"Is_Cashier":1, "Is_Cashier":1,
"TypeId": obj.TypeId, "TypeId": obj.TypeId,
......
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