diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 72164bcc9..fbf24fdd7 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -6,7 +6,8 @@ - + 标准选择 @@ -20,32 +21,12 @@ @close="handleCancel" :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> - - - -
-
- {{$t('standard')}} -
- -
-
- -
-
- {{$t('title')}} -
- -
-
- - {{$t('query')}} - {{$t('reset')}} - -
-
+ import { getAction, postAction } from '@/api/manage' + import currencySearch from '@/components/currencySearch/index' export default { name: 'index', - props: ['query', 'value'], + components:{ + currencySearch + }, + props: ['query', 'value', 'replace_standard_id'], data() { return { visible: false, @@ -92,23 +77,26 @@ { title: this.$t('standard'), dataIndex: 'serial_number', - align: 'center', + align: 'center' }, { title: this.$t('title'), dataIndex: 'title', - align: 'center', + align: 'center' }, { title: this.$t('TextStatus'), dataIndex: 'state', - align: 'center', + align: 'center' } ], dataList: [], pageNo: 1, pageSize: 10, - total: 0 + total: 0, + url: { + seachList: 'document/bussDocumentLibraryEO/queryCondition' //搜索字段 + } } }, mounted() { @@ -118,7 +106,7 @@ standardClick() { this.visible = true this.queryParam = {} - this.replacePage() + this.replacePage(this.replace_standard_id) }, replacePage() { let query = { @@ -126,12 +114,16 @@ pageNo: this.pageNo, pageSize: this.pageSize } + this.selectedRowKeys = [] this.loading = true postAction('document/bussDocumentLibraryEO/replacePageInfo', query).then((res) => { this.loading = false if (res.success) { this.dataList = res.result.records this.total = res.result.total + if (this.replace_standard_id) { + this.selectedRowKeys = this.replace_standard_id.split(',') + } } else { this.dataList = [] } @@ -142,10 +134,13 @@ }, handleSubmit() { let content = [] + let replace_standard_id = [] this.content.forEach(res => { content.push(res.title) + replace_standard_id.push(res.id) }) this.$emit('input', content.join(',')) + this.$emit('change', replace_standard_id.join(',')) this.visible = false }, indexclick(event) { @@ -162,11 +157,12 @@ }) }) }, - searchQuery() { + searchQuery(queryParam) { + this.queryParam = queryParam this.replacePage() }, - searchReset() { - this.queryParam = {} + searchReset(queryParam) { + this.queryParam = queryParam this.replacePage() }, onChange(page, pageSize) { @@ -176,7 +172,7 @@ SizeChange(page, pageSize) { this.pageSize = pageSize this.replacePage() - }, + } } } @@ -237,6 +233,7 @@ height: 38px; margin-top: 2px; } + .page { text-align: right; margin-top: 20px; diff --git a/jero-web/src/components/currencySearch/index.vue b/jero-web/src/components/currencySearch/index.vue new file mode 100644 index 000000000..ae8d8d132 --- /dev/null +++ b/jero-web/src/components/currencySearch/index.vue @@ -0,0 +1,154 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 828988f55..777c291e8 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -156,7 +156,9 @@ @@ -475,7 +477,10 @@ }, add() { this.formInline = {} - } + }, + StandardselectionChange(id){ + this.formInline.replace_standard_id = id + }, } } diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 6272e2a3a..34a68b282 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -105,7 +105,6 @@ getAction(this.url.seachList, params).then((res) => { if (res.success) { this.searchList = res.result - console.log(this.searchList) } }) },