From acfbf42432b48ba43254277c3793dbba429fa814 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 5 Feb 2024 16:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=93=E5=BA=93=20?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=B8=BA0=E7=9A=84=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=20=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

盘点仓库 排除为0的物料库存 隐藏 默认为否
---
 .../heli/storagecheck/StorageCheckForm.vue    | 26 ++++++++++---------
 .../views/heli/storagecheck/checkdetail.vue   |  4 +--
 2 files changed, 16 insertions(+), 14 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 bc78fa46..bfde55ea 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
@@ -4,27 +4,29 @@
       <el-form-item label="盘点单号" prop="stockNo">
         <el-input v-model="formData.stockNo" placeholder="系统自动生成" disabled class="!w-250px" />
       </el-form-item>
+      <el-form-item label="盘点开始日期" prop="checkTime">
+        <el-date-picker v-model="formData.checkTime" type="date" value-format="x" placeholder="盘点开始时间" class="!w-250px" />
+      </el-form-item>
+      <el-form-item label="盘点仓库" prop="whId">
+        <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-250px">
+          <el-option v-for="dict in whList" :key="dict.id" :label="dict.wh_name" :value="dict.id" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="盘点类型" prop="checkType">
         <el-select v-model="formData.checkType" placeholder="盘点类型" class="!w-250px">
           <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="排除库存为0的物料?" prop="noZero">
+      <el-form-item label="排除库存为0的物料?" prop="noZero" v-if="false">
         <el-radio-group v-model="formData.noZero">
           <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value" :label="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
-
-      <el-form-item label="盘点仓库" prop="whId">
-        <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-250px">
-          <el-option v-for="dict in whList" :key="dict.id" :label="dict.wh_name" :value="dict.id" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="盘点开始时间" prop="checkTime">
-        <el-date-picker v-model="formData.checkTime" type="date" value-format="x" placeholder="盘点开始时间" class="!w-250px" />
-      </el-form-item>
+      
+      
+      
       <el-form-item label="备注" prop="description">
         <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
       </el-form-item>
@@ -53,7 +55,7 @@ const formData = ref({
   stockNo: undefined,
   checkType: undefined,
   checkTime: new Date(),
-  noZero: 1,
+  noZero: 2,
   description: undefined,
   status: 1,
   whId: undefined
@@ -124,7 +126,7 @@ const resetForm = () => {
     stockNo: undefined,
     checkType: undefined,
     checkTime: new Date(),
-    noZero: 1,
+    noZero: 2,
     description: undefined,
     status: 1,
     whId: undefined
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
index 7e8f3b5f..cfcab6c3 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue
@@ -55,7 +55,7 @@
             </el-row>
           </el-col>
           <el-col :span="8">
-            <el-row>
+            <!-- <el-row>
               <el-col :span="24">
                 <el-form-item label="排除库存为0的物料?" prop="noZero">
                   <el-radio-group v-model="formData.noZero" disabled>
@@ -65,7 +65,7 @@
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-            </el-row>
+            </el-row> -->
             <el-row>
               <el-col :span="24">
                 <el-form-item label="盘点开始日期" prop="checkTime">