diff --git a/src/pages/user/AccountManagementModify.vue b/src/pages/user/AccountManagementModify.vue
index 0a2eae9..7725600 100644
--- a/src/pages/user/AccountManagementModify.vue
+++ b/src/pages/user/AccountManagementModify.vue
@@ -80,6 +80,7 @@
             confirmPassword: this.$route.query.password,
             roleId: this.$route.query.roleId,
             shopId: this.$route.query.shopId,
+            type:this.$route.query.type
           },
           modifyValidate: {
             userName:[
@@ -112,9 +113,13 @@
         }
       },
       mounted: function () {
-        debugger
         if(this.$route.query.roleCode === 'DZ-DIANZHANG'){
           this.shopSelectDisplay = true;
+          this.modifyFrom.type = 1;
+          this.listShop();
+        } else if(this.$route.query.roleCode  === "DG-DAOGOU"){
+          this.shopSelectDisplay = true;
+          this.modifyFrom.type = 4;
           this.listShop();
         }
         this.listRole();
@@ -158,7 +163,7 @@
               return;
             }
               if(this.shopSelectDisplay && !this.modifyFrom.shopId) {
-                this.$Message.info("店长必须选择店铺");
+                this.$Message.info("必须选择店铺");
                 return;
               }
               if(!this.modifyFrom.roleId) {
@@ -202,6 +207,11 @@
         roleChange(roleBean) {
           if(roleBean.code === 'DZ-DIANZHANG'){
             this.shopSelectDisplay = true;
+            this.modifyFrom.type = 1;
+            this.listShop();
+          } else if(roleBean.code === "DG-DAOGOU"){
+            this.shopSelectDisplay = true;
+            this.modifyFrom.type = 4;
             this.listShop();
           } else {
             this.shopSelectDisplay = false;
diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue
index fcea56d..ae4ae1e 100644
--- a/src/pages/user/AccountManager.vue
+++ b/src/pages/user/AccountManager.vue
@@ -82,18 +82,14 @@
                         align: 'center'
                     },
                     {
-                        title: '姓名',
+                        title: '用户名',
                         key: 'userName',
                         width: '150px'
                     },
                     {
-                        title: '员工ID',
-                        key: 'staffCode',
+                        title: '系统账号',
+                        key: 'account',
                         width: '150px',
-                        render: (h, params) => {
-                            let that = this;
-                            return h('span', {}, that.data1[params.index].staffCode === null ? '--' : that.data1[params.index].staffCode)
-                        }
                     },
                     {
                         title: '系统角色',
@@ -179,13 +175,13 @@
                 changeRoleId: null,
                 updateAccountId: 0,
                 updateUserId: 0,
-                item:null,
+                item: null,
             }
         },
         mounted: function () {
             this.listRoleInfo();
             this.listOfShop();
-            if(this.$route.query != null){
+            if (this.$route.query != null) {
                 this.item = this.$route.query;
                 //别的页面跳转过来
                 this.changeRoleId = this.item.id;
diff --git a/src/pages/user/AccountManagerAdd.vue b/src/pages/user/AccountManagerAdd.vue
index 28b2e45..369255f 100644
--- a/src/pages/user/AccountManagerAdd.vue
+++ b/src/pages/user/AccountManagerAdd.vue
@@ -72,7 +72,6 @@
 
 <script>
     import accountManagementAdd from '../../services/account/AccountManagementAdd'
-    import permission from '../../services/permission/Permission'
     import accountManagement from "../../services/account/AccountManagement";
 
     export default {
@@ -85,7 +84,8 @@
                     account: null,
                     password: null,
                     confirmPassword: null,
-                    shopId: null
+                    shopId: null,
+                    type: null
                 },
                 addValidate: {
                     userName: [
@@ -221,8 +221,13 @@
             roleChange(roleBean) {
                 if (roleBean.code === 'DZ-DIANZHANG') {
                     this.shopSelectDisplay = true;
+                    this.addFrom.type = 1;
                     this.listOfShop();
-                } else {
+                } else if(roleBean.code === "DG-DAOGOU"){
+                    this.shopSelectDisplay = true;
+                    this.addFrom.type = 4;
+                    this.listOfShop();
+                }else {
                     this.shopSelectDisplay = false;
                     this.addFrom.shopId = null;
                 }