diff --git a/src/views/foodManage/stockManage/totalStock/index.vue b/src/views/foodManage/stockManage/totalStock/index.vue
index 8be242f3..f4a65291 100644
--- a/src/views/foodManage/stockManage/totalStock/index.vue
+++ b/src/views/foodManage/stockManage/totalStock/index.vue
@@ -64,7 +64,7 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="货品编码" align="center" prop="materialNum" :show-overflow-tooltip="true" />
+      <el-table-column label="货品编码" align="center" prop="" :show-overflow-tooltip="true" />
       <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true"/>
       <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
       <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" width="120"/>
@@ -72,9 +72,15 @@
       <el-table-column label="条码" align="center" prop="barCode" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/> 
       <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="120"/>
-      <el-table-column label="库存数量" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="库存金额" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
-      <el-table-column label="库存状态" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
+      <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
+        <template slot-scope="scope">
+          <span v-if="scope.row.inventoryStatus==1">正常</span>
+          <span v-if="scope.row.inventoryStatus==2">不足</span>
+          <span v-if="scope.row.inventoryStatus==3">超额</span>
+        </template>
+      </el-table-column>
       <el-table-column label="总库存数" align="center" prop="" :show-overflow-tooltip="true" width="120"/>
     </el-table>