From db905ecd14f63dba9337b4f4715584ef2d7e8c7e Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 07 三月 2025 14:45:00 +0800
Subject: [PATCH] 修改
---
src/views/specialOperationsPay/coalPay/index.vue | 2 ++
src/views/specialOperationsPay/notCoalCalculate/index.vue | 7 ++++---
src/views/specialOperationsPay/notCoalPay/components/studentDialog.vue | 7 -------
src/views/specialOperationsPay/coalCalculate/index.vue | 7 ++++---
src/views/specialOperationsPay/coalPay/components/studentDialog.vue | 15 ++-------------
src/views/specialOperationsPay/notCoalPay/index.vue | 4 ++--
6 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/src/views/specialOperationsPay/coalCalculate/index.vue b/src/views/specialOperationsPay/coalCalculate/index.vue
index f7356a7..288566d 100644
--- a/src/views/specialOperationsPay/coalCalculate/index.vue
+++ b/src/views/specialOperationsPay/coalCalculate/index.vue
@@ -159,6 +159,10 @@
sums[index] = '合计';
return
}
+ if (index === 2) {
+ sums[index] = '--';
+ return
+ }
const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
@@ -169,9 +173,6 @@
return prev;
}
}, 0)
- if(index == 2){
- sums[index] += '元/人次';
- }
} else {
sums[index] = '--';
}
diff --git a/src/views/specialOperationsPay/coalPay/components/studentDialog.vue b/src/views/specialOperationsPay/coalPay/components/studentDialog.vue
index d1f8f2e..867c2f6 100644
--- a/src/views/specialOperationsPay/coalPay/components/studentDialog.vue
+++ b/src/views/specialOperationsPay/coalPay/components/studentDialog.vue
@@ -118,13 +118,6 @@
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getStuList"
- />
</el-dialog>
<el-dialog
:title="dialogStatus==='add'?'新增':'编辑'"
@@ -262,10 +255,6 @@
Authorization: "Bearer " + getToken()
},
total: 0,
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- },
addDialog: false,
dialogStatus: '',
dataForm: {},
@@ -320,8 +309,8 @@
getStuList(id) {
getCoalPayStudentList(id).then(res=>{
if(res.code == 200){
- this.stuList = res.rows
- this.total = res.total
+ this.stuList = res.data
+ this.total = res.data.length
this.stuInfo.totalCountFee = this.stuInfo.amount * this.total
this.stuInfo.totalCount = this.total
if(this.total == 0){
diff --git a/src/views/specialOperationsPay/coalPay/index.vue b/src/views/specialOperationsPay/coalPay/index.vue
index eca8d17..8a3393f 100644
--- a/src/views/specialOperationsPay/coalPay/index.vue
+++ b/src/views/specialOperationsPay/coalPay/index.vue
@@ -128,12 +128,14 @@
},
methods: {
getList() {
+ this.loading = true
this.queryParams.minDate = this.dateValue[0]?this.dateValue[0] + ' 00:00:00':''
this.queryParams.maxDate = this.dateValue[1]?this.dateValue[1] + ' 23:59:59':''
getCoalPayList( this.queryParams).then((res) => {
if (res.code == 200) {
this.payList = res.rows
this.total = res.total
+ this.loading = false
}
})
},
diff --git a/src/views/specialOperationsPay/notCoalCalculate/index.vue b/src/views/specialOperationsPay/notCoalCalculate/index.vue
index fdd90da..26ad777 100644
--- a/src/views/specialOperationsPay/notCoalCalculate/index.vue
+++ b/src/views/specialOperationsPay/notCoalCalculate/index.vue
@@ -209,6 +209,10 @@
sums[index] = '合计';
return
}
+ if (index === 2) {
+ sums[index] = '--';
+ return
+ }
const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
@@ -219,9 +223,6 @@
return prev;
}
}, 0)
- if(index == 2){
- sums[index] += '元/人次';
- }
} else {
sums[index] = '--';
}
diff --git a/src/views/specialOperationsPay/notCoalPay/components/studentDialog.vue b/src/views/specialOperationsPay/notCoalPay/components/studentDialog.vue
index fff6fdf..7ecbe5c 100644
--- a/src/views/specialOperationsPay/notCoalPay/components/studentDialog.vue
+++ b/src/views/specialOperationsPay/notCoalPay/components/studentDialog.vue
@@ -120,13 +120,6 @@
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getStuList"
- />
</el-dialog>
<el-dialog
:title="dialogStatus==='add'?'新增':'编辑'"
diff --git a/src/views/specialOperationsPay/notCoalPay/index.vue b/src/views/specialOperationsPay/notCoalPay/index.vue
index 224d544..6949c22 100644
--- a/src/views/specialOperationsPay/notCoalPay/index.vue
+++ b/src/views/specialOperationsPay/notCoalPay/index.vue
@@ -157,14 +157,14 @@
},
methods: {
getList() {
- this.loading = true;
+ this.loading = true
this.queryParams.params.startTime = this.dateValue[0]?this.dateValue[0]:''
this.queryParams.params.endTime = this.dateValue[1]?this.dateValue[1]:''
getNonCoalPayList( this.queryParams).then((res) => {
if (res.code == 200) {
this.payList = res.rows
this.total = res.total
- this.loading = false;
+ this.loading = false
}
})
},
--
Gitblit v1.9.2