bug修改2

src/views/canteen/order/reserveManagement/index.vue

@@ -137,7 +137,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           size="mini" :disabled="multiple"
@@ -152,7 +152,7 @@
           @click="handleBatchRefund"
         >批量退单
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5" style="display: flex">
         <el-button
           type="primary"
@@ -250,7 +250,7 @@
             @click="handleView(scope.row)"
           >详情
           </el-button>
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text" v-if="scope.row.orderState==1||scope.row.orderState==2||scope.row.orderState==5"
             @click="handleRefundPart(scope.row)"
@@ -273,7 +273,7 @@
             type="text" v-if="scope.row.commentState==1"
             @click="checkEvaluate(scope.row)"
           >评价
-          </el-button>
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>

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> 

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>