diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index a3662b2e3..0a9f5c0a6 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -52,6 +52,10 @@ export default { type: Object, default: {}, require: true + }, + formInline: { + type: Object, + default: true } }, components: { @@ -118,9 +122,25 @@ export default { tableOnChange(pagination, filters, sorter) { console.log(pagination,filters,sorter,'iiiiiiiiiiiiiiiii') }, + getTableListReset() { + let params = { + paramsManifestId: this.paramsManifest.id, + } + this.loading = true + getAction(this.url.tableList, params).then((res) => { + if (res.success) { + this.dataSource = res.result + this.total = res.result.total + this.loading = false + } else { + this.loading = false + } + }) + }, getTableList() { let params = { paramsManifestId: this.paramsManifest.id, + ...this.formInline } this.loading = true getAction(this.url.tableList, params).then((res) => { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 2cbcc1357..c60dac214 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -9,7 +9,7 @@ {{$t('NiONumber')}} + v-model="formInline.nioNumber"> @@ -18,7 +18,7 @@ {{$t('ParameterName')}} + v-model="formInline.paramsName"> @@ -26,7 +26,7 @@ {{$t('certificationCategory')}} - @@ -49,7 +49,7 @@ {{$t('completedBy')}} + v-model="formInline.dre"> @@ -121,7 +121,7 @@ - + @@ -277,10 +277,10 @@ export default { }, searchQuery() { this.pageNo = 1 - // this.getlist() + this.$refs.CollectionTabel.getTableList() }, searchReset() { - this.queryParam = {} + this.$refs.CollectionTabel.getTableListReset() }, handleDel(){ let param={