diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue
index 0864d5ce1..ddb2e7430 100644
--- a/jero-web/src/views/system/modules/UserModal.vue
+++ b/jero-web/src/views/system/modules/UserModal.vue
@@ -21,29 +21,32 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-<!--        v-if="!disabled"-->
+        <!--        v-if="!disabled"-->
         <a-form-item :label="$t('userAccount')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]" :disabled='isdisabled'
+          <a-input :placeholder="$t('enterUserAccount')" v-decorator.trim="[ 'username', validatorRules.username]"
+                   :disabled='isdisabled'
                    :readOnly="!!model.id"/>
         </a-form-item>
-<!--        v-if="!model.id && !disabled"-->
+        <!--        v-if="!model.id && !disabled"-->
         <template>
-<!--          <a-form-item :label="$t('LoginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--            <a-input type="password" :placeholder="$t('enterLoginPassword')" autocomplete='new-password'-->
-<!--                     v-decorator="[ 'password',validatorRules.password]"/>-->
-<!--          </a-form-item>-->
-<!--          v-if="!disabled"-->
-<!--          <a-form-item :label="$t('ConfirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--            <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')"-->
-<!--                     v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>-->
-<!--          </a-form-item>-->
+          <!--          <a-form-item :label="$t('LoginPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--            <a-input type="password" :placeholder="$t('enterLoginPassword')" autocomplete='new-password'-->
+          <!--                     v-decorator="[ 'password',validatorRules.password]"/>-->
+          <!--          </a-form-item>-->
+          <!--          v-if="!disabled"-->
+          <!--          <a-form-item :label="$t('ConfirmPassword')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+          <!--            <a-input type="password" @blur="handleConfirmBlur" :placeholder="$t('reenterLoginPassword')"-->
+          <!--                     v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>-->
+          <!--          </a-form-item>-->
         </template>
-<!--        v-if="!disabled"-->
+        <!--        v-if="!disabled"-->
         <a-form-item :label="$t('userName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterUserName')" :disabled='isdisabled' v-decorator.trim="[ 'realname', validatorRules.realname]"/>
+          <a-input :placeholder="$t('enterUserName')" :disabled='isdisabled'
+                   v-decorator.trim="[ 'realname', validatorRules.realname]"/>
         </a-form-item>
         <a-form-item :label="$t('position')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input  type="textarea" style='height: 100px' :placeholder="$t('pleaseEnter')+$t('position')" :disabled='isdisabled' v-decorator.trim="[ 'jobTitle', validatorRules.jobTitle]"/>
+          <a-input type="textarea" style='height: 100px' :placeholder="$t('pleaseEnter')+$t('position')"
+                   :disabled='isdisabled' v-decorator.trim="[ 'jobTitle', validatorRules.jobTitle]"/>
         </a-form-item>
 
         <!--<a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -53,9 +56,9 @@
         <!--<a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
         <!--<j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]"/>-->
         <!--</a-form-item>-->
-<!--        v-show="!roleDisabled"-->
+        <!--        v-show="!roleDisabled"-->
         <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                     >
+        >
           <a-select
             mode="multiple"
             style="width: 100%"
@@ -63,7 +66,7 @@
             :placeholder="$t('selectUserRole')"
             optionFilterProp="children"
             v-model="selectedRole"
-            :disabled='isdisabled'
+            :disabled='false'
             :getPopupContainer="(target) => target.parentNode">
             <a-select-option v-for="(role,roleindex) in roleList" :key="roleindex.toString()" :value="role.id">
               {{ role.roleName }}
@@ -72,9 +75,9 @@
         </a-form-item>
 
         <!--部门分配-->
-<!--        v-show="!departDisabled && !disabled"-->
+        <!--        v-show="!departDisabled && !disabled"-->
         <a-form-item :label="$t('DepartmentAllocation')" :labelCol="labelCol" :wrapperCol="wrapperCol"
-                     >
+        >
           <a-input-search
             :placeholder="$t('ClickSelectDepartment')"
             v-model="checkedDepartNameString"
@@ -101,34 +104,34 @@
         <!--</a-form-item>-->
 
         <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
-<!--        v-if="!disabled"-->
-<!--        <a-form-item  :label="$t('identity')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--          <a-radio-group-->
-<!--            v-model="identity"-->
-<!--            @change="identityChange">-->
-<!--            <a-radio value="1">{{$t('OrdinaryUsers')}}</a-radio>-->
-<!--            <a-radio value="2">{{$t('superior')}}</a-radio>-->
-<!--          </a-radio-group>-->
-<!--        </a-form-item>-->
-<!--        v-if="departIdShow==true && !disabled"-->
-<!--        <a-form-item :label="$t('ResponsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol"-->
-<!--                     >-->
-<!--          <a-select-->
-<!--            :disabled="disabled"-->
-<!--            mode="multiple"-->
-<!--            style="width: 100%"-->
-<!--            :placeholder="$t('selectResponsibleDepartment')"-->
-<!--            v-model="departIds"-->
-<!--            optionFilterProp="children"-->
-<!--            :getPopupContainer="(target) => target.parentNode"-->
-<!--            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"-->
-<!--          >-->
-<!--            <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key"-->
-<!--            >{{item.title}}-->
-<!--            </a-select-option-->
-<!--            >-->
-<!--          </a-select>-->
-<!--        </a-form-item>-->
+        <!--        v-if="!disabled"-->
+        <!--        <a-form-item  :label="$t('identity')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--          <a-radio-group-->
+        <!--            v-model="identity"-->
+        <!--            @change="identityChange">-->
+        <!--            <a-radio value="1">{{$t('OrdinaryUsers')}}</a-radio>-->
+        <!--            <a-radio value="2">{{$t('superior')}}</a-radio>-->
+        <!--          </a-radio-group>-->
+        <!--        </a-form-item>-->
+        <!--        v-if="departIdShow==true && !disabled"-->
+        <!--        <a-form-item :label="$t('ResponsibleDepartment')" :labelCol="labelCol" :wrapperCol="wrapperCol"-->
+        <!--                     >-->
+        <!--          <a-select-->
+        <!--            :disabled="disabled"-->
+        <!--            mode="multiple"-->
+        <!--            style="width: 100%"-->
+        <!--            :placeholder="$t('selectResponsibleDepartment')"-->
+        <!--            v-model="departIds"-->
+        <!--            optionFilterProp="children"-->
+        <!--            :getPopupContainer="(target) => target.parentNode"-->
+        <!--            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"-->
+        <!--          >-->
+        <!--            <a-select-option v-for="item in resultDepartOptions" :key="item.key" :value="item.key"-->
+        <!--            >{{item.title}}-->
+        <!--            </a-select-option-->
+        <!--            >-->
+        <!--          </a-select>-->
+        <!--        </a-form-item>-->
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
         <!--        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
         <!--          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList" ></j-image-upload>-->
@@ -141,20 +144,21 @@
         <!--v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"-->
         <!--:getCalendarContainer="node => node.parentNode"/>-->
         <!--</a-form-item>-->
-<!--        v-if="!disabled"-->
-<!--        <a-form-item :label="$t('Gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--          <a-select v-decorator="[ 'sex', {}]" :placeholder="$t('selectGender')"-->
-<!--                    :getPopupContainer="(target) => target.parentNode">-->
-<!--            <a-select-option :value="1">{{$t('male')}}</a-select-option>-->
-<!--            <a-select-option :value="2">{{$t('female')}}</a-select-option>-->
-<!--          </a-select>-->
-<!--        </a-form-item>-->
-<!--        v-if="!disabled"-->
+        <!--        v-if="!disabled"-->
+        <!--        <a-form-item :label="$t('Gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+        <!--          <a-select v-decorator="[ 'sex', {}]" :placeholder="$t('selectGender')"-->
+        <!--                    :getPopupContainer="(target) => target.parentNode">-->
+        <!--            <a-select-option :value="1">{{$t('male')}}</a-select-option>-->
+        <!--            <a-select-option :value="2">{{$t('female')}}</a-select-option>-->
+        <!--          </a-select>-->
+        <!--        </a-form-item>-->
+        <!--        v-if="!disabled"-->
         <a-form-item :label="$t('mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]" :disabled='isdisabled'/>
+          <a-input :placeholder="$t('enterEmailAddress')" v-decorator="[ 'email', validatorRules.email]"
+                   :disabled='isdisabled'/>
         </a-form-item>
-<!--        v-if="!disabled"-->
-<!--        :disabled="isDisabledAuth('user:form:phone')"-->
+        <!--        v-if="!disabled"-->
+        <!--        :disabled="isDisabledAuth('user:form:phone')"-->
         <a-form-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input :placeholder="$t('enterMobileNumber')" :disabled='isdisabled'
                    v-decorator="[ 'telephone', validatorRules.telephone]"/>
@@ -173,11 +177,11 @@
     <depart-window ref="departWindow" @ok="modalFormOk"></depart-window>
 
     <div class="drawer-bootom-button" v-show="!disableSubmit">
-<!--      <a-popconfirm :title="$t('AreYouWantDiscardEditing')" @confirm="handleCancel" :okText="$t('determine')"-->
-<!--                    :cancelText="$t('cancel')">-->
-        <a-button style="margin-right: .8rem" @click="handleSubmit">{{$t('cancel')}}</a-button>
-<!--      </a-popconfirm>-->
-<!--      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>-->
+      <!--      <a-popconfirm :title="$t('AreYouWantDiscardEditing')" @confirm="handleCancel" :okText="$t('determine')"-->
+      <!--                    :cancelText="$t('cancel')">-->
+      <a-button style="margin-right: .8rem" @click="handleSubmit">{{$t('cancel')}}</a-button>
+      <!--      </a-popconfirm>-->
+      <a-button @click="handleSubmitOk" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
     </div>
   </a-drawer>
 </template>
@@ -189,7 +193,7 @@
   // 引入搜索部门弹出框的组件
   import departWindow from './DepartWindow'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
-  import { getAction } from '@/api/manage'
+  import { getAction, postAction } from '@/api/manage'
   import { addUser, editUser, queryUserRole, queryall } from '@/api/api'
   import { disabledAuthFilter } from '@/utils/authFilter'
   import { duplicateCheck } from '@/api/api'
@@ -347,6 +351,25 @@
           }
         })
       },
+      handleSubmitOk() {
+        this.confirmLoading = true
+        let selectedRole = JSON.parse(JSON.stringify(this.selectedRole))
+        let param = {
+          ids: this.userId,
+          selectedroles: selectedRole.join(',')
+        }
+        postAction('/sys/user/setRole', param).then((res) => {
+          if (res.success) {
+            this.$emit('ok')
+            this.confirmLoading = false
+            this.visible = false
+            this.$message.success(res.message)
+          } else {
+            this.confirmLoading = false
+            this.$message.warning(res.message)
+          }
+        })
+      },
       refresh() {
         this.selectedDepartKeys = []
         this.checkedDepartKeys = []
@@ -383,7 +406,7 @@
         that.visible = true
         that.model = Object.assign({}, record)
         that.$nextTick(() => {
-          that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'jobTitle','email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post'))
+          that.form.setFieldsValue(pick(this.model, 'username', 'sex', 'realname', 'jobTitle', 'email', 'phone', 'activitiSync', 'workNo', 'telephone', 'post'))
         })
         //身份为上级显示负责部门，否则不显示
         if (this.model.userIdentity == '2') {
@@ -728,7 +751,7 @@
   .drawer-bootom-button {
     position: absolute;
     bottom: -8px;
-    z-index:100;
+    z-index: 100;
     width: 100%;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;
@@ -740,6 +763,6 @@
 </style>
 <style>
   .selectUserRole .ant-select-selection--multiple {
-    height: 100px!important;
+    height: 100px !important;
   }
 </style>
\ No newline at end of file