diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue index 15a8814fc..6d6415529 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue @@ -115,6 +115,7 @@ }, handleCancel() { this.visible = false + this.$emit('classificationMaintenanceModelForm') }, onChange(page, pageSize) { this.pageNo = page diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 93adee56b..4c91a6b97 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -6,7 +6,7 @@ - {{$t('See')}} + {{header_text}}
@@ -107,6 +107,7 @@ queryCountryList: [], countryCardViewList: [], applyMarkets: '', + header_text: '', url: { list: '/problemKnowledgeBase/countryCardTempEO/list', deleteOne: '' @@ -151,6 +152,9 @@ this.displayList.forEach(val => { val.showOrNot = true }) + this.$nextTick(() => { + this.$refs.displayInformationModelRef.dataListOne = JSON.parse(JSON.stringify(this.displayList)) + }) this.consolidateData() this.loading = false } else { @@ -230,6 +234,11 @@ this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px' this.isTrue = true }) + let content = [] + this.queryCountryList.forEach(val => { + content.push(val.applyMarket_dictText) + }) + this.header_text = content.join('-') callback && callback() if (!callback) { this.consolidateData() diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index 724dc4f46..709a02c38 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -9,6 +9,27 @@ @close="handleCancel" :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> +
+ + + +
+
+ {{$t('LabelName')}} +
+ +
+
+ + + {{$t('query')}} + {{$t('reset')}} + + +
+
+
{ + return res.lableName.includes(this.queryParam.labelName) + }) + this.dataList = [...this.dataList] + } + }, + searchReset() { + this.queryParam = {} + this.dataList = JSON.parse(JSON.stringify(this.dataListOne)) + this.dataList = [...this.dataList] + }, getData(data) { this.visible = true this.$nextTick(() => { - this.dataList = data + this.queryParam = {} + this.dataList = JSON.parse(JSON.stringify(data)) this.dataList = [...this.dataList] }) }, @@ -78,11 +115,16 @@ this.visible = false }, handleSubmit() { - this.$emit('displayInformationModelForm', this.dataList) + this.$emit('displayInformationModelForm', this.dataListOne) this.visible = false }, onCheckAllChange(index) { this.dataList[index].showOrNot = !this.dataList[index].showOrNot + this.dataListOne.forEach(res => { + if (res.id == this.dataList[index].id) { + res.showOrNot = !res.showOrNot + } + }) } } } @@ -107,18 +149,41 @@ border-radius: 0 0 2px 2px; } - .box-title { - width: 100%; - text-align: right; - margin-bottom: 20px; + .box-title-text { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; } - .operator-text { - cursor: pointer; - margin-right: 13px; - font-size: 14px; - font-weight: 400; - color: #040B29; + .title-text { + width: 20%; + min-width: 110px; + color: #000F16; display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .box-input { + display: inline-block; + width: 70%; + height: 38px; + margin-top: 2px; + } + + .box-button { + height: 38px; + /*margin-top: 2px;*/ + } + + .text-operation { + margin-right: 8px; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 89f8433f7..0c8e92dd4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -1,15 +1,17 @@ @@ -120,6 +123,9 @@ } }) }, + classificationMaintenanceModelForm(){ + this.replacePage() + }, onSearch() { this.pageNo = 1 this.getList()