feat(采购管理): 优化高级价格管理与采购台账功能

ZN

4 天以前 c0d6fe2638379e6fb23f1af5eff27355cb565e9d

 src/views/procurementManagement/procurementLedger/index.vue

@@ -118,6 +118,31 @@
          width="420"
          show-overflow-tooltip
        />
        <el-table-column label="审批状态" width="140">
          <template #default="scope">
            <el-tag
              v-if="(scope.row.approveStatus ?? scope.row.approvalStatus ?? scope.row.auditStatus) == 0"
              type="warning"
            >待审核</el-tag>
            <el-tag
              v-else-if="(scope.row.approveStatus ?? scope.row.approvalStatus ?? scope.row.auditStatus) == 1"
              type="primary"
            >审核中</el-tag>
            <el-tag
              v-else-if="(scope.row.approveStatus ?? scope.row.approvalStatus ?? scope.row.auditStatus) == 2"
              type="success"
            >审核完成</el-tag>
            <el-tag
              v-else-if="(scope.row.approveStatus ?? scope.row.approvalStatus ?? scope.row.auditStatus) == 3"
              type="danger"
            >审核未通过</el-tag>
            <el-tag
              v-else-if="(scope.row.approveStatus ?? scope.row.approvalStatus ?? scope.row.auditStatus) == 4"
              type="info"
            >已重新提交</el-tag>
            <el-tag v-else type="info">-</el-tag>
          </template>
        </el-table-column>
        <el-table-column
          label="付款方式"
          width="100"
@@ -155,7 +180,6 @@
              type="primary"
              size="small"
              @click="openForm('edit', scope.row)"
                     :disabled="scope.row.receiptPaymentAmount>0 || scope.row.recorderName !== userStore.nickName"
              >编辑</el-button
            >
            <el-button
@@ -226,6 +250,7 @@
                v-model="form.supplierId"
                placeholder="请选择"
                clearable
                @change="handleSupplierChange"
              >
                <el-option
                  v-for="item in supplierList"
@@ -246,6 +271,30 @@
            </el-form-item>
          </el-col>
        </el-row>
            <el-row :gutter="30">
               <el-col :span="12">
                  <el-form-item label="付款方式">
                     <el-input
                        v-model="form.paymentMethod"
                        placeholder="请输入"
                        clearable
                     />
                  </el-form-item>
               </el-col>
               <el-col :span="12">
                  <el-form-item label="签订日期：" prop="executionDate">
                     <el-date-picker
                        style="width: 100%"
                        v-model="form.executionDate"
                        value-format="YYYY-MM-DD"
                        format="YYYY-MM-DD"
                        type="date"
                        placeholder="请选择"
                        clearable
                     />
                  </el-form-item>
               </el-col>
            </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="录入人：" prop="recorderId">
@@ -267,7 +316,6 @@
          <el-col :span="12">
            <el-form-item label="录入日期：" prop="entryDate">
              <el-date-picker
                disabled
                style="width: 100%"
                v-model="form.entryDate"
                value-format="YYYY-MM-DD"
@@ -279,14 +327,45 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="付款方式">
              <el-input
                v-model="form.paymentMethod"
                placeholder="请输入"
                clearable
              />
        <el-row>
          <el-col :span="24">
            <el-form-item>
              <template #label>
                <span>审批人选择：</span>
                <el-button type="primary" @click="addApproverNode" style="margin-left: 8px;">新增节点</el-button>
              </template>
              <div style="display: flex; align-items: flex-end; flex-wrap: wrap;">
                <div
                  v-for="(node, index) in approverNodes"
                  :key="node.id"
                  style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
                >
                  <div>
                    <span>审批人</span>
                    →
                  </div>
                  <el-select
                    v-model="node.userId"
                    placeholder="选择人员"
                    style="width: 140px; margin-bottom: 8px;"
                  >
                    <el-option
                      v-for="user in userList"
                      :key="user.userId"
                      :label="user.nickName"
                      :value="user.userId"
                    />
                  </el-select>
                  <div>
                    <el-button
                      type="danger"
                      size="small"
                      @click="removeApproverNode(index)"
                      v-if="approverNodes.length > 1"
                    >删除</el-button>
                  </div>
                </div>
              </div>
            </el-form-item>
          </el-col>
        </el-row>
@@ -474,6 +553,11 @@
                     </el-select>
                  </el-form-item>
               </el-col>
          <el-col :span="24">
            <el-form-item label=" ">
              <el-button type="warning" :disabled="!(productForm.productId && productForm.productModelId && productForm.taxRate)" @click="showPriceReference" icon="Search">查看历史采购价格参考</el-button>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
@@ -520,7 +604,7 @@
              label="不含税总价(元)："
              prop="taxExclusiveTotalPrice"
            >
              <el-input 
              <el-input
                v-model="productForm.taxExclusiveTotalPrice"
                @change="reverseMathNum('taxExclusiveTotalPrice')"
              />
@@ -560,7 +644,84 @@
        </div>
      </template>
    </el-dialog>
    

    <!-- 历史采购价格参考弹窗 -->
    <el-dialog
      v-model="priceReferenceVisible"
      :title="`历史采购价格参考 ${productForm.supplierName}-${productForm.productName}-${productForm.productModel}`"
      width="1000px"
      append-to-body
    >
      <el-table 
        :data="priceReferenceData" 
        border 
        v-loading="priceReferenceLoading" 
        :default-sort="{ prop: 'updateTime', order: 'descending' }"
      >
        <!-- <el-table-column label="商品信息" min-width="200">
          <template #default="{ row }">
            <div class="product-info">
              <div class="product-name">{{ row.productName }}</div>
              <div class="product-spec">{{ row.specification }}</div>
              <div class="product-code">编码: {{ row.productCode }}</div>
            </div>
          </template>
        </el-table-column> -->
        <!-- <el-table-column label="供应商" prop="supplierName" width="200" /> -->
        <el-table-column label="基础价格(不含税)" width="150" align="right">
          <template #default="{ row }">
            <span class="price-text">¥{{ row.basePrice }}</span>
          </template>
        </el-table-column>
        <el-table-column label="实际价格(不含税)" prop="actuallyPrice" width="150" align="right"/>
        <el-table-column label="折扣信息" width="120" align="center">
          <template #default="{ row }">
            <div v-if="row.discountType">
              <el-tag :type="getDiscountTagType(row.discountType)" size="small">
                {{ getDiscountText(row.discountType) }}
              </el-tag>
              <div class="discount-value">{{ row.discountValue }}{{ row.discountType === 'percentage' ? '%' : '元' }}</div>
            </div>
            <span v-else class="no-discount">无折扣</span>
          </template>
        </el-table-column>
        <el-table-column label="状态" width="100" align="center">
          <template #default="{ row }">
            <el-tag :type="getStatusType(row.status)">{{ getStatusText(row.status) }}</el-tag>
            <!-- <div v-if="isPriceWarning(row)" class="warning-indicator">
              <el-icon color="#F56C6C"><Warning /></el-icon>
            </div> -->
          </template>
        </el-table-column>
        <el-table-column label="生效时间" prop="effectiveTime" width="100" align="center" />
        <el-table-column label="更新时间" prop="updateTime" width="160" sortable align="center" />
        <el-table-column label="备注" width="200" prop="remark" align="center" show-overflow-tooltip />
        <el-table-column label="操作" width="100" align="center" fixed="right">
          <template #default="{ row }">
            <el-button type="success" link @click="selectPriceReference(row)">
              <el-icon><Check /></el-icon>
              引用
            </el-button>
          </template>
        </el-table-column>
      </el-table>

      <div class="pagination-container" style="margin-top: 20px; display: flex; justify-content: flex-end;">
        <el-pagination
          v-model:current-page="priceReferencePagination.current"
          v-model:page-size="priceReferencePagination.size"
          :page-sizes="[10, 20, 50]"
          :total="priceReferenceTotal"
          layout="total, sizes, prev, pager, next"
          @size-change="handlePriceReferenceSizeChange"
          @current-change="handlePriceReferenceCurrentChange"
        />
      </div>
      <template #footer>
        <el-button @click="priceReferenceVisible = false">关闭</el-button>
      </template>
    </el-dialog>

    <!-- 二维码显示对话框 -->
    <el-dialog
      v-model="qrCodeDialogVisible"
@@ -782,7 +943,7 @@
import { getToken } from "@/utils/auth";
import pagination from "@/components/PIMTable/Pagination.vue";
import { ref, onMounted, reactive, toRefs, getCurrentInstance, nextTick } from "vue";
import { Search } from "@element-plus/icons-vue";
import { Search, Check } from "@element-plus/icons-vue";
import { ElMessageBox } from "element-plus";
import { userListNoPage } from "@/api/system/user.js";
import {
@@ -821,8 +982,11 @@
});
const total = ref(0);
const fileList = ref([]);
const approverNodes = ref([{ id: 1, userId: null }]);
let nextApproverId = 2;
import useUserStore from "@/store/modules/user";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import { listPage as listAdvancedPrice } from "@/api/procurementManagement/advancedPriceManagement.js";
import dayjs from "dayjs";

const userStore = useUserStore();
@@ -854,6 +1018,7 @@
    supplierName: "",
    supplierId: "",
    paymentMethod: "",
      executionDate: "",
  },
  rules: {
    purchaseContractNumber: [
@@ -861,10 +1026,19 @@
    ],
    projectName: [{ required: true, message: "请输入", trigger: "blur" }],
    supplierId: [{ required: true, message: "请输入", trigger: "blur" }],
      entryDate: [{ required: true, message: "请选择", trigger: "change" }],
      executionDate: [{ required: true, message: "请选择", trigger: "change" }],
  },
});
const {  form, rules } = toRefs(data);
const { form: searchForm } = useFormData(data.searchForm);

const addApproverNode = () => {
  approverNodes.value.push({ id: nextApproverId++, userId: null });
};
const removeApproverNode = (index) => {
  approverNodes.value.splice(index, 1);
};

// 产品表单弹框数据
const productFormVisible = ref(false);
@@ -885,6 +1059,9 @@
    taxExclusiveTotalPrice: "",
    invoiceType: "",
      warnNum: "",
    supplierName: "",
    productName: "",
    productModel: "",
  },
  productRules: {
    productId: [{ required: true, message: "请选择", trigger: "change" }],
@@ -895,7 +1072,7 @@
      { required: true, message: "请输入", trigger: "blur" },
    ],
    taxRate: [{ required: true, message: "请选择", trigger: "change" }],
      warnNum: [{ required: true, message: "请选择", trigger: "change" }],
      warnNum: [{ required: false, message: "请选择", trigger: "change" }],
    taxInclusiveTotalPrice: [
      { required: true, message: "请输入", trigger: "blur" },
    ],
@@ -906,6 +1083,139 @@
  },
});
const { productForm, productRules } = toRefs(productFormData);

// 采购价格管理参考弹窗
const priceReferenceVisible = ref(false);
const priceReferenceLoading = ref(false);
const priceReferenceData = ref([]);
const priceReferenceTotal = ref(0);
const priceReferencePagination = reactive({
  current: 1,
  size: 10
});

const calculateFinalPrice = (row) => {
  let finalPrice = row.basePrice;
  if (row.discountType === "percentage") {
    finalPrice = row.basePrice * (1 - row.discountValue / 100);
  } else if (row.discountType === "fixed") {
    finalPrice = row.basePrice - row.discountValue;
  }
  let man = Math.max(finalPrice, 0);
  return man.toFixed(2);
};

const getDiscountTagType = (discountType) => {
  const typeMap = {
    percentage: "success",
    fixed: "warning",
    tiered: "info",
  };
  return typeMap[discountType] || "info";
};

const getDiscountText = (discountType) => {
  const textMap = {
    percentage: "百分比",
    fixed: "固定金额",
  };
  return textMap[discountType] || "未知";
};

const getStatusType = (status) => {
  const statusMap = {
    active: "success",
    pending: "warning",
    expired: "info",
  };
  return statusMap[status] || "info";
};

const getStatusText = (status) => {
  const statusMap = {
    active: "有效",
    pending: "待生效",
    expired: "已过期",
  };
  return statusMap[status] || "未知";
};

const showPriceReference = () => {
  if (form.value.supplierId) {
    const supplier = supplierList.value.find((item) => item.id === form.value.supplierId);
    if (supplier) {
      productForm.value.supplierName = supplier.supplierName;
    }
  }
  priceReferenceVisible.value = true;
  handlePriceReferenceSearch();
};

const handlePriceReferenceSearch = () => {
  priceReferenceLoading.value = true;
  // 模拟搜索参数：productId 映射为 productName 或 ID，这里根据 advancedPriceManagement 的 API 确定参数
  // 假设高级价格管理的 listPage 接收 productId
  const query = {
    productId: productForm.value.productId,
    supplierId: form.value.supplierId,
    current: priceReferencePagination.current,
    size: priceReferencePagination.size
  };
  listAdvancedPrice(query).then(res => {
    console.log(res);
    priceReferenceData.value = res.data.records;
    priceReferenceTotal.value = res.data.total;
    priceReferenceLoading.value = false;
  }).catch(() => {
    priceReferenceLoading.value = false;
  });
};

const handlePriceReferenceSizeChange = (size) => {
  priceReferencePagination.size = size;
  handlePriceReferenceSearch();
};

const handlePriceReferenceCurrentChange = (page) => {
  priceReferencePagination.current = page;
  handlePriceReferenceSearch();
};

const selectPriceReference = (row) => {
  // 计算历史价格（作为不含税单价）：基础价格 - 折扣
  let taxExclusivePrice = row.basePrice;
  if (row.discountType === "percentage") {
    taxExclusivePrice = row.basePrice * (1 - row.discountValue / 100);
  } else if (row.discountType === "fixed") {
    taxExclusivePrice = row.basePrice - row.discountValue;
  }
  taxExclusivePrice = Number(Math.max(taxExclusivePrice, 0));

  // 设置数量为 1
  if (!productForm.value.quantity) {
    productForm.value.quantity = 1;
  }

  // 如果已有税率，则计算含税单价
  if (productForm.value.taxRate) {
    const taxRate = Number(productForm.value.taxRate);
    productForm.value.taxInclusiveUnitPrice = (
      taxExclusivePrice *
      (1 + taxRate / 100)
    ).toFixed(2);
  } else {
    // 如果没有税率，暂时将含税单价设为不含税价格，提示用户选择税率
    productForm.value.taxInclusiveUnitPrice = taxExclusivePrice.toFixed(2);
    proxy.$modal.msgWarning("请选择税率以准确计算含税价格");
  }

  // 自动触发计算逻辑（计算总价等）
  mathNum();

  priceReferenceVisible.value = false;
  proxy.$modal.msgSuccess("已引用历史价格（不含税）");
};

const upload = reactive({
  // 上传的地址
  url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
@@ -1019,6 +1329,8 @@
  form.value = {};
  productData.value = [];
  fileList.value = [];
  approverNodes.value = [{ id: 1, userId: null }];
  nextApproverId = 2;
  if (operationType.value == "add") {
    createPurchaseNo().then((res) => {
      form.value.purchaseContractNumber = res.data;
@@ -1040,6 +1352,17 @@
    getPurchaseById({ id: row.id, type: 2 }).then((res) => {
      form.value = { ...res };
      productData.value = form.value.productData;
      const approveUserIds = form.value.approveUserIds || form.value.approverIds;
      if (approveUserIds) {
        const ids = String(approveUserIds)
          .split(",")
          .map((id) => Number(id.trim()))
          .filter((id) => !Number.isNaN(id));
        if (ids.length > 0) {
          approverNodes.value = ids.map((id, idx) => ({ id: idx + 1, userId: id }));
          nextApproverId = ids.length + 1;
        }
      }
      if (form.value.salesLedgerFiles) {
        fileList.value = form.value.salesLedgerFiles;
      } else {
@@ -1078,9 +1401,9 @@
// 移除文件
function handleRemove(file) {
  console.log("handleRemove", file.id);
  if (file.size > 1024 * 1024 * 10) { 
  if (file.size > 1024 * 1024 * 10) {
    // 仅前端清理，不调用删除接口和提示
    return; 
    return;
  }
  if (operationType.value === "edit") {
    let ids = [];
@@ -1094,6 +1417,12 @@
const submitForm = () => {
  proxy.$refs["formRef"].validate((valid) => {
    if (valid) {
      const hasEmptyApprover = approverNodes.value.some((node) => !node.userId);
      if (hasEmptyApprover) {
        proxy.$modal.msgWarning("请为所有审批节点选择审批人");
        return;
      }
      form.value.approveUserIds = approverNodes.value.map((node) => node.userId).join(",");
      if (productData.value.length > 0) {
        form.value.productData = proxy.HaveJson(productData.value);
      } else {
@@ -1121,13 +1450,38 @@
};
// 打开产品弹框
const openProductForm = (type, row, index) => {
  if(!form.value.supplierId){
    proxy.$modal.msgWarning("请选择供应商");
    return;
  }
  productOperationType.value = type;
  productOperationIndex.value = index;
  productForm.value = {};
  productForm.value = {
    supplierName: "",
    productName: "",
    productModel: "",
  };
  proxy.resetForm("productFormRef");
  if (type === "edit") {
    productForm.value = { ...row };
    productForm.value = { 
      ...row,
      productName: row.productCategory || "",
      productModel: row.specificationModel || ""
    };
    // 编辑时，根据 productId 预加载规格型号列表，确保下拉框显示名称而非 ID
    if (productForm.value.productId) {
      modelList({ id: productForm.value.productId }).then((res) => {
        modelOptions.value = res;
      });
    }
  }
  
  // 确保供应商名称始终同步
  const supplier = supplierList.value.find((item) => item.id === form.value.supplierId);
  if (supplier) {
    productForm.value.supplierName = supplier.supplierName;
  }
  
  productFormVisible.value = true;
  getProductOptions();
};
@@ -1137,30 +1491,50 @@
  });
};
const getModels = (value) => {
  productForm.value.productCategory = findNodeById(productOptions.value, value);
  modelList({ id: value }).then((res) => {
    modelOptions.value = res;
  });
  if (value) {
    productForm.value.productCategory = findNodeById(productOptions.value, value) || "";
    productForm.value.productName = productForm.value.productCategory;
    productForm.value.productModelId = "";
    modelList({ id: value }).then((res) => {
      modelOptions.value = res;
    });
  } else {
    productForm.value.productCategory = "";
    productForm.value.productName = "";
    modelOptions.value = [];
  }
};
const getProductModel = (value) => {
  const index = modelOptions.value.findIndex((item) => item.id === value);
  if (index !== -1) {
    productForm.value.specificationModel = modelOptions.value[index].model;
    productForm.value.productModel = modelOptions.value[index].model;
    productForm.value.unit = modelOptions.value[index].unit;
  } else {
    productForm.value.specificationModel = null;
    productForm.value.productModel = null;
    productForm.value.unit = null;
  }
};
const handleSupplierChange = (value) => {
  const supplier = supplierList.value.find((item) => item.id === value);
  if (supplier) {
    form.value.supplierName = supplier.supplierName;
    productForm.value.supplierName = supplier.supplierName;
  } else {
    form.value.supplierName = "";
    productForm.value.supplierName = "";
  }
};
const findNodeById = (nodes, productId) => {
  for (let i = 0; i < nodes.length; i++) {
    if (nodes[i].value === productId) {
      return nodes[i].label; // 找到节点，返回该节点
      return nodes[i].label; // 找到节点，返回该节点的label
    }
    if (nodes[i].children && nodes[i].children.length > 0) {
      const foundNode = findNodeById(nodes[i].children, productId);
      if (foundNode) {
        return foundNode.label; // 在子节点中找到，返回该节点
        return foundNode; // 在子节点中找到，直接返回（已经是label字符串）
      }
    }
  }
@@ -1345,29 +1719,29 @@
  if (field === 'taxInclusiveTotalPrice') {
    // 已知含税总价和数量，反算含税单价
    if (productForm.value.quantity) {
      productForm.value.taxInclusiveUnitPrice = 
      productForm.value.taxInclusiveUnitPrice =
        (Number(productForm.value.taxInclusiveTotalPrice) / Number(productForm.value.quantity)).toFixed(2);
    }
    // 已知含税总价和含税单价，反算数量
    else if (productForm.value.taxInclusiveUnitPrice) {
      productForm.value.quantity = 
      productForm.value.quantity =
        (Number(productForm.value.taxInclusiveTotalPrice) / Number(productForm.value.taxInclusiveUnitPrice)).toFixed(2);
    }
    // 反算不含税总价
    productForm.value.taxExclusiveTotalPrice = 
    productForm.value.taxExclusiveTotalPrice =
      (Number(productForm.value.taxInclusiveTotalPrice) / (1 + taxRate / 100)).toFixed(2);
  } else if (field === 'taxExclusiveTotalPrice') {
    // 反算含税总价
    productForm.value.taxInclusiveTotalPrice = 
    productForm.value.taxInclusiveTotalPrice =
      (Number(productForm.value.taxExclusiveTotalPrice) * (1 + taxRate / 100)).toFixed(2);
    // 已知数量，反算含税单价
    if (productForm.value.quantity) {
      productForm.value.taxInclusiveUnitPrice = 
      productForm.value.taxInclusiveUnitPrice =
        (Number(productForm.value.taxInclusiveTotalPrice) / Number(productForm.value.quantity)).toFixed(2);
    }
    // 已知含税单价，反算数量
    else if (productForm.value.taxInclusiveUnitPrice) {
      productForm.value.quantity = 
      productForm.value.quantity =
        (Number(productForm.value.taxInclusiveTotalPrice) / Number(productForm.value.taxInclusiveUnitPrice)).toFixed(2);
    }
  }
@@ -1423,7 +1797,7 @@
    proxy.$modal.msgWarning("二维码未生成");
    return;
  }
  

  const a = document.createElement('a');
  a.href = qrCodeUrl.value;
  a.download = `采购合同号二维码_${new Date().getTime()}.png`;
@@ -1483,7 +1857,7 @@
// 解析扫码内容（模拟解析二维码数据）
const parseScanContent = (content) => {
  if (!content) return;
  

  // 模拟解析二维码内容，这里可以根据实际需求调整解析逻辑
  // 假设扫码内容格式为：合同号|供应商|项目|金额|付款方式
  const parts = content.split('|');
@@ -1518,11 +1892,11 @@
        remark: scanAddForm.scanRemark,
        type: 2
      };
      

      // 模拟新增成功
      proxy.$modal.msgSuccess("扫码新增成功！");
      closeScanAddDialog();
      

      // 可以选择是否刷新列表
      // getList();
    }