From 510d300851a63c59caac02898aa1ab9dbf0c4d3d 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 19:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/VolManage/integral.vue  |  11 +-
 .../modules/volunteer/activityArchive/add.vue | 233 ++++++++++--------
 .../volunteer/activityArchive/index.vue       |   6 +-
 .../volunteer/activityArchive/realselect.vue  |  36 +--
 .../volunteer/activityArchive/select.vue      |  19 +-
 .../volunteer/pointsRedemption/index.vue      |   2 +-
 .../volunteer/pointsRedemption/record.vue     |   2 +-
 .../volunteer/pointsRedemption/update.vue     |   6 +-
 8 files changed, 182 insertions(+), 133 deletions(-)

diff --git a/src/views/modules/volunteer/VolManage/integral.vue b/src/views/modules/volunteer/VolManage/integral.vue
index 8bd7a314e..2ab17a35a 100644
--- a/src/views/modules/volunteer/VolManage/integral.vue
+++ b/src/views/modules/volunteer/VolManage/integral.vue
@@ -41,7 +41,9 @@
         <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="结束时间"
+          </el-date-picker>
+          <span style="margin: 0 3px;">至</span> 
+          <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" @change="actcontrolTime">
           </el-date-picker>
         </el-form-item>
@@ -62,8 +64,13 @@
         . <el-table-column prop="operationName" header-align="center" align="center" label="名称">
         </el-table-column>
         <el-table-column prop="pointsDelta" header-align="center" align="center" label="类型">
+          <template slot-scope="scope">
+            <span v-if="scope.row.pointsDelta>0">加积分</span>
+            <span v-else>减积分</span>
+          </template>
         </el-table-column>
-        <el-table-column prop="pointsClass" header-align="center" align="center" label="积分">
+
+        <el-table-column prop="pointsDelta" header-align="center" align="center" label="积分">
         </el-table-column>
         <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间">
                 </el-table-column>
diff --git a/src/views/modules/volunteer/activityArchive/add.vue b/src/views/modules/volunteer/activityArchive/add.vue
index e0474cc15..5a89f8ef7 100644
--- a/src/views/modules/volunteer/activityArchive/add.vue
+++ b/src/views/modules/volunteer/activityArchive/add.vue
@@ -2,134 +2,159 @@
   <div>
     <div class="dialog-h-content scroll-h"
       style="display: flex; flex-direction: row; justify-content:space-between; padding: 20px;">
-      <div style="width: 48%; ">
-        <el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="90px" :rules="rules"  >
-          <el-form-item label="主办方" prop="agencyId" required>
-            <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 300px;"
-              v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
-              @change="handleChangeAgency"></el-cascader>
-          </el-form-item>
-          <el-form-item label="活动标题" prop="title" required>
-            <el-input type="textarea" style="width: 300px;" placeholder="请输入活动标题，不超过50子" v-model="formData.title" maxlength="50"
-              show-word-limit>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="活动详情" prop="content" style="display: block" required>
-            <div  style="width: 300px;">
-              <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="150" placeholder="请输入活动内容" />
-            </div>
-          </el-form-item>
-          <el-form-item label="照片" prop="activityImgs" required>
-            <div >
-              <el-upload  :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
-                :show-file-list="true" :data="{ customerId: customerId }" :file-list="formData.activityImgs"
-                :on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
-                :on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" :limit="1">
-                <i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;"></i>  </el-upload>
-            </div>
-          </el-form-item>
-
-          <el-form-item label="活动时间" prop="strTime" required >
-            <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;">
-            </el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
-              format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"style="width: 150px;"@change="actcontrolTime">
-            </el-date-picker>
-          </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"  :min="0"
-                label="描述文字" type="number"></el-input-number>
-              <el-checkbox style="margin-top: 20px;" v-model="checked">不限名额</el-checkbox>
-            </div>
-          </el-form-item>
-          <el-form-item label="活动类型" prop="type" required>
-            <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 300px;">
-              <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label=" 联系人" prop="linkman" required >
-            <el-input v-model="formData.linkman" placeholder="请输入" style="width: 300px;"></el-input>
-          </el-form-item>
-          <el-form-item label=" 联系电话" prop="linkMobile"  required>
-            <el-input v-model="formData.linkMobile" placeholder="请输入"style="width: 300px;"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div style="width: 50%;">
-        <el-form ref="ref_form" :inline="true" :model="formData"  class="form"  label-width="120px">
-
-          <div>
-            <el-form-item label="活动积分" prop="integral">
-              <el-input-number v-model="formData.points"  :min="1" :max="10"
-                label="描述文字"></el-input-number>
+      <el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="120px" :rules="rules">
+        <el-row>
+          <el-col :span="12"> <el-form-item label="主办方" prop="agencyId" required>
+              <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 250px;"
+                v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
+                @change="handleChangeAgency"></el-cascader>
             </el-form-item>
-
-            <!-- <el-form-item label="所属项目" prop="typeId" required>
-                            <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
-                                <el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
-                                    :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </el-form-item> -->
-            <el-form-item label="报名条件" prop="conditions" style="display: block">
-                <el-input type="textarea" placeholder="请输入活动标题，不超过50子" v-model="formData.conditions" maxlength="200"
-                show-word-limit style="width: 300px;">
-              </el-input>
-       
+          </el-col>
+          <el-col :span="12"> <el-form-item label="活动类型" prop="type" required>
+              <el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 250px">
+                <el-option v-for="item in  typeList" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="活动时间" prop="strTime" required>
+              <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss" style="width:195px">
+              </el-date-picker> <span style="margin: 0 10px">至</span> <el-date-picker v-model="formData.endTime"
+                type="datetime" placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
+                style="width:195px" @change="actcontrolTime">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="签到时间" prop="signInTime" required>
               <el-date-picker v-model.trim="formData.signInTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间" style="width:150px">
-              </el-date-picker>至
+                format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间" style="width:195px">
+              </el-date-picker> <span style="margin: 0 10px">至</span>
               <el-date-picker v-model.trim="formData.signOutTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间" style="width:150px" @change="controlTime ">
+                format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间" style="width:195px" @change="controlTime ">
               </el-date-picker>
             </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="活动标题" prop="title" required>
+              <el-input type="textarea" placeholder="请输入活动标题，不超过50子" :height="150"  v-model="formData.title" style="width: 1005px; "
+                maxlength="50" show-word-limit>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="活动详情" prop="content" style="display: block" required>
+              <div style="width: 1005px;">
+                <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="150" placeholder="请输入活动内容" />
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="报名条件" prop="conditions">
+              <el-input type="textarea" placeholder="请输入活动标题，不超过50子" :height="150"  v-model="formData.conditions" maxlength="200"
+                show-word-limit style="width: 1005px;">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="活动积分" prop="integral" >
+              <el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="活动名额" prop="points" required>
+              <div style="display: flex; justify-items:center; align-items: center;">
+                <el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0"
+                  label="描述文字" type="number"></el-input-number>
+                <el-checkbox style="margin-left: 20px;" v-model="checked">不限名额</el-checkbox>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="报名截止时间" prop="deadline" required>
               <el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间"
                 value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
             </el-form-item>
-
-            <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
+          </el-col>
+          <el-col :span="12">
+        <el-form-item label="活动地点" prop="searchValue" required>
+          <div style="width: 300px">
+            <el-select v-model.trim="searchValue" filterable style="width: 300px" remote :reserve-keyword="true"
+              placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
+              <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                style="width: 400px;" :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 v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
               <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
-          </div>
-          <div v-if="formData.sponsors" style="display: flex;">
+          </el-col>
+     
+          <el-col :span="12">
+            <el-form-item label="照片" prop="activityImgs" required>
+              <div>
+                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                  :show-file-list="true" :data="{ customerId: customerId }" :file-list="formData.activityImgs"
+                  :on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                  :on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" :limit="1">
+                  <i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;"></i> </el-upload>
+              </div>
+
+            </el-form-item>
+          </el-col>
+      
+          <el-col :span="12">
+            <div v-if="formData.sponsors" style="display: flex;">
             <div style="">
             <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
-              <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" >
+              <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px">
                 <el-input v-model="item.name" placeholder="请输入" style="width: 280px;"></el-input>
-                <i class="el-icon-remove-outline" @click="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i> 
+                <i class="el-icon-remove-outline" @click="removeDomain(item)"
+                  style="font-size: 20px; margin-left: 20px;"></i>
               </el-form-item>
-  
+
               <el-form-item label="联系电话" prop="sponsors">
                 <el-input v-model="item.phone" placeholder="请输入" style="width: 280px;"></el-input>
               </el-form-item>
             </div>
           </div>
-     
-            <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;" ></i>   </div>
-            <el-form-item label="活动地点" prop="searchValue"   >
-                        <div style="width: 300px">
-                            <el-select v-model.trim="searchValue" filterable style="width: 300px" remote
-                                :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
-                                :loading="loading">
-                                <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)" style="width: 400px;"
-                                    :key="item.value || index" :label="item.label" :value="item.value">
+          <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
+        </div>
+          </el-col>
+        </el-row>
+
+
+
+
+
+
+
+        <!-- <el-form-item label="所属项目" prop="typeId" required>
+                            <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
+                                <el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
+                                    :value="item.id">
                                 </el-option>
                             </el-select>
-                            <div  id="app_activity" class="div_map"></div>
-                        </div>
-                    </el-form-item>
-<!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
-     
+                        </el-form-item> -->
+
+
+
+
+
+
+        
+      </el-form>
+      <!-- <i class="el-icon-circle-plus"  @click="addDomain" style="font-size: 20px;"></i> -->
 
-        </el-form>
-      </div>
     </div>
     <div class="div_btn1">
       <el-button size="small" @click="handleCancle">取 消</el-button>
@@ -178,7 +203,7 @@ export default {
     agencyId:"",
     projectId:"",
     content:"",
-    points:10,
+    points:'',
     imgs:"",
     deadline:"",
     strTime:"",
@@ -631,6 +656,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import '@/assets/scss/modules/management/form-main.scss';
+@import '@/assets/scss/modules/management/form.scss';
+@import '@/assets/scss/modules/visual/a_customize.scss';
+
 .div_map{
   width: 300px;
   margin-top: 10px;
diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index a4499f110..e5fb9ab93 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -10,7 +10,9 @@
           <el-form-item label="活动时间">
             <el-date-picker v-model="formData.strTime" 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.endTime" type="datetime" placeholder="结束时间"format="yyyy-MM-dd HH:mm:ss"
+            </el-date-picker>       
+             <span style="margin: 0 10px">至</span>
+            <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"format="yyyy-MM-dd HH:mm:ss"
             value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
@@ -89,7 +91,7 @@
         </el-pagination>
       </div>
       <el-dialog :visible.sync="add" :close-on-click-modal="false" :close-on-press-escape="false" title="新增"
-        width="1000px" top="10vh" class="dialog-h" @closed="AddClose"  v-if="add">
+        width="1200px" top="10vh" class="dialog-h" @closed="AddClose"  v-if="add">
         <add  :list="fmData" @AddClose="AddClose" />
       </el-dialog>
       <el-dialog :visible.sync="showselect" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index dc299d7f0..61cc3ce6c 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -14,8 +14,8 @@
             {{formData.title }}
           </el-form-item>
           <el-form-item label="活动详情" prop="content" style="display: block" required>
-            <div style="width: 300px;" v-html="formData.content">
-
+            <div style="width: 300px;">
+              <span v-html="formData.content"></span>
             </div>
           </el-form-item>
           <el-form-item label="照片" prop="activityImgs" required>
@@ -34,27 +34,27 @@
               </el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
                 format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"style="width: 150px;"@change="actcontrolTime">
               </el-date-picker> -->
-            {{ formData.strTime }}至{{ formData.endTime }}
+            {{ formData.strTime }}      <span style="margin: 0 10px">至</span>{{ formData.endTime }}
           </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" label="描述文字"
+              <el-input-number disabled="false" v-model.trim="formData.quota" label="描述文字"  v-if="formData.quota!=0"
                 type="number"></el-input-number>
-              <el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio>
+              <span v-if="formData.quota==0">不限名额</span>
             </div>
           </el-form-item>
           <el-form-item label="活动类型" prop="type" required>
             <template slot-scope="scope">
               <span v-if="formData.type === 1">线上活动</span>
               <span v-if="formData.type === 2">线下活动</span>
-      </template>
+            </template>
           </el-form-item>
           <el-form-item label="活动地址" prop="address" required>
-            <el-input v-model.trim="formData.address" placeholder="请输入活动地址" style="width: 300px;"></el-input>
+            {{ formData.address }}
           </el-form-item>
           <el-form-item label="活动对象" prop="activityObject" required>
-            <template slot-scope="scope">{{ scope.row.strTime  }}至{{ scope.row.endTime }}</span>
-      </template>
+            <template slot-scope="scope">{{ scope.row.strTime }}至{{ scope.row.endTime}}
+            </template>
           </el-form-item>
           <el-form-item label=" 联系人" prop="linkman" required>
             {{ formData.linkman }}
@@ -69,7 +69,7 @@
         <el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="115px">
           <div>
             <el-form-item label="活动积分" prop="integral">
-              <el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
+              <el-input-number disabled="false" v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
             </el-form-item>
 
             <!-- <el-form-item label="所属项目" prop="typeId" required>
@@ -91,18 +91,18 @@
             </el-form-item>
 
             <el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
-              <el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
+              <el-switch disabled="false" v-model="formData.online" :active-value='1' :inactive-value='0'
                 @change="handleSwitchChange"></el-switch>
             </el-form-item>
           </div>
-          <div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
-              <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">
-             {{  item.name }}
-              </el-form-item>
-              <el-form-item label="联系电话" prop="sponsors">
+          <div v-if="formData.sponsors" v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
+            <el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">
+              {{ item.name }}
+            </el-form-item>
+            <el-form-item label="联系电话" prop="sponsors">
               {{item.phone}}
-              </el-form-item>
-            </div>
+            </el-form-item>
+          </div>
           <el-form-item label="活动地点" prop="searchValue">
             <div style="width: 300px">
               <!-- <el-select v-model.trim="searchValue" filterable style="width: 300px" remote :reserve-keyword="true"
diff --git a/src/views/modules/volunteer/activityArchive/select.vue b/src/views/modules/volunteer/activityArchive/select.vue
index 5e6529a61..5889711f8 100644
--- a/src/views/modules/volunteer/activityArchive/select.vue
+++ b/src/views/modules/volunteer/activityArchive/select.vue
@@ -32,16 +32,16 @@
           <el-form-item label="活动时间" prop="strTime" required>
             <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
               value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;">
-            </el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
+            </el-date-picker>      <span style="margin: 0 10px">至</span><el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
               format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;"
               @change="actcontrolTime">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="活动名额" prop="points" required>
+          <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" 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>
@@ -151,6 +151,7 @@ var geocoder // 新建一个正逆地址解析类
 export default {
   data () {
     return {
+      checked:false,
       loading: false,
       searchOptions: [],
       orgOptionProps: {
@@ -235,12 +236,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);
       
     }
diff --git a/src/views/modules/volunteer/pointsRedemption/index.vue b/src/views/modules/volunteer/pointsRedemption/index.vue
index 381f5f192..4aa550ffb 100644
--- a/src/views/modules/volunteer/pointsRedemption/index.vue
+++ b/src/views/modules/volunteer/pointsRedemption/index.vue
@@ -21,7 +21,7 @@
       type="datetime"
       placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
       value-format="yyyy-MM-dd HH:mm:ss">
-    </el-date-picker>至   <el-date-picker
+    </el-date-picker><span style="margin: 0 10px">至</span><el-date-picker
       v-model="formData.shelveOnTimeTo"
       type="datetime"
       placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss"
diff --git a/src/views/modules/volunteer/pointsRedemption/record.vue b/src/views/modules/volunteer/pointsRedemption/record.vue
index 0ab30cbee..052c041a5 100644
--- a/src/views/modules/volunteer/pointsRedemption/record.vue
+++ b/src/views/modules/volunteer/pointsRedemption/record.vue
@@ -13,7 +13,7 @@
                 <el-form-item label="兑换时间选择"  label-width="120px">
                     <el-date-picker v-model="searchData.redeemTimeFrom" type="datetime" placeholder="开始时间"
                         format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  style="width: 150px">
-                    </el-date-picker>至 <el-date-picker v-model="searchData.redeemTimeTo" type="datetime"
+                    </el-date-picker><span style="margin: 0 10px">至</span><el-date-picker v-model="searchData.redeemTimeTo" type="datetime"
                         placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"  style="width: 150px">
                     </el-date-picker>
                 </el-form-item>
diff --git a/src/views/modules/volunteer/pointsRedemption/update.vue b/src/views/modules/volunteer/pointsRedemption/update.vue
index 00d797014..e15ba1e5f 100644
--- a/src/views/modules/volunteer/pointsRedemption/update.vue
+++ b/src/views/modules/volunteer/pointsRedemption/update.vue
@@ -148,10 +148,14 @@
           console.log("列表请求成功！！！！！！！！！！！！！！");
           console.log(res.data, "data");
           this.formData = res.data
-          if ( this.formData.stockQty) {
+          if (this.formData.stockQty==null) {
+            this.radio='1'
+          }else{
             this.radio='2'
           }
 
+          
+
         }
       })
         // const { data, code, msg } =  requestGet(url, params)