diff --git a/src/pages/shop/IncreaseStaffManager.vue b/src/pages/shop/IncreaseStaffManager.vue
index fa420d2..7375943 100644
--- a/src/pages/shop/IncreaseStaffManager.vue
+++ b/src/pages/shop/IncreaseStaffManager.vue
@@ -83,12 +83,10 @@
                 </template>
             </div>
 
-            <Form
-                    ref="formValidate"
+            <Form ref="formValidate"
                     :model="formValidate"
                     :rules="ruleValidate"
-                    :label-width="80"
-            >
+                    :label-width="80">
                 <FormItem label="名称" prop="name">
                     <i-input
                             v-model="formValidate.name"
@@ -99,8 +97,7 @@
                     <i-input
                             v-model="formValidate.phone"
                             placeholder="成员通过验证该手机号后可加入企业"
-                            :disabled="flag !== 1"
-                    >
+                            :disabled="flag !== 1">
                     </i-input>
                 </FormItem>
                 <FormItem label="工号" prop="staffCode">
@@ -110,14 +107,13 @@
                             :disabled="flag !== 1"
                     ></i-input>
                 </FormItem>
-                <FormItem label="角色" prop="role">
+                <FormItem label="角色" prop="roleId">
                     <Select
-                            v-model="formValidate.role"
+                            v-model="formValidate.roleId"
                             placeholder="选择角色"
-                            :disabled="flag !== 1"
-                    >
-                        <Option value="DZ-DIANZHANG">店长</Option>
-                        <Option value="DG-DAOGOU">导购</Option>
+                            :disabled="flag !== 1">
+                        <Option :value="4">店长</Option>
+                        <Option :value="5">导购</Option>
                     </Select>
                 </FormItem>
                 <FormItem v-if="flag === 1" label="" prop="checkbox">
@@ -125,8 +121,8 @@
                         <Checkbox label="vail">同步开通账号</Checkbox>
                     </CheckboxGroup>
                 </FormItem>
-                <FormItem v-if="flag !== 1 && formValidate.role === 'DZ-DIANZHANG'" label="主店长" prop="type">
-                    <Checkbox :disabled="formValidate.type === 1 ? true : false" v-model="formValidate.type"
+                <FormItem v-if="flag !== 1 && formValidate.roleCode === 'DZ-DIANZHANG'" label="主店长" prop="type">
+                    <Checkbox :disabled="formValidate.type === 1" v-model="formValidate.type"
                               :true-value="1" :false-value="2"></Checkbox>
                 </FormItem>
                 <FormItem style="text-align: left;">
@@ -244,7 +240,7 @@
                     },
                     {
                         title: '角色',
-                        key: 'role',
+                        key: 'roleName',
                     },
                     {
                         title: '客户数',
@@ -257,21 +253,28 @@
                     },
                     {
                         title: '停用/启用',
-                        key: 'accountFlag',
+                        key: 'status',
                         render: (h, params) => {
                             let _this = this;
                             return h('div', [
                                 h('i-switch', {
                                     props: {
-                                        value: params.row.accountFlag,
-                                        'true-value': true,//开启值
-                                        'false-value': false,//关闭值
+                                        value: params.row.status,
+                                        'true-value': 1,//开启值
+                                        'false-value': 2,//关闭值
                                         size: 'large'
                                     },
                                     on: { //操作事件
                                         'on-change': function (value) {
                                             //修改后请求方法
-                                            _this.modifyStatus(params.row.accountId, value);
+                                            // _this.modifyStatus(params.row.accountId, value);
+                                            let request = {
+                                                status: value,
+                                                id: _this.formValidate.id
+                                            };
+                                            debugger
+                                            //修改接口
+                                            _this.editSattf(request);
                                         }
                                     },
                                     scopedSlots: {
@@ -294,12 +297,13 @@
                     staffCode: '',
                     region: '',
                     phone: '',
-                    role: '',
+                    roleId: 0,
                     store: '',
                     userId: '',
                     type: '',
                     status: 0,
-                    checkbox: ['vail']
+                    checkbox: ['vail'],
+                    roleCode: ''
                 },
                 ruleValidate: {
                     name: [
@@ -316,8 +320,8 @@
                     //     { required: true, message: '邮箱不能为空', trigger: 'blur' },
                     //     { type: 'email', message: '邮箱格式错误', trigger: 'blur' }
                     // ],
-                    role: [
-                        {required: true, message: '请选择角色', trigger: 'change'}
+                    roleId: [
+                        {type: 'number', required: true, message: '请选择角色', trigger: 'change'}
                     ],
                     region: [
                         {required: true, type: String, message: '请选择区域', trigger: 'change'}
@@ -500,27 +504,19 @@
             open: function (flag, row) {
                 this.flag = flag;
                 this.isShowAdd = true;
-                let role;
-
-                if (row && row.type) {
-                    if (row.type === 1 || row.type === 2) {
-                        role = "DZ-DIANZHANG";
-                    } else {
-                        role = "DG-DAOGOU";
-                    }
-                }
-
-                if (flag == 2) {
+                if (flag === 2) {
                     this.formValidate = {
                         name: row.name,
                         staffCode: row.staffCode,
                         phone: row.mobil,
-                        role: role,
+                        roleId: row.roleId,
                         store: row.storeId,
                         type: row.type,
                         userId: row.userId,
                         id: row.id,
+                        roleCode: row.roleCode
                     };
+                    debugger
                 } else {
                     this.handleAdd(this.formValidate);
                 }
@@ -576,16 +572,16 @@
             handleSubmit(value) {
                 if (value) {
                     let request = {};
-                    if (this.flag == 1) {
-                        if (value.name == null || value.name == "") {
+                    if (this.flag === 1) {
+                        if (value.name == null || value.name === "") {
                             this.$Message.success("名称不能为空!");
                             return;
                         }
-                        if (value.staffCode == null || value.staffCode == "") {
+                        if (value.staffCode == null || value.staffCode === "") {
                             this.$Message.success("工号不能为空!");
                             return;
                         }
-                        if (value.role == null || value.role == "") {
+                        if (value.roleId == null || value.roleId === 0) {
                             this.$Message.success("角色不能为空!");
                             return;
                         }
@@ -595,24 +591,18 @@
                             storeId: this.selectedStore,
                             mobil: value.phone,
                             staffCode: value.staffCode,
-                            role: value.role,
+                            role: value.roleId,
                             isOpen: this.formValidate.checkbox[0],
                         };
                         this.addSattf(request);
                     } else {
-                        let newRole;
-                        if (value.role === "DZ-DIANZHANG") {
-                            newRole = 4;
-                        } else {
-                            newRole = 5;
-                        }
 
                         request = {
                             name: value.name,
                             storeId: this.selectedStore,
                             mobil: value.phone,
                             staffCode: value.staffCode,
-                            roleId: newRole,
+                            roleId: value.roleId,
                             userId: this.formValidate.userId,
                             type: this.formValidate.type,
                             id: this.formValidate.id,
@@ -633,7 +623,7 @@
                 value.store = "";
                 value.phone = "";
                 value.staffCode = "";
-                value.role = "";
+                value.roleId = 0;
                 value.type = "";
                 value.region = "";
                 value.checkbox = ["vail"];