Merge remote-tracking branch 'origin/master'

src/api/manager.js

@@ -8,6 +8,14 @@ export function fetchManager(data) {
   })
 }
 
+export function fetchEmp(data) {
+  return request({
+    url: '/manage/manager/listEmp',
+    method: 'post',
+    data
+  })
+}
+
 export function add(data) {
   return request({
     url: '/manage/manager/add',

src/views/employees/index.vue

@@ -156,7 +156,7 @@
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import { 组件名称 } from '组件路径',
-import { fetchEmp, add, findById, update, del, batchDel } from '@/api/emp'
+import { fetchEmp, add, findById, update, del, batchDel } from '@/api/manager'
 export default {
   //import引入的组件需要注入到对象中才能使用
   data() {

src/views/market/index.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="销售管理" v-if="role == 1 || role == 4">销售管理</el-tab-pane>
       <el-tab-pane label="人员管理" v-if="role == 1 || role == 3">
         <el-tabs :tab-position="tabPosition2" style="height: 80%">
-          <el-tab-pane label="管理员管理">
+          <el-tab-pane label="管理员管理" v-if="post == 1 || post == 2">
             <div>
               <el-button @click="fetchManager">刷新</el-button>
             </div>
@@ -37,6 +37,8 @@
               </el-table-column>
               <el-table-column label="员工住址" prop="empAddress"/>
               <el-table-column label="员工薪资" prop="empSal"/>
+              <el-table-column label="员工权限" prop="roleName"/>
+              <el-table-column label="员工岗位" prop="postName"/>
               <el-table-column label="操作">
                 <template slot-scope="scope">
                   <el-button type="warning" @click="openManager(scope.row.empId)">编辑</el-button>
@@ -162,7 +164,7 @@
               </div>
             </el-dialog>
           </el-tab-pane>
-          <el-tab-pane label="员工管理">
+          <el-tab-pane label="员工管理" v-if="post == 1 || post == 2">
             <div>
               <el-button @click="fetchEmp">刷新</el-button>
             </div>
@@ -193,6 +195,8 @@
               </el-table-column>
               <el-table-column label="员工住址" prop="empAddress"/>
               <el-table-column label="员工薪资" prop="empSal"/>
+              <el-table-column label="员工权限" prop="roleName"/>
+              <el-table-column label="员工岗位" prop="postName"/>
               <el-table-column label="操作">
                 <template slot-scope="scope">
                   <el-button type="warning" @click="openEmp(scope.row.empId)">编辑</el-button>
@@ -317,9 +321,13 @@
               </div>
             </el-dialog>
           </el-tab-pane>
+          <el-tab-pane label="会员管理" v-if="post == 1 || post == 3"></el-tab-pane>
+          <el-tab-pane label="客户管理" v-if="post == 1 || post == 3"></el-tab-pane>
         </el-tabs>
       </el-tab-pane>
-      <el-tab-pane label="仓库管理" v-if="role == 1 || role == 2">仓库管理</el-tab-pane>
+      <el-tab-pane label="仓库管理" v-if="role == 1 || role == 2">
+
+      </el-tab-pane>
       <el-tab-pane label="综合统计" v-if="role == 1 || role == 2 || role == 3">综合统计</el-tab-pane>
       <el-tab-pane label="报表统计" v-if="role == 1 || role == 2 || role == 3">报表统计</el-tab-pane>
     </el-tabs>
@@ -330,8 +338,7 @@
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import { 组件名称 } from '组件路径',
 
-import { add, batchDel, del, fetchManager, findById, update } from '@/api/manager'
+import { add, batchDel, del, fetchManager, findById, update, fetchEmp } from '@/api/manager'
-import { fetchEmp } from '@/api/emp'
 import { findRoles, findPosts } from '@/api/role'
 
 export default {
@@ -342,6 +349,7 @@ export default {
       tabPosition1: 'left',
       tabPosition2: 'left',
       role: localStorage.getItem('roleId'),
+      post: localStorage.getItem('postId'),
       emp: {
         empId: null,
         empName: '',