692451959df42c10d489d866dcae48a121bd9dd0..0186e6b9cc2e411ec16b7b56cfda9c822146a0f3
2025-05-21 liding
采购台账,来票登记折叠展示
0186e6 对比 | 目录
2025-05-21 liding
1.来票登记逻辑更改 2.来票台账更改
37aa12 对比 | 目录
已修改5个文件
213 ■■■■ 文件已修改
src/api/procurementManagement/invoiceEntry.js 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/procurementManagement/procurementInvoiceLedger.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/invoiceEntry/index.vue 194 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/procurementManagement/invoiceEntry.js
@@ -9,6 +9,15 @@
        params: query
    })
}
// 查询id采购合同号
export function getPurchaseNoById(query) {
    return request({
        url: '/purchase/ledger/getPurchaseNoById',
        method: 'get',
        params: query
    })
}
// 根据采购合同号查询详细信息
export function getInfo(query) {
    return request({
@@ -20,7 +29,7 @@
// 主列表查询
export function gePurchaseList(query) {
    return request({
        url: '/purchase/registration/list',
        url: '/purchase/ledger/list',
        method: 'get',
        params: query
    })
src/api/procurementManagement/procurementInvoiceLedger.js
@@ -4,7 +4,7 @@
// 查询列表
export function invoiceList(query) {
    return request({
        url: '/purchase/invoice/list',
        url: '/purchase/registration/list',
        method: 'get',
        params: query
    })
@@ -12,7 +12,7 @@
// 查询详情
export function getInvoiceById(query) {
    return request({
        url: '/purchase/invoice/getInvoiceById',
        url: '/purchase/registration/getRegistrationById',
        method: 'get',
        params: query
    })
src/utils/request.js
@@ -17,7 +17,7 @@
  // axios中请求配置有baseURL选项,表示请求URL公共部分
  baseURL: import.meta.env.VITE_APP_BASE_API,
  // 超时
  timeout: 10000
  timeout: 60000
})
// request拦截器
src/views/procurementManagement/invoiceEntry/index.vue
@@ -3,126 +3,104 @@
    <div class="search_form">
      <div>
        <span class="search_title">采购合同号:</span>
        <el-input
            v-model="searchForm.purchaseContractNumber"
            style="width: 240px"
            placeholder="请输入"
            @change="handleQuery"
            clearable
            prefix-icon="Search"
        />
        <el-input v-model="searchForm.purchaseContractNumber" style="width: 240px" placeholder="请输入"
          @change="handleQuery" clearable prefix-icon="Search" />
        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
      </div>
      <div>
        <el-button type="primary" @click="openForm('add')">新增登记</el-button>
        <el-button type="primary" @click="handleAdd">新增登记</el-button>
        <el-button @click="handleOut">导出</el-button>
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
    </div>
    <div class="table_list">
      <el-table :data="tableData" border v-loading="tableLoading"
                @selection-change="handleSelectionChange"
                :expand-row-keys="expandedRowKeys"
                :row-key="row => row.id"
                show-summary
                :summary-method="summarizeMainTable"
                @expand-change="expandChange"
                height="calc(100vh - 18.5em)">
      <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
        :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary :summary-method="summarizeMainTable"
        @expand-change="expandChange" height="calc(100vh - 18.5em)">
        <el-table-column align="center" type="selection" width="55" />
        <el-table-column type="expand">
          <template #default="props">
            <el-table :data="props.row.children" border
                      show-summary
                      :summary-method="summarizeChildrenTable">
            <el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
              <el-table-column align="center" label="序号" type="index" width="60" />
              <el-table-column label="产品大类" prop="productCategory" />
              <el-table-column label="规格型号" prop="specificationModel" />
              <el-table-column label="单位" prop="unit" />
              <el-table-column label="数量" prop="quantity" />
              <el-table-column label="税率(%)" prop="taxRate" />
              <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber"/>
              <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber"/>
              <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber"/>
              <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
              <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
              <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
              <el-table-column label="本次来票数" prop="ticketsNum" />
              <el-table-column label="本次来票金额(元)" prop="ticketsAmount" :formatter="formattedNumber"/>
              <el-table-column label="本次来票金额(元)" prop="ticketsAmount" :formatter="formattedNumber" />
              <el-table-column label="未来票数" prop="futureTickets" />
              <el-table-column label="未来票金额(元)" prop="futureTicketsAmount" :formatter="formattedNumber"/>
              <el-table-column label="未来票金额(元)" prop="futureTicketsAmount" :formatter="formattedNumber" />
            </el-table>
          </template>
        </el-table-column>
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column label="采购合同号" prop="purchaseContractNumber" show-overflow-tooltip/>
        <el-table-column label="销售合同号" prop="salesContractNo" show-overflow-tooltip/>
        <el-table-column label="供应商名称" prop="supplierName" show-overflow-tooltip/>
        <el-table-column label="项目名称" prop="projectName" show-overflow-tooltip/>
        <el-table-column label="合同金额(元)" prop="contractAmount" show-overflow-tooltip :formatter="formattedNumber"/>
        <el-table-column label="采购合同号" prop="purchaseContractNumber" show-overflow-tooltip />
        <el-table-column label="销售合同号" prop="salesContractNo" show-overflow-tooltip />
        <el-table-column label="供应商名称" prop="supplierName" show-overflow-tooltip />
        <el-table-column label="项目名称" prop="projectName" show-overflow-tooltip />
        <el-table-column label="合同金额(元)" prop="contractAmount" show-overflow-tooltip :formatter="formattedNumber" />
        <el-table-column fixed="right" label="操作" min-width="60" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">编辑</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current"
                  :limit="page.size" @pagination="paginationChange" />
      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
        :page="page.current" :limit="page.size" @pagination="paginationChange" />
    </div>
    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '新增来票登记' : '编辑来票登记'" width="80%" @close="closeDia">
    <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '新增来票登记' : '编辑来票登记'" width="80%"
      @close="closeDia">
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="采购合同号:" prop="purchaseLedgerId">
              <el-select v-model="form.purchaseLedgerId" placeholder="请选择" clearable @change="setInfo" :disabled="operationType === 'edit'">
                <el-option v-for="item in purchaseLedgerList" :key="item.id" :label="item.purchaseContractNumber" :value="item.id"/>
              </el-select>
            <el-form-item label="采购合同号:" prop="purchaseLedgerNo">
              <el-input v-model="form.purchaseLedgerNo" disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="销售合同号:" prop="salesContractNo">
              <el-input v-model="form.salesContractNo" placeholder="自动填充" clearable disabled/>
              <el-input v-model="form.salesContractNo" placeholder="自动填充" clearable disabled />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="供应商名称:" prop="supplierName">
              <el-input v-model="form.supplierName" placeholder="自动填充" clearable disabled/>
              <el-input v-model="form.supplierName" placeholder="自动填充" clearable disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="项目名称:" prop="projectName">
              <el-input v-model="form.projectName" placeholder="自动填充" clearable disabled/>
              <el-input v-model="form.projectName" placeholder="自动填充" clearable disabled />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="发票号:" prop="invoiceNumber">
              <el-input v-model="form.invoiceNumber" placeholder="请输入" clearable/>
              <el-input v-model="form.invoiceNumber" placeholder="请输入" clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="发票金额(元):" prop="invoiceAmount">
              <el-input type="number" :step="0.01" v-model="form.invoiceAmount" placeholder="请输入" clearable/>
              <el-input type="number" :step="0.01" v-model="form.invoiceAmount" placeholder="请输入" clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="开票人:" prop="issUer">
              <el-input v-model="form.issUer" placeholder="请输入" clearable disabled/>
              <el-input v-model="form.issUer" placeholder="请输入" clearable disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="开票日期:" prop="issueDate">
              <el-date-picker
                  disabled
                  style="width: 100%"
                  v-model="form.issueDate"
                  value-format="YYYY-MM-DD"
                  format="YYYY-MM-DD"
                  type="date"
                  placeholder="请选择"
                  clearable
              />
              <el-date-picker disabled style="width: 100%" v-model="form.issueDate" value-format="YYYY-MM-DD"
                format="YYYY-MM-DD" type="date" placeholder="请选择" clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -131,24 +109,29 @@
          </el-form-item>
        </el-row>
        <el-table :data="productData" border @selection-change="productSelected" show-summary
                  :summary-method="summarizeChildrenTable">
          :summary-method="summarizeChildrenTable">
          <el-table-column align="center" label="序号" type="index" width="60" />
          <el-table-column label="产品大类" prop="productCategory" />
          <el-table-column label="规格型号" prop="specificationModel" />
          <el-table-column label="单位" prop="unit" />
          <el-table-column label="数量" prop="quantity" />
          <el-table-column label="税率(%)" prop="taxRate" />
          <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber"/>
          <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber"/>
          <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber"/>
          <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
          <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
          <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
          <el-table-column label="本次来票数" prop="ticketsNum" width="170">
            <template #default="scope">
              <el-input-number v-model="scope.row.ticketsNum" :precision="0" :step="1" clearable style="width: 100%"  @blur="invoiceNumBlur(scope.row)"/>
              <el-input-number v-model="scope.row.ticketsNum" :precision="0" :step="1" clearable style="width: 100%"
                @blur="invoiceNumBlur(scope.row)" />
            </template>
          </el-table-column>
          <el-table-column label="本次来票金额(元)" prop="ticketsAmount" :formatter="formattedNumber"></el-table-column>
          <el-table-column label="未来票数" prop="futureTickets"></el-table-column>
          <el-table-column label="未来票金额(元)" prop="futureTicketsAmount" :formatter="formattedNumber"> </el-table-column>
          <el-table-column label="未来票数" prop="futureTickets"
            :formatter="(row) => row.futureTickets == null || row.futureTickets === '' ? row.quantity : row.futureTickets">
          </el-table-column>
          <el-table-column label="未来票金额(元)" prop="futureTicketsAmount"
            :formatter="(row) => (row.futureTicketsAmount !== undefined && row.futureTicketsAmount !== null && row.futureTicketsAmount !== '' ? row.futureTicketsAmount : row.taxExclusiveTotalPrice)">
          </el-table-column>
        </el-table>
      </el-form>
      <template #footer>
@@ -167,6 +150,8 @@
import {ElMessageBox } from "element-plus";
import {userListNoPage} from "@/api/system/user.js";
import {productList} from "@/api/procurementManagement/procurementLedger.js";
import useUserStore from '@/store/modules/user';
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
const tableData = ref([])
const productData = ref([])
@@ -187,6 +172,7 @@
  gePurchaseList,
  getInfo,
  getProduct,
  getPurchaseNoById,
  getRegistrationById
} from "@/api/procurementManagement/invoiceEntry.js";
@@ -199,6 +185,9 @@
  },
  form: {
    purchaseLedgerId: '',
    purchaseLedgerNo: '',
    issUerId: '', // 开票人id
    issUer: '' ,// 开票人姓名
  },
  rules: {
    purchaseLedgerId: [{ required: true, message: "请选择", trigger: "change" }],
@@ -223,7 +212,7 @@
}
const getList = () => {
  tableLoading.value = true
  gePurchaseList({...searchForm.value, ...page}).then(res => {
  gePurchaseList({ ...searchForm.value, ...page }).then(res => {
    tableLoading.value = false
    tableData.value = res.rows
    tableData.value.map(item => {
@@ -251,10 +240,10 @@
  if (expandedRows.length > 0) {
    expandedRowKeys.value = []
    try {
      productList({salesLedgerId: row.purchaseLedgerId, type: 2}).then(res => {
      productList({ salesLedgerId: row.id, type: 2 }).then(res => {
        const index = tableData.value.findIndex(item => item.id === row.id);
        if (index > -1) {
          tableData.value[index].children = res.rows;
          tableData.value[index].children = res;
        }
        expandedRowKeys.value.push(row.id)
      })
@@ -274,31 +263,52 @@
};
// 子表合计方法
const summarizeChildrenTable = (param) => {
  return proxy.summarizeTable(param, ['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice', 'ticketsNum', 'ticketsAmount', 'futureTickets', 'futureTicketsAmount'],{
  return proxy.summarizeTable(param, ['taxInclusiveUnitPrice', 'taxInclusiveTotalPrice', 'taxExclusiveTotalPrice', 'ticketsNum', 'ticketsAmount', 'futureTickets', 'futureTicketsAmount'], {
    ticketsNum: { noDecimal: true }, // 不保留小数
    futureTickets: { noDecimal: true }, // 不保留小数
});
  });
};
const handleAdd = () => {
  if (selectedRows.value.length !== 1) {
    proxy.$modal.msgWarning('请先选中一条数据');
    return;
  }
  openForm('add', selectedRows.value[0]);
}
// 打开弹框
const openForm = (type, row) => {
  operationType.value = type
  form.value = {}
  productData.value = []
  fileList.value = []
  // 查询人员列表
  form.value.issUerId = userStore.id
  form.value.issUer = userStore.name
  userListNoPage().then(res => {
    userList.value = res.data
  })
  // 查询采购合同号
  getProduct().then(res => {
    purchaseLedgerList.value = res
  })
  // 新增时传入当前行id并查询采购合同号
  if (type === 'add' && row && row.id) {
    form.value.purchaseLedgerId = row.id
    getPurchaseNoById({ id: row.id }).then(res => {
      purchaseLedgerList.value = res,
        form.value.purchaseLedgerNo = res.purchaseContractNumber;
        form.value.invoiceAmount = res.invoiceAmount;
        form.value.invoiceNumber = res.invoiceNumber;
      setInfo(res.id)
    })
  } else {
    getProduct().then(res => {
      purchaseLedgerList.value = res
    })
  }
  if (type === 'edit') {
    currentId.value = row.id;
    getRegistrationById({id: row.id}).then(res => {
      form.value = {...res}
    getRegistrationById({ id: row.id }).then(res => {
      form.value = { ...res }
      productData.value = form.value.productData
      if(form.value.salesLedgerFiles) {
      if (form.value.salesLedgerFiles) {
        fileList.value = form.value.salesLedgerFiles
      } else {
        fileList.value = []
@@ -309,7 +319,7 @@
}
// 选择采购合同号赋值
const setInfo = (value) => {
  getInfo({id: value}).then(res => {
  getInfo({ id: value }).then(res => {
    form.value.salesContractNo = res.salesContractNo
    form.value.projectName = res.projectName
    productData.value = res.productData
@@ -336,7 +346,7 @@
}
// 填写数据
const openProductEdit = (row) => {
  const index =  productData.value.findIndex(item => item.id === row.id);
  const index = productData.value.findIndex(item => item.id === row.id);
  if (index > -1) {
    productData.value[index].editFlag = !productData.value[index].editFlag
  }
@@ -344,12 +354,12 @@
// 导出
const handleOut = () => {
  ElMessageBox.confirm(
      '选中的内容将被导出,是否确认导出?',
      '导出', {
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning',
      }
    '选中的内容将被导出,是否确认导出?',
    '导出', {
    confirmButtonText: '确认',
    cancelButtonText: '取消',
    type: 'warning',
  }
  ).then(() => {
    proxy.download("/purchase/registration/export", {}, '来票登记.xlsx')
  }).catch(() => {
@@ -366,12 +376,12 @@
    return
  }
  ElMessageBox.confirm(
      '选中的内容将被删除,是否确认删除?',
      '导出', {
        confirmButtonText: '确认',
        cancelButtonText: '取消',
        type: 'warning',
      }
    '选中的内容将被删除,是否确认删除?',
    '导出', {
    confirmButtonText: '确认',
    cancelButtonText: '取消',
    type: 'warning',
  }
  ).then(() => {
    delRegistration(ids).then(res => {
      proxy.$modal.msgSuccess("删除成功")
@@ -383,14 +393,14 @@
}
//本次开票失焦操作
const invoiceNumBlur = (row) => {
  if(!row.ticketsNum){
  if (!row.ticketsNum) {
    row.ticketsNum = 0
  }
  if(row.ticketsNum > row.futureTickets){
  if (Number(row.ticketsNum) > Number(row.futureTickets)) {
    proxy.$modal.msgWarning('本次开票数不得大于未开票数')
    row.ticketsNum = 0
    return
  }
  row.futureTickets = row.futureTickets - row.ticketsNum
  // 计算本次开票金额
  row.ticketsAmount = row.ticketsNum * row.taxInclusiveUnitPrice
  // 计算未开票数
@@ -401,6 +411,4 @@
getList()
</script>
<style scoped lang="scss">
</style>
<style scoped lang="scss"></style>
src/views/procurementManagement/procurementLedger/index.vue
@@ -413,7 +413,7 @@
      productList({salesLedgerId: row.id, type: 2}).then(res => {
        const index = tableData.value.findIndex(item => item.id === row.id);
        if (index > -1) {
          tableData.value[index].children = res.rows;
          tableData.value[index].children = res;
        }
        expandedRowKeys.value.push(row.id)
      })