From 326a5834be885eed60befa5aec497727dcd5884d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 12 Oct 2023 15:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/api/staff/duty.js              |   8 +
 fuintAdmin/src/views/staff/list.vue           | 213 +++++++-----
 fuintAdmin/src/views/staff/model/addStaff.vue | 324 ------------------
 .../member/controller/LjDutyController.java   |  17 +
 .../fuint/business/member/entity/LJStaff.java |   3 +
 .../member/mapper/xml/LJStaffMapper.xml       |  15 +-
 .../member/service/ILJDutyService.java        |   7 +
 .../service/impl/LJDutyServiceImpl.java       |  14 +
 .../service/impl/LJStaffServiceImpl.java      |  10 +-
 .../controller/BackendAccountController.java  |   4 +-
 .../com/fuint/repository/model/TAccount.java  |   2 +-
 11 files changed, 190 insertions(+), 427 deletions(-)
 delete mode 100644 fuintAdmin/src/views/staff/model/addStaff.vue

diff --git a/fuintAdmin/src/api/staff/duty.js b/fuintAdmin/src/api/staff/duty.js
index 4f8fba4b2..8e5eb3e0d 100644
--- a/fuintAdmin/src/api/staff/duty.js
+++ b/fuintAdmin/src/api/staff/duty.js
@@ -8,3 +8,11 @@ export function listDuty(query) {
     params: query
   })
 }
+
+// 查询角色详细
+export function getDuty(id) {
+  return request({
+    url: '/business/member/duty/' + id,
+    method: 'get'
+  })
+}
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index 62173cf11..6d064a413 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -2,16 +2,16 @@
   <div class="app-container">
     <el-card >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="员工类别" prop="category">
-          <el-select v-model="queryParams.category" clearable placeholder="请选择员工类别">
-            <el-option
-              v-for="item in categoryOptions"
-              :key="item.key"
-              :label="item.name"
-              :value="item.key"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="员工类别" prop="category">-->
+<!--          <el-select v-model="queryParams.category" clearable placeholder="请选择员工类别">-->
+<!--            <el-option-->
+<!--              v-for="item in categoryOptions"-->
+<!--              :key="item.key"-->
+<!--              :label="item.name"-->
+<!--              :value="item.key"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="姓名" prop="name">
           <el-input
             v-model="queryParams.realName"
@@ -32,18 +32,22 @@
         </el-form-item>
         <el-form-item label="状态" prop="auditedStatus">
           <el-select
-            v-model="queryParams.auditedStatus"
+            v-model="queryParams.status"
             placeholder="状态"
             clearable
             style="width: 240px"
           >
-            <el-option key="A" label="启用" value="A"/>
-            <el-option key="N" label="禁用" value="N"/>
+            <el-option
+              v-for="dict in dict.type.zhzt"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
           </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+<!--          <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>-->
 
         </el-form-item>
       </el-form>
@@ -66,14 +70,10 @@
         <el-table-column label="姓名" align="center" prop="realName" />
         <el-table-column label="手机号" align="center" prop="mobile"  width="110"/>
         <el-table-column label="核销权限" align="center" prop="writeOff">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.write_off" :value="scope.row.write_off"/>
-          </template>
+
         </el-table-column>
         <el-table-column label="特殊权限" align="center" prop="specialPrem">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.special_prem" :value="scope.row.special_prem"/>
-          </template>
+
         </el-table-column>
         <el-table-column label="退款权限" align="center" prop="refund">
           <template slot-scope="scope">
@@ -152,21 +152,21 @@
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="员工类别" prop="category">
-              <el-select v-model="form.category" placeholder="请选择员工类别">
-                <el-option key="0" label="请选择员工类别" value="0"></el-option>
-                <el-option
-                  v-for="item in categoryOptions"
-                  :key="item.key"
-                  :label="item.name"
-                  :value="item.key"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="员工类别" prop="category">-->
+<!--              <el-select v-model="form.category" placeholder="请选择员工类别">-->
+<!--                <el-option key="0" label="请选择员工类别" value="0"></el-option>-->
+<!--                <el-option-->
+<!--                  v-for="item in categoryOptions"-->
+<!--                  :key="item.key"-->
+<!--                  :label="item.name"-->
+<!--                  :value="item.key"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="8">
             <el-form-item label="姓名" prop="realName">
@@ -182,10 +182,10 @@
             <el-form-item label="角色组" prop="role">
               <el-select v-model="form.role" placeholder="请选择角色">
                 <el-option
-                  v-for="item in role"
-                  :key="item.dutyId"
-                  :label="item.dutyName"
-                  :value="item.dutyId"
+                  v-for="dict in dict.type.role"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -219,7 +219,7 @@
           <el-col :span="10" style="display: flex;margin-bottom: 20px">
             <template>
               <span style="margin-right: 10px">核销权限</span>
-              <el-checkbox-group v-model="writeOff" @change="getCheckbox">
+              <el-checkbox-group v-model="writeOff" ref="" @change="getCheckbox">
                 <el-checkbox
                   v-for="dict in dict.type.write_off"
                   :key="dict.value"
@@ -231,7 +231,7 @@
           </el-col>
           <el-col :span="14" style="display: flex">
             <span style="margin-right: 10px">特殊权限</span>
-            <el-checkbox-group v-model="specialPrem">
+            <el-checkbox-group v-model="specialPrem" @change="getCheckbox">
               <el-checkbox
                 v-for="dict in dict.type.special_prem"
                 :key="dict.value"
@@ -293,7 +293,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="指定油枪" prop="oilGunId" v-if="form.notice == zdyx">
+            <el-form-item label="指定油枪" prop="oilGunId" v-show="form.notice == 'zdyx'">
               <el-select v-model="form.oilGunId">
                 <el-option
                   v-for="dict in dict.type.notice"
@@ -306,7 +306,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="时间范围" prop="timeFrame">
-              <el-select v-model="form.timeFrame" placeholder="请选择角色">
+              <el-select v-model="form.timeFrame">
                 <el-option
                   v-for="dict in dict.type.time_frame"
                   :key="dict.value"
@@ -320,7 +320,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="交班模式" prop="handoverMode">
-              <el-select v-model="form.handoverMode" placeholder="请选择所属店铺">
+              <el-select v-model="form.handoverMode">
                 <el-option
                   v-for="dict in dict.type.handover"
                   :key="dict.value"
@@ -396,38 +396,26 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="POS权限" prop="posPrem">
-              <el-select
-                v-model="form.posPrem"
-                multiple
-                filterable
-                allow-create
-                default-first-option
-                placeholder="请选择文章标签">
-                <el-option
-                  v-for="item in posOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+              <div class="block">
+                <el-cascader
+                  v-model="posPrem"
+                  :options="posOptions"
+                  :props="props"
+                  @change="handleNodeClick1"
+                  clearable></el-cascader>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="小程序权限" prop="appletPrem">
-              <el-select
-                v-model="form.appletPrem"
-                multiple
-                filterable
-                allow-create
-                default-first-option
-                placeholder="请选择文章标签">
-                <el-option
-                  v-for="item in appletOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+              <div class="block">
+                <el-cascader
+                  v-model="appletPrem"
+                  :options="appletOptions"
+                  :props="props"
+                  @change="handleNodeClick2"
+                  clearable></el-cascader>
+              </div>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -463,12 +451,14 @@
 import { getStaffList, getStaffInfo, updateStaffStatus, deleteStaff, saveStaff } from "@/api/staff";
 import {getName} from "../../utils/fuint";
 import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "@/api/staff/staff";
-import {listDuty} from "@/api/staff/duty";
+import {getDuty, listDuty} from "@/api/staff/duty";
+import {listType} from "@/api/dict/type";
+import {listData} from "@/api/system/dict/data";
 
 export default {
   name: "StaffList",
   dicts: ['ywqx','write_off','special_prem','display','zhzt','transaction','time_frame','handover','handover_quit',
-    'jbjl','official','notice','special_prem'],
+    'jbjl','official','notice','special_prem','role'],
   data() {
     return {
       // 标题
@@ -483,11 +473,28 @@ export default {
       showSearch: true,
       categoryOptions: [],
       storeOptions: [],
-      role:[],
-      posOptions:[],
-      appletOptions:[],
+      // role:[],
+      posPrem:'',
+      posOptions:[
+        {value: '首页权限',label: '首页权限',children:[{value: '禁用普通收款权限', label: '禁用普通收款权限' },]},
+        {value: '会员储值',label: '会员储值'},
+        {value: '会员实体卡',label: '会员实体卡'},
+        {value: '会员积分',label: '会员积分'},
+        {value: '加油金变动',label: '加油金变动'},
+        {value: '会员卡券',label: '会员卡券'},
+        {value: '会员成长值',label: '会员成长值'},
+      ],
+      props: { multiple: true },
+      appletPrem:'',
+      appletOptions:[
+        {value: '首页权限',label: '首页权限',children:[{value: '女装', label: '女装' },]},
+        {value: '会员储值',label: '会员储值'},
+        {value: '会员实体卡',label: '会员实体卡'},
+      ],
       writeOff:[],
+      write:[],
       specialPrem:[],
+      special:[],
       // 总条数
       total: 0,
       // 表格数据
@@ -501,9 +508,9 @@ export default {
       // 表单参数
       form: {
         id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:'', auditedStatus:'',
-        auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'', record:'',
-        merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
-        transaction:'qbjy', writeOff:[],specialPrem:[], official:'', status:'qy',pos:'jy'
+        auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
+        merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
+        transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
       },
       // 查询参数
       queryParams: {
@@ -511,7 +518,7 @@ export default {
         pageSize: 10,
         realName: '',
         mobile: '',
-        auditedStatus: ''
+        status: ''
       },
       // 表单校验
       rules: {
@@ -567,12 +574,19 @@ export default {
   },
   created() {
     this.getList();
-    this.getDuty();
+    // this.getDuty();
     // this.getStoreList();
   },
   methods: {
+    handleNodeClick1(data) {
+      this.form.posPrem = JSON.stringify(data);
+    },
+    handleNodeClick2(data) {
+      this.form.appletPrem = JSON.stringify(data);
+    },
     getCheckbox(){
-      console.log(this.writeOff)
+      this.form.writeOff = this.writeOff.toString();
+      this.form.specialPrem = this.specialPrem.toString();
     },
     // 页面跳转
     toTarget(url) {
@@ -581,13 +595,14 @@ export default {
     getName,
     // 查询列表
     getList() {
-      // this.loading = true;
-      listStaff().then(response => {
+      this.loading = true;
+      listStaff(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.list = response.data.records;
         this.total = response.data.total;
-        response.data.records.forEach(item=>{
-          this.categoryOptions.push(item.category)
-        })
+        // response.data.records.forEach(item=>{
+        //   this.categoryOptions.push(item.category)
+        // })
+        this.loading = false;
         }
       );
       // getStaffList(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
@@ -598,7 +613,7 @@ export default {
       //   }
       // );
     },
-    // 查询角色
+    // 查询角色列表
     getDuty(){
       listDuty().then(response => {
           this.role = response.data
@@ -631,7 +646,8 @@ export default {
     handleStatusChange(row) {
       let text = row.auditedStatus == "A" ? "启用" : "禁用";
       this.$modal.confirm('确认要' + text + '"' + row.realName + '"吗？').then(function() {
-          return updateStaffStatus(row.id, row.auditedStatus);
+          // return updateStaffStatus(row.id, row.auditedStatus);
+        return updateStaff({id:row.id, auditedStatus:row.auditedStatus})
       }).then(() => {
           this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
@@ -657,11 +673,14 @@ export default {
     },
     // 表单重置
     reset() {
+      this.posPrem = '';
+      this.appletPrem = '';
+      this.writeOff = []
       this.form = {
         id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:'', auditedStatus:'A',
-        auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'', record:'',
-        merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
-        transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy'
+        auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
+        merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
+        transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
       };
       this.resetForm("form");
     },
@@ -675,7 +694,8 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (!this.form.id) {
-              console.log(this.form)
+            this.form.posPrem = JSON.parse(this.form.posPrem);
+            this.form.appletPrem = JSON.parse(this.form.appletPrem);
             addStaff(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -693,6 +713,7 @@ export default {
     },
     // 修改按钮操作
     handleUpdate(row) {
+      this.reset();
       this.open = true;
       const id = row.id || this.ids;
       getStaff(id).then(response => {
@@ -700,6 +721,10 @@ export default {
         // this.form.category = response.data.staffInfo.category + '';
         this.open = true;
         this.title = "编辑员工信息";
+        this.writeOff = this.form.writeOff.split(",");
+        this.specialPrem = this.form.specialPrem.split(",");
+        this.posPrem = JSON.parse(this.form.posPrem);
+        this.appletPrem = JSON.parse(this.form.appletPrem);
       });
     },
     // 删除按钮操作
diff --git a/fuintAdmin/src/views/staff/model/addStaff.vue b/fuintAdmin/src/views/staff/model/addStaff.vue
deleted file mode 100644
index 594c48a4b..000000000
--- a/fuintAdmin/src/views/staff/model/addStaff.vue
+++ /dev/null
@@ -1,324 +0,0 @@
-<template>
-  <div>
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="员工类别" prop="category">
-            <el-select v-model="form.category" placeholder="请选择员工类别">
-              <el-option key="0" label="请选择员工类别" value="0"></el-option>
-              <el-option
-                v-for="item in categoryOptions"
-                :key="item.key"
-                :label="item.name"
-                :value="item.key"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="姓名" prop="realName">
-            <el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="手机号" prop="mobile">
-            <el-input v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="角色组" prop="role">
-            <el-select v-model="form.role" placeholder="请选择角色">
-              <el-option
-                v-for="item in role"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="登录密码" prop="mobile">
-            <el-input v-model="form.password" placeholder="请输入登录密码" maxlength="30"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="退款权限" prop="refund">
-            <el-select v-model="form.refund" placeholder="请选择权限">
-              <el-option :key="0" label="无权限" :value="'myqx'"></el-option>
-              <el-option :key="0" label="有权限" :value="'yqx'"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="退款密码" prop="mobile">
-            <el-input v-model="form.applypassword" placeholder="请输入登录密码" maxlength="30"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="10">
-          核销权限
-          <el-checkbox-group v-model="writeOff">
-            <el-checkbox label="复选框 A"></el-checkbox>
-            <el-checkbox label="复选框 B"></el-checkbox>
-          </el-checkbox-group>
-        </el-col>
-        <el-col :span="14">
-          特殊权限
-          <el-checkbox-group v-model="specialPrem">
-            <el-checkbox label="复选框 A"></el-checkbox>
-            <el-checkbox label="复选框 B"></el-checkbox>
-            <el-checkbox label="复选框 C"></el-checkbox>Y
-            <el-checkbox label="复选框 C"></el-checkbox>Y
-          </el-checkbox-group>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="一键加油" prop="refund">
-            <el-select v-model="form.refund">
-              <el-option :key="0" label="无权限" :value="'myqx'"></el-option>
-              <el-option :key="0" label="有权限" :value="'yqx'"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="POS加油员" prop="refund">
-            <el-select v-model="form.refund">
-              <el-option :key="0" label="无权限" :value="'myqx'"></el-option>
-              <el-option :key="0" label="有权限" :value="'yqx'"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="交易统计" prop="refund">
-            <el-select v-model="form.refund">
-              <el-option :key="0" label="无权限" :value="'myqx'"></el-option>
-              <el-option :key="0" label="有权限" :value="'yqx'"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="收款通知" prop="role">
-            <el-select v-model="form.role" placeholder="请选择角色">
-              <el-option
-                v-for="item in role"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="时间范围" prop="role">
-            <el-select v-model="form.role" placeholder="请选择角色">
-              <el-option
-                v-for="item in role"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="交班模式" prop="storeId">
-            <el-select v-model="form.storeId" placeholder="请选择所属店铺">
-              <el-option :key="0" label="全部店铺" :value="0"></el-option>
-              <el-option
-                v-for="item in storeOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-                :disabled="item.status !== 'A'"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="交班权限" prop="storeId">
-            <el-select v-model="form.storeId" placeholder="请选择所属店铺">
-              <el-option :key="0" label="全部店铺" :value="0"></el-option>
-              <el-option
-                v-for="item in storeOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-                :disabled="item.status !== 'A'"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="交班退出" prop="storeId">
-            <el-select v-model="form.storeId" placeholder="请选择所属店铺">
-              <el-option :key="0" label="全部店铺" :value="0"></el-option>
-              <el-option
-                v-for="item in storeOptions"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-                :disabled="item.status !== 'A'"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="交班记录" prop="refund">
-            <el-select v-model="form.refund">
-              <el-option :key="0" label="无权限" :value="'myqx'"></el-option>
-              <el-option :key="0" label="有权限" :value="'yqx'"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="交班商户号" prop="refund">
-            <el-select v-model="form.refund">
-              <el-option :key="0" label="无权限" :value="'myqx'"></el-option>
-              <el-option :key="0" label="有权限" :value="'yqx'"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="员工筛选" prop="refund">
-            <el-select v-model="form.refund">
-              <el-option :key="0" label="无权限" :value="'myqx'"></el-option>
-              <el-option :key="0" label="有权限" :value="'yqx'"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="POS权限" prop="refund">
-            <el-select
-              v-model="posPrem"
-              multiple
-              filterable
-              allow-create
-              default-first-option
-              placeholder="请选择文章标签">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="小程序权限" prop="refund">
-            <el-select
-              v-model="appletPrem"
-              multiple
-              filterable
-              allow-create
-              default-first-option
-              placeholder="请选择文章标签">
-              <el-option
-                v-for="item in appletOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="账户状态" prop="refund">
-            <el-select v-model="form.refund">
-              <el-option :key="0" label="无权限" :value="'myqx'"></el-option>
-              <el-option :key="0" label="有权限" :value="'yqx'"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="备注信息">
-            <el-input v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data(){
-    return{
-      form:[],
-      categoryOptions: [],
-      storeOptions: [],
-      role:[],
-      writeOff:[],
-      specialPrem:[],
-      posPrem:'',
-      posOptions:[],
-      appletPrem:'',
-      appletOptions:[],
-      // 表单校验
-      rules: {
-        realName: [
-          { required: true, message: "姓名不能为空", trigger: "blur" },
-          { min: 2, max: 30, message: '姓名长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: "手机号不能为空", trigger: "blur" },
-          { min: 11, max: 20, message: '手机号长度必须11', trigger: 'blur' }
-        ],
-        storeId: [
-          { required: true, message: "请选择所属店铺", trigger: "blur" }
-        ]
-      }
-    }
-  },
-  methods:{
-    // 提交按钮
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (!this.form.id) {
-            // saveStaff(this.form).then(response => {
-            //   this.$modal.msgSuccess("新增成功");
-            //   this.open = false;
-            //   this.getList();
-            // });
-          } else {
-            // saveStaff(this.form).then(response => {
-            //   this.$modal.msgSuccess("修改成功");
-            //   this.open = false;
-            //   this.getList();
-            // });
-          }
-        }
-      });
-    },
-    cancel(){
-      this.$router.back(-1);
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LjDutyController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LjDutyController.java
index d17262a16..e55bd391f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LjDutyController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LjDutyController.java
@@ -4,8 +4,10 @@ import com.fuint.business.member.entity.LJDuty;
 import com.fuint.business.member.service.ILJDutyService;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -17,9 +19,24 @@ public class LjDutyController extends BaseController {
     @Autowired
     private ILJDutyService dutyService;
 
+    /**
+     * 查询角色信息
+     * @return
+     */
     @GetMapping("/list")
     public ResponseObject list(){
         List<LJDuty> list = dutyService.selectDutyList();
         return getSuccessResult(list);
     }
+
+    /**
+     * 根据id查询角色信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public ResponseObject dutyInfo(@PathVariable Integer id){
+        LJDuty duty = dutyService.selectDutyById(id);
+        return getSuccessResult(duty);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java
index bc3f22bbf..db87a3500 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java
@@ -118,4 +118,7 @@ public class LJStaff extends BaseEntity implements Serializable {
 
     @ApiModelProperty("POS加油员，启用；禁用")
     private String pos;
+
+    @ApiModelProperty("角色id")
+    private String role;
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml
index e0c752cb9..ebefbbf60 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml
@@ -36,24 +36,29 @@
         <result property="official" column="official" />
         <result property="status" column="status" />
         <result property="pos" column="pos" />
+        <result property="role" column="role" />
     </resultMap>
 
     <sql id="selectMtStaff">
         select id, merchant_id, store_id, user_id, category, mobile, real_name, wechat, create_time, update_time,
                audited_status, audited_time, description, create_by, update_by, is_refuel, handover_mode, handover_prem,
                handover_out, record, merchant_status, screen, pos_prem, applet_prem, notice, oil_gun_id, time_frame, refund,
-            transaction, write_off, special_prem, official,status,pos from mt_staff
+            transaction, write_off, special_prem, official,status,pos,role from mt_staff
     </sql>
 <!--根据条件分页查询用户信息-->
     <select id="selectLJStaffList" resultMap="LJStaffResult">
         <include refid="selectMtStaff"></include>
         <where>
+            store_id = #{staff.storeId}
             <if test="staff.realName != null and staff.realName != ''">
                 and real_name like concat('%', #{staff.realName}, '%')
             </if>
             <if test="staff.mobile != null and staff.mobile != ''">
                 and mobile like concat('%', #{staff.mobile}, '%')
             </if>
+            <if test="staff.status != null and staff.status != ''">
+                and status = #{staff.status}
+            </if>
         </where>
     </select>
 <!--根据id查询员工信息-->
@@ -62,9 +67,9 @@
         where id = #{id}
     </select>
 <!--根据id查询员工信息-->
-    <select id="deleteStaffById">
+    <delete id="deleteStaffById">
         delete from mt_staff where id = #{id}
-    </select>
+    </delete>
 <!--增加员工信息-->
     <insert id="insertStaff">
         insert into mt_staff(
@@ -140,11 +145,11 @@
         update mt_staff p set p.AUDITED_STATUS = #{status}, p.UPDATE_TIME = #{updateTime} where p.ID = #{id}
     </update>
 
-    <select id="queryStaffByMobile" resultType="com.fuint.repository.model.MtStaff">
+    <select id="queryStaffByMobile" resultType="com.fuint.business.member.entity.LJStaff">
         select * from mt_staff t where t.MOBILE = #{mobile} and t.AUDITED_STATUS != 'D'
     </select>
 
-    <select id="queryStaffByUserId" resultType="com.fuint.repository.model.MtStaff">
+    <select id="queryStaffByUserId" resultType="com.fuint.business.member.entity.LJStaff">
         select * from mt_staff t where t.USER_ID = #{userId} and t.AUDITED_STATUS != 'D'
     </select>
 </mapper>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJDutyService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJDutyService.java
index 10c29ff18..6016cda20 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJDutyService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJDutyService.java
@@ -11,4 +11,11 @@ public interface ILJDutyService extends IService<LJDuty> {
      * @return
      */
     public List<LJDuty> selectDutyList();
+
+    /**
+     * 根据id查询角色信息
+     * @param id
+     * @return
+     */
+    public LJDuty selectDutyById(int id);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJDutyServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJDutyServiceImpl.java
index 256f2f93f..77e69c76d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJDutyServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJDutyServiceImpl.java
@@ -10,8 +10,22 @@ import java.util.List;
 
 @Service
 public class LJDutyServiceImpl extends ServiceImpl<LJDutyMapper, LJDuty> implements ILJDutyService {
+    /**
+     * 查询角色信息
+     * @return
+     */
     @Override
     public List<LJDuty> selectDutyList() {
         return baseMapper.selectList(null);
     }
+
+    /**
+     * 根据id查询角色信息
+     * @param id
+     * @return
+     */
+    @Override
+    public LJDuty selectDutyById(int id) {
+        return baseMapper.selectById(id);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
index d66f9d943..f9279e481 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.member.entity.LJStaff;
 import com.fuint.business.member.mapper.LJStaffMapper;
 import com.fuint.business.member.service.ILJStaffService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import jdk.nashorn.internal.parser.Token;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -23,6 +26,9 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
      */
     @Override
     public IPage<LJStaff> selectStaffList(Page page, LJStaff staff) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        staff.setStoreId(storeId);
         return baseMapper.selectLJStaffList(page,staff);
     }
 
@@ -63,7 +69,9 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
      */
     @Override
     public int insertStaff(LJStaff staff) {
-        staff.setCreateTime(new Date());
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        staff.setStoreId(storeId);
         int row = baseMapper.insert(staff);
         return row;
     }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java
index e8014c123..9251b2248 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java
@@ -138,9 +138,9 @@ public class BackendAccountController extends BaseController {
             accountDto.setAccountKey(tAccount.getAccountKey());
             accountDto.setAccountName(tAccount.getAccountName());
             accountDto.setAccountStatus(tAccount.getAccountStatus());
-            accountDto.setCreateDate(tAccount.getCreateTime());
+//            accountDto.setCreateDate(tAccount.getCreateTime());
             accountDto.setRealName(tAccount.getRealName());
-            accountDto.setModifyDate(tAccount.getUpdateTime());
+//            accountDto.setModifyDate(tAccount.getUpdateTime());
             accountDto.setStaffId(tAccount.getStaffId());
             accountDto.setMerchantId(tAccount.getMerchantId());
             if (tAccount.getStoreId() > 0) {
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
index 44b96d419..d4d41fea7 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
@@ -45,7 +45,7 @@ public class TAccount extends BaseEntity implements Serializable {
 
     @ApiModelProperty("0 未激活 1已激活")
     private Integer isActive;
-    
+
     @ApiModelProperty("随机码")
     private String salt;