feat(finance): 新增财务应收应付核销功能

- 新增应收单据查询、详情查看接口 - 新增收款计划与开票计划管理接口 - 新增核销记录列表与详情查询接口 - 新增付款核销详情抽屉组件 - 新增核销记录查询页面，支持多条件筛选 - 实现核销记录反核销功能 - 添加核销类型字典配置支持
2025-12-17 20:14:26 +08:00 · 2025-12-17 20:14:26 +08:00 · 6c3f344b92
parent ed90f7ce87
commit 6c3f344b92
4 changed files with 427 additions and 0 deletions
--- a/oms_web/oms_vue/src/api/finance/receivable.js
+++ b/oms_web/oms_vue/src/api/finance/receivable.js
@ -0,0 +1,78 @@
+import request from '@/utils/request'
+
+// 查询销售应收单列表
+export function listReceivable(query) {
+  return request({
+    url: '/finance/receivable/list',
+    method: 'post',
+    data: query
+  })
+}
+
+// 查询销售应收单详情
+export function getReceivable(id) {
+  return request({
+    url: '/finance/receivable/' + id,
+    method: 'get'
+  })
+}
+
+// 查询收款计划列表
+export function getReceiptPlan(receivableBillId) {
+  return request({
+    url: `/finance/receivable/plan/${receivableBillId}`,
+    method: 'get'
+  })
+}
+
+// 更新收款计划
+export function updateReceiptPlan(receivableBillId, data) {
+  return request({
+    url: `/finance/receivable/plan/${receivableBillId}`,
+    method: 'post',
+    data: data
+  })
+}
+
+// 合并并发起收款
+export function mergeAndInitiateReceipt(data) {
+  return request({
+    url: '/finance/receivable/mergeAndInitiateReceipt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 合并并发起开票
+export function mergeAndInitiateInvoice(data) {
+  return request({
+    url: '/finance/receivable/mergeAndInitiateInvoice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询开票计划列表
+export function getInvoicePlan(receivableBillId) {
+  return request({
+    url: `/finance/receivable/invoice/plan/${receivableBillId}`,
+    method: 'get'
+  })
+}
+
+// 更新开票计划
+export function updateInvoicePlan(receivableBillId, data) {
+  return request({
+    url: `/finance/receivable/invoice/plan/${receivableBillId}`,
+    method: 'post',
+    data: data
+  })
+}
+
+// 同步收款计划至开票计划
+export function syncToInvoicePlan(receivableBillId) {
+  return request({
+    url: `/finance/receivable/plan/sync/${receivableBillId}`,
+    method: 'post'
+  })
+}
--- a/oms_web/oms_vue/src/api/finance/writeoff.js
+++ b/oms_web/oms_vue/src/api/finance/writeoff.js
@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 查询核销记录列表
+export function listWriteOff(query) {
+  return request({
+    url: '/finance/writeoff/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询核销详情
+export function getWriteOff(id) {
+  return request({
+    url: '/finance/writeoff/' + id,
+    method: 'get'
+  })
+}
+
+// 删除核销记录
+export function delWriteOff(ids) {
+  return request({
+    url: '/finance/writeoff/' + ids,
+    method: 'delete'
+  })
+}
--- a/oms_web/oms_vue/src/views/finance/writeoff/payment/WriteOffDetailDrawer.vue
+++ b/oms_web/oms_vue/src/views/finance/writeoff/payment/WriteOffDetailDrawer.vue
@ -0,0 +1,89 @@
+<template>
+  <el-drawer
+    title="核销详情"
+    :visible.sync="visible"
+    direction="rtl"
+    size="60%"
+    @close="handleClose"
+  >
+    <div class="drawer-body" v-if="detail">
+            <div class="section">
+              <el-divider content-position="left">付款单信息</el-divider>
+              <el-table :data="[detail]" border stripe>
+                <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+                <el-table-column prop="writeOffAmount" label="本次核销含税总价(元)" align="center"></el-table-column>
+                <el-table-column prop="vendorName" label="制造商名称" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="paymentBillCode" label="采购付款单编号" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="paymentCreateTime" label="付款单生成时间" align="center" width="160">
+                   <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.paymentBill.createTime) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="paymentBillType" label="付款单类型" align="center">
+                  <template slot-scope="scope">
+                    <dict-tag :options="dict.type.payment_bill_type" :value="scope.row.paymentBill.paymentBillType"/>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+
+            <div class="section">        <el-divider content-position="left">应付单明细</el-divider>
+        <el-table :data="detail.detailList" border stripe>
+          <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
+          <el-table-column prop="paymentAmount" label="本次核销含税总价(元)" align="center"></el-table-column>
+          <el-table-column prop="vendorName" label="制造商名称" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="payableBillCode" label="采购应付单编号" align="center" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="createTime" label="应付单生成时间" align="center"></el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+export default {
+  name: "WriteOffDetailDrawer",
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    detail: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  dicts: ['finance_write_off_type', 'payment_bill_type'],
+  methods: {
+    handleClose() {
+      this.$emit("update:visible", false);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.drawer-body {
+  padding: 20px;
+  height: calc(100vh - 80px);
+  overflow-y: auto;
+}
+
+.details-container {
+  border: 1px solid #EBEEF5;
+  padding: 15px;
+  border-radius: 4px;
+  background-color: #f8f8f9;
+}
+
+.detail-item {
+  margin-bottom: 12px;
+  font-size: 14px;
+  color: #606266;
+  line-height: 1.5;
+}
+
+.section {
+  margin-bottom: 25px;
+}
+</style>
--- a/oms_web/oms_vue/src/views/finance/writeoff/payment/writeoffRecord.vue
+++ b/oms_web/oms_vue/src/views/finance/writeoff/payment/writeoffRecord.vue
@ -0,0 +1,234 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="核销序号" prop="writeOffCode">
+        <el-input
+          v-model="queryParams.writeOffCode"
+          placeholder="请输入核销序号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购应付单编号" prop="payableBillCode">
+        <el-input
+          v-model="queryParams.payableBillCode"
+          placeholder="请输入采购应付单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="采购付款单编号" prop="paymentBillCode">
+        <el-input
+          v-model="queryParams.paymentBillCode"
+          placeholder="请输入采购付款单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="制造商名称" prop="vendorName">
+         <el-select v-model="queryParams.vendorName" placeholder="请选择制造商名称" clearable filterable>
+          <el-option
+            v-for="item in vendorOptions"
+            :key="item.vendorName"
+            :label="item.vendorName"
+            :value="item.vendorName"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="核销类型" prop="writeOffType">
+        <el-select v-model="queryParams.writeOffType" placeholder="请选择核销类型" clearable>
+          <el-option
+            v-for="dict in dict.type.finance_write_off_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="核销时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </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="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >反核销</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="writeOffList" @selection-change="handleSelectionChange" row-key="id">
+      <el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
+      <el-table-column label="核销序号" align="center" prop="writeOffCode" />
+      <el-table-column label="核销人" align="center" prop="createByName" />
+      <el-table-column label="核销时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="采购付款单编号" align="center" prop="paymentBillCode" />
+      <el-table-column label="制造商名称" align="center" prop="vendorName" />
+      <el-table-column label="核销类型" align="center" prop="writeOffType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.finance_write_off_type" :value="scope.row.writeOffType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="核销含税总价(元)" align="center" prop="writeOffAmount" />
+      <el-table-column label="核销未税总价(元)" align="center" prop="writeOffAmountWithoutTax" />
+      <el-table-column label="核销税额(元)" align="center" prop="writeOffTaxAmount" />
+      <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-view"
+            @click="handleDetail(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"
+    />
+
+    <!-- 详情抽屉 -->
+    <write-off-detail-drawer :visible.sync="open" :detail="form" />
+  </div>
+</template>
+
+<script>
+import { listWriteOff, getWriteOff, delWriteOff } from "@/api/finance/writeoff";
+import { listVendor } from "@/api/base/vendor";
+import WriteOffDetailDrawer from "./WriteOffDetailDrawer";
+
+export default {
+  name: "WriteOffRecord",
+  components: {
+    WriteOffDetailDrawer
+  },
+  dicts: ['finance_write_off_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      writeOffList: [],
+      // 制造商选项
+      vendorOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        writeOffCode: null,
+        payableBillCode: null,
+        paymentBillCode: null,
+        vendorName: null,
+        writeOffType: null,
+      },
+      // 表单参数
+      form: {}
+    };
+  },
+  created() {
+    this.getList();
+    this.getVendorList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      listWriteOff(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.writeOffList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 查询制造商列表 */
+    getVendorList() {
+      listVendor().then(response => {
+        this.vendorOptions = response.rows;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 查看详情 */
+    handleDetail(row) {
+      this.loading = true;
+      getWriteOff(row.id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "核销详情";
+        this.loading = false;
+      });
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.multiple = !selection.length
+    },
+    /** 反核销按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认反核销核销序号为"' + ids + '"的数据项？').then(function() {
+        return delWriteOff(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("反核销成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>