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,36 +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.productId">
                       :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"
@@ -555,6 +561,7 @@
      productList.value = productRes.data.map(item => ({
        ...item,
        quantityStock: 0,
        warnNum: 0,
        originalQuantityStock: Number(
          item.quantityStock ?? item.inboundQuantity ?? 0
        ),
@@ -671,9 +678,10 @@
      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 = {
@@ -697,8 +705,14 @@
      entryDate: getCurrentDate(),
      remark: "",
    };
    // 确保产品大类数据已加载
    // if (productList.value.length === 0) {
    //   await loadProductList();
    // }
    if (type === "edit" && row) {
      // 编辑模式,回显数据
      console.log(row, "==============");
      directForm.value = { ...row };
      // 回显其他字段
      directQuery.value.inboundQuantity = row.inboundNum || row.inboundQuantity;
@@ -716,13 +730,14 @@
            directQuery.value.productCategory = productCategory;
          }
          // 根据产品大类加载规格型号列表并回显
          loadProductModelList(row.productId).then(() => {
            directQuery.value.productModelId = row.productModelId;
          });
          await loadProductModelList(row.productId);
          directQuery.value.productModelId = row.productModelId;
        } else {
          // 如果没有productId字段,尝试根据productCategory查找
          // 这里需要根据实际情况调整查找逻辑
          directQuery.value.productCategory = row.productCategory || "";
          directQuery.value.productId = row.productCategory || "";
          directQuery.value.productModelId = row.productModelId;
          directQuery.value.specificationModel = row.specificationModel;
        }
      }
    }
@@ -936,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,