From c978c4b02c80bfdf061ea8e62ccc0521d05f3e31 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 17 Dec 2019 10:03:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=8A=A5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heart/actuserlog-add-or-update.vue        | 145 ++++++++++++++++++
 src/views/modules/heart/actuserlog.vue        |  75 +++++++++
 src/views/modules/heart/actuserrelation.vue   |  19 +--
 3 files changed, 224 insertions(+), 15 deletions(-)
 create mode 100644 src/views/modules/heart/actuserlog-add-or-update.vue
 create mode 100644 src/views/modules/heart/actuserlog.vue

diff --git a/src/views/modules/heart/actuserlog-add-or-update.vue b/src/views/modules/heart/actuserlog-add-or-update.vue
new file mode 100644
index 00000000..00175cfb
--- /dev/null
+++ b/src/views/modules/heart/actuserlog-add-or-update.vue
@@ -0,0 +1,145 @@
+<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="活动ID" prop="actId">
+          <el-input v-model="dataForm.actId" placeholder="活动ID"></el-input>
+      </el-form-item>
+          <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）" prop="operationType">
+          <el-input v-model="dataForm.operationType" placeholder="操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）"></el-input>
+      </el-form-item>
+          <el-form-item label="审核不通过的原因" prop="failureReason">
+          <el-input v-model="dataForm.failureReason" placeholder="审核不通过的原因"></el-input>
+      </el-form-item>
+          <el-form-item label="操作时间" prop="operationTime">
+          <el-input v-model="dataForm.operationTime" placeholder="操作时间"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></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: '',
+        actId: '',
+        userId: '',
+        operationType: '',
+        failureReason: '',
+        operationTime: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        actId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        operationType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        failureReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        operationTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { 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(`/heart/actuserlog/${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/actuserlog/', 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/heart/actuserlog.vue b/src/views/modules/heart/actuserlog.vue
new file mode 100644
index 00000000..ccf0e217
--- /dev/null
+++ b/src/views/modules/heart/actuserlog.vue
@@ -0,0 +1,75 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-heart__actuserlog}">
+      <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:actuserlog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('heart:actuserlog: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="actId" label="活动ID" 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="operationType" label="操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="failureReason" label="审核不通过的原因" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="operationTime" label="操作时间" 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:actuserlog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('heart:actuserlog: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 './actuserlog-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/heart/actuserlog/page',
+        getDataListIsPage: true,
+        deleteURL: '/heart/actuserlog',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/heart/actuserrelation.vue b/src/views/modules/heart/actuserrelation.vue
index 728a26cb..c77034d3 100644
--- a/src/views/modules/heart/actuserrelation.vue
+++ b/src/views/modules/heart/actuserrelation.vue
@@ -17,26 +17,15 @@
       </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="actId" label="活动ID" 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="nickname" label="用户昵称" 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="realName" label="报名人真实姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="realName" label="报名人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sex" label="性别(0-女，1-男)" header-align="center" align="center"></el-table-column>
         <el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" label="当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="failureReason" label="未通过原因（仅当未通过时录入，并读取）" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="signupTime" label="报名时间" 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 prop="status" label="状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="failureReason" 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:actuserrelation:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>