From 9e8e0b24a4438dd6b03761e6ba25ba3cb0313d03 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 3 Sep 2021 09:12:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-add-or-update.vue   |  54 ++++-
 src/views/modules/heart/actinfo-list.vue      |   8 +
 src/views/modules/heart/vact-handle.vue       |  96 +++++++++
 .../vactinfo-add-or-update.vue                |   0
 src/views/modules/heart/vactinfo-look.vue     | 201 ++++++++++++++++++
 src/views/modules/heart/vactinfo-route.vue    |  28 +++
 src/views/modules/heart/vactinfo.vue          | 200 +++++++++++++++++
 .../vactorgrelation-add-or-update.vue         |   0
 .../{news => heart}/vactorgrelation.vue       |   0
 src/views/modules/news/vactinfo.vue           |  92 --------
 10 files changed, 577 insertions(+), 102 deletions(-)
 create mode 100644 src/views/modules/heart/vact-handle.vue
 rename src/views/modules/{news => heart}/vactinfo-add-or-update.vue (100%)
 create mode 100644 src/views/modules/heart/vactinfo-look.vue
 create mode 100644 src/views/modules/heart/vactinfo-route.vue
 create mode 100644 src/views/modules/heart/vactinfo.vue
 rename src/views/modules/{news => heart}/vactorgrelation-add-or-update.vue (100%)
 rename src/views/modules/{news => heart}/vactorgrelation.vue (100%)
 delete mode 100644 src/views/modules/news/vactinfo.vue

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index e3b20f4..641fa2c 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -257,9 +257,9 @@
         <el-row>
           <el-form-item prop="actContent"
                         label="活动内容：">
-            <div style="width:1000px">
+            <div style="width:1000px" >
               <!-- 富文本编辑器, 容器 -->
-              <div id="J_quillEditor" class="ql-editor"></div>
+              <div id="J_quillEditor" class="ql-editor" v-html="dataForm.actContent"></div>
               <!-- 自定义上传图片功能 (使用element upload组件) -->
               <el-upload :action="uploadUrl"
                          :show-file-list="false"
@@ -334,6 +334,7 @@ export default {
       visible: false,
       dataForm: {
         id: '',
+        vactId:'',
         title: '',
         headPic: '',
         signupStartTime: '',
@@ -364,7 +365,8 @@ export default {
         isBanner: '1',
         actUserDefaultState: '1',
         bannerUrl: '',
-        volunteerFlag: '1'
+        volunteerFlag: '1',
+        actType:'0'
       },
       isSignupEndTime: {
         disabledDate (time) {
@@ -421,6 +423,8 @@ export default {
     }
   },
   created () {
+    this.dataForm.vactId = this.$route.query.vactId
+    this.getVactInfo()
     this.$http
       .get(`/sys/user/deptOptions/getByLoginUser`)
       .then(({ data: res }) => {
@@ -572,9 +576,16 @@ export default {
       }
     },
     backToActList () {
-      this.$emit('refreshDataList')
-      this.$parent.selectComponent = 'ActInfoList'
-      this.$router.push({ path: '/heart-actinfo' })
+      if(this.dataForm.vactId==undefined){
+        this.$emit('refreshDataList')
+        this.$parent.selectComponent = 'ActInfoList'
+        this.$router.push({ path: '/heart-actinfo' })
+      }else{
+        this.$emit('refreshDataList')
+        this.$parent.selectComponent = 'VactInfo'
+        this.$router.push({ path: '/heart-vactinfo-route' })
+      }
+
     },
     init () {
       this.visible = true
@@ -638,6 +649,19 @@ export default {
       this.dataForm.newsReleaseStartTime = this.time[0]
       this.dataForm.newsReleaseEndTime = this.time[1]
     },
+    // 获取信息
+    getVactInfo () {
+      this.$http.get(`/heart/vactinfo/${this.dataForm.vactId}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        console.log(this.dataForm)
+      }).catch(() => { })
+    },
     // 上传图片ends
     // 获取信息
     getInfo () {
@@ -688,6 +712,10 @@ export default {
         if (signinEndTime < actEndTime) {
           return this.$message.error('签到结束时间必须大于活动结束时间.')
         }
+        if(!(this.dataForm.vactId==undefined)){
+          this.dataForm.actType = '1'
+          this.dataForm.id = ''
+        }
         this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actinfo/', this.dataForm).then(({ data: res }) => {
           this.isAble = false
@@ -703,10 +731,16 @@ export default {
               this.$emit('refreshDataList')
             }
           })
-          this.$parent.selectComponent = 'ActInfoList'
-          this.$router.push({
-            path: '/heart-actinfo'
-          })
+          if(!(this.dataForm.vactId==undefined)){
+            this.$parent.selectComponent = 'VactInfo'
+            this.$router.push({ path: '/heart-vactinfo-route' })
+          }else{
+            this.$parent.selectComponent = 'ActInfoList'
+            this.$router.push({
+              path: '/heart-actinfo'
+            })
+          }
+
         }).catch(() => { })
       })
     }, 1000, { 'leading': true, 'trailing': false }),
diff --git a/src/views/modules/heart/actinfo-list.vue b/src/views/modules/heart/actinfo-list.vue
index 7e6d362..b4ed264 100644
--- a/src/views/modules/heart/actinfo-list.vue
+++ b/src/views/modules/heart/actinfo-list.vue
@@ -8,6 +8,13 @@
             <el-option label="下架" :value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="活动类型">
+          <el-select v-model="dataForm.actType" placeholder="活动类型" clearable>
+            <el-option label="志愿活动" :value="1"></el-option>
+            <el-option label="社区活动" :value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <br>
         <el-form-item label="时间"
                       prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
@@ -43,6 +50,7 @@
                 style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
         <el-table-column prop="title" label="标题" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="actType" label="活动类型" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column prop="signupEndTime" label="报名截止时间" header-align="center" width="180" align="center"></el-table-column>
         <el-table-column prop="actStartTime" label="开始时间" header-align="center" width="180" align="center"></el-table-column>
         <el-table-column prop="actEndTime" label="结束时间" header-align="center" width="180" align="center"></el-table-column>
diff --git a/src/views/modules/heart/vact-handle.vue b/src/views/modules/heart/vact-handle.vue
new file mode 100644
index 0000000..c48452c
--- /dev/null
+++ b/src/views/modules/heart/vact-handle.vue
@@ -0,0 +1,96 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="'处理'" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="审核" prop="state" label-width="80px">
+        <el-select @change="changeHandle" v-model="dataForm.state" placeholder="请选择" clearable>
+          <el-option label="通过" value="10"> </el-option>
+          <el-option label="不通过" value="5"> </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审核意见" prop="reason">
+        <el-input
+                type="textarea"
+                :rows="3"
+                v-model="dataForm.reason"
+                maxlength="2000"
+                style="width:calc(100% - 110px)"></el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        state: '',
+        reason: ''
+      },
+      isAble: false,
+      isMust:false
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        state: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reason: [
+          { required: this.isMust, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    changeHandle(value){
+      if (value === '5') {
+        this.isMust = true
+      }
+      if (value === '10') {
+        this.isMust = false
+      }
+    },
+    init () {
+      this.visible = true
+      this.isAble = false
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.isAble = true
+        this.$http['post']('/heart/vactinfo/handleApply', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            this.isAble = false
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.$emit('connectResponse')
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/news/vactinfo-add-or-update.vue b/src/views/modules/heart/vactinfo-add-or-update.vue
similarity index 100%
rename from src/views/modules/news/vactinfo-add-or-update.vue
rename to src/views/modules/heart/vactinfo-add-or-update.vue
diff --git a/src/views/modules/heart/vactinfo-look.vue b/src/views/modules/heart/vactinfo-look.vue
new file mode 100644
index 0000000..ad24615
--- /dev/null
+++ b/src/views/modules/heart/vactinfo-look.vue
@@ -0,0 +1,201 @@
+<template>
+    <el-dialog :visible.sync="visible" title="详情" :close-on-click-modal="false"
+               :close-on-press-escape="false">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+                 :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+            <el-form-item label="标题：" prop="title" label-width="120px">
+                {{dataForm.title}}
+            </el-form-item>
+            <el-form-item label="活动头图："
+                          prop="imgUrl"
+                          label-width="120px">
+                <el-upload class="avatar-uploader"
+                           disabled
+                           :show-file-list="false">
+                    <img v-if="dataForm.headPic"
+                         :src="dataForm.headPic"
+                         class="avatar">
+                    <i v-else
+                       class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+            </el-form-item>
+            <el-form-item label="活动开始时间：" prop="actStartTime" label-width="120px">
+                {{dataForm.actStartTime}}
+            </el-form-item>
+            <el-form-item label="活动结束时间：" prop="actEndTime" label-width="120px">
+                {{dataForm.actEndTime}}
+            </el-form-item>
+            <el-form-item label="活动地点：" prop="actAddress" label-width="120px">
+                {{dataForm.actAddress}}
+            </el-form-item>
+            <el-form-item label="报名要求：" prop="requirement" label-width="120px">
+                {{dataForm.requirement}}
+            </el-form-item>
+            <el-form-item label="活动内容：" prop="actContent" label-width="120px">
+                {{dataForm.actContent}}
+            </el-form-item>
+            <el-form-item label="是否只允许志愿者参加：" prop="volunteerFlag" label-width="120px">
+                <template slot-scope="scope">
+                    {{
+                    dataForm.volunteerFlag == 0
+                    ? "否"
+                    : dataForm.volunteerFlag == 1
+                    ? "是"
+                    : ""
+                    }}
+                </template>
+            </el-form-item>
+            <el-form-item label="联系人：" prop="contacts" label-width="120px">
+                {{dataForm.contacts}}
+            </el-form-item>
+            <el-form-item label="联系电话：" prop="tel" label-width="120px">
+                {{dataForm.tel}}
+            </el-form-item>
+            <el-form-item label="审核状态：" prop="state" label-width="120px">
+                <template slot-scope="scope">
+                    {{
+                    dataForm.state == 0
+                    ? "审核中"
+                    : dataForm.state == 5
+                    ? "未通过"
+                    : dataForm.state == 10
+                    ? "待发布"
+                    : dataForm.state == 15
+                    ? "已发布"
+                    : ""
+                    }}
+                </template>
+            </el-form-item>
+            <el-form-item label="审核理由：" prop="reason" label-width="120px">
+                {{dataForm.reason}}
+            </el-form-item>
+            <el-form-item label="提交时间：" prop="updatedTime" label-width="120px">
+                {{dataForm.updatedTime}}
+            </el-form-item>
+        </el-form>
+        <template slot="footer">
+            <el-button @click="visible = false">{{ $t('返回') }}</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+    import debounce from 'lodash/debounce'
+    export default {
+        data() {
+            return {
+                visible: false,
+                dataForm: {
+                    id: '',
+                    title: '',
+                    headPic: '',
+                    actStartTime: '',
+                    actEndTime: '',
+                    actAddress: '',
+                    requirement: '',
+                    actContent: '',
+                    volunteerFlag: '',
+                    contacts: '',
+                    tel: '',
+                    state: '',
+                    reason: '',
+                    userId: '',
+                    faceImg: '',
+                    partyFlag: '',
+                    deptId: '',
+                    deptName: '',
+                    allDeptIds: '',
+                    allDeptNames: '',
+                    parentDeptIds: '',
+                    parentDeptNames: '',
+                    delFlag: '',
+                    revision: '',
+                    createdBy: '',
+                    createdTime: '',
+                    updatedBy: '',
+                    updatedTime: ''
+                }
+            }
+        },
+        computed: {
+            dataRule() {
+                return {}
+            }
+        },
+        methods: {
+            init() {
+                this.visible = true
+                this.$nextTick(() => {
+                    this.$refs['dataForm'].resetFields()
+                    if (this.dataForm.id) {
+                        this.getInfo()
+                    }
+                })
+            },
+            // 获取信息
+            getInfo() {
+                this.$http.get(`/heart/vactinfo/${this.dataForm.id}`).then(({data: res}) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    }
+                    this.dataForm = {
+                        ...this.dataForm,
+                        ...res.data
+                    }
+                }).catch(() => {
+                })
+            },
+            // 表单提交
+            dataFormSubmitHandle: debounce(function () {
+                this.$refs['dataForm'].validate((valid) => {
+                    if (!valid) {
+                        return false
+                    }
+                    this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/vactinfo/', this.dataForm).then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        }
+                        this.$message({
+                            message: this.$t('prompt.success'),
+                            type: 'success',
+                            duration: 500,
+                            onClose: () => {
+                                this.visible = false
+                                this.$emit('refreshDataList')
+                            }
+                        })
+                    }).catch(() => {
+                    })
+                })
+            }, 1000, {'leading': true, 'trailing': false})
+        }
+    }
+</script>
+<style>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+
+    .avatar-uploader .el-upload:hover {
+        border-color: #409eff;
+    }
+
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/modules/heart/vactinfo-route.vue b/src/views/modules/heart/vactinfo-route.vue
new file mode 100644
index 0000000..be5153c
--- /dev/null
+++ b/src/views/modules/heart/vactinfo-route.vue
@@ -0,0 +1,28 @@
+<template>
+  <keep-alive include="vactInfo">
+    <component :is="selectComponent"></component>
+  </keep-alive>
+</template>
+<script>
+import VactInfo from './vactinfo'
+import ActInfoAdd from './actinfo-add-or-update'
+export default {
+  data () {
+    return {
+      selectComponent: VactInfo
+    }
+  },
+  components: {
+    VactInfo,
+    ActInfoAdd
+  },
+  methods: {
+    init () {
+      this.selectComponent = VactInfo
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/modules/heart/vactinfo.vue b/src/views/modules/heart/vactinfo.vue
new file mode 100644
index 0000000..58fb920
--- /dev/null
+++ b/src/views/modules/heart/vactinfo.vue
@@ -0,0 +1,200 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-heart__vactinfo}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="公益组织" prop="volunteerOrgId" label-width="70px">
+          <el-select v-model="dataForm.volunteerOrgId" clearable placeholder="志愿组织">
+            <el-option v-for="item in volunteerOrgList" :key="item.id" :label="item.volunteerOrgName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="活动名称" prop="title">
+          <el-input v-model="dataForm.title"
+                    placeholder="活动名称"
+                    clearable></el-input>
+        </el-form-item>
+        <br>
+        <el-form-item label="日期(起)"
+                      prop="vactStartTime" label-width="70px">
+          <el-date-picker v-model="dataForm.vactStartTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="日期(止)"
+                      label-width="70px"
+                      prop="vactEndTime">
+          <el-date-picker v-model="dataForm.vactEndTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="exportHandle()">导出</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('heart:vactinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('heart:vactinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+<!--        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+<!--        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
+        <el-table-column prop="orgNames" label="所属组织" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="title" label="活动名称" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="headPic" label="活动头图" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="stateName" label="审核状态" width=120 header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startEndTime" label="活动起止日期" header-align="center" align="center"></el-table-column>
+        <!--        <el-table-column prop="actStartTime" label="活动开始时间" header-align="center" align="center"></el-table-column>-->
+        <!--        <el-table-column prop="actEndTime" label="活动结束时间" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="actAddress" label="活动地点" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="requirement" label="报名要求" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="actContent" label="活动内容" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="volunteerFlag" label="是否只允许志愿者参加  0否  1是" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="contacts" label="联系人" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="tel" label="联系电话" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="reason" label="审核理由" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="faceImg" label="头像地址" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="partyFlag" label="党员标识：0否1是" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="allDeptNames" label="所有部门名称" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="parentDeptIds" label="父所有部门" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="parentDeptNames" label="父所有部门" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="delFlag" label="删除标识 0-否，1-是" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="createdTime" label="提交时间" width=180 header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>-->
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="openLook(scope.row.id)">{{ $t('详情') }}</el-button>
+            <el-button v-if="scope.row.state==='0'" type="text" size="small" @click="openHandle(scope.row.id)">{{ $t('审核') }}</el-button>
+              <el-button v-if="scope.row.state==='10'" type="text" size="small" @click="addAction(scope.row.id)">{{ $t('发布') }}</el-button>
+            <el-button v-if="$hasPermission('heart:vactinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <vact-look v-if="lookVisible" ref="vactLook" @refreshDataList="getDataList"></vact-look>
+      <vact-handle v-if="handleVisible" ref="vactHandle" @refreshDataList="getDataList"></vact-handle>
+      <actinfo-add-or-update v-if="actAddVisible" ref="actinfoAddOrUpdate" @refreshDataList="getDataList"></actinfo-add-or-update>
+
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './vactinfo-add-or-update'
+import VactHandle from './vact-handle'
+import VactLook from './vactinfo-look'
+import ActinfoAddOrUpdate from './actinfo-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/vactinfo/page',
+        getDataListIsPage: true,
+        deleteURL: '/heart/vactinfo',
+        deleteIsBatch: true,
+        exportURL: '/heart/vactinfo/export'
+      },
+      dataForm: {
+        id: '',
+        vactStartTime: '',
+        vactEndTime: '',
+      },
+      actAddVisible:false,
+      addActVisible:false,
+      lookVisible:false,
+      handleVisible:false,
+      volunteerOrgList:[],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.vactStartTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.vactEndTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      },
+    }
+  },
+  components: {
+    AddOrUpdate,
+    VactHandle,
+    VactLook,
+    ActinfoAddOrUpdate
+  },
+  created: function () {
+    this.getDataList()
+    this.getVolunteerOrgList()
+  },
+  methods: {
+    getVolunteerOrgList() {
+      this.$http.get(`heart/volunteerorg/getVolunteerOrgList`).then(({data: res}) => {
+        this.volunteerOrgList = res.data
+      }).catch(() => {
+      })
+    },
+      openHandle (id) {
+          this.handleVisible = true
+          this.$nextTick(() => {
+              this.$refs.vactHandle.dataForm.id = id
+              this.$refs.vactHandle.init()
+          })
+      },
+      openLook (id) {
+          this.lookVisible = true
+          this.$nextTick(() => {
+              this.$refs.vactLook.dataForm.id = id
+              this.$refs.vactLook.init()
+          })
+      },
+      addAction (id) {
+          this.$parent.selectComponent = 'ActInfoAdd'
+          this.$router.push(
+              { path: '/heart-vactinfo-route', query: { vactId: id } }
+          )
+      },
+
+  }
+}
+</script>
diff --git a/src/views/modules/news/vactorgrelation-add-or-update.vue b/src/views/modules/heart/vactorgrelation-add-or-update.vue
similarity index 100%
rename from src/views/modules/news/vactorgrelation-add-or-update.vue
rename to src/views/modules/heart/vactorgrelation-add-or-update.vue
diff --git a/src/views/modules/news/vactorgrelation.vue b/src/views/modules/heart/vactorgrelation.vue
similarity index 100%
rename from src/views/modules/news/vactorgrelation.vue
rename to src/views/modules/heart/vactorgrelation.vue
diff --git a/src/views/modules/news/vactinfo.vue b/src/views/modules/news/vactinfo.vue
deleted file mode 100644
index a065506..0000000
--- a/src/views/modules/news/vactinfo.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-heart__vactinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('heart:vactinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('heart:vactinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="title" label="标题" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="headPic" label="活动头图" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="actStartTime" label="活动开始时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="actEndTime" label="活动结束时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="actAddress" label="活动地点" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="requirement" label="报名要求" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="actContent" label="活动内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="volunteerFlag" label="是否只允许志愿者参加  0否  1是" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="contacts" label="联系人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="tel" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="state" label="审核状态：0-审核中，5-未通过，10-待发布，15已发布" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="reason" label="审核理由" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userId" label="用户ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="faceImg" label="头像地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="partyFlag" label="党员标识：0否1是" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所有部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptIds" label="父所有部门" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptNames" label="父所有部门" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标识 0-否，1-是" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="$hasPermission('heart:vactinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('heart:vactinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './vactinfo-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/heart/vactinfo/page',
-        getDataListIsPage: true,
-        deleteURL: '/heart/vactinfo',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>

From b9a26d3a97f487516e9635de1fb4f2d8f6e1bf0b Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 6 Sep 2021 19:07:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/heart/actinfo-add-or-update.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index 641fa2c..fd85f80 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -659,7 +659,10 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-        console.log(this.dataForm)
+        this.dataForm.signinStartTime = this.dataForm.actStartTime
+        this.dataForm.signinAddress = this.dataForm.actAddress
+        this.dataForm.signinLatitude = this.dataForm.actLatitude
+        this.dataForm.signinLongitude = this.dataForm.actLongitude
       }).catch(() => { })
     },
     // 上传图片ends

From 309e4620e9cab0453102f2ea84c2f7da19e793d7 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 6 Sep 2021 19:30:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-add-or-update.vue   | 22 ++++++++++++++++++-
 .../modules/heart/actinfo-detail-view.vue     | 13 +++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index fd85f80..945d7d7 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -7,6 +7,14 @@
                :model="dataForm"
                ref="dataForm"
                :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+        <el-row>
+          <el-form-item label="活动类型" prop="actType">
+            <el-select v-model="dataForm.actType" clearable placeholder="活动类型">
+              <el-option v-for="item in actTypeList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
         <el-row>
           <el-form-item label="活动头图："
                         v-loading="loading"
@@ -334,6 +342,7 @@ export default {
       visible: false,
       dataForm: {
         id: '',
+        actType:'',
         vactId:'',
         title: '',
         headPic: '',
@@ -368,6 +377,10 @@ export default {
         volunteerFlag: '1',
         actType:'0'
       },
+      actTypeList: [
+        {dictValue: '0', dictName: '社区活动'},
+        {dictValue: '1', dictName: '志愿活动'},
+      ],
       isSignupEndTime: {
         disabledDate (time) {
           return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
@@ -424,7 +437,9 @@ export default {
   },
   created () {
     this.dataForm.vactId = this.$route.query.vactId
-    this.getVactInfo()
+    if(!(this.dataForm.vactId==undefined)){
+      this.getVactInfo()
+    }
     this.$http
       .get(`/sys/user/deptOptions/getByLoginUser`)
       .then(({ data: res }) => {
@@ -450,6 +465,9 @@ export default {
   computed: {
     dataRule () {
       return {
+        actType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         title: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
@@ -663,6 +681,8 @@ export default {
         this.dataForm.signinAddress = this.dataForm.actAddress
         this.dataForm.signinLatitude = this.dataForm.actLatitude
         this.dataForm.signinLongitude = this.dataForm.actLongitude
+        //设置为志愿活动
+        this.dataForm.actType = '1'
       }).catch(() => { })
     },
     // 上传图片ends
diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
index 98b9917..5cbf031 100644
--- a/src/views/modules/heart/actinfo-detail-view.vue
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -7,6 +7,19 @@
                :rules="dataRule"
                ref="dataForm"
                :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+        <el-row>
+          <el-form-item label="活动类型：">
+            <template slot-scope="scope">
+              {{
+              dataForm.actType == 0
+              ? "社区活动"
+              : dataForm.actType == 1
+              ? "志愿活动"
+              : ""
+              }}
+            </template>
+          </el-form-item>
+        </el-row>
         <el-row>
           <el-form-item label="活动头图："
                         v-loading="loading"