增加废品库存从销售到入库流程

zhangwencui

2026-06-09 f4c73e3d36ff577aed91bed9bcd635c9eb6dcaa6

 src/views/inventoryManagement/wasteStockManagement/WasteRecord.vue

@@ -82,12 +82,6 @@
        <el-table-column label="库存数量"
                         prop="qualitity"
                         show-overflow-tooltip />
        <el-table-column label="冻结数量"
                         prop="lockedQuantity"
                         show-overflow-tooltip />
        <el-table-column label="可用数量"
                         prop="unLockedQuantity"
                         show-overflow-tooltip />
        <el-table-column label="备注"
                         prop="remark"
                         show-overflow-tooltip />
@@ -114,22 +108,7 @@
    </div>
    <waste-batch-no-qty-detail v-if="isShowDetailModal"
                               v-model:visible="isShowDetailModal"
                               :record="record"
                               @subtract="handleDetailSubtract"
                               @frozen="handleDetailFrozen"
                               @thaw="handleDetailThaw" />
    <subtract-stock-inventory v-if="isShowSubtractModal"
                              v-model:visible="isShowSubtractModal"
                              :record="record"
                              type="waste"
                              @completed="handleQuery" />
    <!-- 冻结/解冻库存-->
    <frozen-and-thaw-stock-inventory v-if="isShowFrozenAndThawModal"
                                     v-model:visible="isShowFrozenAndThawModal"
                                     :record="record"
                                     :operation-type="operationType"
                                     type="waste"
                                     @completed="handleQuery" />
                               :record="record" />
  </div>
</template>

@@ -144,7 +123,7 @@
    defineAsyncComponent,
  } from "vue";
  import { ElMessageBox } from "element-plus";
  import { getStockInventoryListPageCombined } from "@/api/inventoryManagement/stockInventory.js";
  import { pageWasteQuery } from "@/api/inventoryManagement/stockUninventory.js";

  const props = defineProps({
    productId: {
@@ -154,12 +133,6 @@
    },
  });

  const SubtractStockInventory = defineAsyncComponent(() =>
    import("@/views/inventoryManagement/stockManagement/Subtract.vue")
  );
  const FrozenAndThawStockInventory = defineAsyncComponent(() =>
    import("@/views/inventoryManagement/stockManagement/FrozenAndThaw.vue")
  );
  const WasteBatchNoQtyDetail = defineAsyncComponent(() =>
    import(
      "@/views/inventoryManagement/wasteStockManagement/WasteBatchNoQtyDetail.vue"
@@ -176,14 +149,8 @@
    size: 100,
  });
  const total = ref(0);
  // 是否显示领用弹框
  const isShowSubtractModal = ref(false);
  // 是否显示冻结/解冻弹框
  const isShowFrozenAndThawModal = ref(false);
  // 是否显示详情弹框
  const isShowDetailModal = ref(false);
  // 操作类型
  const operationType = ref("frozen");

  const data = reactive({
    searchForm: {
@@ -191,7 +158,6 @@
      model: "",
      batchNo: "",
      topParentProductId: props.productId,
      type: "waste",
    },
  });
  const { searchForm } = toRefs(data);
@@ -216,21 +182,15 @@
  };
  const getList = () => {
    tableLoading.value = true;
    getStockInventoryListPageCombined({ ...searchForm.value, ...page })
    pageWasteQuery({ ...searchForm.value, ...page })
      .then(res => {
        tableLoading.value = false;
        tableData.value = res.data.records;
        total.value = res.data.total;
        tableData.value = res.data?.records || [];
        total.value = res.data?.total || 0;
      })
      .catch(() => {
        tableLoading.value = false;
      });
  };

  // 点击领用
  const showSubtractModal = row => {
    record.value = row;
    isShowSubtractModal.value = true;
  };

  // 点击详情
@@ -241,35 +201,6 @@
    }
    record.value = row;
    isShowDetailModal.value = true;
  };

  const handleDetailSubtract = row => {
    isShowDetailModal.value = false;
    showSubtractModal(row);
  };

  const handleDetailFrozen = row => {
    isShowDetailModal.value = false;
    showFrozenModal(row);
  };

  const handleDetailThaw = row => {
    isShowDetailModal.value = false;
    showThawModal(row);
  };

  // 点击冻结
  const showFrozenModal = row => {
    record.value = row;
    isShowFrozenAndThawModal.value = true;
    operationType.value = "frozen";
  };

  // 点击解冻
  const showThawModal = row => {
    record.value = row;
    isShowFrozenAndThawModal.value = true;
    operationType.value = "thaw";
  };

  // 表格选择数据
@@ -293,8 +224,8 @@
    })
      .then(() => {
        proxy.download(
          "/stockInventory/exportStockInventory",
          { topParentProductId: props.productId, type: "waste" },
          "/stockUninventory/exportWasteQuery",
          { topParentProductId: props.productId },
          "废品库存信息.xlsx"
        );
      })