整合前端
This commit is contained in:
砂糖
@@ -0,0 +1,76 @@
|
||||
<template>
|
||||
<el-tabs type="card" v-loading="loading" editable v-model="editableTabsValue" @edit="handleEdit" @tab-click="handleTabClick">
|
||||
<el-tab-pane v-for="account in accountList" :key="account.receiveAccountId" :label="account.receiveAccountName" :name="account.receiveAccountId.toString()"></el-tab-pane>
|
||||
</el-tabs>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
addOaReceiveAccount,
|
||||
AllListOaReceiveAccount,
|
||||
delOaReceiveAccount
|
||||
} from "@/api/oa/oaReceiveAccount";
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
editableTabsValue: undefined,
|
||||
accountList: [],
|
||||
loading: false,
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getAccountList();
|
||||
},
|
||||
methods: {
|
||||
getAccountList() {
|
||||
this.loading = true;
|
||||
AllListOaReceiveAccount().then(res => {
|
||||
this.loading = false;
|
||||
this.accountList = res.data.filter(item => item.receiveAccountId != '-1')
|
||||
})
|
||||
},
|
||||
addAccount(data) {
|
||||
addOaReceiveAccount(data).then(res => {
|
||||
this.getAccountList()
|
||||
this.$message.success('添加成功')
|
||||
this.$emit('tab-click', undefined)
|
||||
})
|
||||
},
|
||||
deleteAccount(id) {
|
||||
delOaReceiveAccount(id).then(res => {
|
||||
this.getAccountList()
|
||||
this.$message.success('删除成功')
|
||||
this.$emit('tab-click', undefined)
|
||||
})
|
||||
},
|
||||
handleEdit(targetName, action) {
|
||||
if (action === 'add') {
|
||||
// 弹出弹窗，输入账户名称
|
||||
this.$prompt('请输入账户名称', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
}).then(({ value }) => {
|
||||
console.log(value)
|
||||
this.addAccount({
|
||||
receiveAccountName: value,
|
||||
parentId: '-1',
|
||||
})
|
||||
})
|
||||
} else if (action === 'remove') {
|
||||
// 弹窗二次确认
|
||||
this.$confirm('确定删除该账户吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
}).then(() => {
|
||||
this.deleteAccount(targetName)
|
||||
})
|
||||
}
|
||||
},
|
||||
handleTabClick(tab, event) {
|
||||
console.log(tab.name,)
|
||||
this.$emit('tab-click', tab.name)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,392 @@
|
||||
<template>
|
||||
<div class="app-container" v-loading="loading">
|
||||
<el-row class="mb8">
|
||||
账户余额: {{ accountBalance }}
|
||||
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="fetchData">刷新</el-button>
|
||||
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleUpdateAccount">修改账户余额</el-button>
|
||||
</el-row>
|
||||
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="对方科目" prop="oppositeSubject">
|
||||
<el-input
|
||||
v-model="queryParams.oppositeSubject"
|
||||
placeholder="请输入对方科目"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="业务摘要" prop="summary">
|
||||
<el-input
|
||||
v-model="queryParams.summary"
|
||||
placeholder="请输入业务摘要"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
余额计算<el-switch v-model="showBalance"/>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="journalAccountList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="日记账记录ID" align="center" prop="journalId" v-if="false"/>
|
||||
<el-table-column label="记账日期" align="center" prop="recordDate" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.recordDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="对方科目" align="center" prop="oppositeSubject" />
|
||||
<el-table-column label="业务摘要" align="center" prop="summary" />
|
||||
<el-table-column label="收入金额" align="center" prop="incomeAmount" />
|
||||
<el-table-column label="支出金额" align="center" prop="expendAmount" />
|
||||
<el-table-column label="账户余额" align="center" prop="balance" v-if="showBalance" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改日记账（绑定封账批次，未封账数据batch_id为NULL）对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="记账日期" prop="recordDate">
|
||||
<el-date-picker clearable
|
||||
v-model="form.recordDate"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择记账日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="对方科目" prop="oppositeSubject">
|
||||
<el-input v-model="form.oppositeSubject" placeholder="请输入对方科目" />
|
||||
</el-form-item>
|
||||
<el-form-item label="业务摘要" prop="summary">
|
||||
<el-input v-model="form.summary" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收入金额" prop="incomeAmount">
|
||||
<el-input v-model="form.incomeAmount" placeholder="请输入收入金额" />
|
||||
</el-form-item>
|
||||
<el-form-item label="支出金额" prop="expendAmount">
|
||||
<el-input v-model="form.expendAmount" placeholder="请输入支出金额" />
|
||||
</el-form-item>
|
||||
<el-form-item label="账户余额" prop="balance">
|
||||
<el-input v-model="form.balance" placeholder="请输入账户余额" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog title="修改账户" :visible.sync="openAccount" width="500px" append-to-body>
|
||||
<el-form ref="formAccount" :model="formAccount" label-width="80px">
|
||||
<el-form-item label="账户余额" prop="balance">
|
||||
<el-input v-model="formAccount.balance" placeholder="请输入账户余额" />
|
||||
</el-form-item>
|
||||
<el-form-item label="账户名称" prop="balance">
|
||||
<el-input v-model="formAccount.receiveAccountName" placeholder="请输入账户余额" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button :loading="buttonLoading" type="primary" @click="submitFormAccount">确 定</el-button>
|
||||
<el-button @click="openAccount = false">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { addJournalAccount, delJournalAccount, getJournalAccount, listJournalAccount, updateJournalAccount } from "@/api/oa/finance/journalAccount";
|
||||
import {
|
||||
getOaReceiveAccount,
|
||||
updateOaReceiveAccount
|
||||
} from "@/api/oa/oaReceiveAccount";
|
||||
|
||||
export default {
|
||||
name: "JournalAccount",
|
||||
props: {
|
||||
accountId: {
|
||||
type: [String, Number],
|
||||
required: true
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
// 按钮loading
|
||||
buttonLoading: false,
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 日记账（绑定封账批次，未封账数据batch_id为NULL）表格数据
|
||||
journalAccountList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
accountId: this.accountId,
|
||||
recordDate: undefined,
|
||||
oppositeSubject: undefined,
|
||||
summary: undefined,
|
||||
incomeAmount: undefined,
|
||||
expendAmount: undefined,
|
||||
balance: undefined,
|
||||
batchId: undefined,
|
||||
},
|
||||
accountBalance: 0,
|
||||
showBalance: false,
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
},
|
||||
openAccount: false,
|
||||
formAccount: {},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.fetchData();
|
||||
},
|
||||
watch: {
|
||||
accountId: {
|
||||
handler(newVal) {
|
||||
this.queryParams.accountId = newVal;
|
||||
this.showBalance = false;
|
||||
this.fetchData();
|
||||
},
|
||||
immediate: true
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
/** 查询日记账（绑定封账批次，未封账数据batch_id为NULL）列表 */
|
||||
fetchData() {
|
||||
this.loading = true;
|
||||
Promise.all([
|
||||
this.getAccountBalance(),
|
||||
this.getList()
|
||||
]).then(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
async getList() {
|
||||
const response = await listJournalAccount(this.queryParams);
|
||||
this.journalAccountList = response.rows;
|
||||
this.total = response.total;
|
||||
},
|
||||
async getAccountBalance() {
|
||||
const response = await getOaReceiveAccount(this.accountId);
|
||||
this.accountBalance = response.data.balance;
|
||||
this.formAccount = response.data
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
console.log(this.accountId)
|
||||
this.form = {
|
||||
journalId: undefined,
|
||||
accountId: this.accountId,
|
||||
recordDate: undefined,
|
||||
oppositeSubject: undefined,
|
||||
summary: undefined,
|
||||
incomeAmount: undefined,
|
||||
expendAmount: undefined,
|
||||
balance: undefined,
|
||||
batchId: undefined,
|
||||
remark: undefined,
|
||||
createTime: undefined,
|
||||
createBy: undefined,
|
||||
updateTime: undefined,
|
||||
updateBy: undefined,
|
||||
delFlag: undefined
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.journalId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = "添加日记账";
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.loading = true;
|
||||
this.reset();
|
||||
const journalId = row.journalId || this.ids
|
||||
getJournalAccount(journalId).then(response => {
|
||||
this.loading = false;
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改日记账";
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
this.buttonLoading = true;
|
||||
if (this.form.journalId != null) {
|
||||
updateJournalAccount(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.fetchData();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
} else {
|
||||
addJournalAccount(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.fetchData();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const journalIds = row.journalId || this.ids;
|
||||
this.$modal.confirm('是否确认删除日记账编号为"' + journalIds + '"的数据项？').then(() => {
|
||||
this.loading = true;
|
||||
return delJournalAccount(journalIds);
|
||||
}).then(() => {
|
||||
this.loading = false;
|
||||
this.fetchData();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('oa/journalAccount/export', {
|
||||
...this.queryParams
|
||||
}, `journalAccount_${new Date().getTime()}.xlsx`)
|
||||
},
|
||||
handleUpdateAccount() {
|
||||
this.openAccount = true;
|
||||
// this.form.accountBalance = this.accountBalance;
|
||||
},
|
||||
submitFormAccount() {
|
||||
this.$refs["formAccount"].validate(valid => {
|
||||
if (valid) {
|
||||
this.buttonLoading = true;
|
||||
updateOaReceiveAccount(this.formAccount).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.openAccount = false;
|
||||
this.fetchData();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
49
ruoyi-ui/src/views/oa/finance/journal/index.vue
Normal file
49
ruoyi-ui/src/views/oa/finance/journal/index.vue
Normal file
@@ -0,0 +1,49 @@
|
||||
<template>
|
||||
<div style="padding: 20px;">
|
||||
<el-row>
|
||||
<AccountTab @tab-click="handleTabClick" />
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="10" v-if="accountId">
|
||||
<el-col :span="22">
|
||||
<!-- 账户信息 -->
|
||||
<JournalTable :accountId="accountId" />
|
||||
</el-col>
|
||||
<el-col :span="2">
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row v-else>
|
||||
请选择账户查看日记账
|
||||
</el-row>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import AccountTab from './components/AccountTab.vue';
|
||||
import JournalTable from './components/JournalTable.vue';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
AccountTab,
|
||||
JournalTable,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
editableTabsValue: undefined,
|
||||
accountList: [],
|
||||
accountId: undefined,
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
|
||||
},
|
||||
methods: {
|
||||
handleTabClick(accountId) {
|
||||
// console.log(accountId)
|
||||
this.accountId = accountId;
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
Reference in New Issue
Block a user