From 04e5f2cc03d0daa5849037616c7a6d41b36e6f26 Mon Sep 17 00:00:00 2001
From: Tom <manfulmr@outlook.com>
Date: Wed, 31 Dec 2025 13:45:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(MmRecordInbound):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E9=A1=BA=E5=BA=8F=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=93=E5=BA=93=E7=BC=96=E7=A0=81=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重新排列表格列顺序以提高可读性
- 在表单中添加仓库编码输入字段
---
 .../productionMaterial/MmRecordInbound.vue    | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
index 0b99475..2228761 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
@@ -38,29 +38,22 @@
             header-cell-class-name="el-table-header-cell"
             highlight-current-row
             @sort-change="sortChange">
-            <el-table-column prop="unit" label="计量单位" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('unit')" />
-            <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
-            <el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remarks')" />
-            <el-table-column prop="operator" label="操作员" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('operator')" />
-            <el-table-column prop="supplierName" label="供应商名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplierName')" />
-            <el-table-column prop="supplierCode" label="供应商编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('supplierCode')" />
-            <el-table-column prop="expiryDate" label="有效期至" :show-overflow-tooltip="true" v-if="columns.showColumn('expiryDate')" />
-            <el-table-column prop="productionDate" label="生产日期" :show-overflow-tooltip="true" v-if="columns.showColumn('productionDate')" />
-            <el-table-column prop="batchNo" label="批次号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('batchNo')" />
+            <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" />
+            <el-table-column prop="inboundNo" label="入库单号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('inboundNo')" />
+            <el-table-column prop="materialCode" label="物料编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
+            <el-table-column prop="materialName" label="物料名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialName')" />
+            <el-table-column prop="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
+            <el-table-column prop="locationName" label="库位名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationName')" />
+            <el-table-column prop="quantity" label="入库数量" align="center" v-if="columns.showColumn('quantity')" />
             <el-table-column prop="transactionType" label="入库类型" align="center" v-if="columns.showColumn('transactionType')">
                 <template #default="scope">
                     <dict-tag :options="options.transactionTypeOptions" :value="scope.row.transactionType" />
                 </template>
             </el-table-column>
-            <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" />
-            <el-table-column prop="quantity" label="入库数量" align="center" v-if="columns.showColumn('quantity')" />
-            <el-table-column prop="locationName" label="库位名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationName')" />
             <el-table-column prop="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
-            <el-table-column prop="warehouseName" label="仓库名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseName')" />
-            <el-table-column prop="warehouseCode" label="仓库编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseCode')" />
-            <el-table-column prop="materialName" label="物料名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialName')" />
-            <el-table-column prop="materialCode" label="物料编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
-            <el-table-column prop="inboundNo" label="入库单号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('inboundNo')" />
+            <el-table-column prop="batchNo" label="批次号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('batchNo')" />
+            <el-table-column prop="operator" label="操作员" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('operator')" />
+            <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
             <el-table-column label="操作" width="160">
                 <template #default="scope">
                     <el-button
@@ -286,6 +279,12 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :lg="12">
+                        <el-form-item label="仓库编码" prop="warehouseCode">
+                            <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :lg="12">
                         <el-form-item label="批次号" prop="batchNo">
                             <el-input v-model="form.batchNo" placeholder="请输入批次号" />
@@ -458,7 +457,6 @@ function cancel() {
 
 // 重置表单
 function reset() {
-
     form.value = {
         unit: null,
         createdTime: null,