Merge branch 'xiaowang-social' into feature

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/LifeCircleManagement/add.vue

@@ -13,8 +13,13 @@
           </el-col> -->
           <el-col :span="12">
             <el-form-item label="类型" prop="type" label-width="100px">
-              <el-cascader v-model="formData.type" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
+              <!-- <el-cascader    @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{ checkStrictly: true }"></el-cascader>
+              <el-form-item label="类型" prop="type" label-width="100px"> -->
+              <el-cascader  v-model="this.formData.type"     @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{emitPath: false,
+                multiple: false, }"></el-cascader>
             </el-form-item>
+           
+        
           </el-col>
           <el-col :span="12">
             <el-form-item label="名称" label-width="100px" prop="name">
@@ -149,10 +154,193 @@
  export default {
     data() {
         return {
+            orgOptionProps: {
+                value: 'value',
+                label: 'label',
+                children: 'subAgencyList',
+                emitPath: false,
+                multiple: false,
+                checkStrictly: true
+            },
           showdisabled:false,
           searchOptions:[],
-          options: [{
+          options:[
-          }],
+        {
+
+            "children": [
+                {
+                    "pv":"1",
+                    "value": "11",
+                    "label": "托儿所"
+                },
+                {
+                    "pv":"1",
+                    "value": "12",
+                    "label": "幼儿园"
+                },
+                {
+                    "pv":"1",
+                    "value": "13",
+                    "label": "小学"
+                },
+                {
+                    "pv":"1",
+                    "value": "14",
+                    "label": "中学"
+                },
+                {
+                    "pv":"1",
+                    "value": "15",
+                    "label": "培训机构"
+                },
+                {
+                    "pv":"1",
+                    "value": "16",
+                    "label": "其它"
+                }
+            ],
+            "value": "1",
+            "label": "教育培训"
+        },
+        {
+            "children": [
+                {
+                    "pv":"2",
+                    "value": "21",
+                    "label": "门诊"
+                },
+                {
+                    "pv":"2",
+                    "value": "22",
+                    "label": "社区医院"
+                },
+                {
+                    "pv":"2",
+                    "value": "23",
+                    "label": "医院"
+                },
+                {
+                    "pv":"2",
+                    "value": "24",
+                    "label": "其它"
+                }
+            ],
+            "value": "2",
+            "label": "医疗卫生"
+        },
+        {
+            "children": [
+                {
+                    "pv":"3",
+                    "value": "31",
+                    "label": "餐饮"
+                },
+                {
+                    "pv":"3",
+                    "value": "32",
+                    "label": "超市"
+                },
+                {
+                    "pv":"3",
+                    "value": "33",
+                    "label": "理发"
+                },
+                {
+                    "pv":"3",
+                    "value": "34",
+                    "label": "书店"
+                },
+                {
+                    "pv":"3",
+                    "value": "35",
+                    "label": "便利店"
+                },
+                {
+                    "pv":"3",
+                    "value": "36",
+                    "label": "市场"
+                },
+                {
+                    "pv":"3",
+                    "value": "37",
+                    "label": "五金"
+                },
+                {
+                    "pv":"3",
+                    "value": "38",
+                    "label": "照相"
+                },
+                {
+                    "pv":"3",
+                    "value": "39",
+                    "label": "综合修理"
+                },
+                {
+                    "pv":"3",
+                    "value": "30",
+                    "label": "服务站"
+                },
+                {
+                    "pv":"3",
+                    "value": "330",
+                    "label": "农贸市场"
+                },
+                {
+                    "pv":"3",
+                    "value": "331",
+                    "label": "其它"
+                }
+            ],
+            "value": "3",
+            "label": "商业服务"
+        },
+        {
+            "children": [
+                 {
+                    "pv":"4",
+                    "value": "41",
+                    "label": "电影院"
+                },
+                {
+                    "pv":"4",
+                    "value": "42",
+                    "label": "歌剧院"
+                },
+                {
+                    "pv":"4",
+                    "value": "43",
+                    "label": "图书馆"
+                },
+                {
+                    "pv":"4",
+                    "value": "44",
+                    "label": "游泳馆"
+                },
+                {
+                    "pv":"4",
+                    "value": "45",
+                    "label": "活动中心"
+                },
+                {
+                    "pv":"4",
+                    "value": "46",
+                    "label": "体育馆"
+                },
+                {
+                    "pv":"4",
+                    "value": "47",
+                    "label": "其它"
+                }
+            ],
+            "value": "4",
+            "label": "文化体育"
+        },
+        {
+            "children": [],
+            "value": "5",
+            "label": "其它"
+        }
+    ],
             fileList:[],
             searchValue:"",
             OrganizationaltypeList:[],
@@ -169,7 +357,7 @@
               linkman: "",
               linkPhone: "",
               workTime: "",
-              type: "1",
+              type: "",
               tags: "",//标签
               agencyId: this.$store.state.user.agencyId,
               address: "",//地址
@@ -229,6 +417,11 @@
       // // }
 
       // this.endLoading();
+    },
+    //获取类型
+    handleChangeAgency(val) {
+            console.log(val);
+            this.formData.type = val
        },
           //获取详情
           getTableDetail(id) {

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

@@ -142,7 +142,7 @@ export default {
                 ],
             showprocess:false,
             EditList:{},
-
+            OrganizationaltypeList:[],
             showAdd: false,
             showMember: false,
             showEdit: false,
@@ -178,11 +178,13 @@ export default {
    async getLifeType () {
        const url = "/sys/dict/data/dictlist"
        let params = {
-         dictType: 'voluntary_sphereLife_type'
+         dictType: 'voluntary_sphereLife_type',
        }
        const { data, code, msg } = await requestPost(url, params)
        if (code === 0) {
          this.OrganizationaltypeList = data;
+         console.log(this.OrganizationaltypeList,"his.Organizationaltype");
+         
        } else {
          this.$message.error(msg)
        }

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

@@ -490,7 +490,8 @@
        const url = "/sys/dict/data/dictlist"
  
        let params = {
-         dictType: 'volunteer_org_type'
+         dictType: 'volunteer_org_type',
+         parentValue:"0"
        }
        console.log("vol123234");
        

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

@@ -339,6 +339,11 @@ export default {
               return fileType && isLt1M;
           },
         handleDel(row) {
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
             console.log(row,"row");
         let url="/voluntary/volunteerOrg/delete";
         let params={
@@ -360,6 +365,16 @@ export default {
             this.$message.error(data.msg)
           }
         })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+
+
+
+
          
         },
         diaClose(){

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

@@ -34,8 +34,9 @@
           {{ 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}} -->

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