From e5a70efeaa9fd96ce1242e5d582c8237319fade4 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 10 四月 2026 11:13:15 +0800
Subject: [PATCH] Merge branch 'dev_天津_阳光印刷' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_阳光印刷
---
src/views/inventoryManagement/stockManagement/Qualified.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Qualified.vue b/src/views/inventoryManagement/stockManagement/Qualified.vue
index 8b15db1..9e6991c 100644
--- a/src/views/inventoryManagement/stockManagement/Qualified.vue
+++ b/src/views/inventoryManagement/stockManagement/Qualified.vue
@@ -23,19 +23,20 @@
: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="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="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="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">
<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>
</template>
</el-table-column>
</el-table>
@@ -99,6 +100,7 @@
const data = reactive({
searchForm: {
productName: '',
+ rootName:'鎴愬搧'
}
})
const { searchForm } = toRefs(data)
@@ -186,7 +188,7 @@
type: 'warning',
}
).then(() => {
- proxy.download("/stockInventory/exportStockInventory", {}, '鍚堟牸搴撳瓨淇℃伅.xlsx')
+ proxy.download("/stockInventory/exportStockInventory", {}, '鎴愬搧搴撳瓨淇℃伅.xlsx')
}).catch(() => {
proxy.$modal.msg("宸插彇娑�")
})
@@ -199,11 +201,9 @@
<style scoped lang="scss">
:deep(.row-low-stock td) {
- background-color: #fde2e2;
- color: #c45656;
}
:deep(.row-low-stock:hover > td) {
- background-color: #fcd4d4;
+ // background-color: #fcd4d4;
}
</style>
--
Gitblit v1.9.3