diff --git a/app/src/components/AssetGroup.vue b/app/src/components/AssetGroup.vue
index 67cdefc..e66dcc3 100644
--- a/app/src/components/AssetGroup.vue
+++ b/app/src/components/AssetGroup.vue
@@ -189,6 +189,12 @@
:footer-props="{'items-per-page-options': [30, 40, 50, 60]}"
:items-per-page="30"
>
+
+ {{level === 0 ? item.colname :''}}
+
+
+ {{level === 0 ? item.index :''}}
+
{{item.isselect === 'true' ? '選項':'文字'}}
diff --git a/app/src/components/Inventory.vue b/app/src/components/Inventory.vue
index 9f73ab2..ffb24f9 100644
--- a/app/src/components/Inventory.vue
+++ b/app/src/components/Inventory.vue
@@ -228,6 +228,7 @@
:hint="comments[header.value]"
:persistent-hint="isRequire(header.value)"
v-on:input="oninput(insertItem, header.value, $event)"
+ :error="isRequire(header.value)"
/>
@@ -319,6 +321,7 @@
:persistent-hint="isRequire(header.value)"
:hint="comments[header.value]"
v-on:input="oninput(modifyItem, header.value, $event)"
+ :error="isRequire(header.value)"
/>
@@ -559,14 +563,21 @@
});
},
clearSinglePropInSearchItem(key) {
- const self = this;
+ // const self = this;
this.searchItem[key] = null;
- this.haveSearch = false;
- Object.keys(this.searchItem).forEach(function(key){
- if (self.searchItem[key] && self.searchItem[key] !== null) {
- this.haveSearch = true;
- }
- });
+ this.haveSearch = false;
+ for (key in this.searchItem) {
+ if (this.searchItem[key] && this.searchItem[key] !== null) {
+ this.haveSearch = true;
+ }
+ }
+ // Object.keys(this.searchItem).forEach(function(key){
+ // // this.haveSearch = false;
+ // if (self.searchItem[key] && self.searchItem[key] !== null) {
+ // this.haveSearch = true;
+ // }
+ // });
+
this.getInventories();
},
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 74f9c1d..857e529 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=pro
+#spring.profiles.active=dev
+spring.profiles.active=pro
server.servlet.context-path=/rms
spring.servlet.multipart.max-file-size=100MB