From 42645a5e05a44fc1f06c2ab96c05dba4e21fe853 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 24 Aug 2020 15:03:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=AC=E7=9B=8A=E6=97=B6=E9=95=BF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-add-or-update.vue     | 17 ++++++++++++++++-
 src/views/modules/heart/actinfo-detail-view.vue |  9 ++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index f811527..64a5313 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -111,6 +111,17 @@
             </el-date-picker>
           </el-form-item>
         </el-row>
+        <el-row>
+          <el-form-item label="公益时长："
+                        prop="kindnessTime">
+            <el-input-number type="number"
+                             :min="0"
+                             v-model="dataForm.kindnessTime"
+                             clearable
+                             style="width:150px">
+            </el-input-number>&emsp;小时
+          </el-form-item>
+        </el-row>
         <el-row>
           <div>
             <el-form-item label="打卡范围时间："
@@ -313,7 +324,8 @@ export default {
         punishmentPoints: '',
         reward: '',
         actUserDefaultState: '1',
-        isConReview: false
+        isConReview: false,
+        kindnessTime: ''
       },
       isImgRequired: true,
       mapSelectVisible: false,
@@ -407,6 +419,9 @@ export default {
         signupEndTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        kindnessTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         signinStartTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
index 01f51a3..53708c9 100644
--- a/src/views/modules/heart/actinfo-detail-view.vue
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -65,6 +65,12 @@
             {{dataForm.actEndTime}}
           </el-form-item>
         </el-row>
+        <el-row>
+          <el-form-item label="公益时长："
+                        prop="kindnessTime">
+            {{dataForm.kindnessTime}}&emsp;小时
+          </el-form-item>
+        </el-row>
         <el-row>
 
           <div>
@@ -188,7 +194,8 @@ export default {
         deptId: '',
         punishmentPoints: '',
         actUserDefaultState: '1',
-        reward: ''
+        reward: '',
+        kindnessTime: ''
       },
       loading: false
     }

From 48af4e51164e220dd971b2f56295a1190a234dc6 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Thu, 27 Aug 2020 10:05:42 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8A=A0=E7=A7=AF=E5=88=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=92=8C=E5=87=8F=E7=A7=AF=E5=88=86=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/points/volunteerinfo-points-adjust.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/points/volunteerinfo-points-adjust.vue b/src/views/modules/points/volunteerinfo-points-adjust.vue
index 7299928..1e33db5 100644
--- a/src/views/modules/points/volunteerinfo-points-adjust.vue
+++ b/src/views/modules/points/volunteerinfo-points-adjust.vue
@@ -58,8 +58,8 @@
       <el-form-item label="操作类型 :"
                     prop="operationType">
         <el-radio-group v-model="dataForm.operationType">
-          <el-radio :label="1">加积分</el-radio>
-          <el-radio :label="0">减积分</el-radio>
+          <el-radio v-if="$hasPermission('volunteer:points:plus')" :label="1">加积分</el-radio>
+          <el-radio v-if="$hasPermission('volunteer:points:less')" :label="0">减积分</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="积分调整 :"

From cfcef2c59534e998b55b64eed7e3f3bb61e41105 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Thu, 27 Aug 2020 11:08:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8A=A0=E7=A7=AF=E5=88=86=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=92=8C=E5=87=8F=E7=A7=AF=E5=88=86=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/points/userinfo-points-adjust.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/points/userinfo-points-adjust.vue b/src/views/modules/points/userinfo-points-adjust.vue
index f0751ec..02c3a12 100644
--- a/src/views/modules/points/userinfo-points-adjust.vue
+++ b/src/views/modules/points/userinfo-points-adjust.vue
@@ -46,8 +46,8 @@
       <el-form-item label="操作类型 :"
                     prop="operationType">
         <el-radio-group v-model="dataForm.operationType">
-          <el-radio :label="1">加积分</el-radio>
-          <el-radio :label="0">减积分</el-radio>
+          <el-radio v-if="$hasPermission('user:points:plus')" :label="1">加积分</el-radio>
+          <el-radio v-if="$hasPermission('user:points:less')" :label="0">减积分</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="积分调整 :"

From 0714b661e5b1765896f0a4462a2fa2b2da6b5a63 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Wed, 2 Sep 2020 14:00:45 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=20init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/events/eventtag-add-or-update.vue | 129 ++++++++++++++++++
 src/views/modules/events/eventtag.vue         |  77 +++++++++++
 2 files changed, 206 insertions(+)
 create mode 100644 src/views/modules/events/eventtag-add-or-update.vue
 create mode 100644 src/views/modules/events/eventtag.vue

diff --git a/src/views/modules/events/eventtag-add-or-update.vue b/src/views/modules/events/eventtag-add-or-update.vue
new file mode 100644
index 0000000..df0e65f
--- /dev/null
+++ b/src/views/modules/events/eventtag-add-or-update.vue
@@ -0,0 +1,129 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :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="tagName">
+          <el-input v-model="dataForm.tagName"
+                    placeholder="请输入标签名称"
+                    maxlength="20"
+                    show-word-limit
+                    clearable></el-input>
+      </el-form-item>
+        <el-form-item label="排序"
+                      prop="sort">
+            <el-input-number v-model="dataForm.sort"
+                             controls-position="right"
+                             :min="0">
+            </el-input-number>
+        </el-form-item>
+        <el-form-item label="是否启用" prop="enableFlag">
+            <el-select v-model="dataForm.enableFlag" placeholder="请选择" clearable>
+                <el-option v-for="item in enableFlagArr"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="description">
+            <el-input type="text"
+                      :rows="3"
+                      v-model="dataForm.description" placeholder="请输入备注"
+                      show-word-limit
+                      clearable
+                      maxlength="100"></el-input>
+        </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        tagName: '',
+        description: '',
+        sort: '',
+        enableFlag: ''
+      },
+      enableFlagArr: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ]
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        tagName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        enableFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/events/eventtag/${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']('/events/eventtag/', 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>
diff --git a/src/views/modules/events/eventtag.vue b/src/views/modules/events/eventtag.vue
new file mode 100644
index 0000000..b7f63c7
--- /dev/null
+++ b/src/views/modules/events/eventtag.vue
@@ -0,0 +1,77 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-news__eventtag}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.tagName" placeholder="标签名称" 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 type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column show-overflow-tooltip prop="tagName" label="标签名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="enableFlag" label="是否启用" header-align="center" align="center" width="80" :formatter="enableFlagFormat"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="description" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" width="160"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="160"></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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button 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 './eventtag-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/eventtag/page',
+        getDataListIsPage: true,
+        deleteURL: '/events/eventtag',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        tagName: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  methods: {
+    enableFlagFormat: function (row, column) {
+      let enableFlag = row.enableFlag
+      if (enableFlag === '0') {
+        return '否'
+      } else if (enableFlag === '1') {
+        return '是'
+      }
+    }
+  }
+}
+</script>