✨ feat: 财务中心增加其他收支
This commit is contained in:
砂糖
44
klp-ui/src/api/finance/otherIncome.js
Normal file
44
klp-ui/src/api/finance/otherIncome.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询其他收入列表
|
||||
export function listOtherIncome(query) {
|
||||
return request({
|
||||
url: '/klp/otherIncome/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询其他收入详细
|
||||
export function getOtherIncome(otherIncomeId) {
|
||||
return request({
|
||||
url: '/klp/otherIncome/' + otherIncomeId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增其他收入
|
||||
export function addOtherIncome(data) {
|
||||
return request({
|
||||
url: '/klp/otherIncome',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改其他收入
|
||||
export function updateOtherIncome(data) {
|
||||
return request({
|
||||
url: '/klp/otherIncome',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除其他收入
|
||||
export function delOtherIncome(otherIncomeId) {
|
||||
return request({
|
||||
url: '/klp/otherIncome/' + otherIncomeId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@@ -29,7 +29,7 @@ $background-light-base: lighten($background-base, 5%);
|
||||
$background-lighter-base: lighten($background-base, 10%);
|
||||
$--color-text-primary: #1a1a1a;
|
||||
$panel-bg-base: $--color-text-primary;
|
||||
$table-bg-base: $--color-text-primary;
|
||||
$table-bg-base: transparent;
|
||||
|
||||
// 亮色边框色原始值
|
||||
$border-color-base: #6E757D;
|
||||
|
||||
275
klp-ui/src/views/finance/other/index.vue
Normal file
275
klp-ui/src/views/finance/other/index.vue
Normal file
@@ -0,0 +1,275 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="收支来源" prop="source">
|
||||
<el-input v-model="queryParams.source" placeholder="请输入收支来源" clearable @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收支分类" prop="incomeType">
|
||||
<el-input v-model="queryParams.incomeType" placeholder="请输入收支分类" clearable @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收支类型" prop="type">
|
||||
<el-radio-group v-model="type" @change="handleQuery">
|
||||
<el-radio label="0">收入</el-radio>
|
||||
<el-radio label="1">支出</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button size="small" type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||
<el-button size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button size="small" type="primary" plain icon="el-icon-plus" @click="handleAdd">新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button size="small" type="success" plain icon="el-icon-edit" :disabled="single" @click="handleUpdate">修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button size="small" type="danger" plain icon="el-icon-delete" :disabled="multiple" @click="handleDelete">删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button size="small" type="warning" plain icon="el-icon-download" @click="handleExport">导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="otherIncomeList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="其他收支ID" align="center" prop="otherIncomeId" v-if="false" />
|
||||
<el-table-column label="收支日期" align="center" prop="incomeDate" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.incomeDate) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收支类型" align="center" prop="incomeType" />
|
||||
<el-table-column label="收支金额" align="center" prop="amount" />
|
||||
<el-table-column label="收支来源" align="center" prop="source" />
|
||||
<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 type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
|
||||
<el-button 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" />
|
||||
|
||||
<!-- 添加或修改其他收支对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="otherIncomeRef" :model="form" :rules="rules" label-width="80px">
|
||||
<!-- 单选框收入或支出 -->
|
||||
<el-form-item label="收支类型" prop="type">
|
||||
<el-radio-group v-model="type">
|
||||
<el-radio label="0">收入</el-radio>
|
||||
<el-radio label="1">支出</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="收支日期" prop="incomeDate">
|
||||
<el-date-picker clearable v-model="form.incomeDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
||||
placeholder="请选择收支日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="收支分类" prop="incomeType">
|
||||
<el-input v-model="form.incomeType" placeholder="请输入收支分类" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收支金额" prop="amount">
|
||||
<el-input v-model="form.amount" placeholder="请输入收支金额" />
|
||||
</el-form-item>
|
||||
<el-form-item label="收支来源" prop="source">
|
||||
<el-input v-model="form.source" placeholder="请输入收支来源" />
|
||||
</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>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listOtherIncome, getOtherIncome, delOtherIncome, addOtherIncome, updateOtherIncome } from "@/api/finance/otherIncome";
|
||||
|
||||
export default {
|
||||
name: "OtherIncome",
|
||||
data() {
|
||||
return {
|
||||
otherIncomeList: [],
|
||||
open: false,
|
||||
buttonLoading: false,
|
||||
loading: true,
|
||||
showSearch: true,
|
||||
ids: [],
|
||||
single: true,
|
||||
multiple: true,
|
||||
total: 0,
|
||||
title: "",
|
||||
type: '0',
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
incomeDate: undefined,
|
||||
incomeType: undefined,
|
||||
amount: undefined,
|
||||
source: undefined,
|
||||
type: 1
|
||||
},
|
||||
form: {
|
||||
otherIncomeId: null,
|
||||
incomeDate: null,
|
||||
incomeType: null,
|
||||
amount: null,
|
||||
source: null,
|
||||
remark: null,
|
||||
delFlag: null,
|
||||
createTime: null,
|
||||
createBy: null,
|
||||
updateTime: null,
|
||||
updateBy: null,
|
||||
type: '0'
|
||||
},
|
||||
rules: {}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
typeLabel() {
|
||||
return this.type === '0' ? '收入' : '支出';
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
/** 查询其他收支列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listOtherIncome({ ...this.queryParams, type: this.type }).then(response => {
|
||||
this.otherIncomeList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
otherIncomeId: null,
|
||||
incomeDate: null,
|
||||
incomeType: null,
|
||||
amount: null,
|
||||
source: null,
|
||||
remark: null,
|
||||
delFlag: null,
|
||||
createTime: null,
|
||||
createBy: null,
|
||||
updateTime: null,
|
||||
updateBy: null,
|
||||
type: this.type
|
||||
};
|
||||
this.resetForm("otherIncomeRef");
|
||||
// this.$refs.otherIncomeRef.reset();
|
||||
},
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryRef");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.otherIncomeId);
|
||||
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 _otherIncomeId = row ? row.otherIncomeId : this.ids[0];
|
||||
getOtherIncome(_otherIncomeId).then(response => {
|
||||
this.loading = false;
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改其他收支";
|
||||
});
|
||||
},
|
||||
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs.otherIncomeRef.validate(valid => {
|
||||
if (valid) {
|
||||
this.buttonLoading = true;
|
||||
if (this.form.otherIncomeId != null) {
|
||||
updateOtherIncome(this.form).then(() => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
} else {
|
||||
addOtherIncome({ ...this.form, type: this.type }).then(() => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}).finally(() => {
|
||||
this.buttonLoading = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const _otherIncomeIds = row ? row.otherIncomeId : this.ids.join(',');
|
||||
this.$modal.confirm(`是否确认删除其他收支编号为"${_otherIncomeIds}"的数据项？`).then(() => {
|
||||
this.loading = true;
|
||||
return delOtherIncome(_otherIncomeIds);
|
||||
}).then(() => {
|
||||
this.loading = true;
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {
|
||||
}).finally(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.$download('oa/otherIncome/export', {
|
||||
...this.queryParams
|
||||
}, `otherIncome_${new Date().getTime()}.xlsx`);
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@@ -30,7 +30,7 @@
|
||||
</el-form-item>
|
||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
||||
<el-form-item style="width:100%;">
|
||||
<el-button :loading="loading" size="medium" type="primary" style="width:100%;"
|
||||
<el-button :loading="loading" size="medium" type="primary" style="width:100%; height: 40px; font-size: 16px;"
|
||||
@click.native.prevent="handleLogin">
|
||||
<span v-if="!loading">登 录</span>
|
||||
<span v-else>登 录 中...</span>
|
||||
@@ -154,12 +154,12 @@ export default {
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss">
|
||||
// 引入全局主题变量，假设你有全局的variables.scss定义了以下变量
|
||||
$--color-background: #2b2f36;
|
||||
$--color-text-primary: #ffffff;
|
||||
$--color-background: #f5f5f5;
|
||||
$--color-text-primary: #111;
|
||||
$--color-text-secondary: #b6bdc5;
|
||||
$--border-color-light: #4c5057;
|
||||
$--color-primary: #5F7BA0;
|
||||
$--metal-gradient-light: linear-gradient(145deg, #3e434a, #363b41);
|
||||
$--color-primary: #657b96;
|
||||
$--metal-gradient-light: linear-gradient(145deg, #f5f5f5, #fff);
|
||||
|
||||
.login-page {
|
||||
display: flex;
|
||||
@@ -203,7 +203,6 @@ $--metal-gradient-light: linear-gradient(145deg, #3e434a, #363b41);
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 4px 32px 0 rgba(0, 0, 0, 0.2);
|
||||
background: $--color-background; // 深色背景
|
||||
border: 1px solid $--border-color-light; // 浅色边框
|
||||
}
|
||||
|
||||
.login-title-welcome {
|
||||
@@ -261,9 +260,7 @@ $--metal-gradient-light: linear-gradient(145deg, #3e434a, #363b41);
|
||||
.el-button--primary {
|
||||
background: $--color-primary; // 主题色按钮
|
||||
border: none;
|
||||
&:hover {
|
||||
opacity: 0.9;
|
||||
}
|
||||
color: #111;
|
||||
}
|
||||
|
||||
.login-right {
|
||||
|
||||
@@ -32,6 +32,26 @@
|
||||
<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="8">
|
||||
<span>含税金额：</span>
|
||||
<span style="margin-right: 10px;">{{ orderInfo.taxAmount }}</span>
|
||||
<span style="margin-right: 10px;">-</span>
|
||||
<span style="margin-right: 10px;">{{ actualAmount }}</span>
|
||||
<span style="margin-right: 10px;">=</span>
|
||||
<span style="color: red; margin-right: 10px;">{{ amountDifference }}</span>
|
||||
</el-col>
|
||||
|
||||
<!-- 无税部分 -->
|
||||
<el-col :span="8">
|
||||
<span>无税金额：</span>
|
||||
<span style="margin-right: 10px;">{{ orderInfo.noTaxAmount }}</span>
|
||||
<span style="margin-right: 10px;">-</span>
|
||||
<span style="margin-right: 10px;">{{ noTaxAmount }}</span>
|
||||
<span style="margin-right: 10px;">=</span>
|
||||
<span style="color: red; margin-right: 10px;">{{ noTaxAmountDifference }}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<KLPTable v-loading="loading" :data="orderDetailList">
|
||||
@@ -192,6 +212,22 @@ export default {
|
||||
// 是否可以编辑（订单状态为新建时才能编辑）
|
||||
canEdit() {
|
||||
return this.orderInfo && this.orderInfo.orderStatus === EOrderStatus.NEW;
|
||||
},
|
||||
actualAmount() {
|
||||
return this.orderDetailList?.reduce((total, item) => {
|
||||
return total + (item.taxPrice || 0) * (item.quantity || 0);
|
||||
}, 0) || 0;
|
||||
},
|
||||
amountDifference() {
|
||||
return ((this.orderInfo?.taxAmount || 0) - this.actualAmount);
|
||||
},
|
||||
noTaxAmount() {
|
||||
return this.orderDetailList?.reduce((total, item) => {
|
||||
return total + (item.noTaxPrice || 0) * (item.quantity || 0);
|
||||
}, 0) || 0;
|
||||
},
|
||||
noTaxAmountDifference() {
|
||||
return ((this.orderInfo?.noTaxAmount || 0) - this.noTaxAmount);
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
|
||||
Reference in New Issue
Block a user