From 56c5011a865954b78b14252dea1a3d9300be0b05 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: Wed, 9 Oct 2024 16:19:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=B4=BB=E5=9C=88=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=BF=97=E6=84=BF=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=9B=9B=E9=A1=B9=E8=BF=9B=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/LifeCircleManagement/add.vue    |   7 -
 .../volunteer/LifeCircleManagement/index.vue  |  50 +-
 .../volunteer/LifeCircleManagement/info.vue   | 196 +++-
 .../volunteer/VoluntaryOrganization/index.vue | 962 +++++++++---------
 4 files changed, 699 insertions(+), 516 deletions(-)

diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index ecdb446f9..ace582367 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue
@@ -336,13 +336,6 @@
             "label": "文化体育"
         },
         {
-            // "children": [
-            // {
-            //         "pv":"5",
-            //         "value": "51",
-            //         "label": "其他"
-            //     },
-            // ],
             "value": "5",
             "label": "其它"
         }
diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue
index 5ecb48202..60120ce53 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/index.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/index.vue
@@ -444,33 +444,31 @@ export default {
               pageNo:this.pageNo,
               pageSize: this.pageSize
           }
-          const { data, code, msg } = await requestGet(url,params);
-          if (code === 0) {
-            console.log("列表请求成功！！！！！！！！！！！！！！");
-            this.total = data.total || 0;
-            this.tableData = data.list
-            this.tableData.forEach(item=>{
-              this.options.forEach(item1=>{
-                console.log(item1,"item1.children.value");
-                console.log(item1.children,"item1.children.value");
-                console.log(item1.children.value,"item1.children.value");
+          const { data, code, msg } = await requestGet(url, params);
+if (code === 0) {
+  console.log("列表请求成功！！！！！！！！！！！！！！");
+  this.total = data.total || 0;
+  this.tableData = data.list;
   
-              item1.children.forEach(item2=>{
-                  if (item2.value==item.type) {
-                    item.typeName=item2.label
-                }else{
-                  item.typeName="其他"
-                }
-                })
-         
-      
-              }
-              )
-            })
-            console.log(this.tableData,"this.tableDatadsfdsf");
-            
-          } else {
-          }
+  this.tableData.forEach(item => {
+    this.options.forEach(item1 => {
+      console.log(item1, "item1");
+      console.log(item1.children, "item1.children");
+      if (Array.isArray(item1.children)) {
+        item1.children.forEach(item2 => {
+          if (item2.value.toString() == item.type) {
+            item.typeName = item2.label;
+          } 
+        });
+      } else {
+      }
+    });
+  });
+  
+  console.log(this.tableData, "this.tableData");
+} else {
+  // 错误处理逻辑
+}
         },
         //模板
         async uploadHttpRequest(file) {
diff --git a/src/views/modules/volunteer/LifeCircleManagement/info.vue b/src/views/modules/volunteer/LifeCircleManagement/info.vue
index cb5bdb49a..6a5460c9e 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/info.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/info.vue
@@ -17,7 +17,7 @@
                                    <div>{{ formData.typeName }}</div>
                             </el-option>
                         </el-select> -->
-                        <div>{{ formData.positionName }}</div>
+                        <div>{{ formData.typeName }}</div>
                         </el-form-item>
                         <el-form-item label="名称" label-width="100px" prop="name">
                             <!-- <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入名称"
@@ -39,7 +39,9 @@
                         </el-form-item> -->
                         <el-form-item label="图片" label-width="100px" prop="attrs">
                             <template>
-                                    <img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
+                                    <el-image  :preview-src-list="[item.url]" v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
+
+                                    </el-image>
                             </template>
                         </el-form-item>
                         <!-- <el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
@@ -89,6 +91,182 @@
    export default {
       data() {
           return {
+            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": "文化体育"
+        },
+        {
+            "value": "5",
+            "label": "其它"
+        }
+    ],
               formData:
               {
                 agencyName:"",
@@ -149,6 +327,20 @@
               console.log(res);
               if (res.code == 0) {
                   this.formData = res.data
+                //   this.formData.forEach(item => {
+                      this.options.forEach(item1 => {
+                          console.log(item1, "item1");
+                          console.log(item1.children, "item1.children");
+                          if (Array.isArray(item1.children)) {
+                              item1.children.forEach(item2 => {
+                                  if (item2.value.toString() == this.formData.type) {
+                                    this.formData.typeName = item2.label;
+                                  }
+                              });
+                          } else {
+                          }
+                      });
+                //   });
                   this.fileList=[{fileUrl:res.data.attrs[0].url}]
                   this.searchValue=res.data.address
                   console.log(this.formData,"this.formData");
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/index.vue b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
index f3fda3e2a..26b8a1965 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/index.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
@@ -1,116 +1,116 @@
 <template>
-    <div class="g-main">
-        <div class="m-search">
-            <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
-                <div>
-                    <el-form-item label="组织名称">
-                        <el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
-                            placeholder="请输入">
-                        </el-input>
-                    </el-form-item>
-                    <el-form-item label="组织类型">
-                        <el-select v-model="formData.serviceType" placeholder="请选择" clearable>
-                            <el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label"
-                                :value="item.value">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </div>
-                <div class="block">
-                    <div style="display: flex; justify-content: flex-end;">
-                        <el-button style="margin-left:10px" class="diy-button--blue" size="small"
-                            @click="handleSearch">查询</el-button>
-                        <el-button style="margin-left:10px" class="diy-button--white" size="small"
-                            @click="resetSearch">重置</el-button>
-                    </div>
-                </div>
-            </el-form>
-        </div>
-        <div class="m-table">
-            <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
-            <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
-            <el-button class="diy-button--white" size="small">
-                <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
-                    :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
-                    :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
-                    :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
-                    导入
-                </el-upload>
-            </el-button>
-            <el-table class="table" :data="tableData" border  style="width: 100%">
-                <el-table-column label="序号" header-align="center" align="center" type="index"
-                    width="80"></el-table-column>
-                <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="orgName" header-align="center" align="center" label="组织名称"
-                    :show-overflow-tooltip="true">
-                    <!-- <template slot-scope="scope">
-        <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
-      </template> -->
-                </el-table-column>
-                <el-table-column prop="serviceTypeName" header-align="center" align="center" label="服务类型"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="numberNum" header-align="center" align="center" label="成员数"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="operator" header-align="center" align="center" label="管理员"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <el-table-column prop="mobile" header-align="center" align="center" label="联系电话"
-                    :show-overflow-tooltip="true">
-                </el-table-column>
-                <!-- <el-table-column prop="createdTime" header-align="center" align="center" label="注册时间" :show-overflow-tooltip="true">
-          </el-table-column>
-          <el-table-column prop="points" header-align="center" align="center" label="积分":show-overflow-tooltip="true">
-          </el-table-column>
-          <el-table-column prop="actNum" header-align="center" align="center" label="活动次数":show-overflow-tooltip="true">
-          </el-table-column> -->
-                <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" v-if="scope.row.editNum !=0"
-                            @click="handleDetail(scope.row)">查看</el-button>
-                        <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0"
-                            @click="handleEdit(scope.row)">修改</el-button> 
-                        <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" 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"
-                            @click="handleprocessl(scope.row)">审核</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div>
-                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                    :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
-                    layout="sizes, prev, pager, next, total" :total="total">
-                </el-pagination>
-            </div>
-            <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="titleName"
-                width="950px" top="10vh" class="dialog-h" @closed="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">
-                <info v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
-            </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" />
-            </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">
-                <MemberManagement v-if="showMember" :list="fmData" @MemberManagementClose="MemberManagementClose" />
-            </el-dialog>
-            <el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
-                width="850px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
-                <process v-if="showprocess" @handleprocesslClose="handleprocesslClose"  :VolunteerList="EditList"/>
-            </el-dialog>
-        </div>
-    </div>
+  <div class="g-main">
+      <div class="m-search">
+          <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
+              <div>
+                  <el-form-item label="组织名称">
+                      <el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
+                          placeholder="请输入">
+                      </el-input>
+                  </el-form-item>
+                  <el-form-item label="组织类型">
+                      <el-select v-model="formData.serviceType" placeholder="请选择" clearable>
+                          <el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label"
+                              :value="item.value">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+              </div>
+              <div class="block">
+                  <div style="display: flex; justify-content: flex-end;">
+                      <el-button style="margin-left:10px" class="diy-button--blue" size="small"
+                          @click="handleSearch">查询</el-button>
+                      <el-button style="margin-left:10px" class="diy-button--white" size="small"
+                          @click="resetSearch">重置</el-button>
+                  </div>
+              </div>
+          </el-form>
+      </div>
+      <div class="m-table">
+          <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+          <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
+          <el-button class="diy-button--white" size="small">
+              <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr"
+                  :limit="1" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false"
+                  :auto-upload="true" :on-progress="handleProgress" :on-success="handleExcelSuccess"
+                  :before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
+                  导入
+              </el-upload>
+          </el-button>
+          <el-table class="table" :data="tableData" border  style="width: 100%">
+              <el-table-column label="序号" header-align="center" align="center" type="index"
+                  width="80"></el-table-column>
+              <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
+                  :show-overflow-tooltip="true">
+              </el-table-column>
+              <el-table-column prop="orgName" header-align="center" align="center" label="组织名称"
+                  :show-overflow-tooltip="true">
+                  <!-- <template slot-scope="scope">
+      <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
+    </template> -->
+              </el-table-column>
+              <el-table-column prop="serviceTypeName" header-align="center" align="center" label="服务类型"
+                  :show-overflow-tooltip="true">
+              </el-table-column>
+              <el-table-column prop="numberNum" header-align="center" align="center" label="成员数"
+                  :show-overflow-tooltip="true">
+              </el-table-column>
+              <el-table-column prop="operator" header-align="center" align="center" label="管理员"
+                  :show-overflow-tooltip="true">
+              </el-table-column>
+              <el-table-column prop="mobile" header-align="center" align="center" label="联系电话"
+                  :show-overflow-tooltip="true">
+              </el-table-column>
+              <!-- <el-table-column prop="createdTime" header-align="center" align="center" label="注册时间" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="points" header-align="center" align="center" label="积分":show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column prop="actNum" header-align="center" align="center" label="活动次数":show-overflow-tooltip="true">
+        </el-table-column> -->
+              <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" v-if="scope.row.editNum !=0||scope.row.status == 'pass'"
+                          @click="handleDetail(scope.row)">查看</el-button>
+                      <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0||scope.row.status == 'pass'"
+                          @click="handleEdit(scope.row)">修改</el-button> 
+                      <el-button type="text" style="color:#1C6AFD;" size="small"  v-if="scope.row.editNum !=0||scope.row.status == 'pass'"
+                          @click="handleshowMember(scope.row)">成员管理</el-button>
+                      <el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0||scope.row.status == 'pass'"
+                          @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"
+                          @click="handleprocessl(scope.row)">审核</el-button>
+                  </template>
+              </el-table-column>
+          </el-table>
+          <div>
+              <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                  :current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
+                  layout="sizes, prev, pager, next, total" :total="total">
+              </el-pagination>
+          </div>
+          <el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="titleName"
+              width="950px" top="10vh" class="dialog-h" @closed="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">
+              <info v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
+          </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" />
+          </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">
+              <MemberManagement v-if="showMember" :list="fmData" @MemberManagementClose="MemberManagementClose" />
+          </el-dialog>
+          <el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
+              width="850px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
+              <process v-if="showprocess" @handleprocesslClose="handleprocesslClose"  :VolunteerList="EditList"/>
+          </el-dialog>
+      </div>
+  </div>
 </template>
 
 <script>
@@ -128,395 +128,395 @@ import process from "./process.vue"
 import axios from "axios";
 
 export default {
-    components: { add, info,edit,MemberManagement,process},
+  components: { add, info,edit,MemberManagement,process},
 
-    data() {
-        return {
-          titleName:"",
-          ids:"",
-            formData: {
-                orgName: "",
-                serviceType: "",
-                optionstype: [
-                    { value: 1, label: "志愿者服务组织" },
-                    { value: 2, label: "志愿者服务团队" },
-                ]
-            },
-            showprocess:false,
-            EditList:{},
+  data() {
+      return {
+        titleName:"",
+        ids:"",
+          formData: {
+              orgName: "",
+              serviceType: "",
+              optionstype: [
+                  { value: 1, label: "志愿者服务组织" },
+                  { value: 2, label: "志愿者服务团队" },
+              ]
+          },
+          showprocess:false,
+          EditList:{},
 
-            showAdd: false,
-            showMember: false,
-            showEdit: false,
-            //   pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
-            pageNo: 1,
-            pageSize: 20,
-            total: 0,
-            tableData: [
-               
-          ],
-          importLoading:false,
-          showInfo:false,
+          showAdd: false,
+          showMember: false,
+          showEdit: false,
+          //   pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
+          pageNo: 1,
+          pageSize: 20,
+          total: 0,
+          tableData: [
+             
+        ],
+        importLoading:false,
+        showInfo:false,
 
-        };
+      };
+    },
+    computed: {
+      maxTableHeight() {
+        return this.$store.state.inIframe
+          ? this.clientHeight - 400 + this.iframeHeigh
+          : this.clientHeight - 400;
       },
-      computed: {
-        maxTableHeight() {
-          return this.$store.state.inIframe
-            ? this.clientHeight - 400 + this.iframeHeigh
-            : this.clientHeight - 400;
-        },
-        ...mapGetters(["clientHeight", "iframeHeight"]),
+      ...mapGetters(["clientHeight", "iframeHeight"]),
+    },
+    watch: {
+  
+    },
+    mounted() {
+      this.ids=this.$store.state.user.agencyId
+      console.log(this.ids,"this.ids");
+      
+      this.getTableData();
+    },
+    methods: {
+      //审查
+      handleprocessl(row){
+          this.showprocess=true
+          this.EditList=row
+          console.log(row,this.fmData,"row");
       },
-      watch: {
-    
+      //关闭审查
+      
+      handleprocesslClose(){
+          this.showprocess=false
+          this.getTableData()
       },
-      mounted() {
-        this.ids=this.$store.state.user.agencyId
-        console.log(this.ids,"this.ids");
-        
-        this.getTableData();
+      //成员管理
+      handleshowMember(row){
+        console.log    (row,this.fmData,"row");
+          this.showMember=true
+          this.fmData=row
+ 
       },
-      methods: {
-        //审查
-        handleprocessl(row){
-            this.showprocess=true
-            this.EditList=row
-            console.log(row,this.fmData,"row");
-        },
-        //关闭审查
-        
-        handleprocesslClose(){
-            this.showprocess=false
-            this.getTableData()
-        },
-        //成员管理
-        handleshowMember(row){
-          console.log    (row,this.fmData,"row");
-            this.showMember=true
-            this.fmData=row
-   
-        },
-        //关闭成员管理
-        MemberManagementClose(){
-            this.showMember=false  
-            this.getTableData()
-        },
-        //修改
-        handleEdit(row) {
-          this.titleName = "修改"
-          this.showAdd = true,
-            this.$nextTick(() => {
-              this.$refs.ref_form.initForm("edit", row.id);
-            });
-          console.log(row, this.EditList, "row");
-        },
-        //关闭修改
-        showEditClose() {
-          this.showEdit = false
+      //关闭成员管理
+      MemberManagementClose(){
+          this.showMember=false  
           this.getTableData()
-        },
-        //新增
-        handleAdd() {
-          this.titleName = "新增"
-          this.showAdd = true
+      },
+      //修改
+      handleEdit(row) {
+        this.titleName = "修改"
+        this.showAdd = true,
           this.$nextTick(() => {
-            this.$refs.ref_form.initForm("add", null);
+            this.$refs.ref_form.initForm("edit", row.id);
           });
-        },
-        //关闭新增
-        showAddClose(){
-            console.log("sdlkfjklsdf1");
+        console.log(row, this.EditList, "row");
+      },
+      //关闭修改
+      showEditClose() {
+        this.showEdit = false
+        this.getTableData()
+      },
+      //新增
+      handleAdd() {
+        this.titleName = "新增"
+        this.showAdd = true
+        this.$nextTick(() => {
+          this.$refs.ref_form.initForm("add", null);
+        });
+      },
+      //关闭新增
+      showAddClose(){
+          console.log("sdlkfjklsdf1");
+          
+          this.showAdd=false
+          this.getTableData()
+      },
+      //关闭查看
+      showInfoClose(){
+          this.showEdit=false
+      },
+      //查询列表
+      async getTableData() {
+        // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+        const url = "/voluntary/volunteerOrg/page";
+
+        let params={
+            orgName: this.formData.orgName,
+            serviceType: this.formData.serviceType,
+            pageNo:this.pageNo,
+            pageSize: this.pageSize
+        }
+        const { data, code, msg } = await requestPost(url,params);
+        if (code === 0) {
+          console.log("列表请求成功！！！！！！！！！！！！！！");
+          this.total = data.total || 0;
+          this.tableData = data.list
+        } else {
+        }
+      },
+      //模板
+      async uploadHttpRequest(file) {
+        debugger
+    
+            // this.importLoading = true;
+          console.log(this.importLoading,"this.importLoading");
+          debugger
+            // this.importBtnTitle = '正在上传中...';
+            this.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+                duration: 3000
+            });debugger
+            let than = this;
+            console.log(than,"than");
+            debugger
+            // document.getElementById('clickA').addEventListener('click', function () {
+            //     than.$router.replace('/main/importRecord-index');
+            // });
+            const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+            formData.append('file', file.file); //添加文件对象
+            formData.append('code', ''); //添加文件对象
+            debugger
+            console.log(formData,"formData");
             
-            this.showAdd=false
-            this.getTableData()
-        },
-        //关闭查看
-        showInfoClose(){
-            this.showEdit=false
-        },
-        //查询列表
-        async getTableData() {
-          // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
-          const url = "/voluntary/volunteerOrg/page";
-  
-          let params={
-              orgName: this.formData.orgName,
-              serviceType: this.formData.serviceType,
-              pageNo:this.pageNo,
-              pageSize: this.pageSize
-          }
-          const { data, code, msg } = await requestPost(url,params);
-          if (code === 0) {
-            console.log("列表请求成功！！！！！！！！！！！！！！");
-            this.total = data.total || 0;
-            this.tableData = data.list
-          } else {
-          }
+            let url = '/voluntary/volunteerOrg/import'
+            // if (this.importType == 2) {
+            //   url = '/governance/icEvent/importAwo'
+            // }
+            console.log(url)
+            await this.$http
+                .post(url, formData)
+                .then(res => {
+                  log("res", res);
+                    if (res.data.code == 0 && res.data.msg == 'success') {
+                        const data = res.data.data;
+                        this.dataList = [
+                            ...Object.keys(data.option.exist).map(k => {
+                                return {
+                                    index: k,
+                                    srcField: data.option.exist[k],
+                                    exist: true,
+                                    field: data.option.exist[k]
+                                };
+                            }),
+                            ...Object.keys(data.option.notExist).map(k => {
+                                return {
+                                    index: k,
+                                    srcField: data.option.notExist[k],
+                                    exist: false,
+                                    field: ''
+                                };
+                            })
+                        ];
+                        this.importOption = data.option;
+                        this.importCode = data.code;
+                        this.fileData = file;
+                    } else this.$message.error(res.data.msg);
+                })
+                .catch(err => {
+                    console.log('失败', err);
+                    file.onError(); //上传失败的文件会从文件列表中删除
+                });
+            this.importLoading = false;
+            this.importBtnTitle = '导入';
+            this.$refs.upload.clearFiles();
+            this.getTableData();
         },
-        //模板
-        async uploadHttpRequest(file) {
-          debugger
-      
-              // this.importLoading = true;
-            console.log(this.importLoading,"this.importLoading");
+
+      handleExcelSuccess(res, file) {
+            if (!res.code === 0 && !res.msg === 'success') {
+                this.$message.error(res.msg);
+            }
+      },
+      beforeExcelUpload(file) {
+            console.log(file,"file1");
             debugger
-              // this.importBtnTitle = '正在上传中...';
-              this.$message({
-                  showClose: true,
-                  dangerouslyUseHTMLString: true,
-                  message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-                  duration: 3000
-              });debugger
-              let than = this;
-              console.log(than,"than");
-              debugger
-              // document.getElementById('clickA').addEventListener('click', function () {
-              //     than.$router.replace('/main/importRecord-index');
-              // });
-              const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-              formData.append('file', file.file); //添加文件对象
-              formData.append('code', ''); //添加文件对象
-              debugger
-              console.log(formData,"formData");
-              
-              let url = '/voluntary/volunteerOrg/import'
-              // if (this.importType == 2) {
-              //   url = '/governance/icEvent/importAwo'
-              // }
-              console.log(url)
-              await this.$http
-                  .post(url, formData)
-                  .then(res => {
-                    log("res", res);
-                      if (res.data.code == 0 && res.data.msg == 'success') {
-                          const data = res.data.data;
-                          this.dataList = [
-                              ...Object.keys(data.option.exist).map(k => {
-                                  return {
-                                      index: k,
-                                      srcField: data.option.exist[k],
-                                      exist: true,
-                                      field: data.option.exist[k]
-                                  };
-                              }),
-                              ...Object.keys(data.option.notExist).map(k => {
-                                  return {
-                                      index: k,
-                                      srcField: data.option.notExist[k],
-                                      exist: false,
-                                      field: ''
-                                  };
-                              })
-                          ];
-                          this.importOption = data.option;
-                          this.importCode = data.code;
-                          this.fileData = file;
-                      } else this.$message.error(res.data.msg);
-                  })
-                  .catch(err => {
-                      console.log('失败', err);
-                      file.onError(); //上传失败的文件会从文件列表中删除
-                  });
-              this.importLoading = false;
-              this.importBtnTitle = '导入';
-              this.$refs.upload.clearFiles();
-              this.getTableData();
-          },
-  
-        handleExcelSuccess(res, file) {
-              if (!res.code === 0 && !res.msg === 'success') {
-                  this.$message.error(res.msg);
-              }
+            const isType = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+            debugger
+            const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+            const fileType = isType || isTypeComputer;
+            debugger
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            debugger
+            if (!fileType) {
+                this.$message.error('上传文件只能是xls/xlsx格式！');
+            }
+            debugger
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+            }
+            console.log(isLt1M,"isLt1M");
+            debugger
+            return fileType && isLt1M;
         },
-        beforeExcelUpload(file) {
-              console.log(file,"file1");
-              debugger
-              const isType = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-              debugger
-              const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-              const fileType = isType || isTypeComputer;
-              debugger
-              const isLt1M = file.size / 1024 / 1024 < 10;
-              debugger
-              if (!fileType) {
-                  this.$message.error('上传文件只能是xls/xlsx格式！');
-              }
-              debugger
-              if (!isLt1M) {
-                  this.$message.error('上传文件大小不能超过 10MB!');
-              }
-              console.log(isLt1M,"isLt1M");
-              debugger
-              return fileType && isLt1M;
-          },
-        handleDel(row) {
-          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            console.log(row,"row");
-        let url="/voluntary/volunteerOrg/delete";
-        let params={
-          id:row.id
+      handleDel(row) {
+        this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log(row,"row");
+      let url="/voluntary/volunteerOrg/delete";
+      let params={
+        id:row.id
+      }
+      requestPost(
+      url,params
+      ).then(({data}) => {
+        if (data && data.code === 0) {
+          this.$message({
+            message: '删除成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {
+            }
+          })
+          this.getTableData()
+        } else {
+          this.$message.error(data.msg)
         }
-        requestPost(
-        url,params
-        ).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$message({
-              message: '删除成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-              }
-            })
-            this.getTableData()
-          } else {
-            this.$message.error(data.msg)
-          }
+      })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });
         })
-          }).catch(() => {
-            this.$message({
-              type: 'info',
-              message: '已取消删除'
-            });
-          })
 
 
 
 
-         
-        },
-        diaClose(){
-          this.formShow=false
-        },
-        resetSearch(){
-          this.formData=[]
-          this.getTableData()
-        },
-        handleDetail(row){
-          console.log(row,"row");
-          this.showInfo=true
-          this.fmData=row
-  
-        },
-        summDetailClose(){
-            this.showAdd=false
-          this.getTableData()
-        },
-        async handleExportModule() {
-          let url = "/voluntary/volunteerOrg/downloadImportTemplate";
-          let params = {};
-          await this.$http({
-            method: "GET",
-            url,
-            responseType: "blob",
-            data: params,
+       
+      },
+      diaClose(){
+        this.formShow=false
+      },
+      resetSearch(){
+        this.formData=[]
+        this.getTableData()
+      },
+      handleDetail(row){
+        console.log(row,"row");
+        this.showInfo=true
+        this.fmData=row
+
+      },
+      summDetailClose(){
+          this.showAdd=false
+        this.getTableData()
+      },
+      async handleExportModule() {
+        let url = "/voluntary/volunteerOrg/downloadImportTemplate";
+        let params = {};
+        await this.$http({
+          method: "GET",
+          url,
+          responseType: "blob",
+          data: params,
+        })
+          .then((res) => {
+            console.log(res,"resskfk");
+            
+            if (res.headers["content-disposition"]) {
+              let fileName = window.decodeURI(
+                res.headers["content-disposition"].split(";")[1].split("=")[1]
+              );
+              console.log("filename", fileName);
+              let blob = new Blob([res.data], {
+                type: "application/vnd.ms-excel",
+              });
+              var url = window.URL.createObjectURL(blob);
+              var aLink = document.createElement("a");
+              aLink.style.display = "none";
+              aLink.href = url;
+              aLink.setAttribute("download", fileName);
+              document.body.appendChild(aLink);
+              aLink.click();
+              document.body.removeChild(aLink); //下载完成移除元素
+              window.URL.revokeObjectURL(url); //释放掉blob对象
+            } else this.$message.error("下载失败");
           })
-            .then((res) => {
-              console.log(res,"resskfk");
-              
-              if (res.headers["content-disposition"]) {
-                let fileName = window.decodeURI(
-                  res.headers["content-disposition"].split(";")[1].split("=")[1]
-                );
-                console.log("filename", fileName);
-                let blob = new Blob([res.data], {
-                  type: "application/vnd.ms-excel",
-                });
-                var url = window.URL.createObjectURL(blob);
-                var aLink = document.createElement("a");
-                aLink.style.display = "none";
-                aLink.href = url;
-                aLink.setAttribute("download", fileName);
-                document.body.appendChild(aLink);
-                aLink.click();
-                document.body.removeChild(aLink); //下载完成移除元素
-                window.URL.revokeObjectURL(url); //释放掉blob对象
-              } else this.$message.error("下载失败");
-            })
-            .catch((err) => {
-              console.log("err", err);
-              return this.$message.error("网络错误");
-            });
-        },
-     
-        handleProgress(event, file, fileList) {
-          console.log("percentage", file.percentage);
-        },
-        handleSizeChange(val) {
-          console.log(`每页 ${val} 条`);
-          this.pageSize = val;
-          window.localStorage.setItem("pageSize", val);
-          this.getTableData();
-        },
-        handleCurrentChange(val) {
-          console.log(`当前页: ${val}`);
-          this.pageNo = val;
-          this.getTableData();
-        },
-        //查询
-        handleSearch(val) {
-          console.log(this.fmData);
-          this.pageNo = 1;
-          this.getTableData();
-        },
-        handleClose() {
-          this.pageType = "list";
-          this.currentProject = {
-            projectId: "",
-          };
-        },
-        handleEditSuccess() {
-          this.handleClose();
-          this.getTableData();
-        },
-  
+          .catch((err) => {
+            console.log("err", err);
+            return this.$message.error("网络错误");
+          });
       },
-    };
-    </script>
-    
-    <style lang="scss" scoped>
-    @import "@/assets/scss/modules/management/list-main.scss";
-    .g-main {
-            width: 100%;
-          }
-          .m-search {
-            background: #ffffff;
-            border-radius: 4px;
-            padding: 30px 20px 5px;
-            box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-          }
-          .item_width_1 {
-            width: 260px;
-          }
-          .item_width_2 {
-            width: 495px;
-          }
-          .m-table {
-            background: #ffffff;
-            box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-            border-radius: 4px;
-            margin-top: 15px;
-            padding: 23px 30px 10px;
-            .table {
-              margin-top: 20px;
-            }
-          }
-          .div_btn {
-            display: flex;
-            justify-content: space-between;
-          }
-          .el-row {
-            /* margin-bottom: 20px; */
-            display: flex;
-            flex-wrap: wrap;
-            margin-top: 10px;
-            margin-right: 50px;
+   
+      handleProgress(event, file, fileList) {
+        console.log("percentage", file.percentage);
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.pageSize = val;
+        window.localStorage.setItem("pageSize", val);
+        this.getTableData();
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.pageNo = val;
+        this.getTableData();
+      },
+      //查询
+      handleSearch(val) {
+        console.log(this.fmData);
+        this.pageNo = 1;
+        this.getTableData();
+      },
+      handleClose() {
+        this.pageType = "list";
+        this.currentProject = {
+          projectId: "",
+        };
+      },
+      handleEditSuccess() {
+        this.handleClose();
+        this.getTableData();
+      },
+
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  @import "@/assets/scss/modules/management/list-main.scss";
+  .g-main {
+          width: 100%;
+        }
+        .m-search {
+          background: #ffffff;
+          border-radius: 4px;
+          padding: 30px 20px 5px;
+          box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+        }
+        .item_width_1 {
+          width: 260px;
+        }
+        .item_width_2 {
+          width: 495px;
+        }
+        .m-table {
+          background: #ffffff;
+          box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+          border-radius: 4px;
+          margin-top: 15px;
+          padding: 23px 30px 10px;
+          .table {
+            margin-top: 20px;
           }
-        
-    
-    </style>
-    
\ No newline at end of file
+        }
+        .div_btn {
+          display: flex;
+          justify-content: space-between;
+        }
+        .el-row {
+          /* margin-bottom: 20px; */
+          display: flex;
+          flex-wrap: wrap;
+          margin-top: 10px;
+          margin-right: 50px;
+        }
+      
+  
+  </style>
+  
\ No newline at end of file