qichexitong/car-shop-admin-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.28(收支管理(收入,支出,应收,应付

Browse Source
This commit is contained in:
Hong
2024-04-28 18:49:35 +08:00
parent 62b4ec1c70
commit 1578ed0405
2 changed files with 336 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/api/finance.js
View File

@@ -1,5 +1,57 @@
import request from '@/utils/request';
// //merchant/receivable/list
/**
* merchant/receivable/list 应收/应付
*/
export function orderReceivableListAPI(params) {
return request({
url: '/admin/merchant/receivable/list',
method: 'get',
params,
});
}
/**
* 添加应收应付
*/
export function receivableCreate(data) {
return request({
url: '/admin/merchant/receivable/create',
method: 'post',
data,
});
}
/**
* 添加支出,收入
*/
export function expenditureCreate(data) {
return request({
url: '/admin/merchant/income/expenditure/create',
method: 'post',
data,
});
}
/**
* merchant/receivable/list 收入/支付
*/
export function orderExpenditureListAPI(params) {
return request({
url: '/admin/merchant/income/expenditure/list',
method: 'get',
params,
});
}
/**
* 删除
*/
export function orderDeleteAPI(id) {
return request({
url: '/admin/merchant/receivable/delete/'+{id},
method: 'post',
});
}
/**
* /api/admin/merchant/car/reservation/order/settlement/list 维修订单结算查询分页
*/

361
src/views/finance/management/index.vue
View File

@@ -9,27 +9,27 @@
<el-tab-pane label="应付明细" name="meet"></el-tab-pane>
</el-tabs>
</div>
<el-form :inline="true" :model="ruleForm" class="demo-form-inline">
<el-form-item label="收款对象" v-if="activeName=='income'">
<el-form :inline="true" ref="ruleForm" :model="ruleForm" class="demo-form-inline">
<el-form-item label="收款对象" v-if="activeName == 'income'">
<el-select v-model="ruleForm.shopId" multiple filterable remote reserve-keyword placeholder="请输入关键词"
:remote-method="remoteMethod" :loading="loading">
<el-option v-for="item in optionsShop" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="付款对象" v-if="activeName=='expenditure'">
<el-form-item label="付款对象" v-if="activeName == 'expenditure'">
<el-select v-model="ruleForm.orderType" placeholder="请选择">
<el-option v-for="item in optionsType" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="应收对象" v-if="activeName=='receivable'">
<el-form-item label="应收对象" v-if="activeName == 'receivable'">
<el-select v-model="ruleForm.orderType" placeholder="请选择">
<el-option v-for="item in optionsType" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="应付对象" v-if="activeName=='meet'">
<el-form-item label="应付对象" v-if="activeName == 'meet'">
<el-select v-model="ruleForm.orderType" placeholder="请选择">
<el-option v-for="item in optionsType" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -41,13 +41,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="结算方式" v-if="activeName=='income'">
<el-form-item label="结算方式" v-if="activeName == 'income'">
<el-select v-model="ruleForm.orderType" placeholder="请选择">
<el-option v-for="item in optionsType" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="付款方式" v-if="activeName!='income'">
<el-form-item label="付款方式" v-if="activeName != 'income'">
<el-select v-model="ruleForm.orderType" placeholder="请选择">
<el-option v-for="item in optionsType" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -60,44 +60,45 @@
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button @click="resetForm('ruleForm')">重置</el-button>
<el-button @click="('ruleForm')">新建收入</el-button>
<el-button @click="('ruleForm')">新建支出</el-button>
<el-button @click="('ruleForm')">新建应收</el-button>
<el-button @click="('ruleForm')">新建应付</el-button>
<el-button type="primary" @click="onSubmit">查询</el-button>
<el-button type="primary" v-if="activeName == 'income'" @click="addAccessFn('收入')">新建收入</el-button>
<el-button type="primary" v-if="activeName == 'expenditure'" @click="addAccessFn('支出')">新建支出</el-button>
<el-button type="primary" v-if="activeName == 'receivable'" @click="addAccessFn('应收')">新建应收</el-button>
<el-button type="primary" v-if="activeName == 'meet'" @click="addAccessFn('支付')">新建应付</el-button>
</el-form-item>
</el-form>
<el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="small" highlight-current-row
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column prop="merName" label="收款对象" />
<el-table-column prop="merName" label="付款对象" />
<el-table-column prop="merName" label="应收对象" />
<el-table-column prop="merName" label="应付对象" />
<el-table-column prop="carNo" label="所属门店" />
<el-table-column prop="createTime" label="收款金额" />
<el-table-column prop="createTime" label="付款金额" />
<el-table-column prop="createTime" label="应收金额" />
<el-table-column prop="createTime" label="应付金额" />
<el-table-column prop="createTime" label="收款日期" />
<el-table-column prop="createTime" label="付款日期" />
<el-table-column prop="createTime" label="应收日期" />
<el-table-column prop="createTime" label="应付日期" />
<el-table-column prop="merName" label="费用类型" />
<el-table-column prop="totalPrice" label="结算方式" />
<el-table-column prop="totalPrice" label="付款方式" />
<el-table-column prop="carNo" label="收款人" />
<el-table-column prop="totalPrice" label="工单号" />
<el-table-column prop="totalPrice" label="对账单号" />
<el-table-column prop="totalPrice" label="对账日期" />
<el-table-column prop="totalPrice" label="开票状态" />
<el-table-column prop="totalPrice" label="开票日期" />
<el-table-column prop="totalPrice" label="备注" />
<el-table-column prop="id" label="序号" />
<el-table-column v-if="activeName == 'income'" prop="merName" label="收款对象" />
<el-table-column v-if="0" prop="merName" label="付款对象" />
<el-table-column v-if="activeName == 'income'" prop="merName" label="应收对象" />
<el-table-column v-if="0" prop="merName" label="应付对象" />
<el-table-column v-if="0" prop="carNo" label="所属门店" />
<el-table-column v-if="activeName == 'income'" prop="amountCollected" label="收款金额" />
<el-table-column v-if="0" prop="createTime" label="付款金额" />
<el-table-column v-if="0" prop="createTime" label="应收金额" />
<el-table-column v-if="0" prop="createTime" label="应付金额" />
<el-table-column v-if="activeName == 'income'" prop="paymentTime" label="收款日期" />
<el-table-column v-if="0" prop="paymentTime" label="付款日期" />
<el-table-column v-if="0" prop="createTime" label="应收日期" />
<el-table-column v-if="0" prop="createTime" label="应付日期" />
<el-table-column v-if="activeName == 'income'" prop="paymentMethod" label="费用类型" />
<el-table-column v-if="activeName == 'income'" prop="totalPrice" label="结算方式" />
<el-table-column v-if="0" prop="totalPrice" label="付款方式" />
<el-table-column v-if="activeName == 'income'" prop="carNo" label="收款人" />
<el-table-column prop="orderSn" label="工单号" />
<el-table-column prop="statementSn" label="对账单号" />
<el-table-column v-if="0" prop="totalPrice" label="对账日期" />
<el-table-column v-if="0" prop="totalPrice" label="开票状态" />
<el-table-column v-if="0" prop="totalPrice" label="开票日期" />
<el-table-column prop="remark" label="备注" />
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click="onDetails(scope.row)">查看</el-button>
<el-button type="text" size="small" >|</el-button>
<el-button type="text" size="small">|</el-button>
<el-button type="text" size="small" @click="onDetails(scope.row)">作废</el-button>
</template>
</el-table-column>
@@ -171,25 +172,173 @@
<el-table-column prop="subtotalPrice" label="小计" />
</el-table>
</div>
<!-- <span slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="dialogVisible = false">我知道了</el-button>
</span> -->
</div>
</el-drawer>
<!-- </el-dialog> -->
<!-- 新建收入 -->
<el-dialog :title="accessTitle" :visible.sync="accessVisible">
<el-form :inline="true" :model="addform" class="demo-form-inline">
<el-form-item :label="activeName == 'income' ? '收款对象' : '付款对象'" :label-width='formLabelWidth'>
<el-input v-model="addform.recipient" :placeholder="activeName == 'income' ? '收款对象' : '付款对象'"
style="width: 200px;"></el-input>
</el-form-item>
<el-form-item label="联系人" :label-width='formLabelWidth'>
<el-input v-model="addform.contacts" placeholder="联系人" style="width: 200px;"></el-input>
</el-form-item>
<el-form-item label="联系电话" :label-width='formLabelWidth'>
<el-input v-model="addform.phone" placeholder="联系电话" style="width: 200px;"></el-input>
</el-form-item>
<el-form-item label="费用类型" :label-width='formLabelWidth'>
<el-select v-model="addform.costType" placeholder="费用类型" style="width: 200px;">
<el-option label="区域一" :value="1"></el-option>
<el-option label="区域二" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="activeName == 'income' ? '收款金额' : '付款金额'" :label-width='formLabelWidth'>
<el-input v-model="addform.amountCollected" :placeholder="activeName == 'income' ? '收款金额' : '付款金额'"
style="width: 200px;"></el-input>
</el-form-item>
<el-form-item :label="activeName == 'income' ? '收款日期' : '付款日期'" :label-width='formLabelWidth'>
<!-- <el-input v-model="addform.paymentTime" placeholder="收款金额" style="width: 200px;"></el-input> -->
<el-date-picker style="width: 200px;" v-model="addform.paymentTime" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="收款方式" :label-width='formLabelWidth'>
<el-select v-model="addform.paymentMethod" placeholder="收款方式" style="width: 200px;">
<el-option v-for="(item) in cashierType" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工单号" :label-width='formLabelWidth'>
<el-input v-model="addform.orderSn" placeholder="工单号" style="width: 200px;"></el-input>
</el-form-item>
<el-form-item label="对账单号" :label-width='formLabelWidth'>
<el-input v-model="addform.statementSn" placeholder="对账单号" style="width: 200px;"></el-input>
</el-form-item>
<el-form-item :label="activeName == 'income' ? '收款备注' : '付款备注'" :label-width='formLabelWidth'>
<el-input v-model="addform.remark" placeholder="备注" style="width: 790px;"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="accessVisible = false">取 消</el-button>
<el-button type="primary" @click="accessSwFn">确 定</el-button>
</div>
</el-dialog>
<!-- 新建应收/应付 -->
<el-dialog :title="incomeTitle" :visible.sync="incomeVisible">
<el-form :inline="true" :model="addform" class="demo-form-inline">
<el-form-item :label="activeName == 'receivable' ? '应收对象' : '应付对象'" :label-width='formLabelWidth'>
<el-input v-model="addform.accountsReceivable" :placeholder="activeName == 'receivable' ? '应收对象' : '应付对象'"
style="width: 200px;"></el-input>
</el-form-item>
<el-form-item label="联系人" :label-width='formLabelWidth'>
<el-input v-model="addform.contacts" placeholder="联系人" style="width: 200px;"></el-input>
</el-form-item>
<el-form-item label="联系电话" :label-width='formLabelWidth'>
<el-input v-model="addform.phone" placeholder="联系电话" style="width: 200px;"></el-input>
</el-form-item>
<el-form-item label="费用类型" :label-width='formLabelWidth'>
<el-select v-model="addform.costType" placeholder="费用类型" style="width: 200px;">
<el-option label="区域一" :value="1"></el-option>
<el-option label="区域二" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="activeName == 'receivable' ? '应收金额' : '应付金额'" :label-width='formLabelWidth'>
<el-input v-model="addform.payableAmount" :placeholder="activeName == 'receivable' ? '应收金额' : '应付金额'"
style="width: 200px;"></el-input>
</el-form-item>
<el-form-item :label="activeName == 'receivable' ? '应收日期' : '应付日期'" :label-width='formLabelWidth'>
<el-date-picker style="width: 200px;" v-model="addform.payableItme" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="对账单号" :label-width='formLabelWidth'>
<el-input v-model="addform.statementSn" placeholder="对账单号" style="width: 200px;"></el-input>
</el-form-item>
<el-form-item :label="'对账日期'" :label-width='formLabelWidth'>
<el-date-picker style="width: 200px;" v-model="addform.paymentTime" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="开票状态" :label-width='formLabelWidth'>
<el-select v-model="addform.invoiceStatus" placeholder="开票状态" style="width: 200px;">
<el-option label="已开票" :value="1"></el-option>
<el-option label="未开票" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'开票日期'" :label-width='formLabelWidth'>
<el-date-picker style="width: 200px;" v-model="addform.invoiceItme" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="收款状态" :label-width='formLabelWidth'>
<el-select v-model="addform.gatheringStatus" placeholder="收款状态" style="width: 200px;">
<el-option label="已收款" :value="1"></el-option>
<el-option label="未收款" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'收款日期'" :label-width='formLabelWidth'>
<el-date-picker style="width: 200px;" v-model="addform.gatheringTime" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item :label="activeName == 'receivable' ? '应收备注' : '应付备注'" :label-width='formLabelWidth'>
<el-input v-model="addform.remark" placeholder="备注" style="width: 790px;"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="incomeVisible = false">取 消</el-button>
<el-button type="primary" @click="accessSwFn(2)">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { reconciliationListAPI, infoListApi, statementListApi } from '@/api/finance';
import { orderReceivableListAPI, orderExpenditureListAPI, expenditureCreate, receivableCreate, infoListApi, statementListApi } from '@/api/finance';
import yearOptions from '@/libs/yearOptions';
import { checkPermi } from '@/utils/permission'; // 权限判断函数
export default {
name: 'statement',
data() {
return {
//详情表单
detailsForm:{},
//新建收入支出
accessTitle: '新建收入',
accessVisible: false,
//新建应收/应付
incomeTitle: '新建应收',
incomeVisible: false,
//添加数据表单
addform: {},
formLabelWidth: '80px',
//详情表单
detailsForm: {},
//收银方式
cashierType: [{
value: 1,
label: '挂账'
}, {
value: 2,
label: '现金'
}, {
value: 3,
label: '转账'
}, {
value: 4,
label: '收款码'
}, {
value: 5,
label: 'APP余额'
}, {
value: 6,
label: '消费券'
}, {
value: 7,
label: '公司承担'
}, {
value: 8,
label: '其他'
}],
//加载loading
loading: false,
//筛选表单
@@ -233,9 +382,50 @@ export default {
};
},
mounted() {
this.getList(1);
this.getListFn()
},
methods: {
//打开新建弹出层
addAccessFn(type) {
if (type == '收入') {
this.accessTitle = '新建收入'
this.addform.isIncome = true
this.accessVisible = true
} else if (type == '支出') {
this.accessTitle = '新建支出'
this.addform.isIncome = false
this.accessVisible = true
} else if (type == '应收') {
this.incomeTitle = '新建应收'
this.addform.isIncome = true
this.incomeVisible = true
} else {
this.incomeTitle = '新建应付'
this.addform.isIncome = false
this.incomeVisible = true
}
},
//提交添加数据
accessSwFn(type) {
console.log(this.addform);
if (type == 2) {
//应收应付
this.addform.payableAmount = Number(this.addform.payableAmount)
receivableCreate(this.addform).then(res => {
this.incomeVisible = false
this.getListFn()
console.log(res);
})
} else {
this.addform.amountCollected = Number(this.addform.amountCollected)
expenditureCreate(this.addform).then(res => {
this.accessVisible = false
this.getListFn()
console.log(res);
})
}
},
//选择框选择监听
handleSelectionChange(val) {
console.log(val);
@@ -268,13 +458,53 @@ export default {
onchangeTime(e) {
this.timeVal = e;
this.tableFrom.specificDateStr = e ? this.timeVal.join(',') : '';
this.getList(1);
this.getListFn();
},
handleClick(e) {
// console.log(e, 'tab');
this.tableFrom.specificDateStr = '';
this.timeVal = [];
this.getList(1);
this.page = 1
this.limit = 20
console.log(this.activeName);
this.getListFn()
},
//查询列表
getListFn() {
if (this.activeName == 'income') {
//收入
this.tableFrom.isIncome = true
this.orderExpenditureListAPIFn()
} else if (this.activeName == 'expenditure') {
//支出
this.tableFrom.isIncome = false
this.orderExpenditureListAPIFn()
} else if (this.activeName == 'receivable') {
//应收
this.tableFrom.isIncome = true
this.orderReceivableListAPIFn()
} else {
//应付
this.tableFrom.isIncome = false
this.orderReceivableListAPIFn()
}
},
//收入支出
orderExpenditureListAPIFn() {
this.listLoading = true;
orderExpenditureListAPI(this.tableFrom).then(res => {
console.log(res);
this.tableData.data = res.list;
this.tableData.total = res.total;
this.listLoading = false;
})
},
//应收,应付
orderReceivableListAPIFn() {
this.listLoading = true;
orderReceivableListAPI(this.tableFrom).then(res => {
console.log(res);
this.tableData.data = res.list;
this.tableData.total = res.total;
this.listLoading = false;
})
},
onDetails(date) {
this.dialogVisible = true;
@@ -285,39 +515,16 @@ export default {
},
seachList() {
this.handleClose();
this.getList(1);
},
// 列表
getList(num) {
this.listLoading = true;
this.tableFrom.page = num ? num : this.tableFrom.page;
this.activeName === 'reco'
? reconciliationListAPI(this.tableFrom)
.then((res) => {
this.tableData.data = res.list;
this.tableData.total = res.total;
this.listLoading = false;
})
.catch(() => {
this.listLoading = false;
})
: statementListApi(this.tableFrom)
.then((res) => {
this.tableData.data = res.list;
this.tableData.total = res.total;
this.listLoading = false;
})
.catch(() => {
this.listLoading = false;
});
this.getListFn(1);
},
pageChange(page) {
this.tableFrom.page = page;
this.getList();
this.getListFn()
},
handleSizeChange(val) {
this.tableFrom.limit = val;
this.getList(1);
this.getListFn()
},
handleClose() {
this.dialogVisible = false;
@@ -328,14 +535,14 @@ export default {
storeApi.brandDeleteApi(id).then((res) => {
this.$message.success('删除成功');
this.$store.commit('merchant/SET_MerchantClassify', []);
this.getList(1);
this.getListFn(1);
});
});
},
onchangeIsShow(row) {
activityApi.activitySwitchApi(row.id).then((res) => {
this.$message.success('操作成功');
this.getList();
this.getListFn();
});
},
},