diff --git a/nezha-fronted/src/components/common/rightBox/modelBox.vue b/nezha-fronted/src/components/common/rightBox/modelBox.vue index 873105c51..2c4a901f5 100644 --- a/nezha-fronted/src/components/common/rightBox/modelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/modelBox.vue @@ -3,11 +3,11 @@
- - @@ -25,32 +25,29 @@
{{currentModel.name}}
+ + + + + + +
{{currentModel.remark}}
+
- - - - - - - -
{{currentModel.remark}}
-
- -
@@ -75,7 +72,9 @@ vendor: {id: '', value: '', code: '', type: ''}, type: {id: '', value: '', code: '', type: ''}, assetStat: {total: '', inStock: '', outStock: ''}, - remark: '' + remark: '', + vendorCode: '', + typeCode: '' }, rightBox: { show: false, @@ -88,6 +87,8 @@ {required: true, message: this.$t('validate.required'), trigger: 'blur'} ], }, + vendorData: [], + typeData: [] } }, methods: { @@ -160,8 +161,39 @@ }); }); }, + getVendorData() { + this.$get('sys/dict/all?type=vendor').then(response => { + if (response.code === 200) { + this.vendorData = response.data + } + }) + }, + getTypeData() { + this.$get('sys/dict/all?type=assetType').then(response => { + if (response.code === 200) { + this.typeData = response.data + } + }) + }, + //vendor的输入建议 + vendorSuggestion(queryString, callback) { + callback(this.suggestionFilter('vendor', queryString)); + }, + //type的输入建议 + typeSuggestion(queryString, callback) { + callback(this.suggestionFilter('type', queryString)); + }, + suggestionFilter(type, queryString) { + if (type == 'vendor') { + + } else if (type == 'type') { + + } + } }, mounted() { + this.getVendorData(); + this.getTypeData(); }, computed: { }, @@ -182,5 +214,8 @@ } - diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index ce259e117..2362f6e46 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -97,6 +97,9 @@ vendor: {id: '', value: '', code: '', type: ''}, type: {id: '', value: '', code: '', type: ''}, assetStat: {total: '', inStock: '', outStock: ''}, + remark: '', + vendorCode: '', + typeCode: '' }, pageObj: { pageNo: 1, @@ -264,7 +267,9 @@ vendor: {id: '', value: '', code: '', type: ''}, type: {id: '', value: '', code: '', type: ''}, assetStat: {total: '', inStock: '', outStock: ''}, - remark: '' + remark: '', + vendorCode: '', + typeCode: '' }; } },