From 3f4d50549a6b9fd30aaf464fb40d7a361e893234 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: Sun, 29 Sep 2024 09:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B7=BB=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=8C=89=E9=92=AE=EF=BC=8C=E7=A4=BE=E5=8C=BA=E5=AE=A3?=
 =?UTF-8?q?=E4=BC=A0=E6=9B=B4=E6=94=B9=E5=BC=B9=E5=87=BA=E6=A1=86=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/comPromotion/index.vue     | 20 ++++-----
 .../volunteer/Dynamicmanagement/add.vue       | 14 ------
 .../volunteer/Dynamicmanagement/index.vue     | 14 +++++-
 .../volunteer/SiteManagement/index.vue        | 16 ++++++-
 .../volunteer/Venuemanagement/index.vue       | 44 ++++++++++++-------
 .../VoluntaryOrganization/process.vue         | 17 +++----
 .../volunteer/VolunteerProjects/index.vue     | 41 +++++++++++------
 .../volunteer/activityArchive/index.vue       | 38 +++++++++++-----
 8 files changed, 127 insertions(+), 77 deletions(-)

diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue
index e2c91177b..a6cc592b5 100644
--- a/src/views/modules/communityParty/comPromotion/index.vue
+++ b/src/views/modules/communityParty/comPromotion/index.vue
@@ -36,31 +36,31 @@
 </div>
 <el-table class="table" :data="tableData" border  v-loading="tableLoading"
   style="width: 100%">
-  <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
-  <el-table-column prop="title" header-align="center" align="center" label="文章标题" width="200">
+  <el-table-column label="序号" header-align="center" align="center" type="index" ></el-table-column>
+  <el-table-column prop="title" header-align="center" align="center" label="文章标题" >
   </el-table-column>
-  <el-table-column prop="tagName" header-align="center" align="center" label="标签" width="150">
+  <el-table-column prop="tagName" header-align="center" align="center" label="标签" >
     <!-- <template slot-scope="scope">
       <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
     </template> -->
   </el-table-column>
-  <el-table-column prop="status" header-align="center" align="center" label="状态" width="80">
+  <el-table-column prop="status" header-align="center" align="center" label="状态" >
         <template slot-scope="scope">
       <span>{{ scope.row.status === 0 ? '已下线' : '已发布' }}</span>
     </template>
   </el-table-column>
-  <el-table-column prop="agencyName" header-align="center" align="center" label="发布单位" width="200">
+  <el-table-column prop="agencyName" header-align="center" align="center" label="发布单位" >
   </el-table-column>
-  <el-table-column prop="releaseTime" header-align="center" align="center" label="发布时间" width="200">
+  <el-table-column prop="releaseTime" header-align="center" align="center" label="发布时间" >
   </el-table-column>
-  <el-table-column prop="top" header-align="center" align="center" label="置顶" width="100">
+  <el-table-column prop="top" header-align="center" align="center" label="置顶" >
     <template slot-scope="scope">
       <span>{{ scope.row.top === 0 ? '否' : '是' }}</span>
     </template>
   </el-table-column>
-  <el-table-column prop="likes" header-align="center" align="center" label="点赞数" width="100">
+  <el-table-column prop="likes" header-align="center" align="center" label="点赞数" >
   </el-table-column>
-  <el-table-column prop="transpond" header-align="center" align="center" label="转发数" width="100">
+  <el-table-column prop="transpond" header-align="center" align="center" label="转发数" >
   </el-table-column>
   <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
     <template slot-scope="scope">
@@ -80,7 +80,7 @@
     </div>
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
-      width="450px" top="5vh" class="dialog-h" @closed="diaClose">
+      width="950px" top="5vh" class="dialog-h" @closed="diaClose">
       <add ref="ref_form"  v-if="formShow" @dialogCancle="addFormCancle"
         @dialogOk="addFormOk"></add>
     </el-dialog>
diff --git a/src/views/modules/volunteer/Dynamicmanagement/add.vue b/src/views/modules/volunteer/Dynamicmanagement/add.vue
index 66b018159..c4292ee03 100644
--- a/src/views/modules/volunteer/Dynamicmanagement/add.vue
+++ b/src/views/modules/volunteer/Dynamicmanagement/add.vue
@@ -218,20 +218,6 @@
         },
  
         async activityType() {
-            const url = "/actual/base/activityType/page"
-            let params = {
-                // agencyId: this.agencyId
-                pageSize: 20,
-                pageNo: 1,
-                typeName: "",
-                enabled: 1
-            }
-            const { data, code, msg } = await requestPost(url, params)
-            if (code === 0) {
-                this.typeList = data.list
-            } else {
-                this.$message.error(msg)
-            }
             this.$nextTick(() => {
                 if (!map) {
                     this.initMap(this.formData.latitude, this.formData.longitude);
diff --git a/src/views/modules/volunteer/Dynamicmanagement/index.vue b/src/views/modules/volunteer/Dynamicmanagement/index.vue
index 78f80e9e5..29bd5f90c 100644
--- a/src/views/modules/volunteer/Dynamicmanagement/index.vue
+++ b/src/views/modules/volunteer/Dynamicmanagement/index.vue
@@ -206,7 +206,12 @@ export default {
         },
         //删除活动
         handledelete(row){
-      let url=`/voluntary/newsTrends/deleteById/${row.id}`
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            let url=`/voluntary/newsTrends/deleteById/${row.id}`
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "DELETE",
@@ -220,6 +225,13 @@ export default {
           this.$message.error(res.msg)
         }
         })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
     //   requestGet(url).then((res)=>{
     //     if(res.code==0){
     //       this.$message.success("删除成功")
diff --git a/src/views/modules/volunteer/SiteManagement/index.vue b/src/views/modules/volunteer/SiteManagement/index.vue
index d18c7c869..c0826282f 100644
--- a/src/views/modules/volunteer/SiteManagement/index.vue
+++ b/src/views/modules/volunteer/SiteManagement/index.vue
@@ -331,7 +331,13 @@ export default {
               return fileType && isLt1M;
           },
           handleDel(row) {
-  console.log(row, "row");
+            
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            console.log(row, "row");
   let url = "/voluntary/position/delete";
   // let params = {
   //   ids: [String(row.id)] // 将 row.id 转换为字符串并放入数组中
@@ -350,6 +356,14 @@ export default {
       console.error("删除失败", error);
       this.$message.error("删除失败，请稍后重试");
     });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
+
         },
         diaClose(){
           this.formShow=false
diff --git a/src/views/modules/volunteer/Venuemanagement/index.vue b/src/views/modules/volunteer/Venuemanagement/index.vue
index 6c4145ff2..a120a695e 100644
--- a/src/views/modules/volunteer/Venuemanagement/index.vue
+++ b/src/views/modules/volunteer/Venuemanagement/index.vue
@@ -327,23 +327,33 @@ export default {
               return fileType && isLt1M;
           },
         handleDel(row) {
-          console.log(row, "row");
-          let url = "/voluntary/positionVenues/delete";
-          let params = [String(row.id)];
-          axios.delete(this.processUrl(url), { data: params })
-            .then((res) => {
-              if (res.data.code === 0) {
-                this.$message.success("删除成功");
-                this.getTableData();
-              } else {
-                this.$message.error(res.data.msg);
-              }
-            })
-    .catch((error) => {
-      console.error("删除失败", error);
-      this.$message.error("删除失败，请稍后重试");
-    });
-         
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            console.log(row, "row");
+            let url = "/voluntary/positionVenues/delete";
+            let params = [String(row.id)];
+            axios.delete(this.processUrl(url), { data: params })
+              .then((res) => {
+                if (res.data.code === 0) {
+                  this.$message.success("删除成功");
+                  this.getTableData();
+                } else {
+                  this.$message.error(res.data.msg);
+                }
+              })
+              .catch((error) => {
+                console.error("删除失败", error);
+                this.$message.error("删除失败，请稍后重试");
+              });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
         },
         diaClose(){
           this.formShow=false
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/process.vue b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
index 4c55aee73..84b321b2f 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/process.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
@@ -1,5 +1,5 @@
 <template>
-  <div  style="height: 600px; overflow-y: scroll;"  >
+  <div style="height: 600px; overflow-y: scroll;">
     <div style="display: flex;white-space: nowrap;  padding: 30px;">
       <el-form style="padding-left: 150px;">
         <el-form-item label="组织名称">
@@ -34,8 +34,9 @@
           {{ tableData.introduction}}
         </el-form-item>
         <el-form-item label="附件">
-          <div class="demo-image__preview">
-            <img v-if="tableData.qualification" style="width: 100px; height: 100px" :src="tableData.qualification">
+          <div class="demo-image__preview" v-if="tableData.qualification" >
+            <el-image style="width: 100px; height: 100px" :src="tableData.qualification" :preview-src-list="tableData.qualificationList">
+            </el-image>
             </img>
           </div>
           <!-- {{ tableData.address}} -->
@@ -43,7 +44,7 @@
         <el-form-item label="组织介绍图" v-if="tableData.orgImage">
           <div class="demo-image__preview">
             <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="tableData.orgImage">
-          </img>
+            </img>
           </div>
           <!-- {{ tableData.address}} -->
         </el-form-item>
@@ -56,11 +57,11 @@
         <el-form-item label="品牌展示图" v-if="tableData.brandImg">
           <div class="demo-image__preview">
             <img v-if="tableData.brandImg" style="width: 100px; height: 100px" :src="tableData.brandImg">
-          </img>
+            </img>
           </div>
           <!-- {{ tableData.address}} -->
         </el-form-item>
-        <el-form-item label="审核结果" >
+        <el-form-item label="审核结果">
           <!-- <div style="display: flex; justify-items:center; align-items: center;">
                 <el-radio v-model="status1" label="pass" style="margin-right:20px">通过</el-radio>
                <div class="flex flex-x  flex-center2">
@@ -81,8 +82,8 @@
 
         </el-form-item>
         <el-form-item label="原因" v-if="findingsofaudit == 'notPass'">
-          <el-input  v-if="findingsofaudit == 'notPass'" v-model="reason" style="width: 200px;"
-          placeholder="请说明原因"></el-input>
+          <el-input v-if="findingsofaudit == 'notPass'" v-model="reason" style="width: 200px;"
+            placeholder="请说明原因"></el-input>
         </el-form-item>
       </el-form>
 
diff --git a/src/views/modules/volunteer/VolunteerProjects/index.vue b/src/views/modules/volunteer/VolunteerProjects/index.vue
index 3a011b20d..250d36ce3 100644
--- a/src/views/modules/volunteer/VolunteerProjects/index.vue
+++ b/src/views/modules/volunteer/VolunteerProjects/index.vue
@@ -211,20 +211,33 @@ export default {
         this.showrecord=false 
         },
         //删除活动
-        handledelete(row){
-      let url="/voluntary/project/admin/delete"
-      let params={
-        id:row.id
-      }
-      requestPost(url,params).then((res)=>{
-        if(res.code==0){
-          this.$message.success("删除成功")
-          this.getTableData()
-        }else{
-          this.$message.error(res.msg)
-        }
-      })
-    },
+        handledelete(row) {
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            let url = "/voluntary/project/admin/delete"
+            let params = {
+              id: row.id
+            }
+            requestPost(url, params).then((res) => {
+              if (res.code == 0) {
+                this.$message.success("删除成功")
+                this.getTableData()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
+
+        },
          //活动上下线
          handleupOnline(row){
           console.log(row,"row");
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 2aaa0fc12..82b7ce3b3 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -301,18 +301,32 @@
         this.handledelete(row);
       }
     },
-    handledelete(row){
-      console.log(row,"删除活动");
-      let url=`/voluntary/activityInfo/delete/${row.id}`
-      requestGet(url).then((res)=>{
-        if(res.code==0){
-          this.$message.success("删除成功")
-          this.getTableData()
-        }else{
-          this.$message.error(res.msg)
-        }
-      })
-    },
+        handledelete(row) {
+
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+
+            console.log(row, "删除活动");
+            let url = `/voluntary/activityInfo/delete/${row.id}`
+            requestGet(url).then((res) => {
+              if (res.code == 0) {
+                this.$message.success("删除成功")
+                this.getTableData()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
+        },
         //分页
         handleCurrentChange(val) {
           console.log(`当前页: ${val}`);