From 0f30fb5488c0d642e13418ac15f38efda17e08de Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 24 四月 2026 11:58:55 +0800
Subject: [PATCH] fix: 库存管理接口调整，产品大类下拉只显示对应的子类
---
src/views/inventoryManagement/stockManagement/Qualified.vue | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 164 insertions(+), 14 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 8b15db1..dae538f 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.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="displayProductOptions"
+ :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>
@@ -26,16 +47,26 @@
<el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="model" 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="warnNum" show-overflow-tooltip />
+ <el-table-column label="鍚堟牸搴撳瓨鏁伴噺" prop="qualifiedQuantity" show-overflow-tooltip>
+ <template #default="scope">{{ getQualifiedStock(scope.row) }}</template>
+ </el-table-column>
+ <el-table-column label="涓嶅悎鏍煎簱瀛樻暟閲�" prop="unqualifiedQuantity" show-overflow-tooltip>
+ <template #default="scope">{{ getUnqualifiedStock(scope.row) }}</template>
+ </el-table-column>
+ <el-table-column label="鍚堟牸鍐荤粨鏁伴噺" prop="qualifiedLockedQuantity" show-overflow-tooltip>
+ <template #default="scope">{{ getQualifiedLockedStock(scope.row) }}</template>
+ </el-table-column>
+ <el-table-column label="涓嶅悎鏍煎喕缁撴暟閲�" prop="unqualifiedLockedQuantity" show-overflow-tooltip>
+ <template #default="scope">{{ getUnqualifiedLockedStock(scope.row) }}</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="60" align="center">
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="90" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">棰嗙敤</el-button>
- <el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">鍐荤粨</el-button>
- <el-button link type="primary" size="small" v-if="scope.row.lockedQuantity > 0" @click="showThawModal(scope.row)">瑙ｅ喕</el-button>
+ <el-button link type="primary" @click="showSubtractModal(scope.row)" :disabled="getQualifiedUnLockedStock(scope.row) <= 0">棰嗙敤</el-button>
+ <el-button link type="primary" v-if="getQualifiedUnLockedStock(scope.row) > 0" @click="showFrozenModal(scope.row)">鍐荤粨</el-button>
+ <el-button link type="primary" v-if="getQualifiedLockedStock(scope.row) > 0" @click="showThawModal(scope.row)">瑙ｅ喕</el-button>
</template>
</el-table-column>
</el-table>
@@ -45,6 +76,7 @@
<new-stock-inventory v-if="isShowNewModal"
v-model:visible="isShowNewModal"
type="qualified"
+ :parent-id="props.parentId"
@completed="handleQuery" />
<subtract-stock-inventory v-if="isShowSubtractModal"
@@ -69,15 +101,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, computed } from 'vue'
import {ElMessage, ElMessageBox} from "element-plus";
import { getStockInventoryListPage } from "@/api/inventoryManagement/stockInventory.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 ImportStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/Import.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)
@@ -99,9 +140,18 @@
const data = reactive({
searchForm: {
productName: '',
+ parentId: undefined,
+ productModelId: undefined,
+ model: '',
}
})
const { searchForm } = toRefs(data)
+
+const displayProductOptions = computed(() => {
+ if (!props.parentId) return productOptions.value
+ const currentParentNode = findNodeById(productOptions.value, props.parentId)
+ return Array.isArray(currentParentNode?.children) ? currentParentNode.children : []
+})
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -116,7 +166,13 @@
}
const getList = () => {
tableLoading.value = true
- getStockInventoryListPage({ ...searchForm.value, ...page }).then(res => {
+ const queryParentId = props.parentId || searchForm.value.parentId
+ getStockInventoryListPage({
+ ...page,
+ topParentProductId: queryParentId,
+ productName: searchForm.value.productName,
+ model: searchForm.value.model,
+ }).then(res => {
tableLoading.value = false
tableData.value = res.data.records
total.value = res.data.total
@@ -125,6 +181,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 || ''
}
const handleFileSuccess = (response) => {
@@ -166,9 +277,34 @@
}
const expandedRowKeys = ref([])
+const toNumber = (value) => {
+ const num = Number(value)
+ return Number.isFinite(num) ? num : 0
+}
+
+const getQualifiedStock = (row) => {
+ return toNumber(row?.qualifiedQuantity ?? row?.qualitity ?? row?.unLockedQuantity)
+}
+
+const getUnqualifiedStock = (row) => {
+ return toNumber(row?.unQualifiedQuantity ?? row?.unqualifiedQuantity ?? row?.unQualifiedUnLockedQuantity ?? row?.unqualifiedUnLockedQuantity)
+}
+
+const getQualifiedLockedStock = (row) => {
+ return toNumber(row?.qualifiedLockedQuantity ?? row?.lockedQuantity)
+}
+
+const getUnqualifiedLockedStock = (row) => {
+ return toNumber(row?.unQualifiedLockedQuantity ?? row?.unqualifiedLockedQuantity)
+}
+
+const getQualifiedUnLockedStock = (row) => {
+ return toNumber(row?.qualifiedUnLockedQuantity ?? row?.unLockedQuantity ?? row?.qualifiedQuantity ?? row?.qualitity)
+}
+
// 琛ㄦ牸琛岀被鍚�
const tableRowClassName = ({ row }) => {
- const stock = Number(row?.unLockedQuantity ?? 0);
+ const stock = getQualifiedUnLockedStock(row);
const warn = Number(row?.warnNum ?? 0);
if (!Number.isFinite(stock) || !Number.isFinite(warn)) {
return '';
@@ -193,8 +329,22 @@
}
onMounted(() => {
+ loadProductOptions()
getList()
})
+
+watch(
+ () => props.parentId,
+ async () => {
+ searchForm.value.parentId = undefined
+ searchForm.value.productName = ''
+ searchForm.value.productModelId = undefined
+ searchForm.value.model = ''
+ await loadModelOptions(undefined)
+ handleQuery()
+ },
+ { immediate: true }
+)
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3