From ad3f764455ca1a66e91c9231dbc3ee1b5cd46584 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: Sat, 14 Sep 2024 18:27:22 +0800
Subject: [PATCH]  bug

---
 .../modules/volunteer/Dynamicmanagement/index.vue  |  1 +
 .../modules/volunteer/Projectreview/index.vue      |  7 ++++---
 src/views/modules/volunteer/VolManage/index.vue    |  1 +
 src/views/modules/volunteer/VolManage/integral.vue | 11 ++++++-----
 .../volunteer/VoluntaryOrganization/index.vue      |  1 +
 .../modules/volunteer/VolunteerProjects/index.vue  |  1 +
 .../modules/volunteer/activityArchive/index.vue    |  1 +
 .../volunteer/activityArchive/realselect.vue       |  5 +++--
 .../modules/volunteer/pointsRedemption/Select.vue  | 14 +++++++++++++-
 .../modules/volunteer/pointsRedemption/add.vue     |  7 ++++++-
 .../modules/volunteer/pointsRedemption/index.vue   |  6 ++++++
 11 files changed, 43 insertions(+), 12 deletions(-)

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 @@
         </el-table-column>
         <el-table-column prop="activityTitle" header-align="center" align="center" label="关联活动">
         </el-table-column>
+        <el-table-column prop="pointsDelta" header-align="center" align="center" label="积分">
+          <template slot-scope="scope">
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleAdjust(scope.row)">{{ scope.row.pointsDelta}}</el-button>
+          </template>
+        </el-table-column>
         <el-table-column prop="pointsDelta" header-align="center" align="center" label="类型">
           <template slot-scope="scope">
             <span v-if="scope.row.pointsDelta>0">加积分</span>
@@ -73,11 +78,7 @@
         </el-table-column>
         <el-table-column prop="description" header-align="center" align="center" label="备注">
         </el-table-column>
-        <el-table-column prop="pointsDelta" header-align="center" align="center" label="积分">
-          <template slot-scope="scope">
-            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleAdjust(scope.row)">{{ scope.row.pointsDelta}}</el-button>
-          </template>
-        </el-table-column>
+
         <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间">
                 </el-table-column>
                 <el-table-column prop="ActivityCount" header-align="center" align="center" label="状态">
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/index.vue b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
index ae633f054..d0825a3d9 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/index.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
@@ -364,6 +364,7 @@ export default {
         },
         resetSearch(){
           this.formData=[]
+          this.getTableData()
         },
         handleDetail(row){
           console.log(row,"row");
diff --git a/src/views/modules/volunteer/VolunteerProjects/index.vue b/src/views/modules/volunteer/VolunteerProjects/index.vue
index cf113bdda..5f7c13f50 100644
--- a/src/views/modules/volunteer/VolunteerProjects/index.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/index.vue
@@ -412,6 +412,7 @@ export default {
         },
         resetSearch(){
           this.formData=[]
+          this.getTableData()
         },
         handleDetail(row){
           this.showInfo=true
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 4e2017699..f75e1e45c 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -370,6 +370,7 @@
         },
         resetSearch(){
           this.formData=[]
+          this.getTableData()
         },
         handleDetail(row){
           console.log(row,"row");
diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index 71921ac0c..231d7d7cd 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -21,11 +21,12 @@
 
           <el-form-item label="照片" prop="activityImgs" required>
             <div>
-              <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+              <!-- <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
                 :show-file-list="true" :data="{ customerId: customerId }" :file-list="formData.activityImgs"
                 :on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
                 :on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" :limit="1">
-                <i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;"></i> </el-upload>
+                <i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;"></i> </el-upload> -->
+                <el-image :src="formData.imgs"></el-image>
             </div>
           </el-form-item>
 
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 @@
             <el-form-item label="金额">
                {{ tableData.worthAmount}}
             </el-form-item>
+            <el-form-item v-if="tableData.classKey == 'zkq'||tableData.classKey == 'mjq'||tableData.classKey == 'cxdjq'" label="折扣卷">
+               {{ tableData.worthAmount}}
+            </el-form-item>
             <el-form-item label="兑换积分">
                {{ tableData.points}}
             </el-form-item>
@@ -17,9 +20,18 @@
                {{ tableData.expireTime }}
               
             </el-form-item>
-            <el-form-item label="兑换地点">
+            <el-form-item label="联系电话">
+               {{ tableData.sponsorMobile}}
+            </el-form-item>
+            <el-form-item label="库存">
+               {{ tableData.stockQty}}
+            </el-form-item>
+            <el-form-item label="发布范围">
                {{ tableData.redeemerOrgName}}
             </el-form-item>
+            <el-form-item label="赞助单位">
+               {{ tableData.sponsorName}}
+            </el-form-item>
             <el-form-item label="规则说明"  style="    display: flex;
     align-items: center;">
                <div v-html="formatContent(tableData.description)" ></div>
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");