Merge branch 'xiaowang-social' into test

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 label="序号" header-align="center" align="center" type="index" ></el-table-column>
-  <el-table-column prop="title" header-align="center" align="center" label="文章标题" width="200">
+  <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>

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);

src/views/modules/volunteer/Dynamicmanagement/index.vue

@@ -206,6 +206,11 @@ export default {
         },
         //删除活动
         handledelete(row){
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             let url=`/voluntary/newsTrends/deleteById/${row.id}`
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
@@ -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("删除成功")

src/views/modules/volunteer/SiteManagement/index.vue

@@ -331,6 +331,12 @@ export default {
               return fileType && isLt1M;
           },
           handleDel(row) {
+            
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             console.log(row, "row");
   let url = "/voluntary/position/delete";
   // let params = {
@@ -350,6 +356,14 @@ export default {
       console.error("删除失败", error);
       this.$message.error("删除失败，请稍后重试");
     });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
+
         },
         diaClose(){
           this.formShow=false

src/views/modules/volunteer/Venuemanagement/index.vue

@@ -327,6 +327,11 @@ export default {
               return fileType && isLt1M;
           },
         handleDel(row) {
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             console.log(row, "row");
             let url = "/voluntary/positionVenues/delete";
             let params = [String(row.id)];
@@ -343,7 +348,12 @@ export default {
                 console.error("删除失败", error);
                 this.$message.error("删除失败，请稍后重试");
               });
-         
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
         },
         diaClose(){
           this.formShow=false

src/views/modules/volunteer/VoluntaryOrganization/add.vue

@@ -3,13 +3,12 @@
 
         <div class="dialog-h-content scroll-h">
 
-          <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule"
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
-             class="form">
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="所属组织" prop="agencyName" label-width="150px">
-                <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称" :disabled="true"
+                            <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称"
-                   class="u-item-width-normal"></el-input>
+                                :disabled="true" class="u-item-width-normal"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -24,23 +23,29 @@
                    <el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" >
                    </el-option>
                 </el-select>
+      
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="组织类型" label-width="150px" prop="orgType">
-                <el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择" clearable >
+                            <el-cascader v-model="value" :options="OrganizationaltypeList" @change="handleChange"  :props="props"></el-cascader>
-                   <el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label" :value="item.value">
+                            <!-- <el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择"
+                                clearable>
+                                <el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label"
+                                    :value="item.value">
                                 </el-option>
-                </el-select>
+                            </el-select> -->
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="活动地点" prop="address" label-width="150px" style="display: block">
                             <div style="width: 634px">
-                   <el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true"
+                                <el-select v-model.trim="searchValue" filterable style="width: 634px" remote
-                      placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
+                                    :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
-                      <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                    :loading="loading">
-                         :key="item.value || index" :label="item.label" :value="item.value">
+                                    <el-option v-for="(item, index) in searchOptions"
+                                        @click.native="handleClickKey(index)" :key="item.value || index"
+                                        :label="item.label" :value="item.value">
                                     </el-option>
                                 </el-select>
                                 <div id="app_activity" class="div_map"></div>
@@ -75,14 +80,16 @@
                     </el-col>
                     <el-form-item label="组织介绍" prop="introduction" label-width="150px" style="display: block">
                         <div class="item_width_1">
-                             <el-input type="textarea" autosize placeholder="请填写组织介绍" v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}" >
+                            <el-input type="textarea" autosize placeholder="请填写组织介绍"
+                                v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
                             </el-input>
                         </div>
                     </el-form-item>
 
                     <el-form-item label="志愿品牌" prop="brand" label-width="150px" style="display: block">
                         <div class="item_width_1">
-                         <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand" :autosize="{ minRows:4., maxRows: 10}" >
+                            <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
+                                :autosize="{ minRows:4., maxRows: 10}">
                             </el-input>
                         </div>
                     </el-form-item>
@@ -123,6 +130,7 @@
  export default {
     data() {
         return {
+            volunteerOrgId:"0",
             fileList:[],
             fileList1:[],
             searchValue:"",
@@ -263,20 +271,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);
@@ -369,7 +363,12 @@
         //     }
         // },
  
-        handleChange(value) {},
+        handleChange(value) {
+            console.log(value);
+            this.volunteerOrgId=value.toString()
+            this.volunteertype1()
+
+        },
         handleTimeChange(time) {
             if (time) {
                 const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
@@ -381,8 +380,7 @@
                 // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
                 // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
             } else {
-                this.formData.startTime = ''
+   
-                this.formData.endTime = ''
             }
  
         },
@@ -487,21 +485,31 @@
         },
    // 获取志愿组织类型
    async volunteertype () {
-       const url = "/sys/dict/data/dictlist"
+       const url = "/voluntary/volunteerInfo/getOrgTypeList"
- 
        let params = {
-         dictType: 'volunteer_org_type',
+           volunteerOrgId:this.volunteerOrgId
-         parentValue:"0"
        }
-       console.log("vol123234");
-       
        const { data, code, msg } = await requestPost(url, params)
- 
        if (code === 0) {
          this.OrganizationaltypeList = data;
        } else {
          this.$message.error(msg)
        }
+     },
+        // 获取志愿组织类型
+   async volunteertype1 () {
+       const url = "/voluntary/volunteerInfo/getOrgTypeList"
+       let params = {
+           volunteerOrgId:this.volunteerOrgId
+       }
+       const { data, code, msg } = await requestPost(url, params)
+       if (code === 0) {
+         this.OrganizationaltypeList.childList=data;
+         console.log(this.OrganizationaltypeList,"sdlkjclsdc");
+         
+       } else {
+         this.$message.error(msg)
+       }
      },
    // 获取志愿组织服务类型
    async volunteerservicetype () {
@@ -817,6 +825,22 @@
  
     },
     props: {
+        lazy: true,
+        lazyLoad (node, resolve) {
+            const { level } = node;
+            console.log(node, resolve,"node, resolve");
+            
+            setTimeout(() => {
+              const nodes = Array.from({ length: level + 1 })
+                .map(item => ({
+                  value: ++id,
+                  label: `选项${id}`,
+                  leaf: level >= 2
+                }));
+              // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+              resolve(nodes);
+            }, 1000);
+          }
         
 
  

src/views/modules/volunteer/VoluntaryOrganization/index.vue

@@ -78,7 +78,7 @@
                             @click="handleshowMember(scope.row)">成员管理</el-button>
                         <el-button type="text" style="color:#1C6AFD;" size="small"
                             @click="handleDel(scope.row)">删除</el-button>
-                        <el-button v-if="scope.row.status == 'processing'" type="text" style="color:#1C6AFD;" size="small"
+                        <el-button v-if="scope.row.status == 'processing'&&scope.row.ischeck==1" type="text" style="color:#1C6AFD;" size="small"
                             @click="handleprocessl(scope.row)">审核</el-button>
                     </template>
                 </el-table-column>
@@ -90,7 +90,7 @@
                 </el-pagination>
             </div>
             <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" title="新增"
-                width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
+                width="950px" top="10vh" class="dialog-h" @closed="showAddClose">
                 <add v-if="showAdd" @showAddClose="showAddClose" />
             </el-dialog>
             <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
@@ -132,6 +132,7 @@ export default {
 
     data() {
         return {
+          ids:"",
             formData: {
                 orgName: "",
                 serviceType: "",
@@ -170,6 +171,9 @@ export default {
     
       },
       mounted() {
+        this.ids=this.$store.state.user.agencyId
+        console.log(this.ids,"this.ids");
+        
         this.getTableData();
       },
       methods: {

src/views/modules/volunteer/VoluntaryOrganization/info.vue

@@ -280,20 +280,7 @@
     //    },
 
        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);

src/views/modules/volunteer/VoluntaryOrganization/process.vue

@@ -34,15 +34,18 @@
           {{ tableData.introduction}}
         </el-form-item>
         <el-form-item label="附件">
-          <div class="demo-image__preview">
+          <div class="demo-image__preview" v-if="tableData.qualification" >
-            <img v-if="tableData.qualification" style="width: 100px; height: 100px" :src="tableData.qualification">
+            <el-image style="width: 100px; height: 100px" :src="tableData.qualification" :preview-src-list="tableData.qualificationList">
+            </el-image>
             </img>
           </div>
           <!-- {{ tableData.address}} -->
         </el-form-item>
         <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">
+            <el-image style="width: 100px; height: 100px" :src="tableData.orgImage" :preview-src-list="[tableData.orgImage]">
+            </el-image>
+            <!-- <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="[tableData.orgImage]"> -->
             </img>
           </div>
           <!-- {{ tableData.address}} -->

src/views/modules/volunteer/VolunteerProjects/index.vue

@@ -212,6 +212,11 @@ export default {
         },
         //删除活动
         handledelete(row) {
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             let url = "/voluntary/project/admin/delete"
             let params = {
               id: row.id
@@ -224,6 +229,14 @@ export default {
                 this.$message.error(res.msg)
               }
             })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
+
         },
          //活动上下线
          handleupOnline(row){

src/views/modules/volunteer/activityArchive/index.vue

@@ -302,6 +302,13 @@
       }
     },
         handledelete(row) {
+
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+
             console.log(row, "删除活动");
             let url = `/voluntary/activityInfo/delete/${row.id}`
             requestGet(url).then((res) => {
@@ -312,6 +319,13 @@
                 this.$message.error(res.msg)
               }
             })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
         },
         //分页
         handleCurrentChange(val) {