From e8364cc73271b541863aaa6feed5f386429e6cce Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 5 Feb 2020 18:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/evaluatedept.vue     |  10 --
 .../custom/evaluateofficer-add-or-update.vue  | 166 ++++++++++++++++++
 src/views/modules/custom/evaluateofficer.vue  |  71 ++++++++
 .../custom/evaluateoption-add-or-update.vue   |  32 +---
 src/views/modules/custom/evaluateoption.vue   |  13 +-
 5 files changed, 247 insertions(+), 45 deletions(-)
 create mode 100644 src/views/modules/custom/evaluateofficer-add-or-update.vue
 create mode 100644 src/views/modules/custom/evaluateofficer.vue

diff --git a/src/views/modules/custom/evaluatedept.vue b/src/views/modules/custom/evaluatedept.vue
index 7ac3fddf..241b101c 100644
--- a/src/views/modules/custom/evaluatedept.vue
+++ b/src/views/modules/custom/evaluatedept.vue
@@ -17,20 +17,10 @@
       </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="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="parentDeptIds" label="父所有部门ID" 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="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="officerCount" 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('custom:evaluatedept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/custom/evaluateofficer-add-or-update.vue b/src/views/modules/custom/evaluateofficer-add-or-update.vue
new file mode 100644
index 00000000..cc88d4bc
--- /dev/null
+++ b/src/views/modules/custom/evaluateofficer-add-or-update.vue
@@ -0,0 +1,166 @@
+<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 部门表主键ID" prop="deptId">
+          <el-input v-model="dataForm.deptId" placeholder="部门ID 部门表主键ID"></el-input>
+      </el-form-item>
+          <el-form-item label="姓名" prop="fullName">
+          <el-input v-model="dataForm.fullName" placeholder="姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="性别(0-女，1-男)" prop="sex">
+          <el-input v-model="dataForm.sex" placeholder="性别(0-女，1-男)"></el-input>
+      </el-form-item>
+          <el-form-item label="职位" prop="position">
+          <el-input v-model="dataForm.position" placeholder="职位"></el-input>
+      </el-form-item>
+          <el-form-item label="点赞次数" prop="likesCount">
+          <el-input v-model="dataForm.likesCount" placeholder="点赞次数"></el-input>
+      </el-form-item>
+          <el-form-item label="被踩次数" prop="opposeCount">
+          <el-input v-model="dataForm.opposeCount" placeholder="被踩次数"></el-input>
+      </el-form-item>
+          <el-form-item label="排序" prop="sort">
+          <el-input v-model="dataForm.sort" 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="删除标识 0：否，1：是" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：否，1：是"></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: '',
+        deptId: '',
+        fullName: '',
+        sex: '',
+        position: '',
+        likesCount: '',
+        opposeCount: '',
+        sort: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        fullName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        position: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        likesCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        opposeCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { 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(`/custom/evaluateofficer/${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']('/custom/evaluateofficer/', 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/custom/evaluateofficer.vue b/src/views/modules/custom/evaluateofficer.vue
new file mode 100644
index 00000000..ff441729
--- /dev/null
+++ b/src/views/modules/custom/evaluateofficer.vue
@@ -0,0 +1,71 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-custom__evaluateofficer}">
+      <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 type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('custom:evaluateofficer: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="fullName" 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="position" label="职位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="likesCount" label="点赞次数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="opposeCount" 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="sort" 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="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 './evaluateofficer-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/custom/evaluateofficer/page',
+        getDataListIsPage: true,
+        deleteURL: '/custom/evaluateofficer',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/custom/evaluateoption-add-or-update.vue b/src/views/modules/custom/evaluateoption-add-or-update.vue
index 5091416e..c960fb84 100644
--- a/src/views/modules/custom/evaluateoption-add-or-update.vue
+++ b/src/views/modules/custom/evaluateoption-add-or-update.vue
@@ -1,37 +1,19 @@
 <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="权限编码（1.点赞，2.吐槽）" prop="roleCode">
+      <el-form-item label="类别" prop="roleCode">
           <el-input v-model="dataForm.roleCode" placeholder="权限编码（1.点赞，2.吐槽）"></el-input>
       </el-form-item>
-          <el-form-item label="评价选项" prop="optionContent">
-          <el-input v-model="dataForm.optionContent" placeholder="评价选项"></el-input>
-      </el-form-item>
-          <el-form-item label="显示顺序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="显示顺序"></el-input>
-      </el-form-item>
-          <el-form-item label="可用标记(0-不可用，1-可用)" prop="available">
+      <el-form-item label="是否启用" prop="available">
           <el-input v-model="dataForm.available" placeholder="可用标记(0-不可用，1-可用)"></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="删除标识 0：否，1：是" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：否，1：是"></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 label="显示顺序" prop="sort">
+          <el-input v-model="dataForm.sort" placeholder="显示顺序"></el-input>
       </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      <el-form-item label="评价选项" prop="optionContent">
+          <el-input v-model="dataForm.optionContent" placeholder="评价选项"></el-input>
       </el-form-item>
-      </el-form>
+    </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
diff --git a/src/views/modules/custom/evaluateoption.vue b/src/views/modules/custom/evaluateoption.vue
index db3ca367..92afd2dd 100644
--- a/src/views/modules/custom/evaluateoption.vue
+++ b/src/views/modules/custom/evaluateoption.vue
@@ -9,7 +9,7 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('custom:evaluateoption:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('custom:evaluateoption:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -17,17 +17,10 @@
       </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="roleCode" label="权限编码（1.点赞，2.吐槽）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="序号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="optionContent" label="评价选项" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" label="显示顺序" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="roleCode" label="类别" header-align="center" align="center"></el-table-column>
         <el-table-column prop="available" 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="delFlag" label="删除标识 0：否，1：是" 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('custom:evaluateoption:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>