Skip to content

C
confucius
Commit 65ad92a1 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent a3779b84
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 92 deletions
src/components/school/manager/employee_finace.vue
View file @ 65ad92a1
<template>
<div class="EmployeeFinace" style="margin:0 20px;">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关单据信息" flat
class="sticky-right-column-table sticky-column-table" separator="none" :data="data" :columns="columns">
class="sticky-right-column-table sticky-column-table" separator="none" :data="DataList" :columns="columns">
<template v-slot:body-cell-CostTypeList="props">
<q-td :props="props">
<template v-for="(s,si) in props.row.CostTypeList">
<span class="_tag_span">{{s}}</span><br />
</template>
</q-td>
</template>
<template v-slot:body-cell-Money="props">
<q-td :props="props">
<p>{{props.row.Type==1 ? "应收" : "应付" }}：<span class="">{{props.row.Money}}</span></p>
<p>{{props.row.Type==1 ? "实收" : "实付" }}：<span class="">{{props.row.PayMoney}}</span></p>
</q-td>
</template>
<template v-slot:body-cell-RemitterName="props">
<q-td :props="props">
<template v-if='props.row.Type===1'>
<span class="_color_gar">汇款人：</span><span>{{props.row.RemitterName}}</span>
</template>
<template v-if='props.row.Type===2'>
<span class="_color_gar">付款对象：</span><span>{{props.row.RemitterName}}</span>
</template>
<template v-if='props.row.Type===4'>
<span class="_color_gar">{{$t('fnc.no')}}</span>
</template>
</q-td>
</template>
<template v-slot:bottom>
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</template>
</q-table>
</div>
</template>
......@@ -19,89 +49,127 @@
return {
loading: false,
msg: {
rowsPerPage: 6,
pageIndex: 1,
pageSize: 5,
rowsPerPage: 5,
createBy: 0,
pageSize: 6,
FrID: '',
sDate: '',
eDate: '',
Status: '-1',
TemplateId: '0',
RB_Branch_Id: '',
RB_Depart_Id: '',
sTradeDate: '',
eTradeDate: '',
ClientType: '',
RemitterName: '',
ClientID: '',
sMoney: '',
eMoney: '',
CurrencyId: '',
CostTypeID: '',
Conditon: '',
TCID: '',
TradeWay: '',
Type: '0',
AccountType: '',
QEndDate: '',
QStartDate: '',
UpdateBy: '',
Sort: '2',
IsSpecial: 0,
Remark: ''
},
columns: [{
name: 'FileName',
name: '单号',
required: true,
label: '公司',
align: 'left',
field: row => row.FileName
},
{
name: 'FileSize',
label: '单号',
field: 'FileSize',
align: 'left',
field: row => row.FrID
},
{
name: 'FinaceType',
name: 'TypeName',
label: '单据类型',
field: 'FinaceType',
field: 'TypeName',
align: 'left',
},
{
name: 'CreateTimeStr',
label: '关联信息',
field: 'CreateTimeStr',
align: 'left',
},
{
name: 'Source',
name: 'CostTypeList',
label: '费用类型',
field: 'Source',
align: 'left'
},
{
name: 'Jiaoyifangs',
label: '交易方式',
field: 'Jiaoyifangs',
field: 'CostTypeList',
align: 'left'
},
{
name: 'JINE',
name: 'Money',
label: '金额',
field: 'JINE',
field: 'Money',
align: 'left'
},
{
name: 'Duixiang',
name: 'RemitterName',
label: '付款对象',
field: 'Duixiang',
field: 'RemitterName',
align: 'left'
},
{
name: 'CreateByName',
name: 'EmName',
label: '制单人员',
field: 'Source',
field: 'EmName',
align: 'left'
},
{
name: 'Status',
name: 'StatusStr',
label: '当前状态',
field: 'Source',
field: 'StatusStr',
align: 'left'
},
{
name: 'optioned',
label: '操作',
field: 'FileId'
}
],
data: [],
DataList: [],
total: 0,
pageCount: 0,
}
},
created() {
console.log("this.saveObj", this.saveObj)
if (this.saveObj.EmAccountId && this.saveObj.EmAccountId > 0) {
this.msg.UpdateBy = this.saveObj.EmAccountId;
}
},
mounted() {
this.getPageList();
},
methods: {
//分页
changePage(val) {
this.msg.pageIndex = val;
this.getPageList();
},
getPageList() { // 获取列表数据
if (!this.msg.ClientID) this.msg.ClientID = 0;
if (!this.msg.ClientType) this.msg.ClientType = 0;
if (!this.msg.CurrencyId) this.msg.CurrencyId = 0;
if (!this.msg.CostTypeID) this.msg.CostTypeID = 0;
if (!this.msg.TemplateId) this.msg.TemplateId = 0;
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.TCID) this.msg.TCID = 0;
if (!this.msg.OrderID) this.msg.OrderID = 0;
if (!this.msg.Status) this.msg.Status = 0;
if (!this.msg.FrID) this.msg.FrID = 0;
if (!this.msg.Conditon) this.msg.Conditon = 1;
if (!this.msg.TradeWay) this.msg.TradeWay = 0;
if (!this.msg.AccountType) this.msg.AccountType = 0;
this.apipost('Financial_post_GetPageList', this.msg, res => {
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
this.pageCount = res.data.data.pageCount;
} else {
this.$message.error(res.data.message);
}
})
}
},
}
......
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ 65ad92a1
......@@ -882,7 +882,6 @@
<el-tooltip class="item" effect="dark" content="追加团款" placement="top">
<span v-if="item.OtherType == 1" class="zhuiClass">追</span>
</el-tooltip>
</td>
<td class="_number">
<template v-if="item.TCIDAndTCNUMList.length>0">
......@@ -966,7 +965,6 @@
</template>
</td>
<td valign="middle">
<!-- <img class="_head_img" :src="item.EmPhoto" alt="">-->
<span>{{item.EmName}}</span>
</td>
<td class="_btn_group">
......@@ -1030,8 +1028,6 @@
<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>
</td>
</tr>
</table>
......@@ -1133,7 +1129,6 @@
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.DeptName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -1178,7 +1173,6 @@
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
</el-form>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
<tr>
......@@ -1222,7 +1216,6 @@
<button class="normalBtn" type="primary" @click="goUrlZD">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -1471,7 +1464,7 @@
// 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
.GroupName; //集团ID
this.ActionMenuCode = userInfo.ActionMenuCode;
this.DepartIDs = userInfo.DeptId;
this.userId = userInfo.Id;
......@@ -1498,7 +1491,6 @@
// this.F_Advance_Match = true;
// }
// });
},
ZhiDanChongDi() {
this.yfcdState = true;
......@@ -1597,7 +1589,6 @@
this.apipost("Financial_post_SetAccountantFinanceMerge", this.hbMsg, res => {
this.hbBtn = false;
if (res.data.resultCode == 1) {
this.getPageList();
} else {
this.Error(res.data.message);
......@@ -1605,8 +1596,6 @@
}, err => {});
})
.catch(() => {});
},
HebingSP() {
if (this.msg.Type == 1 || this.msg.Type == 2) {
......@@ -1616,7 +1605,6 @@
} else {
this.Error("单据类型只能为收入或支出！")
}
},
setHand() {
if (this.HandMsg.TCNUM == '') {
......@@ -1637,7 +1625,6 @@
tab: '新增财务单据'
}
})
},
// 手配费
Handwithfee() {
......@@ -1672,7 +1659,6 @@
message: this.$t('ios.yi') + this.$t('pub.cancelBtn')
});
});
},
//转交
getExchange(FrID) {
......@@ -1706,11 +1692,8 @@
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
this.searchList = res.Data;
}
}).catch(() => {
})
}).catch(() => {})
} else {
this.searchList = [];
}
......@@ -1751,7 +1734,6 @@
this.BOSSDialog = true;
}
}
},
goTicketPage(data) { // 跳转机票
this.$router.push({
......@@ -1805,9 +1787,6 @@
}, err => {});
}
},
// goUrl() {
// this.dialogFormVisible = true;
// },
UpdateTradeDate() {
if (!this.updateMsg.TradeDate) return this.$message.error(this.$t('rule.qxztzhdjyriqi'));
if (!this.updateMsg.Description) return this.$message.error(this.$t('rule.qtxshuoming'));
......@@ -1833,12 +1812,10 @@
if (res.Code == 1) {
this.searchList = res.Data;
this.loading2 = false;
}
}).catch(() => {
})
} else {
this.searchList = [];
this.loading2 = false;
......@@ -1972,7 +1949,6 @@
this.DataList = [];
this.noData = true;
} else {
data.forEach(x => {
x.modelShow = false;
this.checkAllList.push(x.FrID)
......@@ -1996,22 +1972,15 @@
}
})
})
}
})
}).catch(() => {
})
}).catch(() => {})
}
}
} else {
this.loading = false;
this.$message.error(res.data.message);
}
// this.queryInfoInit();
}, err => {})
if (this.msg.Conditon == 7) {
this.getMyRejectFinanceCount();
......@@ -2183,7 +2152,6 @@
}
}, err => {})
}
},
Financial_post_GetBranchAccountList() { //获取交易方式列表
this.apipost('Financial_post_GetBranchAccountList', {}, res => {
......@@ -2245,9 +2213,7 @@
getCompanyList() { //获取公司列表
getSchoolPage(this.schoolMsg).then(res => {
this.CompanyList = res.Data.PageData;
}).catch(() => {
})
}).catch(() => {})
},
Financial_post_GetConditionList() { //获取财务单据枚举列表
this.apipost('Financial_post_GetConditionList', {}, res => {
......@@ -2262,9 +2228,7 @@
}, res => {
if (res.data.resultCode == 1) {
this.currencyTypeList = res.data.data;
} else {
}
} else {}
}, err => {})
},
financeinfo_post_GetCostTypeList() { // 费用类型
......@@ -2275,8 +2239,6 @@
}, res => {
if (res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data;
} else {
}
}, err => {})
},
......@@ -2284,8 +2246,6 @@
this.apipost('Financial_post_GetList', {}, res => {
if (res.data.resultCode == 1) {
this.TemplateGetList = res.data.data;
} else {
}
}, err => {})
},
......@@ -2371,7 +2331,6 @@
this.currentPage = 1;
},
goUrl(path, id, Conditon, pageIndex) {
// return;
this.$router.push({
path: '/financial/financalDocument/' + path,
query: {
......@@ -2446,7 +2405,6 @@
}
})
}
// this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
}
},
watch: {}
......
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