diff --git a/src/views/framework/architecture/azjg2.vue b/src/views/framework/architecture/azjg2.vue index a2fe35e..abf60fe 100644 --- a/src/views/framework/architecture/azjg2.vue +++ b/src/views/framework/architecture/azjg2.vue @@ -8,6 +8,9 @@
+ + + @@ -238,11 +245,13 @@ import { getMemberSettlePeriod, getUrlBase } from '@/api/archityecture' +import TopMemberSelect from './components/top-member-select.vue' import { isLocals } from '../../../utils/numberToCurrency' export default { name: 'Azjg2', components: { - topBar + topBar, + TopMemberSelect }, data() { return { @@ -287,7 +296,8 @@ export default { { value: 1, label: '否' } ], cantz: 1, // 0不可拖拽,1可拖拽 - scale: 1 + scale: 1, + loading: false } }, created() { @@ -295,6 +305,12 @@ export default { this.getAvarerInfo() }, methods: { + TopMemberHandleChange(val) { + if (val) { + this.queryParams.memberCode = val + this.getSearch() + } + }, handleWheel(event) { if (this.cantz == 1) { event.preventDefault() @@ -522,12 +538,16 @@ export default { } }, getSearch() { + this.loading = true getAzFramework(this.queryParams).then((res) => { this.data = res.data[0] this.toggleExpand(this.data, true) + }).finally(() => { + this.loading = false }) }, - reChongzhi() { + resetHandle() { + this.$refs.topMemberSelect.reset() this.queryParams = { memberSettlePeriodId: '', // 期数 memberCode: '', // 会员编号 diff --git a/src/views/framework/architecture/azjg3.vue b/src/views/framework/architecture/azjg3.vue index 4a9f1c7..400c7b6 100644 --- a/src/views/framework/architecture/azjg3.vue +++ b/src/views/framework/architecture/azjg3.vue @@ -8,6 +8,9 @@
+ + + @@ -233,10 +240,12 @@ import { getUrlBase } from '@/api/archityecture' import { isLocals } from '../../../utils/numberToCurrency' +import TopMemberSelect from './components/top-member-select.vue' export default { name: 'Azjg3', components: { - topBar + topBar, + TopMemberSelect }, data() { return { @@ -280,7 +289,8 @@ export default { ], cantz: 1, // 0不可拖拽,1可拖拽 popdata: {}, - scale: 1 + scale: 1, + loading: false } }, created() { @@ -288,6 +298,12 @@ export default { this.getAvarerInfo() }, methods: { + TopMemberHandleChange(val) { + if (val) { + this.queryParams.memberCode = val + this.getSearch() + } + }, handleWheel(event) { if (this.cantz == 1) { event.preventDefault() @@ -565,6 +581,7 @@ export default { } }, getSearch() { + this.loading = true getAzFramework(this.queryParams).then((res) => { res.data.forEach((ele) => { ele.countryUrl2Base64 = '' @@ -573,11 +590,12 @@ export default { }) this.data = res.data[0] this.toggleExpand(this.data, true) - - console.log('🌈this.data', this.data) + }).finally(() => { + this.loading = false }) }, - reChongzhi() { + resetHandle() { + this.$refs.topMemberSelect.reset() this.queryParams = { memberSettlePeriodId: '', // 期数 memberCode: '', // 会员编号 diff --git a/src/views/framework/architecture/azjg4.vue b/src/views/framework/architecture/azjg4.vue index d49215a..d797dcf 100644 --- a/src/views/framework/architecture/azjg4.vue +++ b/src/views/framework/architecture/azjg4.vue @@ -8,6 +8,9 @@
+ + + @@ -221,10 +228,12 @@ import { getUrlBase } from '@/api/archityecture' import { isLocals } from '../../../utils/numberToCurrency' +import TopMemberSelect from './components/top-member-select.vue' export default { name: 'Azjg4', components: { - topBar + topBar, + TopMemberSelect }, data() { return { @@ -268,7 +277,8 @@ export default { { value: 1, label: '否' } ], cantz: 1, // 0不可拖拽,1可拖拽 - scale: 1 + scale: 1, + loading: false } }, created() { @@ -276,6 +286,12 @@ export default { this.getAvarerInfo() }, methods: { + TopMemberHandleChange(val) { + if (val) { + this.queryParams.memberCode = val + this.getSearch() + } + }, // 拖拽移动 move(e) { if (this.cantz == 0) { @@ -490,13 +506,17 @@ export default { } }, getSearch() { + this.loading = true getAzFramework(this.queryParams).then((res) => { this.data = res.data[0] // 默认是否展开 this.toggleExpand(this.data, false) + }).finally(() => { + this.loading = false }) }, - reChongzhi() { + resetHandle() { + this.$refs.topMemberSelect.reset() this.queryParams = { memberSettlePeriodId: '', // 期数 memberCode: '', // 会员编号 diff --git a/src/views/framework/architecture/azjg5.vue b/src/views/framework/architecture/azjg5.vue index 0f95c86..17e4f05 100644 --- a/src/views/framework/architecture/azjg5.vue +++ b/src/views/framework/architecture/azjg5.vue @@ -8,6 +8,9 @@
+ + + @@ -229,10 +236,12 @@ import { getUrlBase } from '@/api/archityecture' import { isLocals } from '../../../utils/numberToCurrency' +import TopMemberSelect from './components/top-member-select.vue' export default { name: 'Azjg5', components: { - topBar + topBar, + TopMemberSelect }, data() { return { @@ -272,7 +281,8 @@ export default { memberSettlePeriodList: [], // 期数 cantz: 1, // 0不可拖拽,1可拖拽 - scale: 1 + scale: 1, + loading: false } }, created() { @@ -280,6 +290,12 @@ export default { this.getAvarerInfo() }, methods: { + TopMemberHandleChange(val) { + if (val) { + this.queryParams.memberCode = val + this.getSearch() + } + }, handleWheel(event) { if (this.cantz == 1) { event.preventDefault() @@ -507,12 +523,16 @@ export default { } }, getSearch() { + this.loading = true getAzFramework5(this.queryParams).then((res) => { this.data = res.data[0] this.toggleExpand(this.data, true) + }).finally(() => { + this.loading = false }) }, - reChongzhi() { + resetHandle() { + this.$refs.topMemberSelect.reset() this.queryParams = { memberSettlePeriodId: '', // 期数 memberCode: '', // 会员编号 diff --git a/src/views/framework/architecture/components/top-member-select.vue b/src/views/framework/architecture/components/top-member-select.vue new file mode 100644 index 0000000..f14d08e --- /dev/null +++ b/src/views/framework/architecture/components/top-member-select.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/views/framework/architecture/index.vue b/src/views/framework/architecture/index.vue index 853ba23..5b315f1 100644 --- a/src/views/framework/architecture/index.vue +++ b/src/views/framework/architecture/index.vue @@ -8,12 +8,16 @@
+ + + + /> + - - + + - + +
@@ -244,11 +250,13 @@ import { getMemberSettlePeriod, getUrlBase } from '@/api/archityecture' +import TopMemberSelect from './components/top-member-select.vue' import { isLocals } from '../../../utils/numberToCurrency' export default { name: 'Azjg', components: { - topBar + topBar, + TopMemberSelect }, data() { return { @@ -293,7 +301,8 @@ export default { { value: 0, label: '是' }, { value: 1, label: '否' } ], - scale: 1 + scale: 1, + loading: false } }, created() { @@ -301,6 +310,12 @@ export default { this.getAvarerInfo() }, methods: { + TopMemberHandleChange(val) { + if (val) { + this.queryParams.memberCode = val + this.getSearch() + } + }, handleWheel(event) { if (this.cantz == 1) { event.preventDefault() @@ -525,12 +540,16 @@ export default { // } }, getSearch() { + this.loading = true getAzFramework(this.queryParams).then((res) => { this.data = res.data[0] this.toggleExpand(this.data, true) + }).finally(() => { + this.loading = false }) }, - reChongzhi() { + resetHandle() { + this.$refs.topMemberSelect.reset() this.queryParams = { memberSettlePeriodId: '', // 期数 memberCode: '', // 会员编号 diff --git a/src/views/settlementCenter/topPerformance/index.vue b/src/views/settlementCenter/topPerformance/index.vue index d1c7bb6..f398e7c 100644 --- a/src/views/settlementCenter/topPerformance/index.vue +++ b/src/views/settlementCenter/topPerformance/index.vue @@ -8,9 +8,9 @@
+ />
- + @change="changeTime" + /> @@ -67,21 +66,19 @@ :key="item.pkVertex" :label="`${item.memberCode} (${item.memberName})`" :value="item.pkVertex" - > + /> - {{ '搜索' }} + {{ '搜索' }} - {{ '重置' }} - 统计 + {{ '重置' }} + 统计 - + - + @@ -187,217 +183,217 @@