Skip to content

C
confucius
Commit 94a2a591 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent f341cc82
Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 211 deletions
src/pages/financial/CostType.vue
View file @ 94a2a591
......@@ -765,7 +765,7 @@
},
//导出费用类型明细报表
method5: function() {
this.GetLocalFile("financeinfo_post_OutToCostTypeExcel", this.msg,"费用类型明细报表.xls");
this.GetErpLocalFile("financeinfo_post_OutToCostTypeExcel", this.msg,"费用类型明细报表.xls");
} ,
editCurency(id){ // 修改信息
this.apipost('financeinfo_post_GetCostType',{ID:id}, res => {
......
src/pages/financial/PlatformAccount.vue
View file @ 94a2a591
......@@ -1022,7 +1022,7 @@
let msg = this.msg;
let userInfo = this.getLocalStorage();
msg.UId = userInfo.Id;
this.GetLocalFile(
this.GetErpLocalFile(
"BankAccount_post_OutToExcelPlatform",
msg,
"平台账户.xls"
......
src/pages/financial/TeamRevenueReport.vue
View file @ 94a2a591
......@@ -2046,7 +2046,7 @@
delete msg.pageIndex;
delete msg.pageSize;
msg.EmployeeId = this.userId;
this.GetLocalFile(
this.GetErpLocalFile(
"financestatistics_post_OutToExcelRevenueReportList",
msg,
"营收报表.xls"
......
src/pages/financial/accDetail/CashAccDetail.vue
View file @ 94a2a591
......@@ -522,7 +522,7 @@
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=1;
var fileName = "现金账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
this.GetErpLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
addChuNaFun(){ // 添加出纳按钮点击事件
let count = 0;
......
src/pages/financial/accDetail/CashReport.vue
View file @ 94a2a591
......@@ -273,14 +273,8 @@
this.currentPage = 1;
},
method5: function () {
this.GetLocalFile("Financial_post_CashOutToGetReportList", this.msg, "现金日报表.xls");
this.GetErpLocalFile("Financial_post_CashOutToGetReportList", this.msg, "现金日报表.xls");
},
// goUrl(path,id,type,typeid){
// this.$router.push({
// path: '/' + path,
// query: {'Is_Cashier':1,'typeid':type,'AccountId':id,'Type':type,'sTradeDate':this.msg.sTradeDate,'eTradeDate':this.msg.eTradeDate,blank:'y',tab:'现金账户明细'}
// })
// },
}
}
......
src/pages/financial/accDetail/CompanyAccDetail.vue
View file @ 94a2a591
......@@ -577,7 +577,7 @@
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=2;
var fileName = "银行账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
this.GetErpLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){
let status=false;
......
src/pages/financial/accDetail/PlatformAccDetail.vue
View file @ 94a2a591
......@@ -483,7 +483,7 @@
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=3;
var fileName = "平台账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
this.GetErpLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){
let status=false;
......
src/pages/financial/accDetail/TransferReport.vue
View file @ 94a2a591
......@@ -260,7 +260,7 @@
this.currentPage = 1;
},
method5: function() {
this.GetLocalFile("Financial_post_OutToGetReportList", this.msg,"银行日报表.xls");
this.GetErpLocalFile("Financial_post_OutToGetReportList", this.msg,"银行日报表.xls");
},
}
}
......
src/pages/financial/financalDocument/CapitalAllocation.vue
View file @ 94a2a591
<style>
@import "../css/cssReset.css";
.page_CapitalAllocation .query-box{
.page_CapitalAllocation .query-box {
padding: 0;
border:0
border: 0
}
.page_CapitalAllocation .form{
.page_CapitalAllocation .form {
padding-top: 25px;
}
.page_CapitalAllocation .el-date-editor .el-range-separator {
padding: 0;
line-height: 29px;
}
.page_CapitalAllocation .el-select{
.page_CapitalAllocation .el-select {
width: 100%;
}
.page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%;
}
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.el-icon-edit{
.page_CapitalAllocation i.icon-sousuo,
.page_CapitalAllocation i.el-icon-edit {
width: 30px;
height: 30px;
display: inline-block;
......@@ -30,24 +36,99 @@
cursor: pointer;
outline: none;
}
.page_CapitalAllocation i.el-icon-edit{background-color: #00C6FF;font-size: 16px;}
.page_CapitalAllocation i.el-icon-edit:hover{background-color: #59daff}
.page_CapitalAllocation i.el-icon-edit:active{background-color: #00b8ec}
.page_CapitalAllocation i.icon-sousuo{background-color: #47BF8C;}
.page_CapitalAllocation i.icon-sousuo:hover{background-color: #66bb97}
.page_CapitalAllocation i.icon-sousuo:active{background-color: #35ab79}
.page_CapitalAllocation ._btn_group{font-size: 14px;}
.page_CapitalAllocation .icon-daiqueren{color: #4BCA81}
.page_CapitalAllocation .icon-yiqueren{color: #4BCA81}
.page_CapitalAllocation .icon-yiquxiao{color: #959595}
.page_CapitalAllocation .icon-shenhebohui{color: #E95252}
.page_CapitalAllocation .icon-icon-zancun{color: #FF9C01}
.page_CapitalAllocation .text_d{text-decoration: underline;cursor: pointer;}
.InfoChangeLog{height: auto;max-height: 220px;background-color: #FFFFFF;}
.changLogList{padding-left: 20px;max-height: 180px;overflow: auto;}
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
.page_CapitalAllocation i.el-icon-edit {
background-color: #00C6FF;
font-size: 16px;
}
.page_CapitalAllocation i.el-icon-edit:hover {
background-color: #59daff
}
.page_CapitalAllocation i.el-icon-edit:active {
background-color: #00b8ec
}
.page_CapitalAllocation i.icon-sousuo {
background-color: #47BF8C;
}
.page_CapitalAllocation i.icon-sousuo:hover {
background-color: #66bb97
}
.page_CapitalAllocation i.icon-sousuo:active {
background-color: #35ab79
}
.page_CapitalAllocation ._btn_group {
font-size: 14px;
}
.page_CapitalAllocation .icon-daiqueren {
color: #4BCA81
}
.page_CapitalAllocation .icon-yiqueren {
color: #4BCA81
}
.page_CapitalAllocation .icon-yiquxiao {
color: #959595
}
.page_CapitalAllocation .icon-shenhebohui {
color: #E95252
}
.page_CapitalAllocation .icon-icon-zancun {
color: #FF9C01
}
.page_CapitalAllocation .text_d {
text-decoration: underline;
cursor: pointer;
}
.InfoChangeLog {
height: auto;
max-height: 220px;
background-color: #FFFFFF;
}
.changLogList {
padding-left: 20px;
max-height: 180px;
overflow: auto;
}
.changLogList_l {
border-left: 1px solid #E9E9E9;
position: relative;
padding-bottom: 10px;
padding-left: 20px;
padding-top: 10px;
}
._radius_green {
background-color: #47BF8C;
width: 7px;
height: 7px;
border-radius: 50%;
display: inline-block;
position: absolute;
left: -4px;
top: 19px;
}
.changLog_time {
color: #666666;
font-size: 12px;
display: inline-block;
padding-right: 10px
}
</style>
<template>
<div class="page_CapitalAllocation">
......@@ -59,73 +140,56 @@
</li>
<li>
<em>{{$t('system.table_company')}}</em>&nbsp;
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" class="w220" @change="getDepartment(msg.RB_Branch_Id),msg.RB_Depart_Id = -2">
<el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" class="w220"
@change="getDepartment(msg.RB_Branch_Id),msg.RB_Depart_Id = -2">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.SName'
:value='item.SId'
:key='item.SId'>
<el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
</el-option>
</el-select>
</li>
<li>
<em>{{$t('admin.admin_Department')}}</em>&nbsp;
<el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" class="w220" @change="getEmployee(msg.RB_Depart_Id), msg.UpdateBy='-1'">
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DeptName'
:value='item.DeptId'
:key='item.DeptId'>
</el-option>
<el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" class="w220"
@change="getEmployee(msg.RB_Depart_Id), msg.UpdateBy='-1'">
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList' :label='item.DeptName' :value='item.DeptId' :key='item.DeptId'>
</el-option>
</el-select>
</li>
<li>
<em>{{$t('fnc.zhidanren')}}</em>&nbsp;
<el-select filterable v-model='msg.UpdateBy' class="w220">
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmployeeName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
<el-select filterable v-model='msg.UpdateBy' class="w220">
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</li>
<li>
<em>{{$t('fnc.zdriqi')}}</em>&nbsp;
<el-date-picker
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
</el-date-picker>
<el-date-picker @change="timeAdd(1)" v-model="productionDate" type="daterange" value-format="yyyy-MM-dd"
range-separator="至">
</el-date-picker>
</li>
<li>
<em>{{$t('fnc.jiaoyiriqi')}}</em>&nbsp;
<el-date-picker
@change="timeAdd(2)"
v-model="productionDate2"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
<el-date-picker @change="timeAdd(2)" v-model="productionDate2" type="daterange" value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</li>
<li>
<li>
<em>{{$t('admin.admin_status')}}</em>&nbsp;
<el-select v-model="msg.Status" filterable class="w220">
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in StatusList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
<el-select v-model="msg.Status" filterable class="w220">
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in StatusList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</li>
<li>
<input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')" @click="goAddurl('addCapitalAllocation')"/>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
<input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')"
@click="goAddurl('addCapitalAllocation')" />
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()" />
</li>
</ul>
</div>
......@@ -211,7 +275,8 @@
</el-row>
</el-form> -->
<div class="page_CapitalAllocation_list">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading="loading">
<tr>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('fnc.jine')}}</th>
......@@ -237,19 +302,17 @@
<i v-if="item.Status==1" class="iconfont icon-daiqueren"></i>
<i v-if="item.Status==4" class="iconfont icon-yiquxiao"></i>
<i v-if="item.Status==2" class="iconfont icon-yiqueren"></i>
<i v-if="item.Status==3" class="iconfont icon-shenhebohui"></i>
<i v-if="item.Status==0 || item.Status==5" class="iconfont icon-zancun"></i>
<el-popover
popper-class="detailsIT_Journal"
width="250"
trigger="click">
<div class="InfoChangeLog" >
<i v-if="item.Status==3" class="iconfont icon-shenhebohui"></i>
<i v-if="item.Status==0 || item.Status==5" class="iconfont icon-zancun"></i>
<el-popover popper-class="detailsIT_Journal" width="250" trigger="click">
<div class="InfoChangeLog">
<div class="changLog">
<p class="_log_t">{{$t('fnc.lcrizhi')}}</p>
<ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'>
<li class="changLogList_l" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C" class="_radius_green"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<span style="background-color: #47BF8C" class="_radius_green"></span>
<p> <span class="_color_blue">{{log.EmName}}</span> <span
class="fr changLog_time">{{log.UpdateDate}}</span> </p>
<p class="_dtel">{{log.StartValue}}</p>
</li>
</ul>
......@@ -258,28 +321,27 @@
</ul>
</div>
</div>
<span slot="reference" class="text_d _font_init" @click="Financial_post_GetFinancLogList(item.FrID)">{{item.StatusStr}}</span>
<span slot="reference" class="text_d _font_init"
@click="Financial_post_GetFinancLogList(item.FrID)">{{item.StatusStr}}</span>
</el-popover>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top"
v-if="(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
<i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID)"></i>
</el-tooltip>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i>
<p>{{$t('active.ld_noData')}}</p>
</div>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size='msg.pageSize'
:total='total'>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</div>
</div>
......@@ -297,7 +359,7 @@
} from '../../../api/system/dept'
export default {
data(){
data() {
return {
msg: {
pageIndex: 1,
......@@ -311,11 +373,11 @@
Status: '-1',
sTradeDate: '',
eTradeDate: '',
EmployeeId:0
EmployeeId: 0
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
Status:'0',
getCompanyMsg: { // 公司
RB_Group_Id: '0',
Status: '0',
},
dataList: [],
CompanyList: [],
......@@ -327,11 +389,11 @@
GetFinancLogList: [],
loading: true,
LogLoading: true,
EmId:0,
EmId: 0,
total: 0,
currentPage: 0,
btnShow:false,
schoolMsg:{
btnShow: false,
schoolMsg: {
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
......@@ -340,50 +402,51 @@
}
}
},
created(){
created() {
this.getList()
let userInfo = this.getLocalStorage(); // 读取缓存数据
this.getCompanyMsg.RB_Group_Id = userInfo.Group_Id; // 集团ID
this.EmId=userInfo.Id;
let ActionMenuCode=userInfo.ActionMenuCode;
let userInfo = this.getLocalStorage(); // 读取缓存数据
this.getCompanyMsg.RB_Group_Id = userInfo.Group_Id; // 集团ID
this.EmId = userInfo.Id;
let ActionMenuCode = userInfo.ActionMenuCode;
},
methods:{
getList: function () { // 获取列表数据
methods: {
getList: function () { // 获取列表数据
if (this.msg.FrID === '') {
this.msg.FrID = 0
}
this.loading= true
this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{
if (res.data.resultCode===1){
this.loading = true
this.apipost('Financial_get_GetFundTransferPageList', this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.$message.error(res.data.message)
}
if (this.msg.FrID===0) {
if (this.msg.FrID === 0) {
this.msg.FrID = ''
}
this.loading= false
this.loading = false
}, null)
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
resetPageIndex() { // 重置页码
this.msg.pageIndex = 1;
this.currentPage = 1;
},
//导出
method5: function() {
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
this.msg.EmployeeId=this.EmId;
method5: function () {
if (!this.msg.RB_Branch_Id) this.msg.RB_Branch_Id = -1;
if (!this.msg.RB_Depart_Id) this.msg.RB_Depart_Id = 0;
if (!this.msg.UpdateBy) this.msg.UpdateBy = 0;
if (!this.msg.Status) this.msg.Status = 0;
if (!this.msg.FrID) this.msg.FrID = 0;
this.msg.EmployeeId = this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
this.GetErpLocalFile("Financial_get_OutToFundTransfer", this.msg, this.$t('fnc.zjdbbiao') + ".xls");
},
getCompanyList: function () { //获取公司列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
......@@ -391,8 +454,8 @@
})
},
getDepartment: function (id) { //获取部门列表
let msg={
getDepartment: function (id) { //获取部门列表
let msg = {
pageIndex: 1,
pageSize: 999,
rowsPerPage: 12,
......@@ -405,21 +468,20 @@
}
msg.School_Id = id;
getDeptPage(msg).then(res => {
this.DepartmentList=res.Data.PageData;
}).catch(() => {
})
this.DepartmentList = res.Data.PageData;
}).catch(() => {})
},
timeAdd: function (t) { // 日期格式
if (t===1) {
if(!this.productionDate){
timeAdd: function (t) { // 日期格式
if (t === 1) {
if (!this.productionDate) {
this.msg.sDate = '';
this.msg.eDate = '';
return
}
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
} else if (t===2){
if(!this.productionDate2){
} else if (t === 2) {
if (!this.productionDate2) {
this.msg.sTradeDate = '';
this.msg.eTradeDate = '';
return
......@@ -428,9 +490,9 @@
this.msg.eTradeDate = this.productionDate2[1];
}
},
GetStatusList: function () { // 获取审核状态枚举
this.apipost('FinancialFlowTemplate_post_GetStatusList',{}, res => {
if(res.data.resultCode == 1) {
GetStatusList: function () { // 获取审核状态枚举
this.apipost('FinancialFlowTemplate_post_GetStatusList', {}, res => {
if (res.data.resultCode == 1) {
this.StatusList = res.data.data;
}
}, err => {})
......@@ -439,43 +501,46 @@
var qMsg = {
Dept_Id: 0
}
qMsg.Dept_Id=id;
qMsg.Dept_Id = id;
queryEmployee(qMsg).then(res => {
if(res.Code==1){
this.EmployeeList = res.Data;
if (res.Code == 1) {
this.EmployeeList = res.Data;
}
}).catch(() => {
})
},
goAddurl(url){
goAddurl(url) {
// this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
var tempStr = '/financial/financalDocument/' + url +'?fengs=1';
var tempStr = '/financial/financalDocument/' + url + '?fengs=1';
this.$router.push({
path: tempStr
});
},
goURL: function (url, edit, id) {
// this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
var tempStr = '/financial/financalDocument/' + url +'?edit=' + edit + '&id='+id;
var tempStr = '/financial/financalDocument/' + url + '?edit=' + edit + '&id=' + id;
this.$router.push({
path: tempStr
});
},
goDetail:function(url,id){
goDetail: function (url, id) {
// this.$router.push({ name: url,query:{id: id, blank: 'y', tab: '资金调拨详情'}})
var tempStr = '/financial/financalDocument/' + url +'?id='+id;
var tempStr = '/financial/financalDocument/' + url + '?id=' + id;
this.$router.push({
path: tempStr
});
},
Financial_post_GetFinancLogList: function(id){ // 获取单据日志
if(this.checkboxShow) return
Financial_post_GetFinancLogList: function (id) { // 获取单据日志
if (this.checkboxShow) return
this.LogLoading = true;
this.apipost('Financial_post_GetFinancLogList',{ID:id,Type:2}, res => {
if(res.data.resultCode == 1) {
this.apipost('Financial_post_GetFinancLogList', {
ID: id,
Type: 2
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x=>{
data.forEach(x => {
x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
})
this.LogLoading = false;
......@@ -484,11 +549,12 @@
}, err => {})
},
},
mounted(){
mounted() {
this.getCompanyList()
this.getDepartment(0)
this.GetStatusList()
this.getEmployee(0)
}
}
</script>
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ 94a2a591
......@@ -597,8 +597,8 @@
<!-- <button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button> -->
<!-- <button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button> -->
<button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
<!-- <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>-->
<!-- <button class="hollowFixedBtn" @click="ZhiDanChongDi"> 预付款冲抵</button>-->
<!-- <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>-->
<!-- <button class="hollowFixedBtn" @click="ZhiDanChongDi"> 预付款冲抵</button>-->
<!-- <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
v-if="msg.Conditon === 3 ">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button> -->
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn"
......@@ -690,7 +690,8 @@
<span>
<em>{{$t('fnc.fybumen')}}</em>
&nbsp;<el-select filterable v-model='msg.RB_Depart_Id'
@change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''" class="w150">
@change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''"
class="w150">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList' :label='item.DeptName' :value='item.DeptId'
:key='item.DeptId'>
......@@ -703,8 +704,7 @@
<em>{{$t('fnc.zdrenyuan')}}</em>
&nbsp;<el-select filterable v-model='msg.UpdateBy' class="w150">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id'
:key='item.Id'>
<el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
......@@ -966,7 +966,7 @@
</template>
</td>
<td valign="middle">
<!-- <img class="_head_img" :src="item.EmPhoto" alt="">-->
<!-- <img class="_head_img" :src="item.EmPhoto" alt="">-->
<span>{{item.EmName}}</span>
</td>
<td class="_btn_group">
......@@ -1026,8 +1026,7 @@
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))"
class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item"
:content="$t('fnc.tzjyriqi')" placement="top">
<el-tooltip class="item" :content="$t('fnc.tzjyriqi')" placement="top">
<i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng"
@click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate"></i>
</el-tooltip>
......@@ -1051,8 +1050,8 @@
<el-form label-width="100px">
<el-form-item :label="$t('fnc.zhuanjiaoren')">
<el-select v-model="zhuanMsg.AuditEmId" filterable remote reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod" @change="$forceUpdate(),choicereciveN(zhuanMsg.AuditEmId)"
:loading="loading2">
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethod"
@change="$forceUpdate(),choicereciveN(zhuanMsg.AuditEmId)" :loading="loading2">
<el-option v-for="item in searchList" :key="item.Id" :label="item.EmployeeName" :value="item.Id">
<span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.DeptName }}</span>
......@@ -1127,7 +1126,8 @@
<el-form label-width="100px">
<el-form-item label="制单人转交：">
<el-select v-model="zhuanjiaoMsg.CreateBy" filterable remote reserve-keyword
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethodEx" @change="$forceUpdate(),choicereciveN2(zhuanjiaoMsg.CreateBy)">
:placeholder="$t('pub.pleaseImport')" :remote-method="remoteMethodEx"
@change="$forceUpdate(),choicereciveN2(zhuanjiaoMsg.CreateBy)">
<el-option v-for="item in searchList" :key="item.Id" :label="item.EmployeeName" :value="item.Id">
<span style="float: left">{{ item.EmployeeName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.DeptName }}</span>
......@@ -1239,7 +1239,9 @@
import {
getSchoolPage
} from '../../../api/school/index'
import {getClassNameList} from '../../../api/finance/index'
import {
getClassNameList
} from '../../../api/finance/index'
export default {
data() {
......@@ -1414,7 +1416,7 @@
IsAdvanceFinance: 1,
},
costList: [],
schoolMsg:{
schoolMsg: {
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
......@@ -1468,7 +1470,8 @@
this.yfOutBranchId = userInfo.School_Id;
// let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
// this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.GroupName; //集团ID
this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo
.GroupName; //集团ID
this.ActionMenuCode = userInfo.ActionMenuCode;
this.DepartIDs = userInfo.DeptId;
this.userId = userInfo.Id;
......@@ -1699,9 +1702,9 @@
var qMsg = {
EmployeeName: 0
}
qMsg.EmployeeName=query;
qMsg.EmployeeName = query;
queryEmployee(qMsg).then(res => {
if(res.Code==1){
if (res.Code == 1) {
this.searchList = res.Data;
}
......@@ -1825,9 +1828,9 @@
var qMsg = {
EmployeeName: 0
}
qMsg.EmployeeName=query;
qMsg.EmployeeName = query;
queryEmployee(qMsg).then(res => {
if(res.Code==1){
if (res.Code == 1) {
this.searchList = res.Data;
this.loading2 = false;
......@@ -1841,19 +1844,19 @@
this.loading2 = false;
}
},
choicereciveN(Id){
if(this.searchList.length>0){
this.searchList.forEach(x=>{
if(x.Id==Id){
choicereciveN(Id) {
if (this.searchList.length > 0) {
this.searchList.forEach(x => {
if (x.Id == Id) {
this.zhuanMsg.AuditEmIdName = x.EmployeeName
}
})
}
},
choicereciveN2(Id){
if(this.searchList.length>0){
this.searchList.forEach(x=>{
if(x.Id==Id){
choicereciveN2(Id) {
if (this.searchList.length > 0) {
this.searchList.forEach(x => {
if (x.Id == Id) {
this.zhuanjiaoMsg.AuditEmIdName = x.EmployeeName
}
})
......@@ -1973,20 +1976,22 @@
data.forEach(x => {
x.modelShow = false;
this.checkAllList.push(x.FrID)
if(x.TCIDList.length>0){
da =da.concat(x.TCIDList)
if (x.TCIDList.length > 0) {
da = da.concat(x.TCIDList)
}
})
this.DataList = data;
if(da.length>0){
let str = da.join(',')
getClassNameList({ClassIds:str}).then(res => {
this.DataList.forEach(x=>{
if(x.TCIDList.length>0){
x.TCIDList.forEach(z=>{
res.Data.forEach(j=>{
if(z == j.ClassId){
if (da.length > 0) {
let str = da.join(',')
getClassNameList({
ClassIds: str
}).then(res => {
this.DataList.forEach(x => {
if (x.TCIDList.length > 0) {
x.TCIDList.forEach(z => {
res.Data.forEach(j => {
if (z == j.ClassId) {
x.TCIDAndTCNUMList.push(j)
}
})
......@@ -2205,10 +2210,10 @@
if (!this.msg.TradeWay) this.msg.TradeWay = 0;
if (!this.msg.AccountType) this.msg.AccountType = 0;
this.msg.EmployeeId = this.userId;
this.GetLocalFile("Financial_get_OutToFinanceList", this.msg, this.$t('fnc.cwbaobiao') + ".xls");
this.GetErpLocalFile("Financial_get_OutToFinanceList", this.msg, this.$t('fnc.cwbaobiao') + ".xls");
},
getDepartment(id) { //部门
let msg={
let msg = {
pageIndex: 1,
pageSize: 999,
rowsPerPage: 12,
......@@ -2221,17 +2226,16 @@
}
msg.School_Id = id;
getDeptPage(msg).then(res => {
this.DepartmentList=res.Data.PageData;
}).catch(() => {
})
this.DepartmentList = res.Data.PageData;
}).catch(() => {})
},
getEmployee(id) { //员工
var qMsg = {
Dept_Id: 0
}
qMsg.Dept_Id=id;
qMsg.Dept_Id = id;
queryEmployee(qMsg).then(res => {
if(res.Code==1){
if (res.Code == 1) {
this.EmployeeList = res.Data;
}
}).catch(() => {
......@@ -2369,7 +2373,7 @@
goUrl(path, id, Conditon, pageIndex) {
// return;
this.$router.push({
path:'/financial/financalDocument/' + path,
path: '/financial/financalDocument/' + path,
query: {
"id": id,
"Conditon": Conditon,
......@@ -2390,7 +2394,7 @@
if (type === 1) {
path = 'addReceivablesDocuments'
this.$router.push({
path:'/financial/financalDocument/' + path,
path: '/financial/financalDocument/' + path,
query: {
"type": type,
"FrID": id,
......@@ -2407,7 +2411,7 @@
} else {
path = 'addFinancialDocuments'
this.$router.push({
path:'/financial/financalDocument/'+ path,
path: '/financial/financalDocument/' + path,
query: {
"type": type,
"FrID": id,
......@@ -2422,7 +2426,7 @@
} else if (type === 4) {
path = 'addCapitalAllocation'
this.$router.push({
path:'/financial/financalDocument/'+ path,
path: '/financial/financalDocument/' + path,
query: {
"id": id,
"edit": 1,
......@@ -2433,7 +2437,7 @@
} else if (type === 7) {
path = 'addFinancialGZDocuments'
this.$router.push({
path:'/financial/financalDocument/'+ path,
path: '/financial/financalDocument/' + path,
query: {
"FrID": id,
"edit": 1,
......
src/pages/financial/financalDocument/RecPayQuery.vue
View file @ 94a2a591
......@@ -1281,7 +1281,7 @@
if (!this.msg.AccountType) this.msg.AccountType = 0;
if (!this.msg.KJCostTypeId) this.msg.KJCostTypeId = 0;
if (!this.msg.IsSelectKJSetCostType) this.msg.IsSelectKJSetCostType = 0;
this.GetLocalFile("Financial_post_DownInOrOut", this.msg, "收支款.xls");
this.GetErpLocalFile("Financial_post_DownInOrOut", this.msg, "收支款.xls");
},
financeRemove(id) { //作废
this.$confirm('是否对申请单进行作废操作？作废后不可恢复！', '提示', {
......
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