发货记录增加数量+“库存预警”字段移至库存管理+点击销售合同号自动跳转到销售台账

zss

5 天以前 fb600a68d1bf4892e1f9817c4fea18563756b2e2

 src/views/inventoryManagement/receiptManagement/index.vue

@@ -78,6 +78,10 @@
                         prop="inboundNum"
                         width="90"
                         show-overflow-tooltip />
        <el-table-column label="库存预警"
                                 prop="warnNum"
                                 width="90"
                                 show-overflow-tooltip />
        <el-table-column label="缺货数量"
                         prop="outStockQuantity"
                         width="100"
@@ -208,6 +212,11 @@
                        clearable />
            </template>
          </el-table-column>
          <el-table-column label="库存预警" prop="warnNum" width="150">
                      <template #default="scope">
                        <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.warnNum" />
                      </template>
                    </el-table-column>
          <el-table-column label="税率(%)"
                           prop="taxRate"
                           width="120" />
@@ -246,28 +255,33 @@
        <el-form :model="directQuery"
                 class="mb-2">
          <el-form-item label="产品大类">
            <el-select v-model="directQuery.productCategory"
                       placeholder="请选择产品大类"
                       clearable
                       filterable
                       @change="handleProductCategoryChange">
              <el-option v-for="item in productList"
                         :key="item.id"
                         :label="item.productName"
                         :value="item.productName" />
            </el-select>
            <el-tree-select v-model="directQuery.productId"
                            placeholder="请选择产品大类"
                            clearable
                            check-strictly
                            @change="handleProductCategoryChange"
                            :data="productList"
                            :disabled="typeValue === 'edit'"
                            :render-after-expand="false"
                            style="width: 100%" />
          </el-form-item>
          <el-form-item label="规格型号">
          <el-form-item v-if="typeValue !== 'edit'" label="规格型号">
            <el-select v-model="directQuery.productModelId"
                       placeholder="请先选择产品大类"
                       clearable
                       filterable
                       :disabled="!directQuery.productCategory">
                       :disabled="!directQuery.productId || typeValue === 'edit'">
              <el-option v-for="item in productModelList"
                         :key="item.id"
                         :label="item.model"
                         :value="item.id" />
            </el-select>
          </el-form-item>
           <el-form-item v-if="typeValue === 'edit'" label="规格型号">
            <el-input v-model="directQuery.specificationModel"
                      placeholder="输入规格型号"
                      clearable
                      disabled />
          </el-form-item>
          <el-form-item label="入库数量">
            <el-input v-model="directQuery.inboundQuantity"
@@ -547,6 +561,7 @@
      productList.value = productRes.data.map(item => ({
        ...item,
        quantityStock: 0,
        warnNum: 0,
        originalQuantityStock: Number(
          item.quantityStock ?? item.inboundQuantity ?? 0
        ),
@@ -663,14 +678,16 @@
      openDirectForm(type, row);
    }
  };

  const typeValue = ref("add");
  // 打开直接新增入库弹框
  const openDirectForm = (type, row) => {
  const openDirectForm = async (type, row) => {
    typeValue.value = type;
    directDialogVisible.value = true;
    directSelectedRows.value = [];
    directQuery.value = {
      productId: null,
      productModelId: null,
      productCategory: "",
      inboundQuantity: 0,
      warnNum: 0,
      outStockQuantity: 0,
@@ -688,36 +705,86 @@
      entryDate: getCurrentDate(),
      remark: "",
    };

    // 确保产品大类数据已加载
    // if (productList.value.length === 0) {
    //   await loadProductList();
    // }
    if (type === "edit" && row) {
      // 编辑模式，回显数据
      console.log(row, "==============");
      directForm.value = { ...row };
      // 回显产品大类
      const selectedProduct = productList.value.find(
        item => item.productName === row.productCategory
      );
      if (selectedProduct) {
        directQuery.value.productId = selectedProduct.id;
        // 根据产品大类加载规格型号列表并回显
        loadProductModelList(selectedProduct.id).then(() => {
          // 回显规格型号
          directQuery.value.productCategory = row.productCategory || "";
      // 回显其他字段
      directQuery.value.inboundQuantity = row.inboundNum || row.inboundQuantity;
      directQuery.value.warnNum = row.warnNum || 0;
      directQuery.value.outStockQuantity = row.outStockQuantity || 0;
      directQuery.value.shortageDescription = row.shortageDescription || "";
      // 回显产品大类和规格型号
      if (row.productModelId) {
        // 这里需要根据实际情况获取产品大类ID，暂时假设row中有productId字段
        if (row.productId) {
          directQuery.value.productId = row.productId;
          // 更新产品类别名称
          const productCategory = findNodeById(productList.value, row.productId);
          if (productCategory) {
            directQuery.value.productCategory = productCategory;
          }
          // 根据产品大类加载规格型号列表并回显
          await loadProductModelList(row.productId);
          directQuery.value.productModelId = row.productModelId;
          // 回显其他字段
          directQuery.value.inboundQuantity =
            row.inboundNum || row.inboundQuantity;
          directQuery.value.warnNum = row.warnNum || 0;
          directQuery.value.outStockQuantity = row.outStockQuantity || 0;
          directQuery.value.shortageDescription = row.shortageDescription || "";
        });
        } else {
          // 如果没有productId字段，尝试根据productCategory查找
          // 这里需要根据实际情况调整查找逻辑
          directQuery.value.productId = row.productCategory || "";
          directQuery.value.productModelId = row.productModelId;
          directQuery.value.specificationModel = row.specificationModel;
        }
      }
    }
  };

  // 转换产品树数据格式为 el-tree-select 所需格式
  function convertIdToValue(data) {
    return data.map(item => {
      const { id, children, ...rest } = item;
      const newItem = {
        ...rest,
        value: id,
        label: item.productName,
      };
      if (children && children.length > 0) {
        newItem.children = convertIdToValue(children);
      }
      return newItem;
    });
  }

  // 根据 ID 查找节点名称
  const findNodeById = (nodes, productId) => {
    for (let i = 0; i < nodes.length; i++) {
      if (nodes[i].value === productId) {
        return nodes[i].label;
      }
      if (nodes[i].children && nodes[i].children.length > 0) {
        const foundNode = findNodeById(nodes[i].children, productId);
        if (foundNode) {
          return foundNode;
        }
      }
    }
    return null;
  };

  // 加载产品大类列表
  const loadProductList = async () => {
    try {
      const res = await productTreeList();
      productList.value = res;
      // 确保数据格式符合 el-tree-select 要求
      if (Array.isArray(res)) {
        productList.value = convertIdToValue(res);
      } else {
        productList.value = [];
      }
    } catch (error) {
      console.error("加载产品大类失败:", error);
      proxy.$modal.msgError("加载产品大类失败");
@@ -726,16 +793,18 @@

  // 处理产品大类变化
  const handleProductCategoryChange = value => {
    directQuery.value.specificationModel = "";
    directQuery.value.productModelId = "";
    productModelList.value = [];
    if (value) {
      // 根据产品大类加载规格型号列表
      const selectedProduct = productList.value.find(
        item => item.productName === value
      );
      if (selectedProduct) {
        loadProductModelList(selectedProduct.id);
      loadProductModelList(value);
      // 更新产品类别名称
      const productCategory = findNodeById(productList.value, value);
      if (productCategory) {
        directQuery.value.productCategory = productCategory;
      }
    } else {
      directQuery.value.productCategory = "";
    }
  };

@@ -882,6 +951,7 @@
        nickName: userStore.nickName,
        details: selectedRows.value.map(product => ({
          id: product.id,
          warnNum: product.warnNum,
          // id: product.salesLedgerProductId,
          inboundQuantity: Number(product.quantityStock),
          productModelId: product.productModelId,