Merge branch 'xiaowang-social' into feature

.env.localhost

@@ -0,0 +1,19 @@
+NODE_ENV=development
+
+# VUE_APP_API_SERVER =  https://epmet-preview.elinkservice.cn/api
+# VUE_APP_API_SERVER =  http://192.168.1.60:8080/api
+VUE_APP_API_SERVER =  http://localhost:8080/api
+# VUE_APP_API_SERVER =  http://219.146.91.110:30801/api219.146.91.110:30801
+# VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
+# VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
+# VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
+# VUE_APP_API_SERVER =   https://epdc-shibei.elinkservice.cn/api
+# VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
+# VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
+
+VUE_APP_BIPASS_API_SERVER =  /linkdata/linkdata-gateway/route
+
+# VUE_APP_NODE_ENV=dev_sdtdt
+VUE_APP_NODE_ENV=dev
+#项目根路径
+VUE_APP_PUBLIC_PATH=epmet-oper

package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
+    "localhost": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve --mode localhost",
     "dev": "node --max_old_space_size=4096 node_modules/@vue/cli-service/bin/vue-cli-service.js serve",
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

src/router/index.js

@@ -942,9 +942,21 @@ const router = new Router({
   }),
   routes: pageRoutes.concat(moduleRoutes, moduleShujuRoutes, dataBoardRoutes),
 });
+
 router.beforeEach((to, from, next) => {
   // 添加动态(菜单)路由
   // 已添加或者当前路由为页面路由, 可直接访问
+  let toUrl = to.meta.iframeURL
+  console.log("=====", toUrl)
+  if (toUrl && toUrl.indexOf("ticket=") != -1) {
+    // 此处请求后端,获取一个ticket票据
+    http.get("/auth/sso/getTicket")
+      .then(({data: res}) => {
+      let ticket = res.data
+      window.open(toUrl + ticket)
+    })
+    return null;
+  }
   if (to.name === "caiji") {
     return next();
   }
@@ -982,7 +994,7 @@ router.beforeEach((to, from, next) => {
         });
         return next({
           name: "login",
-          query: { redirect: to.fullPath } 
+          query: { redirect: to.fullPath }
         });
       }
       window.SITE_CONFIG["menuShujuList"] = res.data;
@@ -996,7 +1008,7 @@ router.beforeEach((to, from, next) => {
       console.log(err);
       next({
         name: "login",
-        query: { redirect: to.fullPath } 
+        query: { redirect: to.fullPath }
       });
     });
   http
@@ -1013,7 +1025,7 @@ router.beforeEach((to, from, next) => {
         });
         return next({
           name: "login",
-          query: { redirect: to.fullPath } 
+          query: { redirect: to.fullPath }
         });
       }
       window.SITE_CONFIG["menuList"] = res.data
@@ -1031,7 +1043,7 @@ router.beforeEach((to, from, next) => {
       console.log(err);
       next({
         name: "login",
-        query: { redirect: to.fullPath } 
+        query: { redirect: to.fullPath }
       });
     });
 });

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

@@ -336,7 +336,13 @@
             "label": "文化体育"
         },
         {
-            "children": [],
+            "children": [
+            {
+                    "pv":"5",
+                    "value": "51",
+                    "label": "其他"
+                },
+            ],
             "value": "5",
             "label": "其它"
         }

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

@@ -13,13 +13,13 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="组织名称" prop="orgName" label-width="150px">
-                            <el-input v-model.trim="formData.orgName"  size="small" clearable placeholder="请输入活动名称"
+                            <el-input :disabled="disabled" v-model.trim="formData.orgName"  size="small" clearable placeholder="请输入活动名称"
                                 class="u-item-width-normal"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="服务类型" label-width="150px" prop="serviceTypeList">
-                            <el-select  multiple-limit='4' class="u-item-width-normal" v-model.trim="formData.serviceTypeList" placeholder="请选择" clearable multiple>
+                            <el-select  :disabled="disabled"  multiple-limit='4' class="u-item-width-normal" v-model.trim="formData.serviceTypeList" placeholder="请选择" clearable multiple>
                    <el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" >
                    </el-option>
                 </el-select>
@@ -28,7 +28,7 @@
                     </el-col>
                     <el-col :span="12">
                         <el-form-item label="组织类型" label-width="150px" prop="orgType">
-                            <el-cascader v-model="value" :options="OrganizationaltypeList" @change="handleChange"  :props="props"></el-cascader>
+                            <el-cascader  :disabled="disabled" v-model="formData.orgType"  :options="OrganizationaltypeList" @change="handleNodeClick"  :props="{ expandTrigger: 'hover',emitPath:false }"></el-cascader>
                             <!-- <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"
@@ -40,7 +40,7 @@
                     <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
+                                <el-select  :disabled="disabled" v-model.trim="searchValue" filterable style="width: 634px" remote
                                     :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
                                     :loading="loading">
                                     <el-option v-for="(item, index) in searchOptions"
@@ -71,16 +71,16 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="组织封面图" label-width="150px" prop="orgImage">
+                        <el-form-item label="组织封面图" label-width="150px" prop="fileList" >
                             <template>
                                 <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
                                     @file-removed="removedImg"></upload-image>
                             </template>
                         </el-form-item>
                     </el-col>
-                    <el-form-item label="组织介绍" prop="introduction" label-width="150px" style="display: block">
+                    <el-form-item  label="组织介绍" prop="introduction" label-width="150px" style="display: block">
                         <div class="item_width_1">
-                            <el-input type="textarea" autosize placeholder="请填写组织介绍"
+                            <el-input :disabled="disabled"  type="textarea" autosize placeholder="请填写组织介绍"
                                 v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
                             </el-input>
                         </div>
@@ -88,14 +88,14 @@
 
                     <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"
+                            <el-input :disabled="disabled"   type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
                                 :autosize="{ minRows:4., maxRows: 10}">
                             </el-input>
                         </div>
                     </el-form-item>
                     <el-form-item label="品牌展示图" label-width="150px" prop="brandImg">
                         <template>
-                            <upload-image :defaultFileList="formData.brandImg" :limit="1" @change="onChangeFileList1"
+                            <upload-image :defaultFileList="fileList1" :limit="1" @change="onChangeFileList1"
                                 @file-removed="removedImg"></upload-image>
                         </template>
                     </el-form-item>
@@ -130,6 +130,7 @@
  export default {
     data() {
         return {
+            disabled:false,
             volunteerOrgId:"0",
             fileList:[],
             fileList1:[],
@@ -193,6 +194,46 @@
     },
  
     methods: {
+        handleNodeClick(data) {
+            console.log(data,"datdsvva");
+            this.formData.orgType=data
+            
+        },
+        async initForm(type, unitId) {
+          console.log(type, unitId,"i就理解哦i");
+        //   if(type=="info"){
+        //     this.showdisabled=true
+        //     this.getTableDetail(unitId)
+        //   }
+          if (type == "edit") {
+            this.disabled=true
+            this.volunteerDetail(unitId)
+          }
+      },
+             //详情
+             async volunteerDetail (id) {
+      const url = "/voluntary/volunteerOrg/getDetail"
+
+      let params = {
+        id: id
+      }
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0&&data) {
+        this.formData = data[0];
+        this.searchValue= this.formData.address
+       this.fileList=[]
+       data[0].orgImage?this.fileList.push({fileUrl:data[0].orgImage}):"";
+       data[0].brandImg?this.fileList1.push({fileUrl:data[0].brandImg}):"";
+  
+        console.log(this.formData,"this.formData");
+        console.log(this.fileList,"this.fileList");
+        
+        
+      } else {
+        this.$message.error(msg)
+      }
+    },
         validateContent() {
       // 使用正则表达式去除HTML标签后检查内容
       const textContent = this.stripHtml(this.formData.sumUp);
@@ -205,71 +246,7 @@
       div.innerHTML = html;
       return div.textContent || div.innerText || '';
     },
- 
+
-     //    // 上传成功
-     //    handleImgSuccess(res, file, fileList) {
-     //        if (res.code === 0 && res.msg === 'success') {
-     //            let format = file.name.split('.').pop();
-     //            let srcType = file.raw.type;
-     //            let type = 'file';
-     //            if (srcType.indexOf('image') != -1) {
-     //                type = 'image';
-     //            } else if (srcType.indexOf('video') != -1) {
-     //                type = 'video';
-     //            }
-     //            // this.formData.activityImgs.push({
-     //            //     format,
-     //            //     name: file.name,
-     //            //     size: file.size,
-     //            //     type,
-     //            //     url: res.data.url
-     //            // });
-     //            // console.log('this.formData.activityImgs',res.data.url)
-     //            this.formData.activityImgs.push(res.data.url);
- 
-     //        } else {
-     //            this.$message.error(res.msg);
-     //        }
-     //    },
-     //    // 删除图片
-     //    handleImgRemove(file) {
-     //        console.log('handleImgRemove', file);
-     //        if (file.response) {
-     //            let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
-     //            this.formData.activityImgs.splice(index, 1);
-     //        } else if (file.url) {
-     //            let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
-     //            this.formData.activityImgs.splice(index, 1);
-     //        }
-     //    },
-        // 图片预览
-     //    handleImgPreview(file) {
-     //        console.log(file);
-     //        window.open(file.url || file.response.data.url);
-     //    },
-     //    // 文件数量超过限制
-     //    handleImgExceed() {
-     //        this.$message({
-     //            type: 'warning',
-     //            message: '文件数量最多不超过三个'
-     //        });
-     //    },
-        // 上传前的验证
-     //    beforeImgUpload(file) {
-     //        const isLt1M = file.size / 1024 / 1024 < 10;
-     //        const srcType = file.type;
-     //        const format = file.name.split('.').pop();
-     //        if (!isLt1M) {
-     //            this.$message.error('上传文件大小不能超过 10MB!');
-     //            return false;
-     //        }
-     //        if (srcType.indexOf('image') == -1) {
-     //            this.$message.error('仅限图片格式');
-     //            return false;
-     //        }
-     //        return true;
-     //    },
- 
         async activityType() {
             this.$nextTick(() => {
                 if (!map) {
@@ -310,18 +287,6 @@
         removedImg() {
             this.formData.coverPic = ''
         },
-        // onChangeFileList(e) {
-        //     console.log(e, 'sssssb');
-        //     this.fileList = e.length > 0 ? e.map(item => ({
-        //         fileType: '0',
-        //         fileUrl: item.response.data.url
-        //     })) : []; // 当e为空时清空fileList
-        //     if (e.length > 0) {
-        //         this.formData.qualification = e[0].response.data.url;
-        //     } else {
-        //         this.formData.qualification = '';
-        //     }
-        // },
         onChangeFileList1(e) {
             console.log(e, 'sssssb');
             this.fileList1 = e.length > 0 ? e.map(item => ({
@@ -349,20 +314,7 @@
             }
         },
  
-        // onChangeImgs(e) {
+    
-        //     this.activityImgs = [];
-        //     if (e.length > 0) {
-        //         e.forEach(item => {
-        //             let ob = {
-        //                 fileType: '0',
-        //                 fileUrl: item.response.data.url
-        //             };
-        //             this.activityImgs.push(ob);
-        //         });
-        //         console.log('this.activityImgs',this.activityImgs)
-        //     }
-        // },
- 
         handleChange(value) {
             console.log(value);
             this.volunteerOrgId=value.toString()
@@ -384,44 +336,7 @@
             }
  
         },
-     //    async initForm(type, activityId) {
+
-     //        this.startLoading()
-     //        this.formType = type
-     //        if (type === 'edit') {
-     //            if (activityId.activityImgs || activityId.sumUp) {
-     //                this.records = true
-     //            } else {
-     //                this.records = false
-     //            }
-     //            this.formData = activityId
-     //            this.timeRange = [this.formData.startTime, this.formData.endTime]
-     //            console.log(activityId,"activityId");
-                
-     //            if (activityId.coverPic) {
-     //                let ob = {
-     //                    fileType: '0',
-     //                    fileUrl: activityId.coverPic
-     //                };
-     //                this.fileList = [ob];
-     //                this.formData.coverPic = ob.fileUrl;
-     //                if (this.formData.online == 1) {
-     //                    this.online = true
-     //                }
-     //            }
-     //        } else if (type === 'records') {
-     //            this.records = true
-     //        } else if (type === 'summary') {
-     //            this.formData = activityId
-     //            this.formData.activityImgs = []
-     //            console.log("this.formData", this.formData)
-     //            this.records = true
-     //            this.summary = false
-     //        } else {
-     //            this.records = false
-     //        }
-     //        this.endLoading()
- 
-     //    },
  
         async getDemandOptions() {
             this.$http
@@ -492,6 +407,10 @@
        const { data, code, msg } = await requestPost(url, params)
        if (code === 0) {
          this.OrganizationaltypeList = data;
+         console.log(this.OrganizationaltypeList,"sdlkjclsdc");
+         this.volunteertype1()
+         this.volunteertype2()
+         
        } else {
          this.$message.error(msg)
        }
@@ -500,11 +419,26 @@
    async volunteertype1 () {
        const url = "/voluntary/volunteerInfo/getOrgTypeList"
        let params = {
-           volunteerOrgId:this.volunteerOrgId
+           volunteerOrgId:"serviceTeam"
+       }
+       const { data, code, msg } = await requestPost(url, params)
+       if (code === 0) {
+         this.OrganizationaltypeList[1].children=data;
+         console.log(this.OrganizationaltypeList,"sdlk13243jclsdc");
+         
+       } else {
+         this.$message.error(msg)
+       }
+     },
+             // 获取志愿组织类型
+   async volunteertype2 () {
+       const url = "/voluntary/volunteerInfo/getOrgTypeList"
+       let params = {
+           volunteerOrgId:"serviceOrg"
        }
        const { data, code, msg } = await requestPost(url, params)
        if (code === 0) {
-         this.OrganizationaltypeList.childList=data;
+         this.OrganizationaltypeList[0].children=data;
          console.log(this.OrganizationaltypeList,"sdlkjclsdc");
          
        } else {

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

@@ -70,15 +70,15 @@
                 <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center"
                     class="operate">
                     <template slot-scope="scope">
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
+                        <el-button  type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0"
                             @click="handleDetail(scope.row)">查看</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
+                        <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0"
-                            @click="handleEdit(scope.row)">修改</el-button>
+                            @click="handleEdit(scope.row)">修改</el-button> 
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
+                        <el-button type="text" style="color:#1C6AFD;" size="small"  v-if="scope.row.editNum !=0"
                             @click="handleshowMember(scope.row)">成员管理</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small"
+                        <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0"
                             @click="handleDel(scope.row)">删除</el-button>
-                        <el-button v-if="scope.row.status == 'processing'&&scope.row.ischeck==1" 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>
@@ -91,7 +91,7 @@
             </div>
             <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" title="新增"
                 width="950px" top="10vh" class="dialog-h" @closed="showAddClose">
-                <add v-if="showAdd" @showAddClose="showAddClose" />
+                <add  ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
             </el-dialog>
             <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
                 width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
@@ -99,7 +99,7 @@
             </el-dialog>
             <el-dialog :visible.sync="showEdit" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
                 width="850px" top="10vh" class="dialog-h" @closed="showEditClose">
-                <edit v-if="showEdit" :VolunteerList="EditList" @showEditClose="showEditClose" />
+                <edit  v-if="showEdit" :VolunteerList="EditList" @showEditClose="showEditClose" />
             </el-dialog>
             <el-dialog :visible.sync="showMember" :close-on-click-modal="false" :close-on-press-escape="false"
                 title="成员管理" width="1000px" top="10vh" class="dialog-h" @closed="MemberManagementClose">
@@ -202,10 +202,12 @@ export default {
             this.getTableData()
         },
         //修改
-        handleEdit(row){
+        handleEdit(row) {
-            this.showEdit=true,
+          this.showAdd = true,
-            this.EditList=row
+            this.$nextTick(() => {
-             console.log(row,this.EditList,"row");
+              this.$refs.ref_form.initForm("edit", row.id);
+            });
+            console.log(row,this.EditList,"row");
         },
         //关闭修改
         showEditClose(){
@@ -215,6 +217,9 @@ export default {
         //新增
         handleAdd(){
             this.showAdd=true
+            this.$nextTick(() => {
+        this.$refs.ref_form.initForm("add", null);
+      });
         },
         //关闭新增
         showAddClose(){

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

@@ -82,6 +82,7 @@
                             </template>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="24">
                     <el-form-item label="组织介绍" prop="introduction" label-width="150px" style="display: block">
                         <div class="item_width_1">
                             <el-input :disabled="true" type="textarea" autosize placeholder="请填写组织介绍"
@@ -89,7 +90,7 @@
                             </el-input>
                         </div>
                     </el-form-item>
-
+                </el-col>
                     <el-form-item label="志愿品牌" prop="brand" label-width="150px" style="display: block">
                         <div class="item_width_1">
                             <el-input :disabled="true" type="textarea" autosize placeholder="请输入内容"

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

@@ -44,7 +44,7 @@
         <el-form-item label="组织介绍图" v-if="tableData.orgImage">
           <div class="demo-image__preview">
             <el-image style="width: 100px; height: 100px" :src="tableData.orgImage" :preview-src-list="[tableData.orgImage]">
-            </el-image>
+            </el-image> 
             <!-- <img v-if="tableData.orgImage" style="width: 100px; height: 100px" :src="[tableData.orgImage]"> -->
             </img>
           </div>

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

@@ -299,20 +299,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);