From bba7458485ef4f0e3508e5d5d0a79504d47d446c Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 5 Feb 2024 16:29:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=BA=93=E5=AD=98=20?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=88=97=20=E9=BB=98=E8=AE=A4=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

盘点库存 排除列 默认当前日期
---
 .../src/views/heli/storagecheck/StorageCheckForm.vue         | 4 ++--
 .../mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue  | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
index bac103e3..bc78fa46 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue
@@ -52,7 +52,7 @@ const formData = ref({
   id: undefined,
   stockNo: undefined,
   checkType: undefined,
-  checkTime: undefined,
+  checkTime: new Date(),
   noZero: 1,
   description: undefined,
   status: 1,
@@ -123,7 +123,7 @@ const resetForm = () => {
     id: undefined,
     stockNo: undefined,
     checkType: undefined,
-    checkTime: undefined,
+    checkTime: new Date(),
     noZero: 1,
     description: undefined,
     status: 1,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
index 11e75ee2..147bdf88 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
@@ -67,6 +67,11 @@
           <span>{{ formatDate(scope.row.checkTime, 'YYYY-MM-DD') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="排除库存为0的物料" align="center" prop="noZero" min-width="160" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.noZero" />
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="description" min-width="160" />
       <el-table-column label="创建人" align="center" prop="creator" min-width="120">
         <template #default="scope">