From f0aa968261413aa5c58db54d5861f78e96c70086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
<819653817@qq.com>
Date: Tue, 15 Oct 2024 13:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E6=9C=89?=
=?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=E7=AD=89=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/volunteer/VolManage/activeRecord.vue | 12 ++++++++----
src/views/modules/volunteer/VolManage/index.vue | 6 ------
src/views/modules/volunteer/VolManage/see.vue | 9 +++++++--
.../modules/volunteer/pointsRedemption/Select.vue | 8 ++++----
.../modules/volunteer/pointsRedemption/update.vue | 2 +-
5 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/views/modules/volunteer/VolManage/activeRecord.vue b/src/views/modules/volunteer/VolManage/activeRecord.vue
index ddc41cdb5..014c1d659 100644
--- a/src/views/modules/volunteer/VolManage/activeRecord.vue
+++ b/src/views/modules/volunteer/VolManage/activeRecord.vue
@@ -30,7 +30,10 @@
- .
+
+
+ {{scope.row.strTime}}-{{scope.row.endTime}}
+
@@ -69,8 +72,8 @@ export default {
Stutas:'',
},
optionsStatus: [
- { value: '1', label: '打卡' },
- { value: '0', label: '未打卡' },
+ { value: 1, label: '打卡' },
+ { value: 0, label: '未打卡' },
],
pageNo: 1,
pageSize: 10,
@@ -100,7 +103,8 @@ export default {
pageNo:this.pageNo,
userId:this.fmData.userId,
searchContent:this.SearchForm.content,
- signFlag:this.SearchForm.Stutas
+ signFlag:this.SearchForm.Stutas,
+ // state:""
}
const { data, code, msg } = await requestPost(url,params);
diff --git a/src/views/modules/volunteer/VolManage/index.vue b/src/views/modules/volunteer/VolManage/index.vue
index 9094c6dc1..0d6799b1d 100644
--- a/src/views/modules/volunteer/VolManage/index.vue
+++ b/src/views/modules/volunteer/VolManage/index.vue
@@ -114,7 +114,6 @@
tableData: [],
Record:false,
fmData:[],
- volunteerOrgList:[]
};
},
computed: {
@@ -129,17 +128,13 @@
},
mounted() {
- this.getvolunteerOrg();
this.getTableData();
-
},
methods: {
-
//查询列表
async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/volunteerInfo/page";
-
let params={
pageSize:this.pageSize,
pageNo:this.pageNo,
@@ -151,7 +146,6 @@
console.log("列表请求成功！！！！！！！！！！！！！！");
this.total = data.total || 0;
this.tableData = data.list
-
} else {
}
},
diff --git a/src/views/modules/volunteer/VolManage/see.vue b/src/views/modules/volunteer/VolManage/see.vue
index 5a3d2138d..1fffbab95 100644
--- a/src/views/modules/volunteer/VolManage/see.vue
+++ b/src/views/modules/volunteer/VolManage/see.vue
@@ -23,7 +23,7 @@
{{ tableData.createdTime}}
- {{ tableData.Nickname}}
+ {{ tableData.volunteerOrgNamea}}
{{ tableData.points}}
@@ -74,8 +74,8 @@ export default {
const { data, code, msg } = await requestPost(url,params);
if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！");
- this.total = data.total || 0;
this.volunteerOrgList = data.list
+ console.log(this.volunteerOrgList,"volunteerOrsadasddgList");
} else {
}
@@ -96,6 +96,11 @@ export default {
if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！");
this.tableData = data.list[0]
+ this.volunteerOrgList.forEach(item=>{
+ if (item.id=this.tableData.volunteerOrgId) {
+ this.tableData.volunteerOrgName=item.orgName
+ }
+ })
console.log(this.tableData,"r");
} else {
diff --git a/src/views/modules/volunteer/pointsRedemption/Select.vue b/src/views/modules/volunteer/pointsRedemption/Select.vue
index cb44d9a71..5918e23b4 100644
--- a/src/views/modules/volunteer/pointsRedemption/Select.vue
+++ b/src/views/modules/volunteer/pointsRedemption/Select.vue
@@ -13,9 +13,9 @@
{{ tableData.worthAmount}}
-
+
{{ tableData.points}}
@@ -33,10 +33,10 @@
{{ tableData.expireTime }}
-
+
{{ tableData.stockQty}}
diff --git a/src/views/modules/volunteer/pointsRedemption/update.vue b/src/views/modules/volunteer/pointsRedemption/update.vue
index 85d8329d8..54cebc84f 100644
--- a/src/views/modules/volunteer/pointsRedemption/update.vue
+++ b/src/views/modules/volunteer/pointsRedemption/update.vue
@@ -70,7 +70,7 @@
-
+