From 830adfef9c17ff8915761ff218f9d8e8a04bc3ea Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 二月 2026 15:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新_双奇点' into dev_新_双奇点
---
src/views/inventoryManagement/stockManagement/Qualified.vue | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 8b15db1..f27df18 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -2,11 +2,18 @@
<div class="app-container">
<div class="search_form">
<div>
- <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <span class="search_title ml10">浜у搧鍚嶇О锛�</span>
<el-input v-model="searchForm.productName"
style="width: 240px"
placeholder="璇疯緭鍏�"
clearable/>
+ <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <el-select v-model="searchForm.parentId"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable>
+ <el-option v-for="item of selectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
</div>
<div>
@@ -23,7 +30,7 @@
:row-class-name="tableRowClassName" height="calc(100vh - 18.5em)">
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
+ <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 />
@@ -71,7 +78,7 @@
import pagination from '@/components/PIMTable/Pagination.vue'
import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
import {ElMessage, ElMessageBox} from "element-plus";
-import { getStockInventoryListPage } from "@/api/inventoryManagement/stockInventory.js";
+import { getStockInventoryListPage, getProductList } from "@/api/inventoryManagement/stockInventory.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"));
@@ -99,9 +106,21 @@
const data = reactive({
searchForm: {
productName: '',
- }
+ },
+ selectList:[
+ {
+ id:1,
+ label:1
+ },{
+ id:2,
+ label:2
+ },{
+ id:3,
+ label:3
+ }
+ ]
})
-const { searchForm } = toRefs(data)
+const { searchForm, selectList } = toRefs(data)
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -191,9 +210,18 @@
proxy.$modal.msg("宸插彇娑�")
})
}
+// 鑾峰彇浜у搧澶х被涓嬫媺
+const productCategorySelectList =async ()=>{
+ let res =await getProductList()
+ console.log(res)
+ if(res?.code === 200 && res?.data) {
+ selectList.value = res.data
+ }
+}
-onMounted(() => {
- getList()
+onMounted(async() => {
+ await productCategorySelectList()
+ await getList()
})
</script>
--
Gitblit v1.9.3