From 388f10aa600b1c2459111aa97cf0947077620a63 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 01 四月 2026 11:24:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/views/inventoryManagement/stockManagement/Qualified.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index e255778..eb91974 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -2,9 +2,29 @@
<div class="app-container">
<div class="search_form">
<div>
- <span class="search_title ml10">浜у搧澶х被锛�</span>
+ <span class="search_title ml10">浜у搧绫诲瀷锛�</span>
+ <el-radio-group v-model="productScope" class="qualified-product-scope" @change="onProductScopeChange">
+ <el-radio-button label="鎴愬搧">鎴愬搧</el-radio-button>
+ <el-radio-button label="鍏朵粬浜у搧">鍏朵粬浜у搧</el-radio-button>
+ </el-radio-group>
+ <!-- <span class="search_title ml10" style="margin-left: 20px">浜у搧澶х被锛�</span>
<el-input v-model="searchForm.productName"
style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable/> -->
+ <span class="search_title ml10" style="margin-left: 20px">瑙勬牸鍨嬪彿锛�</span>
+ <el-input v-model="searchForm.model"
+ style="width: 240px"
+ placeholder="璇疯緭鍏�"
+ clearable/>
+ <span class="search_title ml10" style="margin-left: 20px">UID鐮侊細</span>
+ <el-input v-model="searchForm.uidNo"
+ style="width: 200px"
+ placeholder="璇疯緭鍏�"
+ clearable/>
+ <span class="search_title ml10" style="margin-left: 20px">鎵规鍙凤細</span>
+ <el-input v-model="searchForm.batchNo"
+ style="width: 200px"
placeholder="璇疯緭鍏�"
clearable/>
<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
@@ -26,6 +46,8 @@
<el-table-column label="浜у搧澶х被" prop="productName" show-overflow-tooltip />
<el-table-column label="瑙勬牸鍨嬪彿" prop="model" show-overflow-tooltip />
<el-table-column label="UID鐮�" prop="uidNo" show-overflow-tooltip />
+ <el-table-column label="鎵瑰彿" prop="batchNo" show-overflow-tooltip />
+ <el-table-column label="渚涘簲鍟�" prop="customer" 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 />
@@ -70,7 +92,7 @@
<script setup>
import pagination from '@/components/PIMTable/Pagination.vue'
-import { ref, reactive, toRefs, onMounted, getCurrentInstance } from 'vue'
+import { ref, reactive, toRefs, onMounted, getCurrentInstance, defineAsyncComponent } from 'vue'
import {ElMessage, ElMessageBox} from "element-plus";
import { getStockInventoryListPage } from "@/api/inventoryManagement/stockInventory.js";
const NewStockInventory = defineAsyncComponent(() => import("@/views/inventoryManagement/stockManagement/New.vue"));
@@ -100,9 +122,27 @@
const data = reactive({
searchForm: {
productName: '',
+ model: '',
+ uidNo: '',
+ batchNo: '',
}
})
const { searchForm } = toRefs(data)
+
+// 鎴愬搧(2) / 鍏朵粬浜у搧(鍘熸潗鏂�1銆佸崐鎴愬搧3)锛屼笌浜у搧绫诲瀷瀛楀吀涓�鑷达紱鍒嗛〉鎺ュ彛闇�鏀寔 productType 鎴� productTypes
+const productScope = ref('鎴愬搧')
+
+const getProductScopeParams = () => {
+ if (productScope.value === '鎴愬搧') {
+ return { productType: 2 }
+ }
+ return { productTypes: '1,3' }
+}
+
+const onProductScopeChange = () => {
+ page.current = 1
+ getList()
+}
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -117,7 +157,7 @@
}
const getList = () => {
tableLoading.value = true
- getStockInventoryListPage({ ...searchForm.value, ...page }).then(res => {
+ getStockInventoryListPage({ ...searchForm.value, ...page, ...getProductScopeParams() }).then(res => {
tableLoading.value = false
tableData.value = res.data.records
total.value = res.data.total
@@ -187,7 +227,7 @@
type: 'warning',
}
).then(() => {
- proxy.download("/stockInventory/exportStockInventory", {}, '鍚堟牸搴撳瓨淇℃伅.xlsx')
+ proxy.download("/stockInventory/exportStockInventory", { ...searchForm.value, ...getProductScopeParams() }, '鍚堟牸搴撳瓨淇℃伅.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
@@ -199,6 +239,10 @@
</script>
<style scoped lang="scss">
+.qualified-product-scope {
+ vertical-align: middle;
+}
+
:deep(.row-low-stock td) {
background-color: #fde2e2;
color: #c45656;
--
Gitblit v1.9.3