diff --git a/src/views/modules/volunteer/Dynamicmanagement/index.vue b/src/views/modules/volunteer/Dynamicmanagement/index.vue
index 58421e63c..1962377ce 100644
--- a/src/views/modules/volunteer/Dynamicmanagement/index.vue
+++ b/src/views/modules/volunteer/Dynamicmanagement/index.vue
@@ -303,6 +303,7 @@ export default {
//重置
resetSearch(){
this.formData=[]
+ this.getTableData();
},
diff --git a/src/views/modules/volunteer/Projectreview/index.vue b/src/views/modules/volunteer/Projectreview/index.vue
index 296b59aa7..03d0c6d8e 100644
--- a/src/views/modules/volunteer/Projectreview/index.vue
+++ b/src/views/modules/volunteer/Projectreview/index.vue
@@ -236,7 +236,8 @@ export default {
},
//关闭成员管理
MemberManagementClose(){
- this.showMember=false
+ this.showMember=false
+
},
//修改
handleEdit(row){
@@ -256,7 +257,7 @@ export default {
//关闭新增
showAddClose(){
console.log("sdlkfjklsdf1");
-
+ this.getTableData()
this.showAdd=false
},
//关闭查看
@@ -267,7 +268,6 @@ export default {
async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/projectApplication/admin/auditingList";
-
let params={
pageSize:this.pageSize,
pageNo:this.pageNo,
@@ -370,6 +370,7 @@ export default {
},
resetSearch(){
this.formData=[]
+ this.getTableData()
},
handleDetail(row){
this.showInfo=true
diff --git a/src/views/modules/volunteer/VolManage/index.vue b/src/views/modules/volunteer/VolManage/index.vue
index 103fd43c5..d4ab5ff88 100644
--- a/src/views/modules/volunteer/VolManage/index.vue
+++ b/src/views/modules/volunteer/VolManage/index.vue
@@ -239,6 +239,7 @@
},
resetSearch(){
this.formData=[]
+ this.getTableData()
},
handleDetail(row){
console.log(row,"row");
diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index 8dff26477..5175e8938 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -65,6 +65,11 @@
+
+
+ {{ scope.row.pointsDelta}}
+
+
加积分
@@ -73,11 +78,7 @@
-
-
- {{ scope.row.pointsDelta}}
-
-
+
+
diff --git a/src/views/modules/volunteer/pointsRedemption/Select.vue b/src/views/modules/volunteer/pointsRedemption/Select.vue
index 2892e25b4..a129fd9de 100644
--- a/src/views/modules/volunteer/pointsRedemption/Select.vue
+++ b/src/views/modules/volunteer/pointsRedemption/Select.vue
@@ -10,6 +10,9 @@
{{ tableData.worthAmount}}
+
+ {{ tableData.worthAmount}}
+
{{ tableData.points}}
@@ -17,9 +20,18 @@
{{ tableData.expireTime }}
-
+
+ {{ tableData.sponsorMobile}}
+
+
+ {{ tableData.stockQty}}
+
+
{{ tableData.redeemerOrgName}}
+
+ {{ tableData.sponsorName}}
+
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index d95ce428d..da05ea981 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -211,7 +211,12 @@ export default {
rules: {
sponsorMobile: [
{ required: false, message: '联系电话不能为空', trigger: 'blur' },
- { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+ // { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' },
+ {
+ pattern: /^(\+?\d{1,4}[\s-]?)?(\(?\d{2,5}\)?[\s-]?)?[\d\s-]{5,15}$/,
+ message: '请输入正确的手机号码或座机号码',
+ trigger: 'blur'
+ }
]
}
};
diff --git a/src/views/modules/volunteer/pointsRedemption/index.vue b/src/views/modules/volunteer/pointsRedemption/index.vue
index c007d4711..64df4f985 100644
--- a/src/views/modules/volunteer/pointsRedemption/index.vue
+++ b/src/views/modules/volunteer/pointsRedemption/index.vue
@@ -291,6 +291,11 @@
return this.$message.error(res.msg);
} else {
this.orgOptions = [];
+ this.orgOptions.forEach(item => {
+ item.subAgencyList.forEach(item2 => {
+
+ })
+ })
this.orgOptions.push(res.data);
console.log(this.orgOptions,"this.orgOptions");
@@ -323,6 +328,7 @@
},
resetSearch(){
this.formData=[]
+ this.getTableData();
},
handleDetail(row){
console.log(row,"row");