From 501c61d84ebbab96cc6c3a50c7523aa9cf40eab0 Mon Sep 17 00:00:00 2001
From: Tom <manfulmr@outlook.com>
Date: Sun, 4 Jan 2026 11:54:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将入库单号查询从选择框改为输入框，并添加供应商编码查询
- 优化物料选择框显示，同时展示物料编码和名称
- 表格添加默认按创建时间降序排序
- 出库记录添加日期范围选择功能
- 调整表格列显示配置，隐藏部分不必要字段
- 添加供应商相关字段显示
---
 .../productionMaterial/MmRecordInbound.vue    | 46 ++++++++------
 .../productionMaterial/MmRecordOutbound.vue   | 63 +++++++++++--------
 2 files changed, 65 insertions(+), 44 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
index 31e7fe1..c1a1372 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
@@ -7,8 +7,17 @@
     <div>
         <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
             <el-form-item label="入库单号" prop="inboundNo">
-                <el-select v-model="queryParams.inboundNo" filterable placeholder="请选择">
-                    <el-option v-for="item in dataList" :key="item.inboundNo" :label="item.inboundNo" :value="item.inboundNo"> </el-option>
+                <el-input v-model="queryParams.inboundNo" placeholder="请输入入库单号" />
+            </el-form-item>
+            <el-form-item label="供应商编码" prop="SupplierCode">
+                <el-input v-model="queryParams.SupplierCode" placeholder="请输入供应商编码" />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materialCode">
+                <el-select v-model="queryParams.materialCode" filterable placeholder="请选择">
+                    <el-option v-for="item in dataList" :key="item.materialCode" :label="item.materialName" :value="item.materialCode">
+                        <span style="float: left">{{ item.materialCode }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.materialName }}</span>
+                    </el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="操作员" prop="operator">
@@ -39,23 +48,26 @@
             border
             header-cell-class-name="el-table-header-cell"
             highlight-current-row
-            @sort-change="sortChange">
-            <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" />
-            <el-table-column prop="inboundNo" label="入库单号" align="left" :show-overflow-tooltip="true" v-if="columns.showColumn('inboundNo')" />
-            <el-table-column prop="materialCode" label="物料编码" align="left" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
-            <el-table-column prop="materialName" label="物料名称" align="left" :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" :show-overflow-tooltip="true" v-if="columns.showColumn('quantity')" />
-            <el-table-column prop="transactionType" label="入库类型" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('transactionType')">
+            @sort-change="sortChange"
+            :default-sort = "{prop: 'createdTime', order: 'descending'}">
+            <!-- <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" /> -->
+            <el-table-column prop="createdTime" sortable label="创建时间" align="center" v-if="columns.showColumn('createdTime')" />
+            <el-table-column prop="inboundNo" label="入库单号" align="left" v-if="columns.showColumn('inboundNo')" />
+            <el-table-column prop="materialCode" label="物料编码" align="left" v-if="columns.showColumn('materialCode')" />
+            <el-table-column prop="materialName" label="物料名称" align="left" v-if="columns.showColumn('materialName')" />
+            <el-table-column prop="locationCode" label="库位编码" align="center" v-if="columns.showColumn('locationCode')" />
+            <el-table-column prop="locationName" label="库位名称" align="center" 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="locationCode" label="库位编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('locationCode')" />
-            <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="创建时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+            <el-table-column prop="warehouseCode" label="仓库编码" align="center" v-if="columns.showColumn('warehouseCode')" />
+            <el-table-column prop="batchNo" label="批次号" align="center" v-if="columns.showColumn('batchNo')" />
+            <el-table-column prop="operator" label="操作员" align="center" v-if="columns.showColumn('operator')" />
+            <el-table-column prop="supplierCode" label="供应商编码" align="center" v-if="columns.showColumn('supplierCode')" />
+            <el-table-column prop="supplierName" label="供应商名称" align="center" v-if="columns.showColumn('supplierName')" />
             <el-table-column label="操作" width="160">
                 <template #default="scope">
                     <el-button
@@ -229,7 +241,7 @@ const queryParams = reactive({
     createdTime: null
 })
 const columns = ref([
-    { visible: true, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true },
+    // { visible: true, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'createdTime', label: '创建时间', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'remarks', label: '备注', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'operator', label: '操作员', showOverflowTooltip: true },
@@ -478,8 +490,6 @@ function handleLocationCodeChange() {
     }
 }
 
-
-
 handleQuery()
 getTypeOfWarehousingList()
 getMaterialCodeList()
diff --git a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
index 8d3c74f..4a2e1d3 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
@@ -6,14 +6,24 @@
 <template>
     <div>
         <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
-             <el-form-item label="出库单号" prop="outboundNo">
+            <el-form-item label="出库单号" prop="outboundNo">
                 <el-input v-model="queryParams.outboundNo" placeholder="请输入出库单号" />
             </el-form-item>
             <el-form-item label="物料编码" prop="materialCode">
                 <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" />
             </el-form-item>
             <el-form-item label="创建日期" prop="createdTime">
-                <el-date-picker v-model="queryParams.createdTime" type="date" placeholder="选择日期"value-format="YYYY-MM-DD"> </el-date-picker>
+                <el-date-picker
+                    v-model="queryParams.createdTime"
+                    type="daterange"
+                    :shortcuts="dateOptions"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    placeholder="请选择添加时间"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    align="right">
+                </el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
@@ -37,27 +47,28 @@
             border
             header-cell-class-name="el-table-header-cell"
             highlight-current-row
-            @sort-change="sortChange">
-            <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" />
-            <el-table-column prop="outboundNo" label="出库单号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('outboundNo')" />
-            <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="warehouseCode" label="仓库编码" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseCode')" />
-            <el-table-column prop="warehouseName" label="仓库名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('warehouseName')" />
-            <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')" />
+            @sort-change="sortChange"
+            :default-sort="{ prop: 'createdTime', order: 'descending' }">
+            <!-- <el-table-column prop="id" label="主键ID" align="center" v-if="columns.showColumn('id')" /> -->
+            <el-table-column prop="createdTime" sortable label="创建时间" align="center" v-if="columns.showColumn('createdTime')" />
+            <el-table-column prop="outboundNo" label="出库单号" align="center" v-if="columns.showColumn('outboundNo')" />
+            <el-table-column prop="materialCode" label="物料编码" align="center" v-if="columns.showColumn('materialCode')" />
+            <el-table-column prop="materialName" label="物料名称" align="center" v-if="columns.showColumn('materialName')" />
+            <el-table-column prop="warehouseCode" label="仓库编码" align="center" v-if="columns.showColumn('warehouseCode')" />
+            <el-table-column prop="warehouseName" label="仓库名称" align="center" v-if="columns.showColumn('warehouseName')" />
+            <el-table-column prop="locationCode" label="库位编码" align="center" v-if="columns.showColumn('locationCode')" />
+            <el-table-column prop="locationName" label="库位名称" align="center" v-if="columns.showColumn('locationName')" />
             <el-table-column prop="quantity" label="出库数量" align="center" v-if="columns.showColumn('quantity')" />
-            <el-table-column prop="unit" label="计量单位" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('unit')" />
+            <el-table-column prop="unit" label="计量单位" align="center" v-if="columns.showColumn('unit')" />
             <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="batchNo" label="批次号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('batchNo')" />
-            <el-table-column prop="orderNo" label="关联订单号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('orderNo')" />
-            <el-table-column prop="operator" label="操作员" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('operator')" />
-            <el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remarks')" />
-            <el-table-column prop="createdTime" label="创建时间" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
+            <el-table-column prop="batchNo" label="批次号" align="center" v-if="columns.showColumn('batchNo')" />
+            <el-table-column prop="orderNo" label="关联订单号" align="center" v-if="columns.showColumn('orderNo')" />
+            <el-table-column prop="operator" label="操作员" align="center" v-if="columns.showColumn('operator')" />
+            <el-table-column prop="remarks" label="备注" align="center" v-if="columns.showColumn('remarks')" />
             <el-table-column label="操作" width="160">
                 <template #default="scope">
                     <el-button
@@ -180,8 +191,7 @@
 
                     <el-col :lg="12">
                         <el-form-item label="创建时间" prop="createdTime">
-                            <el-date-picker v-model="form.createdTime" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD">
-                            </el-date-picker>
+                            <el-date-picker v-model="form.createdTime" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD"> </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -202,6 +212,7 @@ import {
     updateMmRecordOutbound,
     getMmRecordOutbound
 } from '@/api/materialManagement/productionMaterial/mmrecordoutbound.js'
+import dateOptions from '@/utils/dateOptions.js'
 const { proxy } = getCurrentInstance()
 const ids = ref([])
 const loading = ref(false)
@@ -213,7 +224,8 @@ const queryParams = reactive({
     sortType: 'asc'
 })
 const columns = ref([
-    { visible: true, align: 'center', type: '', prop: 'id', label: '主键ID' },
+    // { visible: true, align: 'center', type: '', prop: 'id', label: '主键ID' },
+    { visible: true, align: 'center', type: '', prop: 'createdTime', label: '创建时间', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'outboundNo', label: '出库单号', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'materialCode', label: '物料编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'materialName', label: '物料名称', showOverflowTooltip: true },
@@ -221,14 +233,13 @@ const columns = ref([
     { visible: true, align: 'center', type: '', prop: 'warehouseName', label: '仓库名称', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'locationCode', label: '库位编码', showOverflowTooltip: true },
     { visible: true, align: 'center', type: '', prop: 'locationName', label: '库位名称', showOverflowTooltip: true },
-    { visible: false, align: 'center', type: '', prop: 'quantity', label: '出库数量' },
+    { visible: true, align: 'center', type: '', prop: 'quantity', label: '出库数量' },
     { visible: false, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true },
-    { visible: false, align: 'center', type: 'dict', prop: 'transactionType', label: '出库类型', showOverflowTooltip: true },
+    { visible: true, align: 'center', type: 'dict', prop: 'transactionType', label: '出库类型', showOverflowTooltip: true },
     { visible: false, align: 'center', type: '', prop: 'batchNo', label: '批次号', showOverflowTooltip: true },
-    { visible: false, align: 'center', type: '', prop: 'orderNo', label: '关联订单号', showOverflowTooltip: true },
-    { visible: false, align: 'center', type: '', prop: 'operator', label: '操作员', showOverflowTooltip: true },
-    { visible: false, align: 'center', type: '', prop: 'remarks', label: '备注', showOverflowTooltip: true },
-    { visible: false, align: 'center', type: '', prop: 'createdTime', label: '创建时间', showOverflowTooltip: true }
+    { visible: true, align: 'center', type: '', prop: 'orderNo', label: '关联订单号', showOverflowTooltip: true },
+    { visible: true, align: 'center', type: '', prop: 'operator', label: '操作员', showOverflowTooltip: true },
+    { visible: false, align: 'center', type: '', prop: 'remarks', label: '备注', showOverflowTooltip: true }
     //{ visible: false, prop: 'actions', label: '操作', type: 'slot', width: '160' }
 ])
 const total = ref(0)