From ae8cd345c55a1f34753302712cccda8f23ad4852 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Mon, 24 Feb 2020 14:42:47 +0800
Subject: [PATCH] =?UTF-8?q?1114=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/zh-CN.js                             |   2 -
 .../events/handlecategory-add-or-update.vue   | 166 ------------------
 src/views/modules/events/handlecategory.vue   |  82 ---------
 src/views/modules/sys/role-add-or-update.vue  |  77 +-------
 4 files changed, 4 insertions(+), 323 deletions(-)
 delete mode 100644 src/views/modules/events/handlecategory-add-or-update.vue
 delete mode 100644 src/views/modules/events/handlecategory.vue

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 765292b1..eb42ca36 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -366,8 +366,6 @@ t.role.createDate = '创建时间'
 t.role.menuList = '菜单授权'
 t.role.deptList = '数据授权'
 t.role.appMenuList = '工作端菜单授权'
-t.role.categoryList = '项目处理类型授权'
-t.role.whistleDeptList = '吹哨部门授权'
 
 t.user = {}
 t.user.username = '用户名'
diff --git a/src/views/modules/events/handlecategory-add-or-update.vue b/src/views/modules/events/handlecategory-add-or-update.vue
deleted file mode 100644
index b0a65d40..00000000
--- a/src/views/modules/events/handlecategory-add-or-update.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<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' : '100px'">
-      <el-form-item label="处理类别值" prop="categoryVal">
-          <el-input-number v-model="dataForm.categoryVal"
-                         controls-position="right"
-                         :min="0">
-        </el-input-number>
-      </el-form-item>
-      <el-form-item label="显示信息" prop="categoryLabel">
-          <el-input v-model="dataForm.categoryLabel" placeholder="处理类别显示信息"></el-input>
-      </el-form-item>
-      <el-form-item label="类型编码" prop="categoryCode">
-          <el-input v-model="dataForm.categoryCode" placeholder="类型编码"></el-input>
-      </el-form-item>
-      <el-form-item label="状态" prop="available">
-          <el-select v-model="dataForm.available" clearable
-                     placeholder="请选择">
-            <el-option v-for="item in options"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-      </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="revision" v-if="false">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy" v-if="false">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime" v-if="false">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy" v-if="false">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime" v-if="false">
-          <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: '',
-        categoryVal: '',
-        categoryLabel: '',
-        available: '',
-        sort: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: '',
-        categoryCode: ''
-      },
-      options: [{
-        id: '0',
-        name: '不可用'
-      }, {
-        id: '1',
-        name: '可用'
-      }]
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        categoryVal: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        categoryLabel: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        available: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        categoryCode: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: false, 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/handlecategory/${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/handlecategory/', 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/handlecategory.vue b/src/views/modules/events/handlecategory.vue
deleted file mode 100644
index 38697844..00000000
--- a/src/views/modules/events/handlecategory.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-events__handlecategory}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="显示信息">
-          <el-input v-model="dataForm.categoryLabel" 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 v-if="$hasPermission('events:handlecategory:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('events:handlecategory: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 label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="categoryVal" label="处理类别值" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="categoryLabel" label="处理类别显示信息" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="categoryCode" label="编码" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="available" label="状态" header-align="center" align="center" >
-            <template slot-scope="scope">
-                        <el-tag v-if="scope.row.available === '0'" size="small" type="danger">不可用</el-tag>
-                        <el-tag v-else size="small" type="success">可用</el-tag>
-            </template>
-        </el-table-column>
-        <el-table-column prop="sort" label="排序" header-align="center" align="center" sortable></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center" v-if="false"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center" v-if="false"></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" v-if="false"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center" v-if="false"></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('events:handlecategory:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('events:handlecategory: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 './handlecategory-add-or-update'
-export default {
-  mixins: [mixinViewModule],
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/handlecategory/page',
-        getDataListIsPage: true,
-        deleteURL: '/events/handlecategory',
-        deleteIsBatch: true
-      },
-      dataForm: {
-        id: '',
-        categoryLabel: ''
-      }
-    }
-  },
-  components: {
-    AddOrUpdate
-  }
-}
-</script>
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index 0b8f80bd..b01b61d7 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -29,7 +29,7 @@
                   :placeholder="$t('role.remark')"></el-input>
       </el-form-item>
       <el-row>
-        <el-col :span="5">
+        <el-col :span="8">
           <el-form-item size="mini"
                         :label="$t('role.menuList')">
             <el-tree :data="menuList"
@@ -41,7 +41,7 @@
             </el-tree>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="8">
           <el-form-item size="mini"
                         :label="$t('role.deptList')">
             <el-tree :data="deptList"
@@ -53,7 +53,7 @@
             </el-tree>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="8">
           <el-form-item size="mini"
                         :label="$t('role.appMenuList')">
             <el-tree :data="appMenuList"
@@ -65,30 +65,6 @@
             </el-tree>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item size="mini"
-                        :label="$t('role.categoryList')">
-            <el-tree :data="categoryList"
-                     :props="{ label: 'name', children: 'children' }"
-                     node-key="id"
-                     ref="categoryListTree"
-                     accordion
-                     show-checkbox>
-            </el-tree>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item size="mini"
-                        :label="$t('role.whistleDeptList')">
-            <el-tree :data="whistleDeptList"
-                     :props="{ label: 'name', children: 'children' }"
-                     node-key="id"
-                     ref="whistleDeptListTree"
-                     accordion
-                     show-checkbox>
-            </el-tree>
-          </el-form-item>
-        </el-col>
       </el-row>
     </el-form>
     <template slot="footer">
@@ -107,9 +83,7 @@ export default {
       visible: false,
       menuList: [],
       deptList: [],
-      whistleDeptList: [],
       appMenuList: [],
-      categoryList: [],
       roleTypeList: [],
       dataForm: {
         id: '',
@@ -117,8 +91,6 @@ export default {
         menuIdList: [],
         deptIdList: [],
         appMenuIdList: [],
-        categoryIdList: [],
-        whistleDeptIdList: [],
         remark: '',
         typeKey: ''
       }
@@ -144,14 +116,10 @@ export default {
         this.$refs.menuListTree.setCheckedKeys([])
         this.$refs.deptListTree.setCheckedKeys([])
         this.$refs.appMenuListTree.setCheckedKeys([])
-        this.$refs.categoryListTree.setCheckedKeys([])
-        this.$refs.whistleDeptListTree.setCheckedKeys([])
         Promise.all([
           this.getMenuList(),
           this.getDeptList(),
-          this.getAppMenuList(),
-          this.getCategoryList(),
-          this.getWhistleDeptList()
+          this.getAppMenuList()
         ]).then(() => {
           if (this.dataForm.id) {
             this.getInfo()
@@ -177,15 +145,6 @@ export default {
         this.deptList = res.data
       }).catch(() => { })
     },
-    // 获取吹哨部门列表
-    getWhistleDeptList () {
-      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.whistleDeptList = res.data
-      }).catch(() => { })
-    },
     // 获取App菜单列表
     getAppMenuList () {
       return this.$http.get('/sys/appmenu/select').then(({ data: res }) => {
@@ -195,15 +154,6 @@ export default {
         this.appMenuList = res.data
       }).catch(() => { })
     },
-    // 获取项目处理类型授权
-    getCategoryList () {
-      return this.$http.get('/events/handlecategory/getCategoryList').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.categoryList = res.data
-      }).catch(() => { })
-    },
     // 获取信息
     getInfo () {
       this.$http.get(`/sys/role/${this.dataForm.id}`).then(({ data: res }) => {
@@ -217,8 +167,6 @@ export default {
         this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
         this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
         this.dataForm.appMenuIdList.forEach(item => this.$refs.appMenuListTree.setChecked(item, true))
-        this.dataForm.categoryIdList.forEach(item => this.$refs.categoryListTree.setChecked(item, true))
-        this.$refs.whistleDeptListTree.setCheckedKeys(this.dataForm.whistleDeptIdList)
       }).catch(() => { })
     },
     // 表单提交
@@ -236,11 +184,6 @@ export default {
           ...this.$refs.appMenuListTree.getCheckedKeys(),
           ...this.$refs.appMenuListTree.getHalfCheckedKeys()
         ]
-        this.dataForm.categoryIdList = [
-          ...this.$refs.categoryListTree.getCheckedKeys(),
-          ...this.$refs.categoryListTree.getHalfCheckedKeys()
-        ]
-        this.dataForm.whistleDeptIdList = this.$refs.whistleDeptListTree.getCheckedKeys()
         this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -268,15 +211,3 @@ export default {
   }
 }
 </script>
-// 添加树样式
-<style lang="scss">
-.el-tree {
-  width: 100%;
-  overflow-x: auto;
-  overflow-y: hidden;
-}
-.el-tree>.el-tree-node {
-  display: inline-block;
-  min-width: 100%;
-}
-</style>