From f4c73e3d36ff577aed91bed9bcd635c9eb6dcaa6 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 09 六月 2026 16:38:11 +0800
Subject: [PATCH] 增加废品库存从销售到入库流程
---
src/views/inventoryManagement/wasteStockManagement/WasteRecord.vue | 83 +++--------------------------------------
1 files changed, 7 insertions(+), 76 deletions(-)
diff --git a/src/views/inventoryManagement/wasteStockManagement/WasteRecord.vue b/src/views/inventoryManagement/wasteStockManagement/WasteRecord.vue
index 4a2d95b..c41bebf 100644
--- a/src/views/inventoryManagement/wasteStockManagement/WasteRecord.vue
+++ b/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"
);
})
--
Gitblit v1.9.3