diff --git a/jero-web/src/components/SplitTable/DocTable.vue b/jero-web/src/components/SplitTable/DocTable.vue index dc12b047b..a6746e610 100644 --- a/jero-web/src/components/SplitTable/DocTable.vue +++ b/jero-web/src/components/SplitTable/DocTable.vue @@ -106,7 +106,7 @@ } }, mounted() { - eventBUs.$on('searchQuery', search => { + eventBUs.$on('searchQueryOne', search => { Object.keys(search).forEach(res => { if (search[res] instanceof Array) { search[res] = search[res].join(',') @@ -116,7 +116,7 @@ this.getData() this.getTableList() }) - eventBUs.$on('searchReset', target => { + eventBUs.$on('searchResetOne', target => { this.searchParmes = {} this.selectedRowKeys = [] this.getData() @@ -126,8 +126,8 @@ this.getTableList() }, beforeDestroy(){ - eventBUs.$off('searchQuery') - eventBUs.$off('searchReset') + eventBUs.$off('searchQueryOne') + eventBUs.$off('searchResetOne') }, methods: { diff --git a/jero-web/src/components/searchalonetext/index.vue b/jero-web/src/components/searchalonetext/index.vue index 323765aa6..fe5d71cf0 100644 --- a/jero-web/src/components/searchalonetext/index.vue +++ b/jero-web/src/components/searchalonetext/index.vue @@ -179,11 +179,11 @@ export default { }, methods: { searchQuery() { - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) + eventBUs.$emit('searchQueryOne', JSON.parse(JSON.stringify(this.queryParam))) }, searchReset() { this.queryParam = {} - eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam))) + eventBUs.$emit('searchQueryOne', JSON.parse(JSON.stringify(this.queryParam))) }, getSeach() { let params = { diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 99ee4012a..5d123152c 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -96,10 +96,10 @@ {{!record.releaseStatus || record.releaseStatus == 'Draft' ? $t('release') :$t('withdraw')}} {{$t('edit')}} {{$t('delete')}} @@ -279,8 +279,7 @@ let idList = [] let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord)) for (let i = 0; i < selectedRowKeysRecord.length; i++) { - if (selectedRowKeysRecord[i].createBy == _this.userInfo().username && - selectedRowKeysRecord[i].releaseStatus == 'Draft') { + if (selectedRowKeysRecord[i].releaseStatus == 'Draft') { idList.push(selectedRowKeysRecord[i].id) } } diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 760ce1dfd..6ca1cbee4 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -1,39 +1,39 @@ \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index e62ec4b42..b5108ebad 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -1,76 +1,81 @@