From 39f51cb984ac3ecd77f541ee7f73a75771109e65 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 24 四月 2026 11:06:51 +0800
Subject: [PATCH] 对库存管理视图进行重构，以支持动态产品类别和型号，并提升库存检索功能
---
src/views/inventoryManagement/stockManagement/Unqualified.vue | 135 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 126 insertions(+), 9 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 38a95ae..a7558b9 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -3,10 +3,31 @@
<div class="search_form">
<div>
<span class="search_title ml10">浜у搧澶х被锛�</span>
- <el-input v-model="searchForm.productName"
- style="width: 240px"
- placeholder="璇疯緭鍏�"
- clearable/>
+ <el-tree-select
+ v-model="searchForm.parentId"
+ style="width: 240px"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ check-strictly
+ :data="productOptions"
+ :render-after-expand="false"
+ @change="handleParentChange"
+ />
+ <span class="search_title ml10">瑙勬牸鍨嬪彿锛�</span>
+ <el-select
+ v-model="searchForm.productModelId"
+ style="width: 240px"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ @change="handleModelChange"
+ >
+ <el-option v-for="item in modelOptions"
+ :key="item.id"
+ :label="item.model"
+ :value="item.id" />
+ </el-select>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -22,10 +43,20 @@
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
- <el-table-column label="鍘氬害(mm)" prop="thickness" show-overflow-tooltip />
<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
- <el-table-column label="鍐荤粨鏁伴噺" prop="lockedQuantity" show-overflow-tooltip />
+ <el-table-column label="鍚堟牸搴撳瓨鏁伴噺" prop="qualifiedQuantity" show-overflow-tooltip>
+ <template #default="scope">{{ scope.row.qualifiedQuantity ?? 0 }}</template>
+ </el-table-column>
+ <el-table-column label="涓嶅悎鏍煎簱瀛樻暟閲�" prop="unqualifiedQuantity" show-overflow-tooltip>
+ <template #default="scope">{{ scope.row.unqualifiedQuantity ?? scope.row.qualitity ?? scope.row.unLockedQuantity ?? 0 }}</template>
+ </el-table-column>
+ <el-table-column label="鍚堟牸鍐荤粨鏁伴噺" prop="qualifiedLockedQuantity" show-overflow-tooltip>
+ <template #default="scope">{{ scope.row.qualifiedLockedQuantity ?? 0 }}</template>
+ </el-table-column>
+ <el-table-column label="涓嶅悎鏍煎喕缁撴暟閲�" prop="unqualifiedLockedQuantity" show-overflow-tooltip>
+ <template #default="scope">{{ scope.row.unqualifiedLockedQuantity ?? scope.row.lockedQuantity ?? 0 }}</template>
+ </el-table-column>
+ <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" show-overflow-tooltip />
<el-table-column label="澶囨敞" prop="remark" show-overflow-tooltip />
<el-table-column label="鏈�杩戞洿鏂版椂闂�" prop="updateTime" show-overflow-tooltip />
<el-table-column fixed="right" label="鎿嶄綔" min-width="90" align="center">
@@ -42,6 +73,7 @@
<new-stock-inventory v-if="isShowNewModal"
v-model:visible="isShowNewModal"
type="unqualified"
+ :parent-id="props.parentId"
@completed="handleQuery" />
<subtract-stock-inventory v-if="isShowSubtractModal"
@@ -61,15 +93,24 @@
<script setup>
import pagination from '@/components/PIMTable/Pagination.vue'
-import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
+import { ref, reactive, toRefs, onMounted, getCurrentInstance, watch } from 'vue'
import { ElMessageBox } from "element-plus";
import { getStockUninventoryListPage } from "@/api/inventoryManagement/stockUninventory.js";
+import { modelList, productTreeList } from "@/api/basicData/product.js";
const NewStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/New.vue"));
const SubtractStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/Subtract.vue"));
const FrozenAndThawStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/FrozenAndThaw.vue"));
+const props = defineProps({
+ parentId: {
+ type: [Number, String],
+ default: undefined,
+ },
+})
const { proxy } = getCurrentInstance()
const tableData = ref([])
+const productOptions = ref([])
+const modelOptions = ref([])
const selectedRows = ref([])
const record = ref({})
const tableLoading = ref(false)
@@ -89,6 +130,9 @@
const data = reactive({
searchForm: {
productName: '',
+ parentId: undefined,
+ productModelId: undefined,
+ model: '',
}
})
const { searchForm } = toRefs(data)
@@ -106,7 +150,12 @@
}
const getList = () => {
tableLoading.value = true
- getStockUninventoryListPage({ ...searchForm.value, ...page }).then(res => {
+ const queryParentId = searchForm.value.parentId || props.parentId
+ getStockUninventoryListPage({
+ ...searchForm.value,
+ ...page,
+ parentId: queryParentId,
+ }).then(res => {
tableLoading.value = false
tableData.value = res.data.records
total.value = res.data.total
@@ -115,6 +164,61 @@
}).catch(() => {
tableLoading.value = false
})
+}
+
+const convertIdToValue = (data) => {
+ return (data || []).map((item) => {
+ const children = Array.isArray(item.children) ? item.children : []
+ return {
+ ...item,
+ value: item.id,
+ label: item.label || item.productName || '',
+ children: convertIdToValue(children),
+ }
+ })
+}
+
+const findNodeById = (nodes, id) => {
+ for (let i = 0; i < nodes.length; i++) {
+ const node = nodes[i]
+ if (node.value === id) return node
+ if (node.children?.length) {
+ const found = findNodeById(node.children, id)
+ if (found) return found
+ }
+ }
+ return null
+}
+
+const loadProductOptions = async () => {
+ try {
+ const res = await productTreeList()
+ productOptions.value = convertIdToValue(res || [])
+ } catch (e) {
+ productOptions.value = []
+ }
+}
+
+const loadModelOptions = async (parentId) => {
+ if (!parentId) {
+ modelOptions.value = []
+ return
+ }
+ const res = await modelList({ id: parentId })
+ modelOptions.value = Array.isArray(res) ? res : []
+}
+
+const handleParentChange = async (value) => {
+ searchForm.value.productModelId = undefined
+ searchForm.value.model = ''
+ const selected = findNodeById(productOptions.value, value)
+ searchForm.value.productName = selected?.label || ''
+ await loadModelOptions(value || props.parentId)
+}
+
+const handleModelChange = (value) => {
+ const selected = modelOptions.value.find((item) => item.id === value)
+ searchForm.value.model = selected?.model || ''
}
// 鐐瑰嚮棰嗙敤
@@ -172,8 +276,21 @@
}
onMounted(() => {
+ loadProductOptions()
getList()
})
+
+watch(
+ () => props.parentId,
+ async () => {
+ searchForm.value.parentId = props.parentId
+ searchForm.value.productModelId = undefined
+ searchForm.value.model = ''
+ await loadModelOptions(props.parentId)
+ handleQuery()
+ },
+ { immediate: true }
+)
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3