Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory...

huminmin

15 小时以前 9af1256e9e86154aa319c1b0fe79afa87730f515

Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津军泰伟业

 src/views/procurementManagement/invoiceEntry/components/Modal.vue

@@ -57,6 +57,7 @@
                        prop="invoiceAmount">
            <el-input-number :step="0.01"
                             :min="0"
                             :disabled="true"
                             style="width: 100%"
                             v-model="form.invoiceAmount"
                             placeholder="请输入发票金额"

 src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue

@@ -28,12 +28,22 @@
      </el-col>
      <el-col :span="12">
        <el-form-item label="来票数：">
          <el-input-number :step="0.1" :min="0" style="width: 100%" v-model="form.ticketsNum" @change="inputTicketsNum" :precision="2"/>
          <el-input-number :step="0.1"
                           :min="0"
                           style="width: 100%"
                           v-model="form.ticketsNum"
                           @change="inputTicketsNum"
                           :precision="2" />
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <el-form-item label="本次来票金额(元)：">
                    <el-input-number :step="0.1" :min="0" style="width: 100%" v-model="form.ticketsAmount" @change="inputTicketsAmount" :precision="2"/>
          <el-input-number :step="0.1"
                           :min="0"
                           style="width: 100%"
                           v-model="form.ticketsAmount"
                           @change="inputTicketsAmount"
                           :precision="2" />
        </el-form-item>
      </el-col>
      <el-col :span="12">
@@ -48,12 +58,12 @@
<script setup>
import useFormData from "@/hooks/useFormData";
import { getProductRecordById } from "@/api/procurementManagement/procurementInvoiceLedger";
const { proxy } = getCurrentInstance()
  const { proxy } = getCurrentInstance();

defineOptions({
  name: "来票台账表单",
});
const temFutureTickets = ref(0)
  const temFutureTickets = ref(0);
const { form, resetForm } = useFormData({
  id: undefined,
  purchaseContractNumber: undefined, // 采购合同号
@@ -66,7 +76,7 @@
    ticketRegistrationId: undefined, // 含税单价
});

const load = async (id) => {
  const load = async id => {
  const { code, data } = await getProductRecordById({ id });
  if (code === 200) {
    form.id = data.id;
@@ -78,12 +88,14 @@
    form.ticketsAmount = data.ticketsAmount.toFixed(2);
    form.taxInclusiveUnitPrice = data.taxInclusiveUnitPrice;
    form.futureTickets = data.futureTickets;
    temFutureTickets.value = data.futureTickets;
      // temFutureTickets.value = data.futureTickets;
      temFutureTickets.value = data.quantity;

        form.ticketRegistrationId = data.ticketRegistrationId;
  }
};

const inputTicketsNum = (val) => {
  const inputTicketsNum = val => {
    // 确保含税单价存在且不为零
    if (!form.taxInclusiveUnitPrice || Number(form.taxInclusiveUnitPrice) === 0) {
        proxy.$modal.msgWarning("含税单价不能为零或未定义");
@@ -91,16 +103,18 @@
    }
    if (Number(form.ticketsNum) > Number(temFutureTickets.value)) {
        proxy.$modal.msgWarning("开票数不得大于未开票数");
        form.ticketsNum = temFutureTickets.value
      form.ticketsNum = temFutureTickets.value;
    }
    
    // 确保所有数值都转换为数字类型进行计算
    const ticketsAmount = Number(form.ticketsNum) * Number(form.taxInclusiveUnitPrice);
    const futureTickets = Number(temFutureTickets.value) - Number(form.ticketsNum);
    const ticketsAmount =
      Number(form.ticketsNum) * Number(form.taxInclusiveUnitPrice);
    const futureTickets =
      Number(temFutureTickets.value) - Number(form.ticketsNum);
    form.futureTickets = Number(futureTickets.toFixed(2));
    form.ticketsAmount = Number(ticketsAmount.toFixed(2));
};
const inputTicketsAmount = (val) => {
  const inputTicketsAmount = val => {
    // 确保含税单价存在且不为零
    if (!form.taxInclusiveUnitPrice || Number(form.taxInclusiveUnitPrice) === 0) {
        proxy.$modal.msgWarning("含税单价不能为零或未定义");
@@ -109,9 +123,12 @@
    
    if (Number(val) > Number(form.futureTickets*form.taxInclusiveUnitPrice)) {
        proxy.$modal.msgWarning("本次来票金额不得大于总金额");
        form.ticketsAmount = (form.futureTickets*form.taxInclusiveUnitPrice).toFixed(2)
        const ticketsNum = Number(form.ticketsAmount) / Number(form.taxInclusiveUnitPrice);
        form.ticketsNum = Number(ticketsNum.toFixed(2))
      form.ticketsAmount = (
        form.futureTickets * form.taxInclusiveUnitPrice
      ).toFixed(2);
      const ticketsNum =
        Number(form.ticketsAmount) / Number(form.taxInclusiveUnitPrice);
      form.ticketsNum = Number(ticketsNum.toFixed(2));
        return;
    }
    

 src/views/salesManagement/receiptPayment/index.vue

@@ -1,27 +1,26 @@
<template>
  <div class="app-container">
    <div class="search_form">
      <el-form :inline="true" :model="searchForm" style="width: 100%">
      <el-form :inline="true"
               :model="searchForm"
               style="width: 100%">
        <el-row justify="space-between">
          <el-col :span="24">
            <el-form-item label="客户名称">
              <el-input
                v-model="searchForm.customerName"
              <el-input v-model="searchForm.customerName"
                placeholder="请输入"
                @change="handleQuery"
                clearable
                prefix-icon="Search"
              />
                        prefix-icon="Search" />
            </el-form-item>
            <el-form-item>
              <el-checkbox
                v-model="searchForm.status"
              <el-checkbox v-model="searchForm.status"
                label="不显示待回款为0"
                @change="handleQuery"
              />
                           @change="handleQuery" />
            </el-form-item>
            <el-form-item>
              <el-button type="primary" @click="handleQuery"> 搜索 </el-button>
              <el-button type="primary"
                         @click="handleQuery"> 搜索 </el-button>
            </el-form-item>
          </el-col>
        </el-row>
@@ -31,14 +30,15 @@
      <div class="actions">
        <div></div>
        <div>
          <el-button type="primary" @click="openForm('add')">
          <el-button type="primary"
                     @click="openForm('add')">
            新增回款
          </el-button>
          <el-button icon="Download" @click="handleOut"> 导出 </el-button>
          <el-button icon="Download"
                     @click="handleOut"> 导出 </el-button>
        </div>
      </div>
      <el-table
        :data="tableData"
      <el-table :data="tableData"
        border
        v-loading="tableLoading"
        @selection-change="handleSelectionChange"
@@ -47,105 +47,97 @@
        :summary-method="summarizeMainTable"
        :expand-row-keys="expandedRowKeys"
        @expand-change="expandChange"

        height="calc(100vh - 21.5em)"
      >
        <el-table-column align="center" type="selection" width="55" />
                height="calc(100vh - 21.5em)">
        <el-table-column align="center"
                         type="selection"
                         width="55" />
        <el-table-column type="expand">
          <template #default="props">
            <el-table
              :data="props.row.children"
            <el-table :data="props.row.children"
              border
              show-summary
              :summary-method="summarizeChildrenTable"
            >
              <el-table-column
                align="center"
                      :summary-method="summarizeChildrenTable">
              <el-table-column align="center"
                label="序号"
                type="index"
                width="60"
              />
              <el-table-column label="回款日期" prop="receiptPaymentDate"  width="130"/>
              <el-table-column label="回款金额" prop="receiptPaymentAmount">
                               width="60" />
              <el-table-column label="回款日期"
                               prop="receiptPaymentDate"
                               width="130" />
              <el-table-column label="回款金额"
                               prop="receiptPaymentAmount">
                <template #default="scope">
                                    <el-input-number :step="0.01" :min="0" style="width: 100%"
                  <el-input-number :step="0.01"
                                   :min="0"
                                   style="width: 100%"
                                                                     v-model="scope.row.receiptPaymentAmount"
                                                                     :disabled="!scope.row.editType"
                                                                     :precision="2"
                                                                     placeholder="请输入"
                                                                     clearable
                                    />
                                   clearable />
                </template>
              </el-table-column>
              <el-table-column label="回款方式" prop="receiptPaymentType">
              <el-table-column label="回款方式"
                               prop="receiptPaymentType">
                <template #default="scope">
                  <el-select
                    v-model="scope.row.receiptPaymentType"
                  <el-select v-model="scope.row.receiptPaymentType"
                    placeholder="请选择"
                    clearable
                    :disabled="!scope.row.editType"
                  >
                    <el-option
                      v-for="item in receipt_payment_type"
                             :disabled="!scope.row.editType">
                    <el-option v-for="item in receipt_payment_type"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
                    />
                               :value="item.value" />
                  </el-select>
                </template>
              </el-table-column>
              <el-table-column label="登记人" prop="registrant" width="90"/>
              <el-table-column label="登记日期" prop="createTime"   width="130"/>
              <el-table-column label="操作" width="150" align="center">
              <el-table-column label="登记人"
                               prop="registrant"
                               width="90" />
              <el-table-column label="登记日期"
                               prop="createTime"
                               width="130" />
              <el-table-column label="操作"
                               width="150"
                               align="center">
                <template #default="scope">
                  <el-button
                    link
                  <el-button link
                    type="primary"
                    size="small"
                    @click="changeEditType(scope.row)"
                    v-if="!scope.row.editType"
                    >编辑</el-button
                  >
                  <el-button
                    link
                             v-if="!scope.row.editType">编辑</el-button>
                  <el-button link
                    type="primary"
                    size="small"
                    @click="saveReceiptPayment(scope.row)"
                    v-if="scope.row.editType"
                    >保存</el-button
                  >
                  <el-button
                    link
                             v-if="scope.row.editType">保存</el-button>
                  <el-button link
                    type="primary"
                    size="small"
                    @click="delReceiptRecord(scope.row)"
                    >删除</el-button
                  >
                             @click="delReceiptRecord(scope.row)">删除</el-button>
                </template>
              </el-table-column>
            </el-table>
          </template>
        </el-table-column>
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
          label="销售合同号"
        <el-table-column align="center"
                         label="序号"
                         type="index"
                         width="60" />
        <el-table-column label="销售合同号"
          prop="salesContractNo"
          show-overflow-tooltip
          width="240"
        />
        <el-table-column
          label="客户名称"
                         width="240" />
        <el-table-column label="客户名称"
          prop="customerName"
          show-overflow-tooltip
          width="240"
        />
        <el-table-column
          label="回款状态"
                         width="240" />
        <el-table-column label="回款状态"
          prop="statusName"
          width="120"
        >
                         width="120">
          <template #default="{ row }">
            <el-tag :type="getStatusTagType(row.statusName)" disable-transitions>
            <el-tag :type="getStatusTagType(row.statusName)"
                    disable-transitions>
              {{ row.statusName || "--" }}
            </el-tag>
          </template>
@@ -156,33 +148,27 @@
<!--          show-overflow-tooltip-->
<!--          width="100"-->
<!--        />-->
        <el-table-column
          label="发票号"
        <el-table-column label="发票号"
          prop="invoiceNo"
          show-overflow-tooltip
          width="200"
        />
        <el-table-column
          label="发票金额(元)"
                         width="200" />
        <el-table-column label="发票金额(元)"
          prop="invoiceTotal"
          show-overflow-tooltip
          :formatter="formattedNumber"
          width="200"
        />
        <el-table-column label="税率(%)" prop="taxRate" show-overflow-tooltip />
        <el-table-column
          label="回款金额(元)"
                         width="200" />
        <el-table-column label="税率(%)"
                         prop="taxRate"
                         show-overflow-tooltip />
        <el-table-column label="回款金额(元)"
          prop="receiptPaymentAmountTotal"
          show-overflow-tooltip
          :formatter="formattedNumber"
          width="200"
        />
        <el-table-column
          label="待回款金额(元)"
                         width="200" />
        <el-table-column label="待回款金额(元)"
          prop="noReceiptAmount"
          show-overflow-tooltip
          width="200"
        >
                         width="200">
          <template #default="{ row, column }">
            <el-text type="danger">
              {{ formattedNumber(row, column, row.noReceiptAmount) }}
@@ -190,139 +176,126 @@
          </template>
        </el-table-column>
      </el-table>
      <pagination
        v-show="total > 0"
      <pagination v-show="total > 0"
        :total="total"
        layout="total, sizes, prev, pager, next, jumper"
        :page="page.current"
        :limit="page.size"
        @pagination="paginationChange"
      />
                  @pagination="paginationChange" />
    </div>
    <el-dialog
      v-model="dialogFormVisible"
    <el-dialog v-model="dialogFormVisible"
      title="新增回款页面"
      width="70%"
      @close="closeDia"
    >
      <el-form
        :model="form"
               @close="closeDia">
      <el-form :model="form"
        label-width="140px"
        label-position="top"
        :rules="rules"
        ref="formRef"
      >
               ref="formRef">
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="销售合同号：" prop="salesContractNo">
              <el-input
                v-model="form.salesContractNo"
            <el-form-item label="销售合同号："
                          prop="salesContractNo">
              <el-input v-model="form.salesContractNo"
                placeholder="自动填充"
                disabled
              />
                        disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="客户名称：" prop="customerName">
              <el-input
                v-model="form.customerName"
            <el-form-item label="客户名称："
                          prop="customerName">
              <el-input v-model="form.customerName"
                placeholder="自动填充"
                disabled
              />
                        disabled />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="发票号：" prop="invoiceNo">
              <el-input
                v-model="form.invoiceNo"
            <el-form-item label="发票号："
                          prop="invoiceNo">
              <el-input v-model="form.invoiceNo"
                placeholder="自动填充"
                disabled
              />
                        disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="发票金额(元)：" prop="invoiceTotal">
              <el-input
                type="number"
            <el-form-item label="发票金额(元)："
                          prop="invoiceTotal">
              <el-input type="number"
                v-model="form.invoiceTotal"
                placeholder="自动填充"
                :step="0.01"
                disabled
              />
                        disabled />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="税率：" prop="taxRate">
              <el-input
                type="number"
            <el-form-item label="税率："
                          prop="taxRate">
              <el-input type="number"
                v-model="form.taxRate"
                placeholder="自动填充"
                :step="0.01"
                disabled
              />
                        disabled />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="本次回款金额：" prop="receiptPaymentAmount">
              <el-input-number :step="0.01" :min="0" style="width: 100%"
            <el-form-item label="本次回款金额："
                          prop="receiptPaymentAmount">
              <el-input-number :step="0.01"
                               :min="0"
                               style="width: 100%"
                                                             :precision="2"
                v-model="form.receiptPaymentAmount"
                placeholder="请输入"
                clearable
              />
                               clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="回款形式：" prop="receiptPaymentType">
              <el-select
                v-model="form.receiptPaymentType"
            <el-form-item label="回款形式："
                          prop="receiptPaymentType">
              <el-select v-model="form.receiptPaymentType"
                placeholder="请选择"
                clearable
              >
                <el-option
                  v-for="item in receipt_payment_type"
                         clearable>
                <el-option v-for="item in receipt_payment_type"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
                           :value="item.value" />
              </el-select>
            </el-form-item>
          </el-col>
                    <el-col :span="12">
                        <el-form-item label="回款日期：" prop="receiptPaymentDate">
                            <el-date-picker
                                style="width: 100%"
            <el-form-item label="回款日期："
                          prop="receiptPaymentDate">
              <el-date-picker style="width: 100%"
                                v-model="form.receiptPaymentDate"
                                value-format="YYYY-MM-DD"
                                format="YYYY-MM-DD"
                                type="date"
                                placeholder="请选择"
                                clearable
                            />
                              clearable />
                        </el-form-item>
                    </el-col>
        </el-row>
        <el-row :gutter="30">
                    <el-col :span="12">
                        <el-form-item label="登记人：" prop="registrant">
                            <el-input
                                v-model="form.registrant"
            <el-form-item label="登记人："
                          prop="registrant">
              <el-input v-model="form.registrant"
                                placeholder="请输入"
                                clearable
                            />
                        clearable />
                        </el-form-item>
                    </el-col>
        </el-row>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button type="primary"
                     @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
@@ -403,10 +376,10 @@
  return parseFloat(cellValue).toFixed(2);
};

const getStatusTagType = (statusName = '') => {
  const getStatusTagType = (statusName = "") => {
  const normalized = statusName.trim();
  if (!normalized) return 'info';
  return normalized === '未完成回款' ? 'danger' : 'success';
    if (!normalized) return "info";
    return normalized === "未完成回款" ? "danger" : "success";
};
// 查询列表
/** 搜索按钮操作 */
@@ -414,7 +387,7 @@
  page.current = 1;
  getList();
};
const paginationChange = (obj) => {
  const paginationChange = obj => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
@@ -422,16 +395,18 @@
const getList = () => {
  tableLoading.value = true;
  bindInvoiceNoRegPage({ ...searchForm, ...page })
    .then((res) => {
      .then(res => {
      tableLoading.value = false;
      tableData.value = res.data.records;
      total.value = res.data.total;
            if (expandedRowKeys.value.length > 0) {
                const arr = []
                const index = tableData.value.findIndex(item => item.id === expandedRowKeys.value[0]);
          const arr = [];
          const index = tableData.value.findIndex(
            item => item.id === expandedRowKeys.value[0]
          );
                if (index > -1) {
                    arr.push(tableData.value[index]);
                    expandChange(tableData.value[index], arr)
            expandChange(tableData.value[index], arr);
                }
            }
    })
@@ -447,11 +422,11 @@
      receiptPaymentHistoryListNoPage({
        invoiceLedgerId: row.id,
        type: 1,
      }).then((res) => {
        const index = tableData.value.findIndex((item) => item.id === row.id);
        }).then(res => {
          const index = tableData.value.findIndex(item => item.id === row.id);
        if (index > -1) {
          if (res?.length > 0) {
            res.forEach((item) => {
              res.forEach(item => {
              item.editType = false;
            });
          }
@@ -467,12 +442,13 @@
  }
};
// 表格选择数据
const handleSelectionChange = (selection) => {
  console.log("selection", selection);
  selectedRows.value = selection
  const handleSelectionChange = selection => {
    // 筛选掉 editType 为 false 的项
    selectedRows.value = selection.filter(item => item.editType !== false);
    console.log("selectedRows.value", selectedRows.value);
};
// 主表合计方法
const summarizeMainTable = (param) => {
  const summarizeMainTable = param => {
  return proxy.summarizeTable(
    param,
    ["invoiceTotal", "receiptPaymentAmountTotal", "noReceiptAmount"],
@@ -483,12 +459,14 @@
  );
};
// 子表合计方法
const summarizeChildrenTable = (param) => {
  const summarizeChildrenTable = param => {
  return proxy.summarizeTable(param, ["receiptPaymentAmount"]);
};
// 打开弹框
const openForm = () => {
  form.value = {};
    console.log(selectedRows.value, "selectedRows.value");

  if (selectedRows.value.length !== 1) {
    proxy.$modal.msgError("请选择一条数据");
    return;
@@ -497,7 +475,7 @@
    proxy.$modal.msgWarning("无需再回款");
    return;
  }
  invoiceInfo({ id: selectedRows.value[0].id }).then((res) => {
    invoiceInfo({ id: selectedRows.value[0].id }).then(res => {
    form.value = { ...res.data };
    form.value.invoiceLedgerId = form.value.id;
    form.value.id = "";
@@ -507,9 +485,9 @@
};
// 提交表单
const submitForm = () => {
  proxy.$refs["formRef"].validate((valid) => {
    proxy.$refs["formRef"].validate(valid => {
    if (valid) {
      receiptPaymentSaveOrUpdate(form.value).then((res) => {
        receiptPaymentSaveOrUpdate(form.value).then(res => {
        proxy.$modal.msgSuccess("提交成功");
        closeDia();
        getList();
@@ -524,7 +502,7 @@
};

// 删除回款记录
const delReceiptRecord = (row) => {
  const delReceiptRecord = row => {
  console.log("row", row);
  ElMessageBox.confirm("确认删除该记录吗？", "提示", {
    confirmButtonText: "确定",
@@ -549,18 +527,18 @@
};

// 编辑修改状态
const changeEditType = (row) => {
  const changeEditType = row => {
  row.editType = !row.editType;
};

// 保存回款记录
const saveReceiptPayment = (row) => {
  const saveReceiptPayment = row => {
  let updateData = {
    id: row.id,
    receiptPaymentType: row.receiptPaymentType,
    receiptPaymentAmount: row.receiptPaymentAmount,
  };
  receiptPaymentSaveOrUpdate(updateData).then((res) => {
    receiptPaymentSaveOrUpdate(updateData).then(res => {
    row.editType = !row.editType;
        getList();
        proxy.$modal.msgSuccess("提交成功");
@@ -575,7 +553,7 @@
    type: "warning",
  })
    .then(() => {
      const ids = selectedRows.value.map((item) => item.id);
        const ids = selectedRows.value.map(item => item.id);
      proxy.download(
        `/receiptPayment/export`,
        { ids: `${ids}` },

 src/views/salesManagement/salesLedger/index.vue

@@ -1545,14 +1545,16 @@
                                        <div>
                                          <span class="label">客户名称：</span>
                                          <span class="value">${
                                            item.customerName || "张爱有"
                                                            item.customerName ||
                                                            "张爱有"
                                          }</span>
                                        </div>
                                      </div>
                                      <div class="info-row">
                                        <span class="label">单号：</span>
                                        <span class="value">${
                                          item.salesContractNo || ""
                                                          item.salesContractNo ||
                                                          ""
                                        }</span>
                                      </div>
                                    </div>
@@ -1572,24 +1574,31 @@
                                        <tbody>
                                          ${
                                            item.products &&
                                            item.products.length > 0
                                                            item.products.length >
                                                              0
                                              ? item.products
                                                  .map(
                                                    product => `
                                              <tr>
                                                <td>${
                                                  product.productCategory || ""
                                                                  product.productCategory ||
                                                                  ""
                                                }</td>
                                                <td>${
                                                  product.specificationModel || ""
                                                                  product.specificationModel ||
                                                                  ""
                                                }</td>
                                                <td>${product.unit || ""}</td>
                                                                <td>${
                                                                  product.unit ||
                                                                  ""
                                                                }</td>
                                                <td>${
                                                  product.taxInclusiveUnitPrice ||
                                                  "0"
                                                }</td>
                                                <td>${
                                                  product.quantity || "0"
                                                                  product.quantity ||
                                                                  "0"
                                                }</td>
                                                <td>${
                                                  product.taxInclusiveTotalPrice ||
@@ -1638,7 +1647,8 @@
                                        <div class="footer-item">
                                          <span class="label">操作员：</span>
                                          <span class="value">${
                                            userStore.nickName || "撕开前"
                                                            userStore.nickName ||
                                                            "撕开前"
                                          }</span>
                                        </div>
                                        <div class="footer-item">