From 3c9c5f8f074b9dc0f12975b74874ed38406018b7 Mon Sep 17 00:00:00 2001
From: Tom <manfulmr@outlook.com>
Date: Wed, 31 Dec 2025 10:09:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=89=A9=E6=96=99=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=8A=E9=80=89=E9=A1=B9=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将日期选择器从datetime类型改为date类型，统一使用YYYY-MM-DD格式
- 修正入库记录表单中入库类型选项的绑定字段
- 添加出库记录查询表单的创建日期筛选条件
- 更新注释说明为"获取出入库类型列表"
---
 .../productionMaterial/MmInventory.vue        |  2 +-
 .../productionMaterial/MmRecordInbound.vue    | 35 +++++++++++++------
 .../productionMaterial/MmRecordOutbound.vue   |  5 ++-
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index df64093..14fcf3a 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -587,7 +587,7 @@ function getMaterialCodeList() {
     }
 }
 
-// 获取入库类型列表
+// 获取出入库类型列表
 function getTypeOfWarehousingList() {
     try {
         getTransactionOption('typeOfWarehousing').then((res) => {
diff --git a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
index 2148f92..b01e8b0 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordInbound.vue
@@ -13,7 +13,7 @@
                 <el-input v-model="queryParams.operator" placeholder="请输入操作员" />
             </el-form-item>
             <el-form-item label="创建日期" prop="createdTime">
-                <el-date-picker v-model="queryParams.createdTime" type="datetime" placeholder="选择日期时间"> </el-date-picker>
+                <el-date-picker v-model="queryParams.createdTime" type="date" placeholder="选择日期" value-format="YYYY-MM-DD"> </el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
@@ -93,8 +93,7 @@
 
                     <el-col :lg="12">
                         <el-form-item label="创建时间" prop="createdTime">
-                            <el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
-                            </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>
 
@@ -124,15 +123,13 @@
 
                     <el-col :lg="12">
                         <el-form-item label="有效期至" prop="expiryDate">
-                            <el-date-picker v-model="form.expiryDate" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
-                            </el-date-picker>
+                            <el-date-picker v-model="form.expiryDate" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD"> </el-date-picker>
                         </el-form-item>
                     </el-col>
 
                     <el-col :lg="12">
                         <el-form-item label="生产日期" prop="productionDate">
-                            <el-date-picker v-model="form.productionDate" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
-                            </el-date-picker>
+                            <el-date-picker v-model="form.productionDate" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD"> </el-date-picker>
                         </el-form-item>
                     </el-col>
 
@@ -147,9 +144,9 @@
                             <el-select v-model="form.transactionType" placeholder="请选择入库类型">
                                 <el-option
                                     v-for="item in options.transactionTypeOptions"
-                                    :key="item.dictValue"
-                                    :label="item.dictLabel"
-                                    :value="item.dictValue"></el-option>
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -225,6 +222,7 @@ import {
     updateMmRecordInbound,
     getMmRecordInbound
 } from '@/api/materialManagement/productionMaterial/mmrecordinbound.js'
+import { getTransactionOption } from '@/api/materialManagement/productionMaterial/mminventory.js'
 const { proxy } = getCurrentInstance()
 const ids = ref([])
 const loading = ref(false)
@@ -236,7 +234,7 @@ const queryParams = reactive({
     sortType: 'asc',
     supplierCode: null,
     operator: null,
-    createdTime: null,
+    createdTime: null
 })
 const columns = ref([
     { visible: true, align: 'center', type: '', prop: 'unit', label: '计量单位', showOverflowTooltip: true },
@@ -367,6 +365,7 @@ function handleAdd() {
     open.value = true
     title.value = '添加入库记录表'
     opertype.value = 1
+    getTypeOfWarehousingList()
 }
 // 修改按钮操作
 function handleUpdate(row) {
@@ -426,5 +425,19 @@ function handleDelete(row) {
         })
 }
 
+// 获取出入库类型列表
+function getTypeOfWarehousingList() {
+    try {
+        getTransactionOption('typeOfWarehousing').then((res) => {
+            const { code, data } = res
+            if (code == 200) {
+                state.options.transactionTypeOptions = data
+            }
+        })
+    } catch (error) {
+        proxy.$modal.msgError(error.message)
+    }
+}
+
 handleQuery()
 </script>
diff --git a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
index a02d8d4..8d3c74f 100644
--- a/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
+++ b/src/views/materialManagement/productionMaterial/MmRecordOutbound.vue
@@ -12,6 +12,9 @@
             <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-form-item>
             <el-form-item>
                 <el-button icon="search" type="primary" @click="handleQuery">{{ $t('btn.search') }}</el-button>
                 <el-button icon="refresh" @click="resetQuery">{{ $t('btn.reset') }}</el-button>
@@ -177,7 +180,7 @@
 
                     <el-col :lg="12">
                         <el-form-item label="创建时间" prop="createdTime">
-                            <el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
+                            <el-date-picker v-model="form.createdTime" type="date" placeholder="选择日期时间" value-format="YYYY-MM-DD">
                             </el-date-picker>
                         </el-form-item>
                     </el-col>