From 87d0b636a580b78d94edbdf96ca666317ba48f17 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 09 四月 2026 18:00:40 +0800
Subject: [PATCH] feat(库存管理): 增加存货名称和辅单位数量列并调整表格布局
---
src/views/qualityManagement/metricMaintenance/index.vue | 45 ++++++++++++++--------
src/views/inventoryManagement/stockManagement/Qualified.vue | 8 ++-
src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue | 8 ++-
src/views/inventoryManagement/stockManagement/Unqualified.vue | 8 ++-
src/views/qualityManagement/metricBinding/index.vue | 2
5 files changed, 44 insertions(+), 27 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 36073e7..7c427d6 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -26,10 +26,12 @@
<el-table-column label="浠撳簱缂栫爜" prop="warehouseCode" show-overflow-tooltip />
<el-table-column label="浠撳簱" prop="warehouseName" show-overflow-tooltip />
<el-table-column label="瀛樿揣缂栫爜" prop="productCode" 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="subUnit" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅(涓诲崟浣�)" prop="unit" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅(杈呭崟浣�)" prop="subUnit" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺(涓诲崟浣�)" prop="qualitity" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺(杈呭崟浣�)" prop="subQualitity" min-width="100" 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">
diff --git a/src/views/inventoryManagement/stockManagement/Unqualified.vue b/src/views/inventoryManagement/stockManagement/Unqualified.vue
index 9bc5c79..343984a 100644
--- a/src/views/inventoryManagement/stockManagement/Unqualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Unqualified.vue
@@ -26,10 +26,12 @@
<el-table-column label="浠撳簱缂栫爜" prop="warehouseCode" show-overflow-tooltip />
<el-table-column label="浠撳簱" prop="warehouseName" show-overflow-tooltip />
<el-table-column label="瀛樿揣缂栫爜" prop="productCode" 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="subUnit" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅(涓诲崟浣�)" prop="unit" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅(杈呭崟浣�)" prop="subUnit" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺(涓诲崟浣�)" prop="qualitity" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺(杈呭崟浣�)" prop="subQualitity" min-width="100" 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">
diff --git a/src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue b/src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue
index 4387467..65b780f 100644
--- a/src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue
+++ b/src/views/inventoryManagement/stockManagement/rawMaterialRecord.vue
@@ -26,10 +26,12 @@
<el-table-column label="浠撳簱缂栫爜" prop="warehouseCode" show-overflow-tooltip />
<el-table-column label="浠撳簱" prop="warehouseName" show-overflow-tooltip />
<el-table-column label="瀛樿揣缂栫爜" prop="productCode" 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="subUnit" show-overflow-tooltip />
- <el-table-column label="搴撳瓨鏁伴噺" prop="qualitity" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅(涓诲崟浣�)" prop="unit" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鍗曚綅(杈呭崟浣�)" prop="subUnit" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺(涓诲崟浣�)" prop="qualitity" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鏁伴噺(杈呭崟浣�)" prop="subQualitity" min-width="100" 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">
diff --git a/src/views/qualityManagement/metricBinding/index.vue b/src/views/qualityManagement/metricBinding/index.vue
index 2b64757..0509961 100644
--- a/src/views/qualityManagement/metricBinding/index.vue
+++ b/src/views/qualityManagement/metricBinding/index.vue
@@ -442,7 +442,7 @@
}
.metric-tabs {
- margin-bottom: 10px;
+ margin: 10px;
}
.metric-binding-row {
diff --git a/src/views/qualityManagement/metricMaintenance/index.vue b/src/views/qualityManagement/metricMaintenance/index.vue
index 5b2c6bd..ee17428 100644
--- a/src/views/qualityManagement/metricMaintenance/index.vue
+++ b/src/views/qualityManagement/metricMaintenance/index.vue
@@ -1,5 +1,10 @@
<template>
<div class="app-container metric-maintenance">
+ <el-tabs v-model="activeTab" @tab-change="handleTabChange" class="metric-tabs">
+ <el-tab-pane label="鍘熸潗鏂欐楠�" name="0" />
+ <el-tab-pane label="杩囩▼妫�楠�" name="1" />
+ <el-tab-pane label="鍑哄巶妫�楠�" name="2" />
+ </el-tabs>
<el-row :gutter="16" class="metric-maintenance-row">
<!-- 宸︿晶锛氭娴嬫爣鍑嗗垪琛� -->
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" class="left-col">
@@ -52,21 +57,6 @@
@change="handleQuery"
@clear="handleQuery"
/>
- </template>
- <template #inspectTypeHeader>
- <el-select
- v-model="searchForm.inspectType"
- placeholder="绫诲埆"
- clearable
- size="small"
- style="width: 120px"
- @change="handleQuery"
- @clear="handleQuery"
- >
- <el-option label="鍘熸潗鏂欐楠�" value="0" />
- <el-option label="杩囩▼妫�楠�" value="1" />
- <el-option label="鍑哄巶妫�楠�" value="2" />
- </el-select>
</template>
<template #stateHeader>
<el-select
@@ -187,6 +177,9 @@
const { proxy } = getCurrentInstance()
+// 绫诲埆 Tab锛�0=鍘熸潗鏂欙紝1=杩囩▼锛�2=鍑哄巶锛�
+const activeTab = ref('0')
+
// 宸︿晶鏍囧噯鍒楄〃锛氭暣琛屽唴瀹瑰眳涓紙閰嶅悎鏍峰紡锛�
const rowClassNameCenter = () => 'row-center'
@@ -297,7 +290,6 @@
{
label: '绫诲埆',
prop: 'inspectType',
- headerSlot: 'inspectTypeHeader',
align: 'center',
dataType: 'tag',
formatData: (val) => {
@@ -389,6 +381,20 @@
]
}
])
+
+const handleTabChange = () => {
+ searchForm.value.standardNo = ''
+ searchForm.value.standardName = ''
+ searchForm.value.remark = ''
+ searchForm.value.state = ''
+ searchForm.value.processId = ''
+ searchForm.value.inspectType = activeTab.value
+ page.current = 1
+ currentStandard.value = null
+ detailTableData.value = []
+ paramSelectedRows.value = []
+ getStandardList()
+}
// 鏌ヨ鍒楄〃
const getStandardList = () => {
@@ -692,6 +698,7 @@
}
onMounted(() => {
+ searchForm.value.inspectType = activeTab.value
getProcessList()
getStandardList()
})
@@ -701,6 +708,10 @@
.metric-maintenance {
padding: 0;
min-width: 0;
+}
+
+.metric-tabs {
+ margin: 10px;
}
.metric-maintenance-row {
@@ -829,4 +840,4 @@
width: 100%;
margin-top: 4px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3