diff --git a/src/api/api.js b/src/api/api.js
index 082c6d2..35df794 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1,27 +1,27 @@
-import { getAction, deleteAction, putAction, postAction, httpAction } from '@/api/manage'
+import { getAction, deleteAction, postAction, httpAction } from '@/api/manage'
 import Vue from 'vue'
 import {UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
 
 //角色管理
 const addRole = (params)=>postAction("/sys/role/add",params);
-const editRole = (params)=>putAction("/sys/role/edit",params);
+const editRole = (params)=>postAction("/sys/role/edit",params);
 const checkRoleCode = (params)=>getAction("/sys/role/checkRoleCode",params);
 const queryall = (params)=>getAction("/sys/role/queryall",params);
 
 //用户管理
 const addUser = (params)=>postAction("/sys/user/add",params);
-const editUser = (params)=>putAction("/sys/user/edit",params);
+const editUser = (params)=>postAction("/sys/user/edit",params);
 const queryUserRole = (params)=>getAction("/sys/user/queryUserRole",params);
 const getUserList = (params)=>getAction("/sys/user/page",params);
 // 获取全部用户列表
 const getAllUserList = (params) => getAction("/sys/user/list", params);
-const frozenBatch = (params)=>putAction("/sys/user/frozenBatch",params);
+const frozenBatch = (params)=>postAction("/sys/user/frozenBatch",params);
 //验证用户是否存在
 const checkOnlyUser = (params)=>getAction("/sys/user/checkOnlyUser",params);
 //改变密码
-const changePassword = (params)=>putAction("/sys/user/changePassword",params);
+const changePassword = (params)=>postAction("/sys/user/changePassword",params);
 // 重置密码
-const resetUserPassword = (params) => putAction('',params)
+const resetUserPassword = (params) => postAction('',params)
 
 //权限管理
 const addPermission= (params)=>postAction("/sys/permission/add",params);
@@ -62,10 +62,10 @@ const deleteLogList = (params)=>deleteAction("/sys/log/deleteBatch",params);
 
 //数据字典
 const addDict = (params)=>postAction("/sys/dict/add",params);
-const editDict = (params)=>putAction("/sys/dict/edit",params);
+const editDict = (params)=>postAction("/sys/dict/edit",params);
 const treeList = (params)=>getAction("/sys/dict/treeList",params);
 const addDictItem = (params)=>postAction("/sys/dictItem/add",params);
-const editDictItem = (params)=>putAction("/sys/dictItem/edit",params);
+const editDictItem = (params)=>postAction("/sys/dictItem/edit",params);
 
 //字典标签专用（通过code获取字典数组）
 export const ajaxGetDictItems = (code, params)=>getAction(`/sys/dict/getDictItems/${code}`,params);
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index aa6ee84..7bc1835 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -53,7 +53,7 @@
     </div>
 
     <user-role-modal ref="modalUserRole"></user-role-modal>
-    <role-modal ref="modalForm" @ok="modalFormOk"></role-modal>
+    <role-modal ref="modalForm" @ok="modalFormOk" @clearSelect="onClearSelected"></role-modal>
   </a-card>
 </template>
 <script>
@@ -138,10 +138,6 @@ export default {
     }
   },
   methods: {
-    onClearSelected() {
-      this.selectedRowKeys1 = [];
-      this.selectionRows1 = [];
-    },
     selectOK(data) {
       let params = {};
       params.roleId = this.currentRoleId;
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index fc910e9..ac90130 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -98,7 +98,7 @@
 
 <script>
 import UserModal from "./modules/UserModal";
-import { getFileAccessHttpUrl } from "@/api/manage";
+import {getAction, getFileAccessHttpUrl} from "@/api/manage";
 import { JeroListMixin } from "@/mixins/JeroListMixin";
 import JInput from "@/components/jero/JInput";
 import JEllipsis from "@comp/jero/JEllipsis";
@@ -148,6 +148,13 @@ export default {
           dataIndex: "sex_dictText",
           scopedSlots: { customRender: "text" },
         },
+        {
+          title: "角色类型",
+          align: "center",
+          width: 100,
+          dataIndex: "",
+          // scopedSlots: { customRender: "text" },
+        },
         {
           title: "手机号码",
           align: "center",
@@ -156,7 +163,7 @@ export default {
           scopedSlots: { customRender: "text" },
         },
         {
-          title: "部门",
+          title: "组织机构",
           align: "center",
           width: 180,
           dataIndex: "orgCodeTxt",
@@ -215,6 +222,7 @@ export default {
   },
   created() {
     this.loadDepartTreeData()
+    this.initAllRole()
   },
   computed:{
     importExcelUrl(){
@@ -246,6 +254,14 @@ export default {
       })
     },
     /*
+    * 角色下拉数据
+    * */
+    initAllRole() {
+      getAction('/sys/role/treeListPage').then(res => {
+        this.treeRoleData = res.result.records
+      })
+    },
+    /*
     * 重置密码
     * */
     resetPassword(id){
diff --git a/src/views/system/modules/RoleModal.vue b/src/views/system/modules/RoleModal.vue
index a4c4a8e..8955791 100644
--- a/src/views/system/modules/RoleModal.vue
+++ b/src/views/system/modules/RoleModal.vue
@@ -1,44 +1,54 @@
 <template>
   <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 85%;overflow-y: hidden">
+      :title="title"
+      :width="800"
+      :visible="visible"
+      :confirmLoading="confirmLoading"
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="关闭"
+      wrapClassName="ant-modal-cust-warp"
+      style="top:5%;height: 85%;overflow-y: hidden">
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
 
         <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="角色名称">
-          <a-input placeholder="请输入角色名称" @change="event => event.target.value = event.target.value.trim()" :maxLength="30" v-decorator="[ 'roleName', validatorRules.roleName]" />
-        </a-form-item>
-
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="角色编码">
-          <a-input placeholder="请输入角色编码" @change="event => event.target.value = event.target.value.trim()" :maxLength="64" :disabled="roleDisabled" v-decorator="[ 'roleCode', validatorRules.roleCode]" />
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="角色名称">
+          <a-input placeholder="请输入角色名称" @change="event => event.target.value = event.target.value.trim()"
+                   :maxLength="30" v-decorator="[ 'roleName', validatorRules.roleName]"/>
         </a-form-item>
 
         <a-form-item
             :labelCol="labelCol"
             :wrapperCol="wrapperCol"
-            label="上级角色">
-          <a-input placeholder="请选择上级角色" @change="event => event.target.value = event.target.value.trim()" :maxLength="64" :disabled="roleDisabled" v-decorator="[ 'parentId', validatorRules.roleParentId]" />
+            label="角色编码">
+          <a-input placeholder="请输入角色编码" @change="event => event.target.value = event.target.value.trim()"
+                   :maxLength="64" :disabled="roleDisabled" v-decorator="[ 'roleCode', validatorRules.roleCode]"/>
+        </a-form-item>
+        <!--是添加上级 就禁用-->
+        <a-form-item
+            label="上级角色"
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol">
+          <a-tree-select
+              style="width:100%"
+              :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
+              :treeData="roleList"
+              :disabled="isAddLower"
+              v-decorator="[ 'parentId', validatorRules.parentId]"
+              placeholder="请选择上级角色">
+          </a-tree-select>
         </a-form-item>
 
         <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="描述">
-          <a-textarea :rows="5" @change="event => event.target.value = event.target.value.trim()" :maxLength="126" placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]" />
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="描述">
+          <a-textarea :rows="5" @change="event => event.target.value = event.target.value.trim()" :maxLength="126"
+                      placeholder="请输入描述" v-decorator="[ 'description', validatorRules.description ]"/>
         </a-form-item>
 
       </a-form>
@@ -51,132 +61,152 @@
 </template>
 
 <script>
-  import pick from 'lodash.pick'
-  import {addRole,editRole,duplicateCheck } from '@/api/api'
-  import {checkRoleCode} from "@/utils/validateOnly";
+import pick from 'lodash.pick'
+import {addRole, editRole, duplicateCheck} from '@/api/api'
+import {checkRoleCode} from "@/utils/validateOnly";
+import {getAction} from "@api/manage";
 
-  export default {
-    name: "RoleModal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        roleDisabled: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-          roleName:{
-            rules: [
-              { required: true, message: '请输入角色名称!' },
-              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
-            ],
-            validateTrigger: 'blur'
-          },
-          roleCode:{
-            rules: [
-              { required: true,validator: this.validateRoleCode},
-              { min: 0, max: 50, message: '长度不超过 50 个字符', trigger: 'blur' },
-            ],
-            validateTrigger: 'blur'},
-          description:{
-            rules: [
-              { min: 0, max: 300, message: '长度不超过 300 个字符', trigger: 'blur' }
-            ],
-          }
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
+export default {
+  name: "RoleModal",
+  data() {
+    return {
+      title: "操作",
+      visible: false,
+      roleDisabled: false,
+      // 是否添加下级
+      isAddLower: false,
+      model: {},
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5},
       },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-
-        //编辑页面禁止修改角色编码
-        if(this.model.id){
-          this.roleDisabled = true;
-        }else{
-          this.roleDisabled = false;
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 16},
+      },
+      // 角色树列表
+      roleList: [],
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      validatorRules: {
+        roleName: {
+          rules: [
+            {required: true, message: '请输入角色名称!'},
+            {min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur'}
+          ],
+          validateTrigger: 'blur'
+        },
+        roleCode: {
+          rules: [
+            {required: true, validator: this.validateRoleCode},
+            {min: 0, max: 50, message: '长度不超过 50 个字符', trigger: 'blur'},
+          ],
+          validateTrigger: 'blur'
+        },
+        description: {
+          rules: [
+            {min: 0, max: 300, message: '长度不超过 300 个字符', trigger: 'blur'}
+          ],
         }
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'roleName', 'description','roleCode'))
-        });
+      },
+    }
+  },
+  created() {
+  },
+  methods: {
+    add() {
+      this.edit({});
+    },
+    edit(record) {
+      this.form.resetFields();
+      this.initAllRole()
+      this.model = Object.assign({}, record);
+      this.visible = true;
 
-      },
-      /*
-      *  添加下级
-      * */
-      addLowerRole(parentId){
-        this.form.resetFields();
-        this.visible = true;
-        this.$nextTick( () => {
-          this.form.setFieldsValue({parentId:parentId})
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.confirmLoading  =true
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            values.roleName = (values.roleName || '').trim()
-            values.roleCode = (values.roleCode || '').trim()
-            let formData = Object.assign(this.model, values);
-            let obj;
-            console.log(formData)
-            if(!this.model.id){
-              obj=addRole(formData);
-            }else{
-              obj=editRole(formData);
-            }
-            obj.then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-                that.close();
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }else {
-            this.confirmLoading  =false
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      validateRoleCode(rule, value, callback){
-        checkRoleCode(value,this.model.id).then(res => {
-          if(res.success){
-            callback()
-          }else {
-            callback(res.code === 500 ? '角色编码已经存在': res)
-          }
-        })
+      //编辑页面禁止修改角色编码
+      if (this.model.id) {
+        this.roleDisabled = true;
+      } else {
+        this.roleDisabled = false;
       }
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'roleName', 'description', 'roleCode', 'parentId'))
+      });
+
+    },
+    /*
+    *  添加下级
+    * */
+    addLowerRole(parentId) {
+      // 添加下级
+      this.isAddLower = true;
+      this.form.resetFields();
+      this.initAllRole()
+      this.visible = true;
+      this.$nextTick(() => {
+        this.form.setFieldsValue({parentId: parentId})
+      })
+    },
+    /*
+    * 查询所有角色
+    * */
+    initAllRole() {
+      getAction('/sys/role/treeListPage').then(res => {
+        this.roleList = res.result.records
+      })
+    },
+    close() {
+      this.$emit('close');
+      this.isAddLower = false
+      this.visible = false;
+    },
+    handleOk() {
+      this.confirmLoading = true
+      const that = this;
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          values.roleName = (values.roleName || '').trim()
+          values.roleCode = (values.roleCode || '').trim()
+          let formData = Object.assign(this.model, values);
+          let obj;
+          console.log(formData)
+          if (!this.model.id) {
+            obj = addRole(formData);
+          } else {
+            obj = editRole(formData);
+          }
+          obj.then((res) => {
+            if (res.success) {
+              that.$message.success(res.message);
+              that.$emit('ok');
+              this.$emit('clearSelect')
+              that.close();
+            } else {
+              that.$message.warning(res.message);
+            }
+          }).finally(() => {
+            that.confirmLoading = false;
+          })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    validateRoleCode(rule, value, callback) {
+      checkRoleCode(value, this.model.id).then(res => {
+        if (res.success) {
+          callback()
+        } else {
+          callback(res.code === 500 ? '角色编码已经存在' : res)
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped>
diff --git a/src/views/system/modules/SysConfusionForm.vue b/src/views/system/modules/SysConfusionForm.vue
index d9822a3..dcfb88d 100644
--- a/src/views/system/modules/SysConfusionForm.vue
+++ b/src/views/system/modules/SysConfusionForm.vue
@@ -179,7 +179,7 @@ export default {
             method = 'post';
           } else {
             httpurl += this.url.edit;
-            method = 'put';
+            method = 'post';
           }
           let formData = Object.assign(this.model, values);
           console.log("表单提交数据", formData)
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 1df6460..14aa5f3 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -75,11 +75,11 @@
 <!--            <a-radio value="2">上级</a-radio>-->
 <!--          </a-radio-group>-->
 <!--        </a-form-item>-->
-        <a-form-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="departIdShow==true">
+        <a-form-item label="组织机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select
               mode="multiple"
               style="width: 100%"
-              placeholder="请选择负责部门"
+              placeholder="请选择组织机构"
               v-model="departIds"
               optionFilterProp="children"
               :getPopupContainer="(target) => target.parentNode"
@@ -100,34 +100,32 @@
           </a-select>
         </a-form-item>
 
-          <a-form-item
-              label="角色类型"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol">
-            <a-tree-select
-                style="width:100%"
-                :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
-                :treeData="treeRoleData"
-                v-decorator="[ 'roleParentId', validatorRules.name]"
-                placeholder="请选择角色类型"
-            >
-            </a-tree-select>
-          </a-form-item>
+<!--          <a-form-item-->
+<!--              label="角色类型"-->
+<!--              :labelCol="labelCol"-->
+<!--              :wrapperCol="wrapperCol">-->
+<!--            <a-tree-select-->
+<!--                style="width:100%"-->
+<!--                :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"-->
+<!--                :treeData="treeRoleData"-->
+<!--                v-decorator="[ 'roleParentId', validatorRules.roleParentId]"-->
+<!--                placeholder="请选择角色类型"-->
+<!--            >-->
+<!--            </a-tree-select>-->
+<!--          </a-form-item>-->
 
-
-
-          <a-form-item
-              label="组织机构"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol">
-            <a-tree-select
-                style="width:100%"
-                :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"
-                :treeData="treeDepartData"
-                v-decorator="[ 'departId', validatorRules.name]"
-                placeholder="请选择组织机构">
-            </a-tree-select>
-          </a-form-item>
+<!--          <a-form-item-->
+<!--              label="组织机构"-->
+<!--              :labelCol="labelCol"-->
+<!--              :wrapperCol="wrapperCol">-->
+<!--            <a-tree-select-->
+<!--                style="width:100%"-->
+<!--                :dropdownStyle="{ maxHeight: '200px',maxWidth:'100px','overflow-x':'hidden',' overflo-y': 'auto' }"-->
+<!--                :treeData="treeDepartData"-->
+<!--                v-decorator="[ 'departId', validatorRules.name]"-->
+<!--                placeholder="请选择组织机构">-->
+<!--            </a-tree-select>-->
+<!--          </a-form-item>-->
 
 
         <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">