From 7864d3c157abdd5332983db4bc84bea3de72b251 Mon Sep 17 00:00:00 2001
From: teddyhuang <a825147@icloud.com>
Date: Thu, 25 Mar 2021 07:33:35 +0800
Subject: [PATCH] 202103250733

---
 app/src/components/Inventory.vue              | 7 ++++---
 src/main/java/com/moze/rms/dao/AssertDAO.java | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/components/Inventory.vue b/app/src/components/Inventory.vue
index 6c45dcc..69e22e1 100644
--- a/app/src/components/Inventory.vue
+++ b/app/src/components/Inventory.vue
@@ -507,21 +507,22 @@
                 });
             },
             clearSinglePropInSearchItem(key) {
-                console.log(key);
+                const self = this;
                 this.searchItem[key] = null;
-                console.log(this.searchItem);
                 this.haveSearch = false;
                 Object.keys(this.searchItem).forEach(function(key){
-                    if (self.searchItem[key] !== null) {
+                    if (self.searchItem[key] && self.searchItem[key] !== null) {
                         this.haveSearch = true;
                     }
                 });
+                this.getInventories();
             },
             async clearSearchItem() {
                 const self = this;
                 Object.keys(this.searchItem).forEach(function(key){
                     self.searchItem[key] = null;
                 });
+                this.getInventories();
                 // this.searchItem =  {};
                 // await this.cols.forEach((item) => {
                 //     this.searchItem[item.colname] = null;
diff --git a/src/main/java/com/moze/rms/dao/AssertDAO.java b/src/main/java/com/moze/rms/dao/AssertDAO.java
index eecfd24..65893f9 100644
--- a/src/main/java/com/moze/rms/dao/AssertDAO.java
+++ b/src/main/java/com/moze/rms/dao/AssertDAO.java
@@ -96,7 +96,7 @@ public interface AssertDAO extends SqlObject {
         sql += "'資產群組',";
         sql += "'0',";
         sql += "'nvarchar',";
-        sql += "'2',";
+        sql += "'1',";
         sql += "'true',";
         sql += "'true',";
         sql += "'true',";