From 0967d6d5df37955be9ff9063d273bb5383494cc0 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Mon, 29 Sep 2025 14:41:36 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/foodManage/stockReport/expiredWarning/index.vue | 4 ++--
 src/views/foodManage/stockReport/inoutDetails/index.vue   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/foodManage/stockReport/expiredWarning/index.vue b/src/views/foodManage/stockReport/expiredWarning/index.vue
index acd5db51..f702ebda 100644
--- a/src/views/foodManage/stockReport/expiredWarning/index.vue
+++ b/src/views/foodManage/stockReport/expiredWarning/index.vue
@@ -29,7 +29,7 @@
         <el-form-item label="过期状态" prop="expireState"> 
             <el-select v-model="queryParams.expireState" placeholder="请选择过期状态" style="width: 240px;">
                 <el-option label="过期" :value="1"></el-option> 
-                <el-option label="保质期内" :value="2"></el-option> 
+                <!-- <el-option label="保质期内" :value="2"></el-option>  -->
                 <el-option label="临期" :value="3"></el-option> 
             </el-select> 
         </el-form-item>   
@@ -69,7 +69,7 @@
         <el-table-column label="过期状态" align="center" prop="expireState" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
                 <span v-if="scope.row.expireState==1">过期</span>
-                <span v-if="scope.row.expireState==2">保质期内</span> 
+                <!-- <span v-if="scope.row.expireState==2">保质期内</span>  -->
                 <span v-if="scope.row.expireState==3">临期</span> 
             </template>
         </el-table-column> 
diff --git a/src/views/foodManage/stockReport/inoutDetails/index.vue b/src/views/foodManage/stockReport/inoutDetails/index.vue
index 6207ac24..5fee29e7 100644
--- a/src/views/foodManage/stockReport/inoutDetails/index.vue
+++ b/src/views/foodManage/stockReport/inoutDetails/index.vue
@@ -53,6 +53,7 @@
                             <span v-if="scope.row.recordType==1&&scope.row.outType==1">采购入库</span>
                             <span v-if="scope.row.recordType==1&&scope.row.outType==2">退料入库</span>
                             <span v-if="scope.row.recordType==1&&scope.row.outType==3">调拨入库</span>
+                            <span v-if="scope.row.recordType==1&&scope.row.outType==4">即入即出</span>
                             <span v-if="scope.row.recordType==2&&scope.row.outType==1">领取出库</span>
                             <span v-if="scope.row.recordType==2&&scope.row.outType==2">报损出库</span>
                             <span v-if="scope.row.recordType==2&&scope.row.outType==3">退货出库</span>