From 4a811fb2cd4ee4e1cbfe284bfd1fe3a7d16204ce Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 02 四月 2026 17:35:48 +0800
Subject: [PATCH] fix: 终检表单优化检验用粉剂/液情况字段
---
src/views/inventoryManagement/stockManagement/Qualified.vue | 124 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 insertions(+), 15 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 8b15db1..c60eb87 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -1,16 +1,52 @@
<template>
<div class="app-container">
- <div class="search_form">
- <div>
- <span class="search_title ml10">浜у搧澶х被锛�</span>
- <el-input v-model="searchForm.productName"
- style="width: 240px"
- placeholder="璇疯緭鍏�"
- clearable/>
- <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
+ <div class="search_form search_form--wrap">
+ <div class="search-field">
+ <span class="search_title">浜у搧绫诲瀷锛�</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>
</div>
- <div>
- <el-button type="primary" @click="isShowNewModal = true">鏂板搴撳瓨</el-button>
+ <div class="search-field">
+ <span class="search_title">浜у搧鍚嶇О锛�</span>
+ <el-input
+ v-model="searchForm.productName"
+ class="search-input"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </div>
+ <div class="search-field">
+ <span class="search_title">瑙勬牸鍨嬪彿锛�</span>
+ <el-input
+ v-model="searchForm.model"
+ class="search-input"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </div>
+ <div class="search-field">
+ <span class="search_title">UID鐮侊細</span>
+ <el-input
+ v-model="searchForm.uidNo"
+ class="search-input"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </div>
+ <div class="search-field">
+ <span class="search_title">鎵规鍙凤細</span>
+ <el-input
+ v-model="searchForm.batchNo"
+ class="search-input"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </div>
+ <div class="search-field search-field--actions">
+ <el-button type="primary" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary" @click="isShowNewModal = true">鏂板搴撳瓨</el-button>
<el-button type="info" plain icon="Upload" @click="isShowImportModal = true">
瀵煎叆搴撳瓨
</el-button>
@@ -20,18 +56,22 @@
<div class="table_list">
<el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
:expand-row-keys="expandedRowKeys" :row-key="row => row.id" style="width: 100%"
- :row-class-name="tableRowClassName" height="calc(100vh - 18.5em)">
+ :row-class-name="tableRowClassName" height="calc(100vh - 26.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="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="productionDate" 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 />
<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="120" 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>
@@ -69,7 +109,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"));
@@ -99,9 +139,24 @@
const data = reactive({
searchForm: {
productName: '',
+ model: '',
+ uidNo: '',
+ batchNo: '',
}
})
const { searchForm } = toRefs(data)
+
+// 鎴愬搧(2) / 鍏朵粬浜у搧(鍘熸潗鏂�1銆佸崐鎴愬搧3)锛屼笌浜у搧绫诲瀷瀛楀吀涓�鑷达紱鍒嗛〉鎺ュ彛闇�鏀寔 productType 鎴� productTypes
+const productScope = ref('鎴愬搧')
+
+const getProductScopeParams = () => {
+ return { productScope: productScope.value }
+}
+
+const onProductScopeChange = () => {
+ page.current = 1
+ getList()
+}
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -116,7 +171,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
@@ -186,7 +241,7 @@
type: 'warning',
}
).then(() => {
- proxy.download("/stockInventory/exportStockInventory", {}, '鍚堟牸搴撳瓨淇℃伅.xlsx')
+ proxy.download("/stockInventory/exportStockInventory", { ...searchForm.value, ...getProductScopeParams() }, '鍚堟牸搴撳瓨淇℃伅.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
@@ -198,6 +253,45 @@
</script>
<style scoped lang="scss">
+.search_form--wrap {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ gap: 12px 16px;
+}
+
+.search-field {
+ display: inline-flex;
+ align-items: center;
+ flex: 0 1 auto;
+ min-width: 0;
+ gap: 8px;
+
+ .search_title {
+ flex-shrink: 0;
+ white-space: nowrap;
+ text-align: right;
+ min-width: 4.5em;
+ }
+
+ .search-input {
+ width: 200px;
+ }
+
+ .qualified-product-scope {
+ flex-shrink: 0;
+ }
+}
+
+.search-field--actions {
+ flex-wrap: wrap;
+ gap: 8px;
+}
+
+.qualified-product-scope {
+ vertical-align: middle;
+}
+
:deep(.row-low-stock td) {
background-color: #fde2e2;
color: #c45656;
--
Gitblit v1.9.3