diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index 952cbb37..322fcb78 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -222,7 +222,7 @@
               </template>
       </el-table-column>
       <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('进仓状态')" align="center" prop="status" min-width="100" >
+      <el-table-column :label="$t('进仓状态')" align="center" prop="stockInFlag" min-width="100" >
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.stockInFlag=='0'" type="info">未入仓</el-tag>
                 <el-tag v-if="scope.row.stockInFlag=='1'" type="success">已入仓</el-tag>
@@ -649,9 +649,35 @@ export default {
         }
 
 
+        if (j === 'confirmStatus') {
+          if(v['confirmStatus'] == 0){
+            return '未确认';
+          }
+          else if(v['confirmStatus'] == 1){
+            return '已确认';
+          }
+          else if(v['confirmStatus'] == 2){
+            return '部分确认';
+          }
+          else{
+            return '/';
+          }
+        }
 
-
-
+        if (j === 'stockInFlag') {
+          if(v['stockInFlag'] == 0){
+            return '未入仓';
+          }
+          else if(v['stockInFlag'] == 1){
+            return '已入仓';
+          }
+          else if(v['stockInFlag'] == 2){
+            return '部分入仓';
+          }
+          else{
+            return '/';
+          }
+        }
         if (j === 'waybillDetail.blMessage') {
           if(v['waybillDetail']['blMessage']  == 1){
             return '发送';