From a45fb8f20ffb147c3c470c1c1ac0a273dcbed70a Mon Sep 17 00:00:00 2001 From: khalil Date: Tue, 3 Jun 2025 18:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E9=92=BB=E7=9F=B3=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E6=B5=81=E6=B0=B4-=E5=A2=9E=E5=8A=A0=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E9=95=BF=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agencyDiamondFlow.vue | 157 +++---- .../anchorSalaryOperate.vue | 395 +++++++++--------- 2 files changed, 270 insertions(+), 282 deletions(-) diff --git a/src/views/guildOperationManagement/agencyDiamondFlow.vue b/src/views/guildOperationManagement/agencyDiamondFlow.vue index 679532b..6d9d1f8 100644 --- a/src/views/guildOperationManagement/agencyDiamondFlow.vue +++ b/src/views/guildOperationManagement/agencyDiamondFlow.vue @@ -3,123 +3,124 @@
- {{ item.name }} + {{ item.name }}
- +
- + + v-model:partition-infos="partitionArr" /> - + + v-model:region-id="searchForm.regionId" + v-model:after-init="getData" /> - - + + - - + + - - - + + + - 搜索 - 重置搜索 + 搜索 + 重置搜索
- 导出 + 导出
- + - - + + - + - + - + - + + + - + - +
- +
@@ -197,10 +198,14 @@ export default { getDateCycleList() { getDateCycleList({ month: 3 }).then((res) => { this.dateCycleList = res.data || []; - this.searchForm.dateCycle = this.dateCycleList[0].dateCycle; + this.searchForm.dateCycle = res.data? this.dateCycleList[0].dateCycle: undefined; }); }, getData() { + if (!this.searchForm.dateCycle) { + return; + } + this.tableLoading = true; let { pageParams, searchForm } = this; diff --git a/src/views/guildOperationManagement/anchorSalaryOperate.vue b/src/views/guildOperationManagement/anchorSalaryOperate.vue index b95ded1..9c99c6e 100644 --- a/src/views/guildOperationManagement/anchorSalaryOperate.vue +++ b/src/views/guildOperationManagement/anchorSalaryOperate.vue @@ -2,147 +2,153 @@
- +
- + + v-model:after-init="getData" /> - - + + - - + + - - + + - - - + + + - 搜索 - 重置搜索 + 搜索 + 重置搜索
- + - - + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -331,8 +309,8 @@ import PartitionSelect from "@/views/common/partitionSelect.vue"; export default { name: "anchorSalaryOperate", - components: {PartitionSelect, TablePagination }, - data() { + components: { PartitionSelect, TablePagination }, + data () { return { dateCycleList: [], btnLoading: false, // 导出弹出框(dialog)的确认按钮 @@ -394,16 +372,21 @@ export default { dialogType: 1, }; }, - created() { + created () { this.getDateCycleList(); }, methods: { - getDateCycleList() { + getDateCycleList () { getDateCycleList({ month: 3 }).then((res) => { this.dateCycleList = res.data || []; + this.searchForm.dateCycle = res.data ? res.data[0].dateCycle : undefined; }); }, - getData() { + getData () { + if (this.searchForm.dateCycle == undefined) { + return; + } + this.tableLoading = true; let { pageParams, searchForm } = this; @@ -435,7 +418,7 @@ export default { }); }, // 弹窗 - handleOpen(index, row) { + handleOpen (index, row) { switch (index) { case 1: this.dialogTitle = "钻石兑换薪资"; @@ -474,7 +457,7 @@ export default { this.getDetail(); }, - getDetail() { + getDetail () { let { pageParams1, dialogParams } = this; pageParams1 = JSON.parse(JSON.stringify(pageParams1)); dialogParams = JSON.parse(JSON.stringify(dialogParams)); @@ -499,7 +482,7 @@ export default { }); }, // 点击搜索 - handSearch() { + handSearch () { this.$refs["searchForm"].validate((valid) => { if (valid) { this.pageParams.pageNo = 1; @@ -508,49 +491,49 @@ export default { }); }, // 重置搜索表单 - resetSearchForm() { + resetSearchForm () { this.$refs["searchForm"].resetFields(); this.pageParams.pageNo = 1; this.tableData = []; this.getData(); }, // 分页导航 - handleSizeChange(val) { + handleSizeChange (val) { this.pageParams.pageSize = val; this.getData(); }, - handlePageChange(val) { + handlePageChange (val) { this.pageParams.pageNo = val; this.getData(); }, // 弹窗分页导航 - handleSizeChange1(val) { + handleSizeChange1 (val) { this.pageParams1.pageSize = val; this.getDetail(); }, - handlePageChange1(val) { - this.pageParams1.pageNo = val; + handlePageChange1 (val) { + this.pageParams1.pageNo = val; this.getDetail(); }, - headerCopy(column, e) { + headerCopy (column, e) { this.$copy(column.label); }, }, computed: { - convertTimestamp1() { + convertTimestamp1 () { return function (time) { let date = new Date(time); return formatDateYMD(date); }; }, - convertTimestamp() { + convertTimestamp () { return function (time) { let date = new Date(time); return formatDate(date); }; }, - dateCycleType() { + dateCycleType () { const { dateCycleList } = this; return function (value) { for (let item of dateCycleList) {