Merge remote-tracking branch 'origin/dev_NEW_pro' into dev-new_pro_OA

yyb

22 小时以前 5470429a79313630a7ddef601de1d89e7dada754

 src/views/financialManagement/payable/purchaseReturn.vue

@@ -1,26 +1,20 @@
<template>
  <!-- 采购退货 -->

  <div class="app-container">
    <el-form :model="filters" :inline="true">
      <el-form-item label="退货单号:">
        <el-input
          v-model="filters.returnNo"
          placeholder="请输入退货单号"
          clearable
          style="width: 200px"
        />
        <el-input v-model="filters.returnNo" placeholder="请输入退货单号" clearable style="width: 200px;" />
      </el-form-item>

      <el-form-item label="供应商:">
        <el-input
          v-model="filters.supplierName"
          placeholder="请输入供应商"
          clearable
          style="width: 200px"
        />
        <el-select v-model="filters.supplierId" placeholder="请选择供应商" clearable filterable style="width: 200px;">
          <el-option
            v-for="item in supplierList"
            :key="item.id"
            :label="item.supplierName"
            :value="item.id"
          />
        </el-select>
      </el-form-item>

      <el-form-item label="退货日期:">
        <el-date-picker
          v-model="filters.dateRange"
@@ -33,23 +27,18 @@
          clearable
        />
      </el-form-item>

      <el-form-item>
        <el-button type="primary" @click="onSearch">搜索</el-button>

        <el-button @click="resetFilters">重置</el-button>
      </el-form-item>
    </el-form>

    <div class="table_list">
      <div class="actions">
        <div></div>

        <div>
          <el-button @click="handleOut" icon="Download">导出</el-button>
        </div>
      </div>

      <PIMTable
        rowKey="id"
        :column="columns"
@@ -57,9 +46,7 @@
        :tableLoading="tableLoading"
        :page="{
          current: pagination.currentPage,

          size: pagination.pageSize,

          total: pagination.total,
        }"
        @pagination="changePage"
@@ -68,14 +55,11 @@
  </div>
</template>



<script setup>
import { ref, reactive, onMounted, getCurrentInstance } from "vue";

import { ElMessage } from "element-plus";

import { listPageAccountPurchaseReturn } from "@/api/financialManagement/accountPurchase";
import { listSupplier } from "@/api/basicData/supplierManageFile.js";

defineOptions({
  name: "采购退货",
@@ -85,38 +69,26 @@

const filters = reactive({
  returnNo: "",

  supplierName: "",

  supplierId: "",
  dateRange: [],
});

const pagination = reactive({
  currentPage: 1,

  pageSize: 10,

  total: 0,
});

const columns = [
  { label: "退货单号", prop: "returnNo", minWidth: "150" },

  { label: "供应商", prop: "supplierName", minWidth: "180" },

  { label: "关联入库单号", prop: "inboundBatches", minWidth: "150" },

  { label: "退货日期", prop: "preparedAt", minWidth: "170" },

  {
    label: "退款总额",

    prop: "totalAmount",

    minWidth: "150",

    align: "right",

    formatData: (val) =>
      val === null || val === undefined || val === ""
        ? ""
@@ -125,66 +97,65 @@
            maximumFractionDigits: 2,
          }),
  },

  { label: "退货方式", prop: "returnType", minWidth: "150" },

  { label: "采购订单号", prop: "purchaseContractNumber", minWidth: "150" },
];

const dataList = ref([]);

const tableLoading = ref(false);
const supplierList = ref([]);

function buildFilterParams() {
  const params = {
    returnNo: filters.returnNo || undefined,

    supplierName: filters.supplierName || undefined,
  };

  if (filters.dateRange && filters.dateRange.length === 2) {
const buildFilterParams = () => {
  const params = {};
  if (filters.returnNo) {
    params.returnNo = filters.returnNo;
  }
  if (filters.supplierId) {
    params.supplierId = filters.supplierId;
  }
  if (filters.dateRange?.length === 2) {
    params.startDate = filters.dateRange[0];

    params.endDate = filters.dateRange[1];
  }

  return params;
}
};

const getSupplierList = () => {
  listSupplier({ current: -1, size: -1, isWhite: 0 }).then((res) => {
    if (res.code === 200) {
      supplierList.value = res.data?.records ?? [];
    }
  });
};

const onSearch = () => {
  pagination.currentPage = 1;

  getTableData();
};

const getTableData = () => {
  tableLoading.value = true;

  listPageAccountPurchaseReturn({
    ...buildFilterParams(),

    current: pagination.currentPage,

    size: pagination.pageSize,
  })
    .then((res) => {
      const ok = res.code === 200 || res.code === 0;

      if (ok && res.data) {
        pagination.total = res.data.total ?? 0;

        dataList.value = res.data.records ?? [];
      } else {
        ElMessage.error(res.msg || "查询失败");

        dataList.value = [];
        pagination.total = 0;
      }
    })

    .catch(() => {
      dataList.value = [];
      pagination.total = 0;
      ElMessage.error("查询失败");
    })

    .finally(() => {
      tableLoading.value = false;
    });
@@ -192,48 +163,36 @@

const resetFilters = () => {
  filters.returnNo = "";

  filters.supplierName = "";

  filters.supplierId = "";
  filters.dateRange = [];

  pagination.currentPage = 1;

  getTableData();
};

const changePage = ({ page, limit }) => {
  pagination.currentPage = page;

  pagination.pageSize = limit;

  getTableData();
};

const handleOut = () => {
  proxy.download(
    "/accountPurchase/exportAccountPurchaseReturn",

    buildFilterParams(),

    `采购退货_${new Date().getTime()}.xlsx`
    `采购退货_${Date.now()}.xlsx`
  );
};

onMounted(() => {
  getSupplierList();
  getTableData();
});
</script>



<style lang="scss" scoped>
.actions {
  display: flex;

  justify-content: space-between;

  margin-bottom: 15px;
}
</style>