From a422b902884e55574d45594b8386be5a09635aa5 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: Thu, 29 Aug 2024 16:07:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E9=A2=9D=E4=B8=BA0=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E9=99=90=E9=A2=9D=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/VolManage/activeRecord.vue      | 30 ++++--------
 .../modules/volunteer/VolManage/index.vue     | 28 +++++------
 .../modules/volunteer/VolManage/integral.vue  | 49 ++++++++-----------
 .../modules/volunteer/activityArchive/add.vue | 39 +++++++++------
 .../volunteer/activityArchive/index.vue       | 20 ++++----
 .../volunteer/activityArchive/realselect.vue  | 12 ++++-
 .../volunteer/pointsRedemption/index.vue      |  2 +-
 7 files changed, 89 insertions(+), 91 deletions(-)

diff --git a/src/views/modules/volunteer/VolManage/activeRecord.vue b/src/views/modules/volunteer/VolManage/activeRecord.vue
index 8951a0a70..4c46c085a 100644
--- a/src/views/modules/volunteer/VolManage/activeRecord.vue
+++ b/src/views/modules/volunteer/VolManage/activeRecord.vue
@@ -1,21 +1,9 @@
 <template>
-  <div class="g-main ">
+  <div class="g-main"style="padding: 30px;">
     <div class="">
-      <!-- <div class="flex flex-center1 flex-center2 ">
-        <div>活动查询：</div>
-        <el-input placeholder="请输入内容" v-model="SearchForm.content" style="width: 200px" clearable>
-        </el-input>
-      </div>
-      <div class="flex" style="align-items: center;">
-        <div>状态：</div>
-        <el-select v-model="SearchForm.Stutas" placeholder="请选择" clearable>
-          <el-option v-for="item in optionsStatus" :key="item.value" :label="item.label" :value="item.value" >
-          </el-option>
-        </el-select>
-      </div> -->
       <el-form :inline="true" :model="SearchForm" class="demo-form-inline" style="">
         <el-form-item label="活动查询">
-          <el-input placeholder="请输入内容" v-model="SearchForm.content" style="width: 150px" clearable>
+          <el-input placeholder="请输入内容" v-model="SearchForm.content"  clearable>
           </el-input>
         </el-form-item>
         <el-form-item label="状态" label-width="80px">
@@ -30,21 +18,21 @@
       </el-form>
 
     </div>
-    <div class="m-bot50">
-      <el-table class="table" :data="tableData" border style="width: 700px">
+    <div >
+      <el-table  :data="tableData" border >
         <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
 
-        <el-table-column prop="agencyName" header-align="center" align="center" label="主办方">
+        <el-table-column prop="agencyName" header-align="center" align="center" label="主办方" :show-overflow-tooltip="true">
 
         </el-table-column>
-        <el-table-column prop="address" header-align="center" align="center" label="活动地点">
+        <el-table-column prop="address" header-align="center" align="center" label="活动地点" :show-overflow-tooltip="true">
 
         </el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="活动标题">
+        <el-table-column prop="title" header-align="center" align="center" label="活动标题" :show-overflow-tooltip="true">
         </el-table-column>
-        . <el-table-column prop="strTime" header-align="center" align="center" label="活动时间">
+        . <el-table-column prop="strTime" header-align="center" align="center" label="活动时间" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="endTime" header-align="center" align="center" label="状态">
+        <el-table-column prop="statusType" 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">
diff --git a/src/views/modules/volunteer/VolManage/index.vue b/src/views/modules/volunteer/VolManage/index.vue
index 1d09533a4..103fd43c5 100644
--- a/src/views/modules/volunteer/VolManage/index.vue
+++ b/src/views/modules/volunteer/VolManage/index.vue
@@ -23,7 +23,7 @@
       </el-form>
     </div>
     <div class="m-table">
-      <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</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"
@@ -31,29 +31,29 @@
           :http-request="uploadHttpRequest">
           导入
         </el-upload>
-      </el-button>
+      </el-button> -->
       <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
-        <el-table-column label="序号" header-align="center" align="center" type="index"></el-table-column>
-        <el-table-column prop="agencyName" header-align="center" align="center" label="所属社区">
+        <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="nickName" header-align="center" align="center" label="昵称">
+        <el-table-column prop="nickName" 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="name" header-align="center" align="center" label="姓名">
+        <el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="identityTypeNames" header-align="center" align="center" label="身份信息">
+        <el-table-column prop="identityTypeNames" header-align="center" align="center" label="身份信息" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="mobile" header-align="center" align="center" label="手机号">
+        <el-table-column prop="mobile" header-align="center" align="center" label="手机号" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="idCard" header-align="center" align="center" label="身份证号">
+        <el-table-column prop="idCard" header-align="center" align="center" label="身份证号" :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="createdTime" header-align="center" align="center" label="注册时间">
+        <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="积分">
+        <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="活动次数">
+        <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">
@@ -70,11 +70,11 @@
         </el-pagination>
       </div>
       <el-dialog :visible.sync="Record" :close-on-click-modal="false" :close-on-press-escape="false" title="活动记录"
-        width="750px" top="10vh" class="dialog-h"  @closed="summDetailClose">
+        width="1000px" top="10vh" class="dialog-h"  @closed="summDetailClose">
         <Record v-if="Record" :list="fmData" @summDetailClose="summDetailClose" />
       </el-dialog>
       <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
-        width="750px" top="10vh" class="dialog-h">
+        width="1000px" top="10vh" class="dialog-h">
         <see v-if="formShow" :list="fmData"  />
       </el-dialog>
       <el-dialog :visible.sync="integral" :close-on-click-modal="false" :close-on-press-escape="false" title="积分调整"
diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index 435d90c78..15c0d76a5 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -30,42 +30,26 @@
           label="描述文字"></el-input-number>
       </el-form-item>
     </el-form> -->
-    <div class="flex flex-wrap flex-end">
-      <div class="flex flex-center1 flex-center2 m-bottom10  " style="">
-        <div>积分类型</div>
-        <el-select v-model="formData.classKey" placeholder="请选择" clearable>
+    <el-form :inline="true" :model="SearchForm" class="demo-form-inline" style="">
+        <el-form-item label="积分类型">
+          <el-select v-model="formData.classKey" placeholder="请选择" clearable>
                 <el-option v-for="item in formData.optionsStatus" :key="item.code" :label="item.name"
                   :value="item.code">
                 </el-option>
               </el-select>
-      </div>
-      <div class="flex flex-center1 flex-center2 m-bottom10" style="">
-        <div>积分时间</div>
-          <div>
+        </el-form-item>
+        <el-form-item label="积分时间" label-width="100px">
             <el-date-picker v-model="formData.createdTimeFrom" type="datetime" placeholder="开始时间"
             format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
           </el-date-picker>至 <el-date-picker v-model="formData.createdTimeTo" type="datetime" placeholder="结束时间"
-            format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+            format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" @change="actcontrolTime">
           </el-date-picker>
-          </div>
-      </div>
-      <!-- <div class="flex flex-center1 flex-center2 m-bottom10" style="">
-                <div>状态：</div>
-                <el-select v-model="StatusName" placeholder="请选择">
-                    <el-option v-for="item in Status" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
-
-            </div>
-            <div class="flex flex-center1 flex-center2 m-bottom10" style="">
-                <div>兑换时间选择：</div>
-                <el-date-picker v-model="ExchangeTime" type="date" placeholder="选择日期">
-                </el-date-picker>
-            </div> -->
-      <div>
-        <el-button type="primary" class="m-bottom10" @click="handleSearch">查询</el-button>
-      </div>
-    </div>
+        </el-form-item>
+        </el-form>
+        <div  style="display: flex; justify-content: flex-end; margin-bottom: 10px;">
+          <el-button type="primary" @click="handleSearch">查询</el-button>
+        </div>
+      
     <div >
       <el-table :data="tableData" border     height="250"      >
         <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
@@ -163,6 +147,15 @@ export default {
   
   },
   methods: {
+          //控制活动时间
+          actcontrolTime(){
+      console.log("dislfj");
+        if(this.formData.createdTimeFrom>this.formData.createdTimeTo){
+          this.$message.error('活动结束时间不能在活动开始时间之前');
+          this.formData.createdTimeTo=''
+          return
+        }
+    },
     //查询
     handleSearch(val) {
             this.pageNo = 1;
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index 84deec308..f024352d4 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -38,9 +38,9 @@
           </el-form-item>
           <el-form-item label="活动名额" prop="points" required>
             <div style="display: flex; flex-direction: column;">
-              <el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" 
+              <el-input-number   :disabled="formData.notQuota =='0'" v-model.trim="formData.quota"  :min="0"
                 label="描述文字" type="number"></el-input-number>
-              <el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio>
+              <el-checkbox style="margin-top: 20px;" v-model="checked">不限名额</el-checkbox>
             </div>
           </el-form-item>
           <el-form-item label="活动类型" prop="type" required>
@@ -156,6 +156,7 @@ var geocoder // 新建一个正逆地址解析类
 export default {
   data () {
     return {
+      checked:false,
       loading: false,
       searchOptions: [],
       orgOptionProps: {
@@ -186,7 +187,7 @@ export default {
     signOutTime:"",
     quota:'',
     conditions:"",
-    notQuota:'',
+    notQuota:1,
     linkman:"",
     linkMobile:"",
     address:"",
@@ -244,12 +245,18 @@ export default {
     }
   },
   watch: {
-    'formData.notQuota'(newValue) {
+    'checked'(newValue) {
       console.log(newValue,'newvalue');
       // 当 notQuota 变为 '0' 时，清空 quota
-      if (newValue === '0') {
-        this.formData.quota = '';
+      //不限为0，限为1
+      if (newValue) {
+        this.formData.quota = 0;
+        this.formData.notQuota=0
+
+      }else{
+        this.formData.notQuota=1
       }
+
       console.log( this.formData.quota);
       
     }
@@ -356,17 +363,17 @@ export default {
       }
       console.log(parms,"parms");
       
-      await requestPost(url,parms).then((res)=>{
-        console.log(res,"res");
-        if (res.code==0) {
-          this.$message.success('添加成功');
-          this.$emit('AddClose')
-          // this.$router.push({path:'/volunteer/activityArchive'})
-        }else{
-          this.$message.error(res.msg);
-        }
+      // await requestPost(url,parms).then((res)=>{
+      //   console.log(res,"res");
+      //   if (res.code==0) {
+      //     this.$message.success('添加成功');
+      //     this.$emit('AddClose')
+      //     // this.$router.push({path:'/volunteer/activityArchive'})
+      //   }else{
+      //     this.$message.error(res.msg);
+      //   }
         
-      })
+      // })
     },
     addDomain() {
       console.log(this.formData.sponsors,this.tableDate,);
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index c4520e6e0..a4499f110 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -35,34 +35,34 @@
     <div class="m-table">
       <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
       <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
-        <el-table-column label="序号" header-align="center" align="center" type="index"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="活动标题">
+        <el-table-column label="序号" header-align="center" align="center" type="index"  width="80"></el-table-column>
+        <el-table-column prop="title" header-align="center" align="center" label="活动标题"  :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="address" header-align="address" align="center" label="活动地点"></el-table-column>
-        <el-table-column prop="strTime" header-align="center" align="center" label="活动时间">
+        <el-table-column prop="address" header-align="address" align="center" label="活动地点"  :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="strTime" header-align="center" align="center" label="活动时间"  :show-overflow-tooltip="true">
                     <template slot-scope="scope">
         <span>{{ scope.row.strTime  }}至{{ scope.row.endTime }}</span>
       </template>
       
         </el-table-column>
-        <el-table-column prop="deadline" header-align="center" align="center" label="报名截止时间">
+        <el-table-column prop="deadline" header-align="center" align="center" label="报名截止时间"  :show-overflow-tooltip="true">
   
         </el-table-column>
-        <el-table-column prop="agencyName" header-align="center" align="center" label="主办方">
+        <el-table-column prop="agencyName" header-align="center" align="center" label="主办方"  :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="updatedTime" header-align="center" align="center" label="发布时间">
+        <el-table-column prop="updatedTime" header-align="center" align="center" label="发布时间"  :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="statusType" header-align="center" align="center" label="状态">
+        <el-table-column prop="statusType" header-align="center" align="center" label="状态"  :show-overflow-tooltip="true">
           <!-- <template slot-scope="scope">
             <span>{{ scope.row.online === 0 ? '下线' : '上线' }}</span>
           </template> -->
         </el-table-column>
-        <el-table-column prop="Points" header-align="center" align="center" label="来源">
+        <el-table-column prop="Points" header-align="center" align="center" label="来源"  :show-overflow-tooltip="true">
           管理端
         </el-table-column>
         <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="所属项目">
         </el-table-column> -->
-        <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
+        <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate"  :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <el-button type="text" v-if="scope.row.statusType=='未发布'" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">修改</el-button>
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>
diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index 265eb47a3..dc299d7f0 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -44,7 +44,17 @@
             </div>
           </el-form-item>
           <el-form-item label="活动类型" prop="type" required>
-            {{ formData.type }}
+            <template slot-scope="scope">
+              <span v-if="formData.type === 1">线上活动</span>
+              <span v-if="formData.type === 2">线下活动</span>
+      </template>
+          </el-form-item>
+          <el-form-item label="活动地址" prop="address" required>
+            <el-input v-model.trim="formData.address" placeholder="请输入活动地址" style="width: 300px;"></el-input>
+          </el-form-item>
+          <el-form-item label="活动对象" prop="activityObject" required>
+            <template slot-scope="scope">{{ scope.row.strTime  }}至{{ scope.row.endTime }}</span>
+      </template>
           </el-form-item>
           <el-form-item label=" 联系人" prop="linkman" required>
             {{ formData.linkman }}
diff --git a/src/views/modules/volunteer/pointsRedemption/index.vue b/src/views/modules/volunteer/pointsRedemption/index.vue
index 74fa337a8..381f5f192 100644
--- a/src/views/modules/volunteer/pointsRedemption/index.vue
+++ b/src/views/modules/volunteer/pointsRedemption/index.vue
@@ -43,7 +43,7 @@
       <div class="m-table">
         <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
         <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
-          <el-table-column label="序号" header-align="center" align="center" type="index"></el-table-column>
+          <el-table-column label="序号" header-align="center" align="center" type="index" width="80"> </el-table-column>
           <el-table-column prop="redeemerOrgName" header-align="center" align="center" label="发布区域">
           </el-table-column>
           <el-table-column prop="className" header-align="center" align="center" label="分类">