From ebf24181f300dd10d1f5047d8d4e2c457687edcf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 30 一月 2026 16:47:02 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/fileManagement/bookshelf/index.vue | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/views/fileManagement/bookshelf/index.vue b/src/views/fileManagement/bookshelf/index.vue
index 2689900..a084900 100644
--- a/src/views/fileManagement/bookshelf/index.vue
+++ b/src/views/fileManagement/bookshelf/index.vue
@@ -135,7 +135,7 @@
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>璐ф灦灞傛暟锛�</div>
<div class="search_input">
- <el-input v-model="shelves.row" size="small"></el-input>
+ <el-input-number v-model="shelves.row" size="small" :min="1" :max="10" :precision="0" :step="1" controls-position="right" style="width: 100%"></el-input-number>
</div>
</el-col>
</el-row>
@@ -143,7 +143,7 @@
<el-col class="search_thing" :span="24">
<div class="search_label"><span class="required-span">* </span>璐ф灦鍒楁暟锛�</div>
<div class="search_input">
- <el-input v-model="shelves.col" size="small"></el-input>
+ <el-input-number v-model="shelves.col" size="small" :min="1" :max="10" :precision="0" :step="1" controls-position="right" style="width: 100%"></el-input-number>
</div>
</el-col>
</el-row>
@@ -287,6 +287,16 @@
ElMessage.error('璇峰～鍐欒揣鏋跺垪鏁�')
return
}
+ const rowNum = Number(shelves.row)
+ const colNum = Number(shelves.col)
+ if (rowNum < 1 || colNum < 1 || rowNum > 10 || colNum > 10) {
+ ElMessage.error('璐ф灦灞傛暟鍜屽垪鏁伴渶涓�1-10鐨勬暣鏁�')
+ return
+ }
+ if (!Number.isInteger(rowNum) || !Number.isInteger(colNum)) {
+ ElMessage.error('璐ф灦灞傛暟鍜屽垪鏁颁笉鑳戒负灏忔暟')
+ return
+ }
upLoadShelves.value = true
if (currentEdit.value && currentEdit.value.id) {
@@ -294,8 +304,8 @@
updateShelf({
id: currentEdit.value.id,
name: shelves.name,
- row: Number(shelves.row),
- col: Number(shelves.col),
+ row: rowNum,
+ col: colNum,
warehouseId: entity.warehouseId
}).then(res => {
upLoadShelves.value = false
@@ -311,11 +321,10 @@
} else {
// 鏂板
- // 杩欓噷闇�瑕佹浛鎹负瀹為檯鐨凙PI璋冪敤
- addShelf({
+ addShelf({
name: shelves.name,
- row: Number(shelves.row),
- col: Number(shelves.col),
+ row: rowNum,
+ col: colNum,
warehouseId: entity.warehouseId
}).then(res => {
upLoadShelves.value = false
@@ -341,16 +350,14 @@
type: "warning"
}).then(() => {
if (level == 1) {
- // 鍒犻櫎浠撳簱
+ // 鍒犻櫎浠撳簱锛堟帴鍙ｈ姹備紶 ID 鏁扮粍锛�
deleteWarehouse([row.id]).then(res => {
ElMessage.success('鍒犻櫎鎴愬姛')
selectList()
})
} else {
- // 鍒犻櫎璐ф灦
- deleteShelf({
- id: row.id
- }).then(res => {
+ // 鍒犻櫎璐ф灦锛堟帴鍙ｅ悓鏍疯姹備紶 ID 鏁扮粍锛�
+ deleteShelf([row.id]).then(res => {
ElMessage.success('鍒犻櫎鎴愬姛')
selectList()
})
--
Gitblit v1.9.3