From 0f81aa1cf96c48473d4df5488e9d1e2d23a33c63 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 18:19:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=B4=BB=E5=9C=88=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=8F=98=E4=B8=BA4=E4=B8=AA=EF=BC=8C?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=9C=A8pc=E4=B8=8A=E4=B8=8B=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/LifeCircleManagement/add.vue    | 228 ++++++++++--------
 .../volunteer/activityArchive/index.vue       |   2 +-
 2 files changed, 130 insertions(+), 100 deletions(-)

diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index ace582367..c39bec473 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue
@@ -1,33 +1,34 @@
 <template>
-  <div>
+    <div>
 
-    <div class="dialog-h-content scroll-h">
+        <div class="dialog-h-content scroll-h">
 
-      <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
-        <el-row>
-          <!-- <el-col :span="12">
+            <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-cascader    @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{ checkStrictly: true }"></el-cascader>
+                    <el-col :span="12">
+                        <el-form-item label="类型" prop="type" label-width="100px">
+                            <!-- <el-cascader    @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{ checkStrictly: true }"></el-cascader>
               <el-form-item label="类型" prop="type" label-width="100px"> -->
-              <el-cascader  v-model="this.formData.type"     @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{emitPath: false,
+                            <el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options"
+                                :disabled="showdisabled" :props="{emitPath: false,
                 multiple: false, }"></el-cascader>
-            </el-form-item>
-           
-        
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="名称" label-width="100px" prop="name">
-              <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称" :disabled="showdisabled"
-                class="u-item-width-normal"></el-input>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="12">
+                        </el-form-item>
+
+
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="名称" label-width="100px" prop="name">
+                            <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称"
+                                :disabled="showdisabled" class="u-item-width-normal"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-col :span="12">
                         <el-form-item label="组织类型" label-width="100px" prop="orgType">
                             <el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择"
                                 clearable>
@@ -37,79 +38,98 @@
                             </el-select>
                         </el-form-item>
                     </el-col> -->
-          <el-col :span="24">
-            <el-form-item label="位置" prop="searchValue" label-width="100px" style="display: block">
-              <div style="width: 634px">
-                <el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true" :disabled="showdisabled"
-                  placeholder="请输入关键词" :remote-method="remoteMethod" >
-                  <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
-                    :key="item.value || index" :label="item.label" :value="item.value">
-                  </el-option>
-                </el-select>
-                <div id="app_activity" class="div_map"></div>
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系人" prop="linkman" label-width="100px">
-              <el-input v-model.trim="formData.linkman" size="small" clearable placeholder="请输入联系人" :disabled="showdisabled"
-                class="u-item-width-normal"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="linkPhone" label-width="100px">
-              <el-input v-model.trim="formData.linkPhone" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
-                class="u-item-width-normal"></el-input>
-            </el-form-item>
-          </el-col> 
-          <el-col :span="12">
-            <!-- <div v-if="formData.tags" style="display: flex; "> -->
+                    <el-col :span="24">
+                        <el-form-item label="位置" prop="searchValue" label-width="100px" style="display: block">
+                            <div style="width: 634px">
+                                <el-select v-model.trim="searchValue" filterable style="width: 634px" remote
+                                    :reserve-keyword="true" :disabled="showdisabled" placeholder="请输入关键词"
+                                    :remote-method="remoteMethod">
+                                    <el-option v-for="(item, index) in searchOptions"
+                                        @click.native="handleClickKey(index)" :key="item.value || index"
+                                        :label="item.label" :value="item.value">
+                                    </el-option>
+                                </el-select>
+                                <div id="app_activity" class="div_map"></div>
+                            </div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系人" prop="linkman" label-width="100px">
+                            <el-input v-model.trim="formData.linkman" size="small" clearable placeholder="请输入联系人"
+                                :disabled="showdisabled" class="u-item-width-normal"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="联系电话" prop="linkPhone" label-width="100px">
+                            <el-input v-model.trim="formData.linkPhone" size="small" clearable placeholder="请输入手机号"
+                                :disabled="showdisabled" class="u-item-width-normal"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-col :span="12">
+            <div  style="display: flex; ">
               <div >
-                <!-- <div v-for="(item, index) in formData.tags" :label="index" :key="item.name" :prop=index style="display: flex;">
-                -->
+                <div v-for="(item, index) in formData.tags" :label="index" :key="item.name" :prop=index style="display: flex;">
                 <el-form-item label="标签" prop="tags" label-width="100px" >
                     <el-input :disabled="showdisabled" v-model="formData.tags" placeholder="请输入(最多添加四个)"  lass="u-item-width-normal"></el-input>
       </el-form-item>
-                  <!-- <div  v-if="index > 0"  @click="removeDomain(item)" style="color: blue; font-size: 12px;  margin-top: 15px">删除
-                  </div> -->
-                <!-- </div> -->
-              <!-- </div> -->
-              <!-- <div  @click="addDomain" style="color: blue; font-size: 12px;  margin-top: 15px">添加
-                </div> -->
-              <!-- <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i> -->
-            </div>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="展示图片" label-width="100px" prop="attrs">
-              <template>
-                <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" v-if="!showdisabled"
-                  @file-removed="removedImg"></upload-image>
-                  <div v-else>
-                  <img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
+                  <div  v-if="index > 0"  @click="removeDomain(item)" style="color: blue; font-size: 12px;  margin-top: 15px">删除
+                  </div>
                 </div>
-              </template>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="营业时间" label-width="100px" prop="workTime">
-              <el-input v-model.trim="formData.workTime" size="small" clearable placeholder="请输入营业时间" :disabled="showdisabled"
-                class="u-item-width-normal"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="备注" label-width="100px" prop="beiremarkzhu">
-              <el-input v-model.trim="formData.remark" size="small" clearable placeholder="请输入备注" :disabled="showdisabled"
-                class="u-item-width-normal"></el-input>
-            </el-form-item>
-          </el-col>
-          <!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
+              </div>
+              <div  @click="addDomain" style="color: blue; font-size: 12px;  margin-top: 15px">添加
+                </div>
+              <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
+            </div>
+          </el-col> -->
+                    <el-col :span="12">
+                        <div v-if="formData.tags1" style="display: flex;">
+                            <div>
+                                <div v-for="(item, index) in formData.tags1" :key="item.name + index"
+                                    style="display: flex;">
+                                    <el-form-item label="标签" prop="tags1" label-width="100px">
+                                        <el-input :disabled="showdisabled" v-model="item.tab" placeholder="请输入(最多添加四个)"
+                                            class="u-item-width-normal"></el-input>
+                                    </el-form-item>
+                                    <div v-if="index > 0" @click="removeDomain(index)"
+                                        style="color: blue; font-size: 12px; margin-top: 15px">
+                                        删除
+                                    </div>
+                                </div>
+                            </div>
+                            <div @click="addDomain" style="color: blue; font-size: 12px; margin-top: 15px">添加</div>
+                        </div>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="展示图片" label-width="100px" prop="attrs">
+                            <template>
+                                <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
+                                    v-if="!showdisabled" @file-removed="removedImg"></upload-image>
+                                <div v-else>
+                                    <img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
+                                </div>
+                            </template>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="营业时间" label-width="100px" prop="workTime">
+                            <el-input v-model.trim="formData.workTime" size="small" clearable placeholder="请输入营业时间"
+                                :disabled="showdisabled" class="u-item-width-normal"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="备注" label-width="100px" prop="beiremarkzhu">
+                            <el-input v-model.trim="formData.remark" size="small" clearable placeholder="请输入备注"
+                                :disabled="showdisabled" class="u-item-width-normal"></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
                         <div class="item_width_1">
                             <el-input type="textarea" autosize placeholder="请填写组织介绍"
                                 v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
                             </el-input>
                         </div>
                     </el-form-item> -->
-          <!-- 
+                    <!-- 
                     <el-form-item label="志愿品牌" prop="brand" label-width="100px" style="display: block">
                         <div class="item_width_1">
                             <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
@@ -123,15 +143,15 @@
                                 @file-removed="removedImg"></upload-image>
                         </template>
                     </el-form-item> -->
-        </el-row></el-form>
-    </div>
-    <div class="div_btn">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button size="small"  type="primary"  @click="handleComfirm">确
-        定</el-button>
+                </el-row></el-form>
+        </div>
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" @click="handleComfirm">确
+                定</el-button>
 
+        </div>
     </div>
-  </div>
 </template>
  
  <script>
@@ -357,7 +377,10 @@
               linkPhone: "",
               workTime: "",
               type: "",
-              tags: "",//标签
+              tags1: [
+                {}
+              ],
+              tags:"",//标签
               agencyId: this.$store.state.user.agencyId,
               address: "",//地址
               longitude: this.$store.state.user.longitude, //经度
@@ -443,8 +466,9 @@
       },
       //添加标签
       addDomain() {
-        if (this.formData.tags.length < 4) {
-        this.formData.tags.push(this.tableDate);
+        if (this.formData.tags1.length < 4) {
+            this.formData.tags1.push({ name: '', tab: '' });
+        
         }else{
           this.$message.error("最多添加4个标签");
         }
@@ -453,11 +477,12 @@
       //删除动态
       removeDomain(item) {
         console.log(item);
-        var index = this.formData.sponsors.indexOf(item)
-        if (index !== -1) {
-          this.formData.sponsors.splice(index, 1)
-          this.tableDate = {}
-        }
+        this.formData.tags1.splice(item, 1);
+        // var index = this.formData.sponsors.indexOf(item)
+        // if (index !== -1) {
+        //   this.formData.sponsors.splice(index, 1)
+        //   this.tableDate = {}
+        // }
       },
         validateContent() {
       // 使用正则表达式去除HTML标签后检查内容
@@ -569,7 +594,11 @@
      
    
         async handleComfirm() {
-         console.log(this.formData,"     this.formData");
+           let one=this.formData.tags1.map(item => item.tab).join(', ')
+           this.formData.tags=one;
+           console.log(this.formData,"this.formData");
+           
+        //  console.log(this.formData.tags.map(item => item.tab).join(', '),"     this.formData");
           //  if (!this.formData.type) {
           //     this.$message.error('请选择类型');
           //     return;
@@ -608,6 +637,7 @@
         },
         //增加
         async addActivity() {
+      
                 let url = '/voluntary/sphereLife/saveOrUpdate'
                 const { data, code, msg } = await requestPost(url, this.formData)
                 if (code === 0) {
@@ -750,7 +780,7 @@
                 linkman: [
                     { required: true, message: '请填写联系人', trigger: 'blur' }
                 ],
-                tags: [
+                tags1: [
                     { required: true, message: '请填写标签信息', trigger: 'blur' },
                 ],
                 attrs: [
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 82b7ce3b3..09a2010a3 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -85,7 +85,7 @@
               @click="handleDetail(scope.row)">修改</el-button>
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>
             <el-button type="text"v-if="scope.row.auditStatus === 0" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button>
-            <el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'&&scope.row.client !== 1" 
+            <el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'" 
               type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
             <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'&&scope.row.client !== 1"  type="text" style="color:#1C6AFD;"
               size="small" @click="handleupOnline(scope.row)">上线</el-button>