From e1d2099cf996b68383bc5480d395ba0d8cf8b41b 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 13:28:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=B4=BB=E5=9C=88=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=98=B5=E5=9C=B0=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E9=98=B5=E5=9C=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E6=97=B6=E5=80=99=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4=EF=BC=8C=E9=99=84=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/LifeCircleManagement/add.vue    |   8 +-
 .../volunteer/LifeCircleManagement/index.vue  | 214 +++++++++++++++++-
 .../modules/volunteer/SiteManagement/add.vue  |   8 +-
 .../modules/volunteer/SiteManagement/info.vue |  20 +-
 .../volunteer/VoluntaryOrganization/index.vue |  23 +-
 .../VoluntaryOrganization/process.vue         |  23 +-
 6 files changed, 257 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index dc3d25c69..ecdb446f9 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue
@@ -692,12 +692,12 @@
         async remoteMethod(query) {
             console.log(query, "sfsvsdv");
             if (query !== '') {
-
                 const { msg, data } = await map.searchNearby(query);
+                console.log(data,"sdl;kjfklsjfkld");
+                
                 this.resultList = []
  
                 if (msg == "success" && data.resultList && data.resultList.length > 0) {
- 
                     if (data.resultList && data.resultList.length > 0) {
                         this.resultList = data.resultList
                         console.log(this.resultList, "this.resultList");
@@ -705,6 +705,7 @@
                             return { value: `${item.id}`, label: `${item.address + item.title}` };
  
                         });
+                        
                         console.log(this.searchOptions, "this.searchOptions");
                     }
                 } else {
@@ -727,7 +728,10 @@
             map.setMarker(lonlat[1], lonlat[0]);
             this.formData.latitude = lonlat[1];
             this.formData.longitude = lonlat[0];
+            this.formData.address = selPosition.address + selPosition.name
             this.searchValue = selPosition.address + selPosition.name
+            console.log(this.formData.latitude, this.formData.longitude, "this.formData.latitude, this.formData.longitude");
+            
         },
  
 
diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue
index 0883d6bd7..5ecb48202 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/index.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/index.vue
@@ -54,7 +54,7 @@
                 <el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
                     :show-overflow-tooltip="true">
                 </el-table-column>
-                <el-table-column prop="type" header-align="center" align="center" label="类型"
+                <el-table-column prop="typeName" header-align="center" align="center" label="类型"
                     :show-overflow-tooltip="true">
                     <!-- <template slot-scope="scope">
         <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
@@ -127,6 +127,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": "其它"
+        }
+    ],
             formTitle:"",
             formData: {
                 name:"",
@@ -273,6 +449,26 @@ export default {
             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");
+  
+              item1.children.forEach(item2=>{
+                  if (item2.value==item.type) {
+                    item.typeName=item2.label
+                }else{
+                  item.typeName="其他"
+                }
+                })
+         
+      
+              }
+              )
+            })
+            console.log(this.tableData,"this.tableDatadsfdsf");
+            
           } else {
           }
         },
@@ -373,7 +569,14 @@ export default {
               return fileType && isLt1M;
           },
         handleDel(row) {
-          console.log(row, "row");
+          
+          this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+
+            console.log(row, "row");
           let url = "/voluntary/sphereLife/delete";
           let params = [String(row.id)];
           axios.delete(this.processUrl(url), { data: params })
@@ -389,6 +592,13 @@ export default {
               console.error("删除失败", error);
               this.$message.error("删除失败，请稍后重试");
             });
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消删除'
+            });
+          })
+        
         },
         diaClose(){
           this.formShow=false
diff --git a/src/views/modules/volunteer/SiteManagement/add.vue b/src/views/modules/volunteer/SiteManagement/add.vue
index b8ac7b3af..bce38ee7d 100644
--- a/src/views/modules/volunteer/SiteManagement/add.vue
+++ b/src/views/modules/volunteer/SiteManagement/add.vue
@@ -5,12 +5,6 @@
 
             <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
                 <el-row>
-                    <!-- <el-col :span="12">
-                        <el-form-item label="所属组织" prop="agencyName" label-width="100px">
-                            <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入组织名称"
-                                :disabled="true" class="u-item-width-normal"></el-input>
-                        </el-form-item>
-                    </el-col> -->
                     <el-col :span="12">
                         <el-form-item label="类型" prop="type" label-width="100px">
                             <el-select  :disabled="showdisabled" v-model="formData.type" placeholder="请选择" clearable class="u-item-width-normal">
@@ -119,7 +113,7 @@
                       { value: 1, label: "实践点" },
                       { value: 2, label: "其它" },
 
-                  ],
+                ],
               formData:
               {
                 agencyName:"",
diff --git a/src/views/modules/volunteer/SiteManagement/info.vue b/src/views/modules/volunteer/SiteManagement/info.vue
index 016fb19a1..473aad301 100644
--- a/src/views/modules/volunteer/SiteManagement/info.vue
+++ b/src/views/modules/volunteer/SiteManagement/info.vue
@@ -10,12 +10,13 @@
                                 :disabled="true" class="u-item-width-normal"></el-input>
                         </el-form-item>
                      -->
-                        <el-form-item label="类型" prop="type" label-width="100px">
+                        <el-form-item label="类型" prop="typeName" label-width="100px">
                             <!-- <el-select  :disabled="showdisabled" v-model="formData.type" placeholder="请选择" clearable class="u-item-width-normal">
                             <el-option  :disabled="showdisabled" class="u-item-width-normal" v-for="item in formData.optionstype" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
                         </el-select> -->
+                        <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="请输入名称"
@@ -34,7 +35,7 @@
                         </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">
@@ -78,6 +79,12 @@
    export default {
       data() {
           return {
+            optionstype: [
+                      { value: 0, label: "实践站" },
+                      { value: 1, label: "实践点" },
+                      { value: 2, label: "其它" },
+
+                ],
               formData:
               {
                 agencyName:"",
@@ -137,10 +144,19 @@
             requestGet(url).then((res) => {
               console.log(res);
               if (res.code == 0) {
+                this.optionstype.forEach((item) => {
+                  if (item.value == res.data.type) {
+                    res.data.typeName = item.label;
+                    console.log(res.data,"res.data.typeName");
+                    
+                  }
+                });
+                
                   this.formData = res.data
                   this.fileList=[{fileUrl:res.data.attrs[0].url}]
                   console.log(this.formData,"this.formData");
                   
+                  
               } else {
                   this.$message.error(res.msg)
               }
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/index.vue b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
index 274d43313..f3fda3e2a 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/index.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/index.vue
@@ -89,7 +89,7 @@
                     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="新增"
+            <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>
@@ -132,6 +132,7 @@ export default {
 
     data() {
         return {
+          titleName:"",
           ids:"",
             formData: {
                 orgName: "",
@@ -203,23 +204,25 @@ export default {
         },
         //修改
         handleEdit(row) {
+          this.titleName = "修改"
           this.showAdd = true,
             this.$nextTick(() => {
               this.$refs.ref_form.initForm("edit", row.id);
             });
-            console.log(row,this.EditList,"row");
+          console.log(row, this.EditList, "row");
         },
         //关闭修改
-        showEditClose(){
-            this.showEdit=false
-            this.getTableData()
+        showEditClose() {
+          this.showEdit = false
+          this.getTableData()
         },
         //新增
-        handleAdd(){
-            this.showAdd=true
-            this.$nextTick(() => {
-        this.$refs.ref_form.initForm("add", null);
-      });
+        handleAdd() {
+          this.titleName = "新增"
+          this.showAdd = true
+          this.$nextTick(() => {
+            this.$refs.ref_form.initForm("add", null);
+          });
         },
         //关闭新增
         showAddClose(){
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/process.vue b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
index e3f893117..7d152dce4 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/process.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="height: 600px; overflow-y: scroll;">
+  <div class="dialog-h-content scroll-h">
     <div style="display: flex;white-space: nowrap;  padding: 30px;">
       <el-form style="padding-left: 150px;">
         <el-form-item label="组织名称">
@@ -33,7 +33,7 @@
         <el-form-item label="组织介绍">
           {{ tableData.introduction}}
         </el-form-item>
-        <el-form-item label="附件">
+        <el-form-item label="附件" v-if="tableData.qualification">
           <div class="demo-image__preview" v-if="tableData.qualification" >
             <el-image style="width: 100px; height: 100px" :src="tableData.qualification" :preview-src-list="tableData.qualificationList">
             </el-image>
@@ -50,7 +50,7 @@
           </div>
           <!-- {{ tableData.address}} -->
         </el-form-item>
-        <el-form-item label="申请时间">
+        <el-form-item v-if="editNum" label="申请时间">
           {{tableData.updatedTime}}
         </el-form-item>
         <el-form-item label="志愿品牌" v-if="tableData.brand">
@@ -61,34 +61,21 @@
             <img v-if="tableData.brandImg" style="width: 100px; height: 100px" :src="tableData.brandImg">
             </img>
           </div>
-          <!-- {{ tableData.address}} -->
         </el-form-item>
         <el-form-item label="审核结果">
-          <!-- <div style="display: flex; justify-items:center; align-items: center;">
-                <el-radio v-model="status1" label="pass" style="margin-right:20px">通过</el-radio>
-               <div class="flex flex-x  flex-center2">
-                  <el-radio v-model="status1" label="notPass" style="margin-right: 10px;">不通过</el-radio>
-                  <el-input aria-hidden="true" v-if="status1 == 'notPass'" type="number" v-model="reason" style="width: 200px;"
-                     placeholder="请说明原因"></el-input>
-               </div>
-         
-              </div> -->
           <template>
             <el-select v-model="findingsofaudit" placeholder="请选择">
               <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
                 :disabled="item.disabled">
               </el-option>
             </el-select>
-
           </template>
-
         </el-form-item>
         <el-form-item label="原因" v-if="findingsofaudit == 'notPass'">
           <el-input v-if="findingsofaudit == 'notPass'" v-model="reason" style="width: 200px;"
             placeholder="请说明原因"></el-input>
         </el-form-item>
       </el-form>
-
     </div>
     <div class="div_btn">
       <!-- <div style="display: flex;  margin-bottom: 20px;     margin-left: 75px;"> 
@@ -124,6 +111,7 @@ export default {
    name: "see",
     data() {
     return {
+      editNum:false,
       options:[
         {
           value: 'pass',
@@ -150,6 +138,9 @@ export default {
   },
   created() {
     console.log(this.VolunteerList,"list");
+    if(this.VolunteerList.editNum==0){
+     this.editNum=true
+    }
     // this.tableData=this.VolunteerList
     // this.awardId=this.list.id
     this.getTableData()