优化

src/views/modules/activity/add.vue

@@ -28,14 +28,14 @@
                     <el-form-item label="活动名称" prop="activityName">
                         <el-input v-model="basicForm.activityName" placeholder="请输入活动名称"></el-input>
                     </el-form-item>
-                    <el-form-item label="报名时间" prop="signupStartEnd">
+                    <el-form-item label="报名时间" prop="signupEndTime">
                       <div class="adfac">
                         <el-date-picker v-model="basicForm.signupStartTime" @change="e=>handleSignupDateChange(e,'signupStartTime')" type="datetime" format="yyyy-MM-dd HH:mm" placeholder="年/月/日 - -:- -" style="width: 180px;"></el-date-picker>
                         <span style="margin: 0 10px;">至</span>
                         <el-date-picker v-model="basicForm.signupEndTime" @change="e=>handleSignupDateChange(e,'signupEndTime')" type="datetime" format="yyyy-MM-dd HH:mm" placeholder="年/月/日 - -:- -" style="width: 180px;"></el-date-picker>
                       </div>
                     </el-form-item>
-                    <el-form-item label="活动时间" prop="activityStartEnd">
+                    <el-form-item label="活动时间" prop="activityEndTime">
                       <div class="adfac">
                         <el-date-picker v-model="basicForm.activityStartTime" @change="e=>handleActivityDateChange(e,'activityStartTime')" type="datetime" format="yyyy-MM-dd HH:mm" placeholder="年/月/日 - -:- -" style="width: 180px;"></el-date-picker>
                         <span style="margin: 0 10px;">至</span>
@@ -244,10 +244,10 @@ export default {
         activityName: [
           { required: true, message: '请输入活动名称', trigger: 'blur' }
         ],
-        signupStartEnd: [
+        signupEndTime: [
           { required: true, message: '请选择报名时间', trigger: 'change' }
         ],
-        activityStartEnd: [
+        activityEndTime: [
           { required: true, message: '请选择活动时间', trigger: 'change' }
         ],
         provinceId: [
@@ -394,12 +394,12 @@ export default {
     },
     getTypeOptions () {
       this.$http.get('/core/activity/type/page', { params: { page: 1, limit: -1 } }).then(res => {
-        this.typeOptions = res.data.data.list || []
+        this.typeOptions = res.data.data.list.filter(l => l.enable === 1) || []
       })
     },
     getCategoryOptions () {
       this.$http.get('/core/activity/category/page', { params: { page: 1, limit: -1 } }).then(res => {
-        this.categoryOptions = res.data.data.list || []
+        this.categoryOptions = res.data.data.list.filter(l => l.enable === 1) || []
       })
     },
     getSupplierOptions () {
@@ -502,6 +502,7 @@ export default {
       this.$refs.basicRef.validate(valid => {
         if (valid) {
           if (Date.parse(this.basicForm.signupStartTime) > Date.parse(this.basicForm.signupEndTime)) return this.$message.error('报名结束时间不能小于报名开始时间')
+          if (Date.parse(this.basicForm.signupEndTime) < Date.parse(new Date())) return this.$message.error('报名结束时间不能小于当前时间')
           if (Date.parse(this.basicForm.signupEndTime) > Date.parse(this.basicForm.activityStartTime)) return this.$message.error('活动开始时间不能小于报名结束时间')
           if (Date.parse(this.basicForm.activityStartTime) > Date.parse(this.basicForm.activityEndTime)) return this.$message.error('活动结束时间不能小于活动开始时间')
           if (!this.basicForm.coverFile) return this.$message.error('请上传活动列表图片')

src/views/modules/activity/classify.vue

@@ -18,16 +18,16 @@
           <el-table :data="dataList" border cell-class-name="vertical-top-cell" v-loading="loading" empty-text="暂无活动分类" style="margin-top: 12px;">
             <el-table-column prop="categoryName" label="分类名称"></el-table-column>
             <el-table-column prop="categoryNo" label="分类编码"></el-table-column>
-            <el-table-column prop="enable" label="状态">
+            <!-- <el-table-column prop="enable" label="状态">
               <template #default="scope">
                 <div>{{ scope.row.enable?'启用':'停用' }}</div>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="操作" width="250">
                 <template #default="scope">
                     <el-button link type="text" @click="handleEdit(scope.row)" v-if="$hasPermission('core:activitycategory:update')">编辑</el-button>
-                    <el-button link type="text" @click="handleOpenClose(scope.row,1)" v-if="$hasPermission('core:activitycategory:openClose')&&scope.row.enable==0">启用</el-button>
-                    <el-button link type="text" @click="handleOpenClose(scope.row,0)" v-if="$hasPermission('core:activitycategory:openClose')&&scope.row.enable==1">停用</el-button>
+                    <!-- <el-button link type="text" @click="handleOpenClose(scope.row,1)" v-if="$hasPermission('core:activitycategory:openClose')&&scope.row.enable==0">启用</el-button>
+                    <el-button link type="text" @click="handleOpenClose(scope.row,0)" v-if="$hasPermission('core:activitycategory:openClose')&&scope.row.enable==1">停用</el-button> -->
                     <el-button link type="text" @click="handleDelete(scope.row)" v-if="$hasPermission('core:activitycategory:delete')">删除</el-button>
                 </template>
             </el-table-column>
@@ -41,10 +41,10 @@
           <el-form-item label="分类编码" prop="categoryNo">
             <el-input v-model="form.categoryNo" placeholder="请输入分类编码"></el-input>
           </el-form-item>
-          <el-form-item label="状态" prop="enable">
+          <!-- <el-form-item label="状态" prop="enable">
             <el-radio v-model="form.enable" :label="1">启用</el-radio>
             <el-radio v-model="form.enable" :label="0">停用</el-radio>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <div class="demo-drawer__footer" style="display: flex;justify-content: end;margin-top: 300px;">
           <el-button :loading="buttonLoading" type="primary" @click="submitForm">保 存</el-button>
@@ -102,6 +102,7 @@ export default {
     handleAdd () {
       this.title = '新增活动分类'
       this.show = true
+      this.form.categoryNo = 'HDFL' + (this.dataList.length + 1).toString().padStart(2, '0')
     },
     handleEdit (row) {
       this.$http.get('/core/activity/category/' + row.id).then(res => {

src/views/modules/activity/info.vue

@@ -51,7 +51,7 @@
             </div>
             <div class="title adfacjb">
                 活动报名信息
-                <el-button type="primary" @click="handleExcel">导出Excel</el-button>
+                <el-button type="primary" @click="handleExcel" v-if="$hasPermission('core:activitysignup:export')">导出Excel</el-button>
             </div>
             <el-table :data="dataList" border cell-class-name="vertical-top-cell" v-loading="loading" empty-text="暂无活动报名信息" style="margin-top: 16px;">
                 <el-table-column prop="id" label="善行少年编号" width="200"></el-table-column>

src/views/modules/activity/list.vue

@@ -63,7 +63,7 @@
               <el-table-column label="操作" width="270" fixed="right">
                   <template #default="scope">
                       <!-- <el-button link type="text" @click="handleEdit(scope.row)" v-if="scope.row.activeState!=3&&$hasPermission('core:activity:update')">编辑</el-button> -->
-                      <el-button link type="text" @click="handleEdit(scope.row)" v-if="$hasPermission('core:activity:update')">编辑</el-button>
+                      <el-button link type="text" @click="handleEdit(scope.row)" v-if="scope.row.activeState<2&&$hasPermission('core:activity:update')">编辑</el-button>
                       <el-button link type="text" @click="handleInfo(scope.row)" v-if="scope.row.activeState!=0&&$hasPermission('core:activity:info')">报名信息</el-button>
                       <el-button link type="text" @click="handleCode(scope.row)" v-if="!scope.row.signCode&&scope.row.activeState==2&&$hasPermission('core:activity:code')">生成签到码</el-button>
                       <el-button link type="text" @click="handleReviewCode(scope.row)" v-if="scope.row.signCode&&scope.row.activeState==2&&$hasPermission('core:activity:code')">查看签到码</el-button>

src/views/modules/activity/type.vue

@@ -18,16 +18,16 @@
             <el-table :data="dataList" border cell-class-name="vertical-top-cell" v-loading="loading" empty-text="暂无活动类型" style="margin-top: 12px;">
               <el-table-column prop="typeName" label="类型名称"></el-table-column>
               <el-table-column prop="typeNo" label="类型编码"></el-table-column>
-              <el-table-column prop="enable" label="状态">
+              <!-- <el-table-column prop="enable" label="状态">
                 <template #default="scope">
                   <div>{{ scope.row.enable?'启用':'停用' }}</div>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column label="操作" width="250">
                   <template #default="scope">
                       <el-button link type="text" @click="handleEdit(scope.row)" v-if="$hasPermission('core:activitytype:update')">编辑</el-button>
-                      <el-button link type="text" @click="handleOpenClose(scope.row,1)" v-if="$hasPermission('core:activitytype:openClose')&&scope.row.enable==0">启用</el-button>
-                      <el-button link type="text" @click="handleOpenClose(scope.row,0)" v-if="$hasPermission('core:activitytype:openClose')&&scope.row.enable==1">停用</el-button>
+                      <!-- <el-button link type="text" @click="handleOpenClose(scope.row,1)" v-if="$hasPermission('core:activitytype:openClose')&&scope.row.enable==0">启用</el-button>
+                      <el-button link type="text" @click="handleOpenClose(scope.row,0)" v-if="$hasPermission('core:activitytype:openClose')&&scope.row.enable==1">停用</el-button> -->
                       <el-button link type="text" @click="handleDelete(scope.row)" v-if="$hasPermission('core:activitytype:delete')">删除</el-button>
                   </template>
               </el-table-column>
@@ -41,10 +41,10 @@
             <el-form-item label="类型编码" prop="typeNo">
               <el-input v-model="form.typeNo" placeholder="请输入类型编码"></el-input>
             </el-form-item>
-            <el-form-item label="状态" prop="enable">
+            <!-- <el-form-item label="状态" prop="enable">
               <el-radio v-model="form.enable" :label="1">启用</el-radio>
               <el-radio v-model="form.enable" :label="0">停用</el-radio>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
           <div class="demo-drawer__footer" style="display: flex;justify-content: end;margin-top: 300px;">
             <el-button :loading="buttonLoading" type="primary" @click="submitForm">保 存</el-button>

src/views/modules/medal.vue

@@ -16,6 +16,7 @@
                 </el-table-column>
                 <el-table-column prop="issueBeginTime" label="发放开始时间"></el-table-column>
                 <el-table-column prop="issueEndTime" label="发放结束时间"></el-table-column>
+                <el-table-column prop="remark" label="备注"></el-table-column>
                 <el-table-column label="操作">
                     <template slot-scope="scope">
                         <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
@@ -61,6 +62,9 @@
             <el-form-item label="发放结束时间" :class="{'red':form.isDefault===0}">
               <el-date-picker v-model="form.issueEndTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" style="width: 100%;" :disabled="form.isDefault===1"></el-date-picker>
             </el-form-item>
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" placeholder="请输入备注" :disabled="form.isDefault===1"></el-input>
+            </el-form-item>
           </el-form>
           <div class="demo-drawer__footer" style="display: flex;justify-content: end;margin-top: 200px;">
             <el-button :loading="buttonLoading" type="primary" @click="submitForm">保 存</el-button>
@@ -91,7 +95,8 @@ export default {
         medalName: '',
         imageUrl: '',
         issueBeginTime: '',
-        issueEndTime: ''
+        issueEndTime: '',
+        remark: ''
       },
       rules: {
         medalName: [
@@ -212,7 +217,8 @@ export default {
         medalName: '',
         imageUrl: '',
         issueBeginTime: '',
-        issueEndTime: ''
+        issueEndTime: '',
+        remark: ''
       }
       this.fileList = []
       this.$refs['medalRef'].resetFields()