From f8a15eadd99227d745fc70a751d24a80eeb219a6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 25 六月 2025 09:20:28 +0800
Subject: [PATCH] 1.巡样式修改

---
 src/views/warehouseManagement/index.vue |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index 8905e20..0996680 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -43,7 +43,7 @@
         <el-button type="success" plain :icon="Refresh" v-if="activeTab=== 'officialInventory'" @click="mergeRows('merge')">鍚堝苟</el-button>
       </el-space>
       <div>
-        <el-table :data="tableData" border @selection-change="selectionChange" style="width: 100%" show-summary :summary-method="summarizeChildrenTable">
+        <el-table :data="tableData" border @selection-change="selectionChange" style="width: 100%;height: calc(100vh - 30em)" show-summary :summary-method="summarizeChildrenTable">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="搴忓彿" type="index" width="60" align="center" />
           <el-table-column prop="supplierName" label="渚涜揣鍟嗗悕绉�" width="180" sortable/>
@@ -491,6 +491,7 @@
           }
           return acc;
         }, []);
+        mergeForm.value.type = 2
         merge(mergeForm.value).then(() => {
           cancel()
           proxy.$modal.msgSuccess('鍚堝苟鎴愬姛')
@@ -512,6 +513,7 @@
       delete form.value.registrationTime
       delete form.value.createTime
       delete form.value.updateTime
+      form.value.type = 1
       form.value.fieldValue = filteredList.value.map(item => ({
         [item.fields]: form.value[item.fields]
       }))

--
Gitblit v1.9.3