abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善发票管理前端，修复不能组合开票 bug

Browse Source
This commit is contained in:
ryoeiken 2021-01-22 17:53:43 +08:00
parent 159132ee7e
commit d92f8cd997
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/views/fantang/invoiceReturn/index.vue
View File

@ -413,7 +413,7 @@
<el-table-column label="发票号" align="center" prop="invoiceNum"/> <el-table-column label="发票号" align="center" prop="invoiceNum"/>
<el-table-column label="税号" align="center" prop="taxId"/> <el-table-column label="税号" align="center" prop="taxId"/>
<el-table-column label="收款方式" align="center" prop="collectionType"/> <el-table-column label="收款方式" align="center" prop="collectionType"/>
<el-table-column label="开票类型" align="center" prop="invoiceType" :formatter="formatInvoiceType"/> <el-table-column label="回款跟踪" align="center" prop="invoiceType" :formatter="formatInvoiceType"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -500,9 +500,9 @@ export default {
methods: { methods: {
formatInvoiceType(row) { formatInvoiceType(row) {
if (row.invoiceType === 1 || row.invoiceType === "1") { if (row.invoiceType === 1 || row.invoiceType === "1") {
return "开票" return "完成"
} else { } else {
return "挂账" return "未完成"
} }
}, },
/** 查询财务收费开票列表 */ /** 查询财务收费开票列表 */

27
ruoyi-ui/src/views/fantang/settlement/index.vue
View File

@ -188,13 +188,7 @@
</template> </template>
<script> <script>
import { import {delSettlement, exportSettlement, getSettlement, listSettlement} from "../../../api/fantang/settlement";
addSettlement,
delSettlement,
exportSettlement,
getSettlement,
listSettlement
} from "../../../api/fantang/settlement";
import {addToInvoice} from "../../../api/fantang/invoice"; import {addToInvoice} from "../../../api/fantang/invoice";
export default { export default {
@ -442,19 +436,12 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.settleId != null) { addToInvoice(this.form).then(response => {
addToInvoice(this.form).then(response => { this.msgSuccess("已开票");
this.msgSuccess("已开票"); this.open = false;
this.open = false; this.combinationOpen = false;
this.getList(); this.getList();
}) })
} else {
addSettlement(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
} }
}); });
}, },