From 0de30962f3570e4f55257af343cb309ea818763e Mon Sep 17 00:00:00 2001
From: zxy <zhouxy@11.com>
Date: Tue, 31 Mar 2026 09:41:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor(heli):=20=E4=BC=98=E5=8C=96=E4=BB=93?=
 =?UTF-8?q?=E5=82=A8=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=E5=92=8C=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wmsstorage/vo/WmsStorageInExcelVO.java    |   2 +-
 .../wmsstorage/vo/WmsStorageOutExcelVO.java   |   2 +-
 .../wmsstoragedetail/vo/DetailInExcelVO.java  |   2 +-
 .../wmsstoragedetail/vo/DetailOutExcelVO.java |   2 +-
 .../views/heli/wmsstorage/WmsStorageForm.vue  | 115 ++++++++++--------
 .../src/views/heli/wmsstorage/index.vue       |   5 +-
 6 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageInExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageInExcelVO.java
index a752106a..9626f064 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageInExcelVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageInExcelVO.java
@@ -17,7 +17,7 @@ import java.time.LocalDate;
 @ExcelIgnoreUnannotated
 public class WmsStorageInExcelVO {
     @ExcelProperty("系统编号")
-    private Long systemID = 1L;
+    private Long id = 1L;
 
     @ExcelProperty("业务类型")
     private String busiType;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageOutExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageOutExcelVO.java
index 13af615f..576f72ad 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageOutExcelVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstorage/vo/WmsStorageOutExcelVO.java
@@ -17,7 +17,7 @@ import java.time.LocalDate;
 @ExcelIgnoreUnannotated
 public class WmsStorageOutExcelVO {
     @ExcelProperty("系统编号")
-    private Long systemID = 1L;
+    private Long id = 1L;
 
     @ExcelProperty("仓库")
     private String whName;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailInExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailInExcelVO.java
index 00ac76f6..63abe02d 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailInExcelVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailInExcelVO.java
@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 @ExcelIgnoreUnannotated
 public class DetailInExcelVO {
     @ExcelProperty("系统编号")
-    private Long systemID = 1L;
+    private Long id = 1L;
 
     @ExcelProperty("物料编码")
     private String matCode;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailOutExcelVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailOutExcelVO.java
index adf7a0cf..bd03ad28 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailOutExcelVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/wmsstoragedetail/vo/DetailOutExcelVO.java
@@ -13,7 +13,7 @@ import java.math.BigDecimal;
 public class DetailOutExcelVO {
 
     @ExcelProperty("系统编号")
-    private Long systemID = 1L;
+    private Long id = 1L;
 
     @ExcelProperty("物料编码")
     private String matCode;
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/WmsStorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/WmsStorageForm.vue
index 23e617ac..d09be8a0 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/WmsStorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/WmsStorageForm.vue
@@ -1,64 +1,38 @@
+
 <template>
   <Dialog title="基础信息" v-model="dialogVisible" width="1200px" @close="handleClose">
     <div v-loading="formLoading" style="min-height: 200px;">
-      <el-descriptions :column="2" border>
-        <el-descriptions-item label="单据类型">
-          {{ getHeliStockTypeLabel(formData.stockType) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="单据状态">
-          {{ getHeliStorageStatusLabel(formData.status) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="单据编号">
-          {{ formData.stockNo }}
-        </el-descriptions-item>
-        <el-descriptions-item label="业务日期">
-          {{ formatDate(formData.busiDate, 'YYYY-MM-DD') }}
-        </el-descriptions-item>
-        <el-descriptions-item label="仓库" :span="2">
-          {{ formData.whName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="供应商名称" :span="2">
-          {{ formData.supplierName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="价格类型">
-          {{ formData.priceType }}
-        </el-descriptions-item>
-        <el-descriptions-item label="辅助项">
-          {{ formData.auItem }}
-        </el-descriptions-item>
-        <el-descriptions-item label="部门" :span="2">
-          {{ formData.deptName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="发票编码">
-          {{ formData.incoiceCode }}
-        </el-descriptions-item>
-        <el-descriptions-item label="生成人">
-          {{ formData.stockEmp }}
-        </el-descriptions-item>
-        <el-descriptions-item label="生成时间">
-          {{ formatDate(formData.stockTime) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="导出人" :span="2">
-          {{ formData.exportEmpName }}
-        </el-descriptions-item>
-        <el-descriptions-item label="导出时间">
-          {{ formatDate(formData.exprotTime) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="备注" :span="2">
-          {{ formData.description }}
-        </el-descriptions-item>
-      </el-descriptions>
-
+      <!-- 表单信息 -->
+      <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="单据编号" prop="stockNo">
+              <el-input v-model="formData.stockNo" disabled placeholder="单据编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="业务日期" prop="busiDate">
+              <el-input :model-value="formattedBusiDate" disabled placeholder="业务日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单据类型" prop="stockType">
+              <el-input v-model="stockTypeLabel" disabled placeholder="单据类型" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
       <!-- 明细列表 -->
-      <div style="margin-top: 20px;">
-        <div style="font-weight: bold; margin-bottom: 10px; font-size: 14px;">入出库明细</div>
+      <div class="detail-section">
+        <div class="section-title">入出库明细</div>
         <el-table
           :data="formData.detailList || []"
           :stripe="true"
           :show-overflow-tooltip="true"
           border
           max-height="300"
+          class="detail-table"
         >
           <el-table-column type="index" width="80" label="序号" align="center" />
           <el-table-column label="物料编码" align="center" prop="matCode" min-width="120" />
@@ -76,8 +50,7 @@
 <script setup lang="ts">
 import * as WmsStorageApi from '@/api/heli/wmsstorage'
 import {
-  getHeliStockTypeLabel,
-  getHeliStorageStatusLabel
+  getHeliStockTypeLabel
 } from '@/api/heli/wmsstorage'
 import { formatDate } from '@/utils/formatTime'
 
@@ -125,6 +98,17 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 
+/** 单据类型标签 */
+const stockTypeLabel = computed(() => {
+  return getHeliStockTypeLabel(formData.value.stockType)
+})
+
+/** 格式化业务日期 */
+const formattedBusiDate = computed(() => {
+  if (!formData.value.busiDate) return ''
+  return formatDate(formData.value.busiDate, 'YYYY-MM-DD')
+})
+
 /** 关闭弹窗 */
 const handleClose = () => {
   dialogVisible.value = false
@@ -132,3 +116,30 @@ const handleClose = () => {
 }
 
 </script>
+
+<style scoped>
+.detail-section {
+  margin-top: 20px;
+}
+
+.section-title {
+  font-weight: 600;
+  margin-bottom: 12px;
+  font-size: 15px;
+  color: #303133;
+  padding-left: 4px;
+  border-left: 3px solid #409EFF;
+}
+
+.detail-table {
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  border-radius: 4px;
+  overflow: hidden;
+}
+
+:deep(.el-input.is-disabled .el-input__inner) {
+  color: #606266;
+  background-color: #f5f7fa;
+  cursor: not-allowed;
+}
+</style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue
index 487ba9c7..4b52efeb 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue
@@ -65,7 +65,7 @@
       :data="list"
       :stripe="true"
       :show-overflow-tooltip="true"
-      height="600px"
+      height="500px"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -265,6 +265,7 @@ const handleExportSelected = async () => {
 onMounted(() => {
   // 设置默认日期范围：当月1号到当天
   queryParams.busiDate = getDefaultDateRange()
-  // 不自动加载数据，需要点击查询按钮
+  // 自动加载数据
+  getList()
 })
 </script>