diff --git a/src/views/modules/volunteer/VolManage/index.vue b/src/views/modules/volunteer/VolManage/index.vue
index 3f202ba76..1d09533a4 100644
--- a/src/views/modules/volunteer/VolManage/index.vue
+++ b/src/views/modules/volunteer/VolManage/index.vue
@@ -78,7 +78,7 @@
+ width="1000px" top="10vh" class="dialog-h" @closed="summDetailClose">
@@ -109,7 +109,7 @@
formShow:false,
// pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
pageNo: 1,
- pageSize: window.localStorage.getItem("pageSize") || 20,
+ pageSize:20,
total: 1,
tableData: [],
Record:false,
diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index bc5a4fed4..e315d7ea0 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -1,6 +1,6 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+ .
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 取消
- 确定
+ 取消
+ 确定
@@ -45,6 +117,12 @@ export default {
name: "see",
data() {
return {
+ formData:{
+ createdTimeTo:"",
+ createdTimeTo:"",
+ classKey:"",
+ optionsStatus: [],
+ },
labelPosition: 'right',
tableData: [],
integralnum: 1,
@@ -55,6 +133,9 @@ export default {
description:"",
pointsDelta:"",
Positive:'',
+ pageSize: 10,
+ pageNo: 1,
+ total: 0,
};
},
props:{
@@ -65,14 +146,30 @@ export default {
},
created() {
console.log(this.list,"list");
- this.tableData=this.list
- this.getpoints()
+ this.getlist()
+ this.getpoint1s()
},
computed:{
},
methods: {
+ //查询
+ handleSearch(val) {
+ this.pageNo = 1;
+ this.getlist();
+ },
+ handleSizeChange(val) {
+ console.log(`每页 ${val} 条`);
+ this.pageSize = val;
+ window.localStorage.setItem("pageSize", val);
+ this.getlist();
+ },
+ handleCurrentChange(val) {
+ console.log(`当前页: ${val}`);
+ this.pageNo = val;
+ this.getlist();
+ },
//选+-
handleRadioChange(val){
console.log(val);
@@ -80,22 +177,24 @@ export default {
console.log(this.Positive);
},
+
//获取积分行为
- async getpoints() {
+ async getpoint1s() {
const url = "/voluntary/points/adjustVolunteerPoints/reasonsList";
let params={
-
}
await requestGet(url,params).then((res)=>{
if (res.code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
- this.options = res.data
+ this.optionsStatus = res.data
+ console.log(this.optionsStatus);
+
} else {
}
})
},
//调整积分
- async getTableData() {
+ async getTableData() {
const url = "/voluntary/points/adjustVolunteerPoints/commit";
let params={
volunteerId:this.tableData.id,
@@ -120,7 +219,39 @@ await requestGet(url,params).then((res)=>{
} else {
}
},
-
+
+ async getlist() {
+ const url = "/voluntary/points/listPointsChangeRecord";
+ let params={
+ volunteerId:this.list.id,
+ createdTimeFrom:this.formData.createdTimeFrom,
+ createdTimeTo:this.formData.createdTimeTo,
+ description:this.description,
+ pageNo:this.pageNo,
+ pageSize:this.pageSize,
+ // pointsDelta:this.Positive+this.integralnum,
+ primaryPoints:this.tableData.points
+ // volunteerId:this.list.id,
+ // mobile:this.formData.phone,
+ // name:this.formData.name
+ }
+ console.log(params,"params");
+
+ const { data, code, msg } = await requestGet(url,params);
+ if (code === 0) {
+ this.tableData=data.list
+ this.total=data.total
+ console.log("列表请求成功!!!!!!!!!!!!!!");
+
+ // console.log("列表请求成功!!!!!!!!!!!!!!");
+ // this.$message({
+ // message: "调整成功",
+ // type: "success",
+ // });
+ // this.$emit('summDetailClose')
+ } else {
+ }
+ },
handleSubmit(){
this.$emit('summDetailClose')
},
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index c8129e926..7f31a281c 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -19,7 +19,6 @@
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
至
-<<<<<<< HEAD
不限名额
@@ -60,16 +46,6 @@
-=======
-
- 不限名额
-
-
-
-
-
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
@@ -82,18 +58,11 @@
-<<<<<<< HEAD
-
-
-
-
-=======
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
-<<<<<<< HEAD
-=======
-
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
@@ -115,7 +80,6 @@
-<<<<<<< HEAD
至
@@ -124,18 +88,10 @@
-=======
-
-
-
-
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
-<<<<<<< HEAD
@@ -162,58 +118,25 @@
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
取 消
-<<<<<<< HEAD
确定
-=======
- 确定
-
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
\ No newline at end of file
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 8a9c93213..48e24f992 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -14,13 +14,8 @@
value-format="yyyy-MM-dd HH:mm:ss">
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
@@ -96,21 +91,17 @@
width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
+
+
+
-<<<<<<< HEAD
-=======
-
-
-
-
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
@@ -127,33 +118,27 @@
import add from "./add.vue"
import ActivityCountshow from "./Administration.vue"
import Points from "./Points.vue"
+ import select from "./select.vue"
export default {
- components: {add,ActivityCountshow,Points },
+ components: {add,ActivityCountshow,Points,select },
data() {
return {
HandlePointsshow: false,
ActivityCountshow: false,
add: false,
+ showselect:false,
formData: {
content: "",
strTime: "",
endTime: "",
optionsStatus: [{
-<<<<<<< HEAD
value: '0',
label: '下线'
}, {
value: '1',
label: '上线 '
-=======
- value: '已发布',
- label: '已发布'
- }, {
- value: '未发布',
- label: '未发布'
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
},],
online:'',
title:""
@@ -188,7 +173,6 @@
this.getTableData();
},
methods: {
-<<<<<<< HEAD
//活动上下线
handleupOnline(row){
@@ -212,8 +196,6 @@
})
},
-=======
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
//查询
handleSearch(){
console.log("this.long");
@@ -232,10 +214,7 @@
pageSize:this.pageSize,
statusType:this.formData.statusType,
endTime:this.formData.endTime,
-<<<<<<< HEAD
online:this.formData.online
-=======
->>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
}
requestGet(url, params).then((res) => {
if (res.code == 0) {
@@ -324,7 +303,7 @@
},
handleDetail(row){
console.log(row,"row");
- this.formShow=true
+ this.showselect=true
this.fmData=row
},
diff --git a/src/views/modules/volunteer/activityArchive/select.vue b/src/views/modules/volunteer/activityArchive/select.vue
new file mode 100644
index 000000000..739a3cc00
--- /dev/null
+++ b/src/views/modules/volunteer/activityArchive/select.vue
@@ -0,0 +1,500 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+ 不限名额
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/volunteer/pointsRedemption/Select.vue b/src/views/modules/volunteer/pointsRedemption/Select.vue
index 98e4c9750..82b0d5370 100644
--- a/src/views/modules/volunteer/pointsRedemption/Select.vue
+++ b/src/views/modules/volunteer/pointsRedemption/Select.vue
@@ -20,7 +20,7 @@
{{ tableData.redeemerOrgName}}
- {{ tableData.sponsorName}}
+ {{ tableData.description}}
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index 6f9492d50..95939f7c5 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -69,8 +69,7 @@
- 提交
- 提交
+ 提交
取消
@@ -122,10 +121,6 @@ export default {
}
},
created() {
- if (this.list) {
- this.formData=this.list
- }
-
this.getclasses()
this.getOrgTreeList()
},
diff --git a/src/views/modules/volunteer/pointsRedemption/index.vue b/src/views/modules/volunteer/pointsRedemption/index.vue
index 2201a885b..5a45dc1e3 100644
--- a/src/views/modules/volunteer/pointsRedemption/index.vue
+++ b/src/views/modules/volunteer/pointsRedemption/index.vue
@@ -91,6 +91,10 @@
width="1000px" top="10vh" class="dialog-h" @closed="closeDialog">
+
+
+
@@ -111,11 +115,13 @@
import { mapGetters } from "vuex";
import add from "./add";
import Select from "./Select.vue"
+ import update from "./update.vue"
export default {
- components: {add,record,Select},
+ components: {add,record,Select,update},
data() {
return {
+ updateshow:false,
orgOptionProps: {
value: 'agencyId',
label: 'agencyName',
@@ -144,7 +150,7 @@
formShow:false,
// pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
pageNo: 1,
- pageSize: window.localStorage.getItem("pageSize") || 20,
+ pageSize: 20,
total: 1,
tableData: [
],
@@ -287,7 +293,7 @@
},
handleDetail(row){
console.log(row,"row");
- this.add=true
+ this.updateshow=true
this.fmData=row
},
handleSizeChange(val) {
diff --git a/src/views/modules/volunteer/pointsRedemption/update.vue b/src/views/modules/volunteer/pointsRedemption/update.vue
new file mode 100644
index 000000000..4416f4033
--- /dev/null
+++ b/src/views/modules/volunteer/pointsRedemption/update.vue
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 不限数目
+
+ 自定义
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提交
+ 取消
+
+
+
+
+
\ No newline at end of file