From 0731e1e9cae081454f4abc5e44eeaadd6434a771 Mon Sep 17 00:00:00 2001
From: zhengjie <zhengjie@tom.com>
Date: Thu, 11 Apr 2019 16:16:52 +0800
Subject: [PATCH] =?UTF-8?q?=201.7=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue         |  4 ++--
 src/views/system/dept/module/edit.vue   |  6 +++++-
 src/views/system/dept/module/form.vue   | 12 ++++--------
 src/views/system/dept/module/header.vue |  6 +++++-
 src/views/system/job/index.vue          |  4 ++--
 src/views/system/job/module/edit.vue    |  6 +++++-
 src/views/system/job/module/form.vue    | 12 ++++--------
 src/views/system/job/module/header.vue  |  6 +++++-
 src/views/system/user/index.vue         |  5 ++---
 src/views/system/user/module/edit.vue   |  6 +++++-
 src/views/system/user/module/form.vue   | 10 ++++------
 src/views/system/user/module/header.vue |  6 +++++-
 12 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 5b51e9d..d45308f 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <eHeader :query="query" :dicts="dicts"/>
     <!--表格渲染-->
     <tree-table v-loading="loading" :expand-all="true" :data="data" :columns="columns" size="small">
       <el-table-column label="状态" align="center">
@@ -17,7 +17,7 @@
       </el-table-column>
       <el-table-column label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <edit v-if="checkPermission(['ADMIN','DEPT_ALL','DEPT_EDIT'])" :data="scope.row" :sup_this="sup_this"/>
+          <edit v-if="checkPermission(['ADMIN','DEPT_ALL','DEPT_EDIT'])" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
           <el-popover
             v-if="checkPermission(['ADMIN','DEPT_ALL','DEPT_DELETE'])"
             :ref="scope.row.id"
diff --git a/src/views/system/dept/module/edit.vue b/src/views/system/dept/module/edit.vue
index 53c1b75..afafb79 100644
--- a/src/views/system/dept/module/edit.vue
+++ b/src/views/system/dept/module/edit.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="success" @click="to">编辑</el-button>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
+    <eForm ref="form" :sup_this="sup_this" :is-add="false" :dicts="dicts"/>
   </div>
 </template>
 <script>
@@ -16,6 +16,10 @@ export default {
     sup_this: {
       type: Object,
       required: true
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   methods: {
diff --git a/src/views/system/dept/module/form.vue b/src/views/system/dept/module/form.vue
index 1d0b408..d694d28 100644
--- a/src/views/system/dept/module/form.vue
+++ b/src/views/system/dept/module/form.vue
@@ -20,12 +20,10 @@
 
 <script>
 import { add, edit, getDepts } from '@/api/dept'
-import initDict from '@/mixins/initDict'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   components: { Treeselect },
-  mixins: [initDict],
   props: {
     isAdd: {
       type: Boolean,
@@ -34,6 +32,10 @@ export default {
     sup_this: {
       type: Object,
       default: null
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   data() {
@@ -52,12 +54,6 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      // 加载数据字典
-      this.getDict('dept_status')
-    })
-  },
   methods: {
     cancel() {
       this.resetForm()
diff --git a/src/views/system/dept/module/header.vue b/src/views/system/dept/module/header.vue
index a81bc3e..b57bb4e 100644
--- a/src/views/system/dept/module/header.vue
+++ b/src/views/system/dept/module/header.vue
@@ -15,7 +15,7 @@
         type="primary"
         icon="el-icon-plus"
         @click="add">新增</el-button>
-      <eForm ref="form" :is-add="true"/>
+      <eForm ref="form" :is-add="true" :dicts="dicts"/>
     </div>
   </div>
 </template>
@@ -29,6 +29,10 @@ export default {
     query: {
       type: Object,
       required: true
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   data() {
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 6628390..cadb102 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <eHeader :query="query"/>
+    <eHeader :query="query" :dicts="dicts"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="name" label="名称"/>
@@ -28,7 +28,7 @@
       </el-table-column>
       <el-table-column label="操作" width="150px" align="center">
         <template slot-scope="scope">
-          <edit v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_EDIT'])" :data="scope.row" :sup_this="sup_this"/>
+          <edit v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_EDIT'])" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
           <el-popover
             v-if="checkPermission(['ADMIN','USERJOB_ALL','USERJOB_DELETE'])"
             :ref="scope.row.id"
diff --git a/src/views/system/job/module/edit.vue b/src/views/system/job/module/edit.vue
index c778f11..8fee7d1 100644
--- a/src/views/system/job/module/edit.vue
+++ b/src/views/system/job/module/edit.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="success" @click="to">编辑</el-button>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
+    <eForm ref="form" :sup_this="sup_this" :is-add="false" :dicts="dicts"/>
   </div>
 </template>
 <script>
@@ -16,6 +16,10 @@ export default {
     sup_this: {
       type: Object,
       required: true
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   methods: {
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
index 5391e76..bea5d15 100644
--- a/src/views/system/job/module/form.vue
+++ b/src/views/system/job/module/form.vue
@@ -26,10 +26,8 @@ import { getDepts } from '@/api/dept'
 import { add, edit } from '@/api/job'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import initDict from '@/mixins/initDict'
 export default {
   components: { Treeselect },
-  mixins: [initDict],
   props: {
     isAdd: {
       type: Boolean,
@@ -38,6 +36,10 @@ export default {
     sup_this: {
       type: Object,
       default: null
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   data() {
@@ -61,12 +63,6 @@ export default {
       }
     }
   },
-  created() {
-    this.$nextTick(() => {
-      // 加载数据字典
-      this.getDict('job_status')
-    })
-  },
   methods: {
     cancel() {
       this.resetForm()
diff --git a/src/views/system/job/module/header.vue b/src/views/system/job/module/header.vue
index f83692f..2fc5594 100644
--- a/src/views/system/job/module/header.vue
+++ b/src/views/system/job/module/header.vue
@@ -15,7 +15,7 @@
         type="primary"
         icon="el-icon-plus"
         @click="add">新增</el-button>
-      <eForm ref="form" :is-add="true"/>
+      <eForm ref="form" :is-add="true" :dicts="dicts"/>
     </div>
   </div>
 </template>
@@ -29,6 +29,10 @@ export default {
     query: {
       type: Object,
       required: true
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   data() {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 50bf5c5..35b77c6 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -8,7 +8,7 @@
         <el-tree :data="depts" :props="defaultProps" :expand-on-click-node="false" default-expand-all @node-click="handleNodeClick"/>
       </el-col>
       <el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20">
-        <eHeader :query="query" :sup_this="sup_this"/>
+        <eHeader :query="query" :sup_this="sup_this" :dicts="dicts"/>
         <!--表格渲染-->
         <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
           <el-table-column prop="username" label="用户名"/>
@@ -33,7 +33,7 @@
           </el-table-column>
           <el-table-column label="操作" width="140" align="center">
             <template slot-scope="scope">
-              <edit v-if="checkPermission(['ADMIN','USER_ALL','USER_EDIT'])" :data="scope.row" :sup_this="sup_this"/>
+              <edit v-if="checkPermission(['ADMIN','USER_ALL','USER_EDIT'])" :dicts="dicts" :data="scope.row" :sup_this="sup_this"/>
               <el-popover
                 v-if="checkPermission(['ADMIN','USER_ALL','USER_DELETE'])"
                 :ref="scope.row.id"
@@ -85,7 +85,6 @@ export default {
   },
   created() {
     this.getDeptDatas()
-    console.log(this.dicts)
     this.$nextTick(() => {
       this.init()
       // 加载数据字典
diff --git a/src/views/system/user/module/edit.vue b/src/views/system/user/module/edit.vue
index 8eb6d75..fb2c30d 100644
--- a/src/views/system/user/module/edit.vue
+++ b/src/views/system/user/module/edit.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="success" @click="to">编辑</el-button>
-    <eForm ref="form" :sup_this="sup_this" :is-add="false"/>
+    <eForm ref="form" :sup_this="sup_this" :is-add="false" :dicts="dicts"/>
   </div>
 </template>
 <script>
@@ -17,6 +17,10 @@ export default {
     sup_this: {
       type: Object,
       required: true
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   methods: {
diff --git a/src/views/system/user/module/form.vue b/src/views/system/user/module/form.vue
index 3085ef4..3e2c814 100644
--- a/src/views/system/user/module/form.vue
+++ b/src/views/system/user/module/form.vue
@@ -48,12 +48,10 @@ import { add, edit } from '@/api/user'
 import { getDepts } from '@/api/dept'
 import { getAll } from '@/api/role'
 import { getAllJob } from '@/api/job'
-import initDict from '@/mixins/initDict'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   components: { Treeselect },
-  mixins: [initDict],
   props: {
     isAdd: {
       type: Boolean,
@@ -62,6 +60,10 @@ export default {
     sup_this: {
       type: Object,
       default: null
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   data() {
@@ -96,10 +98,6 @@ export default {
     }
   },
   created() {
-    this.$nextTick(() => {
-      // 加载数据字典
-      this.getDict('user_status')
-    })
     const explorer = navigator.userAgent
     if (explorer.indexOf('Chrome') >= 0) {
       this.style = 'width: 184px'
diff --git a/src/views/system/user/module/header.vue b/src/views/system/user/module/header.vue
index 8405b2b..8e457bd 100644
--- a/src/views/system/user/module/header.vue
+++ b/src/views/system/user/module/header.vue
@@ -18,7 +18,7 @@
         type="primary"
         icon="el-icon-plus"
         @click="add">新增</el-button>
-      <eForm ref="form" :sup_this="sup_this" :is-add="true"/>
+      <eForm ref="form" :sup_this="sup_this" :is-add="true" :dicts="dicts"/>
     </div>
     <!-- 导出 -->
     <el-button
@@ -47,6 +47,10 @@ export default {
     sup_this: {
       type: Object,
       required: true
+    },
+    dicts: {
+      type: Array,
+      required: true
     }
   },
   data() {