fixes

src/views/modules/warehouse/stock.vue

@@ -246,8 +246,15 @@ export default {
       },
       // 转换属性“状态”
       formatState (row) {
-        if (!row.lockCnt) return ''
-        return row.lockCnt === '0' ? '正常' : '盘点中'
+        if (row.isInventory && Number(row.isInventory) === 1 && row.lockCnt && Number(row.lockCnt) > 0) {
+          return '盘点中'
+        } else if (row.isInventory && Number(row.isInventory) === 1) {
+          return '盘点中'
+        } else if (row.lockCnt && Number(row.lockCnt) > 0) {
+          return '锁定中'
+        } else {
+          return '正常'
+        }
       },
       // 变更通知人设置
       setNoticeChangeHandel () {