diff --git a/package.json b/package.json
index 49fc32c90f07bd852e65c9c68ad545269e4a8de4..89088e0d1307dcc858c30fcb12fe273eb3d2b1dd 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "clipboard": "^2.0.11",
     "crypto-js": "^4.1.1",
     "echarts": "^5.3.3",
-    "element-plus": "^2.2.9",
+    "element-plus": "^2.2.19",
     "html2canvas": "^1.4.1",
     "sass": "^1.35.1",
     "uuid": "^8.3.2",
diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 57b282d9032c42c29746592a026ed006866c8b8f..ffafb95f94ec1764903350cff844972f6be0e7ba 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -243,6 +243,7 @@ div {
 .el-dialog__header {
   border-bottom: 1px solid #edf0ff;
   padding: 16px;
+  margin-right: 0;
 }
 
 .el-dialog__title {
@@ -1518,10 +1519,6 @@ border-radius:8px;
 	color: #404a62;
   padding-left: 20px;
 }
-.name_btn {
-  color: #3759be;
-  cursor: pointer;
-}
 .fr {
   float: right;
 }
@@ -1539,4 +1536,27 @@ border-radius:8px;
   vertical-align: baseline;
   cursor: pointer;
 }
+/* 可点击文字颜色、指针样式 */
+.can_click_text {
+  cursor: pointer;
+  color: #3759be;
+}
+.can_click_text:hover {
+  color: #738bd2;
+}
+.can_click_text:active {
+  color: #2c4798;
+}
+
+.warning_info {
+  background-color: #f7f7f9;
+  font-size: 14px;
+	color: #404a62;
+  padding: 5px;
+  text-align: left;
+  margin: 20px 0;
+}
+.danger_info {
+  color: #d75138;
+}
 
diff --git a/src/bg-ui/bg-info.vue b/src/bg-ui/bg-info.vue
index bc56e094c098d2564645feb93fc6ca22f2a33661..962d99283eaac372afdc90c979df0cb31605710b 100644
--- a/src/bg-ui/bg-info.vue
+++ b/src/bg-ui/bg-info.vue
@@ -18,7 +18,12 @@
               width: item.copy ? 'calc(100% - 36px)' : item.download || item.password ? 'calc(100% - 22px)': '100%',
               color: item.download ? '#3759be' : '#404a62'
             }"
-          >{{ item.value }}</span>
+          >
+          <span v-if="item.state" :style="{color: stateColor[item.state]}"> <span class="state-dot" :style="{backgroundColor: stateColor[item.state]}"></span>{{item.value}}</span>
+           <span v-else-if="item.secret">{{secret(item.value)}}</span>
+           <span v-else-if="item.callback"  @click.stop="item.callback && item.callback()" class="can_click_text">{{item.value}}</span>
+          <span v-else>{{ item.value }}</span>
+          </span>
           <a
             class="copy-btn"
             @click="copyText(item.value, $event)"
@@ -26,6 +31,7 @@
           >
             复制
           </a>
+          <bg-icon v-if="item.copy_icon" @click="copyIcon(item.value)" class="copy-btn" style="font-size: 14px; color: #a9b1c7;cursor: pointer;" icon="#bg-ic-copy"></bg-icon>
           <bg-icon 
             class="copy-btn"
             style="font-size: 14px; color: #a9b1c7;cursor: pointer;" 
@@ -61,9 +67,18 @@ export default {
       default: 2,
     },
   },
+  model: {
+      prop: 'data',
+      event: 'newValue'
+    },
   data() {
     return {
-      show: false
+      show: false,
+      stateColor: {
+        success: '#48ad97',
+        danger: '#d75138',
+        default: '#787878'
+      }
     }
   },
   methods: {
@@ -81,6 +96,8 @@ export default {
       });
     },
     copyText(text, e) {
+      console.log(text)
+      console.log(e)
       const clipboard = new Clipboard(e.target, {
         text: () => text,
       });
@@ -101,6 +118,15 @@ export default {
       // 解决第一次点击不生效的问题，如果没有，第一次点击会不生效
       clipboard.onClick(e);
     },
+    copyIcon(data) {
+      navigator.clipboard.writeText(data).then(
+        function () {
+        },
+        function () {
+          
+        }
+      );
+    },
     download(url) {
       const a = document.createElement("a"); // 创建a标签
       a.setAttribute("download", ""); // download属性
@@ -114,7 +140,16 @@ export default {
         item.value = "***************"
       }
       this.show = !this.show
-    }
+    },
+    secret(value) {
+      const len = value.length;
+      const str1 = value.substring(0,3);
+      const str2 = value.substring(value.length-6,value.length);
+      const passwordStr = value.substring(3,value.length-6).split('').map(item => '*').join('');
+      console.log(8888888)
+      console.log(passwordStr)
+      return str1+passwordStr+str2
+    } 
   },
 };
 </script>
diff --git a/src/bg-ui/bg-table-btns.vue b/src/bg-ui/bg-table-btns.vue
index 53e6fe18e43a1574f3c270d6c908cede0c421ac5..f2adb807ce35e18bf1029c136af180a803201c2f 100644
--- a/src/bg-ui/bg-table-btns.vue
+++ b/src/bg-ui/bg-table-btns.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="bg-table-btns">
     <bg-table-btn
+      class="can_click_text"
       v-for="(item, index) in curOperations"
       :key="index"
       :disabled="isDisabled(item)"
diff --git a/src/bg-ui/bg-upload.vue b/src/bg-ui/bg-upload.vue
index 11300f05bad3e7357fd376d7902f9f367cb9a83d..a243d24cda42db87f7a9c2c63cfc6c34c4bd67e0 100644
--- a/src/bg-ui/bg-upload.vue
+++ b/src/bg-ui/bg-upload.vue
@@ -4,7 +4,7 @@
     :class="{ 'is-disabled': actionDisabled, 'is-easy': isEasy }"
   >
     <el-upload
-      action="/apaas/static/file/upload"
+      action="/apaas/common/file/upload"
       :data="{
         directory: 'file',
         uniqueCode: false,
@@ -127,7 +127,7 @@ export default {
   },
   computed: {
     actionDisabled() {
-      return this.disabled || this.fileList.length === this.limit;
+      return this.disabled ;//|| this.fileList.length === this.limit; 文件数量 === limit 会导致无法删除已上传文件
     },
   },
   watch: {
diff --git a/src/bg-ui/index.scss b/src/bg-ui/index.scss
index f9ca573c9cdf6be2fd6dc0ed88290012db2e0a4f..09b5cd8401e841b8cd1d4afb4b51e4af1e39eddc 100644
--- a/src/bg-ui/index.scss
+++ b/src/bg-ui/index.scss
@@ -808,6 +808,10 @@ a {
   &.disabled {
     cursor: not-allowed;
     color: #a9b1c7;
+    &:hover,
+    &:active {
+      color: #a9b1c7;
+    }
   }
 
   & + .bg-table-btn {
@@ -1477,7 +1481,7 @@ a {
         font-size: 14px;
         line-height: 24px;
         color: #404a62;
-
+        
         &:nth-child(1) {
           flex-shrink: 0;
           width: 240px;
@@ -1502,6 +1506,14 @@ a {
             cursor: pointer;
             margin-left: 8px;
           }
+          .state-dot {
+            padding: 4px;
+            display: inline-block;
+            height: 5px;
+            width: 5px;
+            border-radius: 10px;
+            margin-right: 5px;
+          }
         }
       }
 
@@ -1797,8 +1809,10 @@ a {
     .el-upload__tip {
       // display: none;
       cursor: not-allowed;
+      line-height: 18px;
     }
   }
+  
 
   &.is-easy {
     > div {
@@ -1820,6 +1834,9 @@ a {
       }
     }
   }
+  .el-upload__tip {
+    line-height: 18px;
+  }
 }
 
 .bg-upload-image {
diff --git a/src/components/error-table.vue b/src/components/error-table.vue
index 0f1f33cafe5c21c98ba5309be8abb17776c45b29..fe7cb5e4a61fb740549c9fceb84a0b4b7f52b532 100644
--- a/src/components/error-table.vue
+++ b/src/components/error-table.vue
@@ -34,8 +34,8 @@
         </template>
   
         <template v-slot:action="{ row,index }">
-          <bg-table-btn :disabled="disabled||acDisable" :click="()=>{addParam(index)}">增加</bg-table-btn>
-          <bg-table-btn :disabled="disabled||acDisable" :click="()=>{removeParam(row, index)}">
+          <bg-table-btn class="can_click_btn" :disabled="disabled||acDisable" :click="()=>{addParam(index)}">增加</bg-table-btn>
+          <bg-table-btn class="can_click_btn" :disabled="disabled||acDisable" :click="()=>{removeParam(row, index)}">
               删除
           </bg-table-btn>
         </template>
diff --git a/src/components/input-object-table.vue b/src/components/input-object-table.vue
index 8768d1d86a941e4599ee9278d89c0c5fad151d61..8bac1e463c7c1e18e77d87ea6674c4d4834f99b6 100644
--- a/src/components/input-object-table.vue
+++ b/src/components/input-object-table.vue
@@ -94,8 +94,8 @@
         </template>
 
         <template v-slot:action="{ row }">
-          <bg-table-btn :disabled="disabled" :click="()=>{addInputConf(row)}"> 增加 </bg-table-btn>
-          <bg-table-btn :disabled="disabled" :click="()=>{removeInputConf(row)}"> 删除 </bg-table-btn>
+          <bg-table-btn  class="can_click_btn" :disabled="disabled" :click="()=>{addInputConf(row)}"> 增加 </bg-table-btn>
+          <bg-table-btn  class="can_click_btn" :disabled="disabled" :click="()=>{removeInputConf(row)}"> 删除 </bg-table-btn>
         </template>
       </bg-table-pro>
     </el-form>
diff --git a/src/page/main/config/dict/index.vue b/src/page/main/config/dict/index.vue
index ecbea23f93b6cbd43b26bb8b35f032ea8cd82191..d02af739e714457fd489e3f3cfb2829dfb273420 100644
--- a/src/page/main/config/dict/index.vue
+++ b/src/page/main/config/dict/index.vue
@@ -9,7 +9,7 @@
     <div class="flex_row">
       <div class="flex_left">
         <div class="box">
-          <el-input class="type-input" v-model="typeKeyword" @input="searchType" placeholder="请输入内容"></el-input>
+          <el-input class="type-input" v-model="typeKeyword" @input="searchType" :prefix-icon="Search" placeholder="请输入搜索内容"></el-input>
           
           <div class="type_station bg-scroll">
             <div class="type-box" :class="{'current-type':nodeClassifyId==item.classify_id}" @click="nodeClick(item)" v-for="(item,index) in typeList" :key="'type'+index+200">
@@ -164,6 +164,7 @@ import { reactive, ref,onBeforeMount,toRefs,computed, watch, nextTick } from 'vu
 import { useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus'
 import axios from '../../../../request/http.js'
+import { Search } from '@element-plus/icons-vue'
 const bgForm = ref(null)
 const state = reactive({
   bgForm,
diff --git a/src/page/main/develop/account/add/contact-form.vue b/src/page/main/develop/account/add/contact-form.vue
index 2cf446edc3d20df4b7f824170673dfc981917295..e2bec5148092924000895c4123dd75e980917c2c 100644
--- a/src/page/main/develop/account/add/contact-form.vue
+++ b/src/page/main/develop/account/add/contact-form.vue
@@ -41,7 +41,7 @@ const checkPhone = (rule, value, callback) => {
           callback();
         }
       });
-    };
+};
 
 const contactFormRules = reactive({
   contact_name: [
@@ -51,6 +51,9 @@ const contactFormRules = reactive({
     { required: true, message: '请输入联系人手机号', trigger: 'blur' },
     { validator: checkPhone, trigger: 'blur' },
   ],
+  contact_email: [
+    { type: 'email', message: '请输入正确的邮箱', trigger: 'blur' },
+  ]
 })
 const contactRef = ref(null)
 const emit = defineEmits(['action'])
@@ -71,7 +74,7 @@ const clearForm = () => {
 } 
 
 const setForm = (data) => {
-  contactForm.value = Object.assign(contactForm, data);
+   Object.assign(contactForm, data);
 }
 
 onMounted(() => {
diff --git a/src/page/main/develop/account/add/index.vue b/src/page/main/develop/account/add/index.vue
index d39e563ea247a325b27634f30cfb3ce1e2006221..51869ae6d413dd7f8ea1bfa1812b445e1b9bed22 100644
--- a/src/page/main/develop/account/add/index.vue
+++ b/src/page/main/develop/account/add/index.vue
@@ -118,7 +118,7 @@ const nextStep = () => {
 //业务系统表单检验触发事件 data为null 校验失败
 const getSystemFormData = (data) => {
         if(data) {
-            formData.value = Object.assign(formData,data);
+            Object.assign(formData,data);
             step.value = 2;
         }else {
 
@@ -128,22 +128,13 @@ const getSystemFormData = (data) => {
 const getContactFormData = (data) => {
 
     if(data) {
-        formData.value = Object.assign(formData,data);
+        Object.assign(formData,data);
         if(route.query.id) {
             console.log(formData)
             let params = {
+                ...formData,
                 id: parseInt(route.query.id),
-                business_name: formData.value.business_name,
-                system_account: formData.value.system_account,
-                contact_email: formData.value.contact_email,
-                contact_phone: formData.value.contact_phone,
-                contact_name: formData.value.contact_name,
-                logo: formData.value.logo && formData.value.logo.length > 0 ? formData.value.logo[0].url : '',
-                state: formData.value.state,
-                business_desc: formData.value.business_desc,
-                develop_id: formData.value.develop_id,
-                access_address: formData.value.access_address,
-                remark: formData.value.remark
+                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
             }
             $axios.post(`/apaas/system/v5/user/update`,params)
                 .then((res) => {
@@ -151,26 +142,14 @@ const getContactFormData = (data) => {
                     successFlag.value = true;
                     step.value = 3;
                 }else {
-                    $message.error(res.data.msg)
+                    $message.error(res.data.data)
                 }
             })
         }else {
             let params = {
-                organization_id: formData.value.organization_id,
-                system_role_id: "ab98a936-9046-455b-aba3-4c73671024d0",
-                logo: formData.value.logo && formData.value.logo.length > 0 ? formData.value.logo[0].url : '',
-                password: CryptoJS.AES.encrypt(formData.value.password,"swuE9cmCZQwrkYRV").toString(),
-                business_code: formData.value.business_code,
-                business_name: formData.value.business_name,
-                business_desc: formData.value.business_desc,
-                system_account: formData.value.system_account,
-                access_address: formData.value.access_address,
-                develop_id: formData.value.develop_id,
-                state: formData.value.state,
-                contact_name: formData.value.contact_name,
-                contact_phone: formData.value.contact_phone,
-                contact_email: formData.value.contact_email,
-                remark: formData.value.remark,
+                ...formData,
+                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
+                password: CryptoJS.AES.encrypt(formData.password,"swuE9cmCZQwrkYRV").toString(),
             }
             $axios.put(`/apaas/system/v5/user/create`,params)
                 .then((res) => {
@@ -178,7 +157,7 @@ const getContactFormData = (data) => {
                     successFlag.value = true;
                     step.value = 3;
                 }else {
-                    $message.error(res.data.msg)
+                    $message.error(res.data.data)
                 }
             })
         }
@@ -197,7 +176,7 @@ const continueCreate = () => {
     systemFormRef.value.clearForm();
     contactFormRef.value.clearForm();
     step.value = 1;
-    successFlag = false;
+    successFlag.value = false;
 }
 //取消
 const cancel = () => {
@@ -232,7 +211,7 @@ const getDetail = () => {
                 remark: form.remark,
             })
             }else {
-                $message.error(res.data.msg)
+                $message.error(res.data.data)
             }
         })
     }
diff --git a/src/page/main/develop/account/add/system-form.vue b/src/page/main/develop/account/add/system-form.vue
index 85f047f18f9ede03d925b4701ccfa8004d529688..fa372b1118d028807732ad4922ef7732f67d8867 100644
--- a/src/page/main/develop/account/add/system-form.vue
+++ b/src/page/main/develop/account/add/system-form.vue
@@ -10,7 +10,7 @@
     <el-form-item label="所属机构" prop="organization_id">
       <el-tree-select v-model="systemForm.organization_id" :data="orgData" :props="treeProps" :render-after-expand="false" :disabled="formType" style="width: 100%;"/>
     </el-form-item>
-    <el-form-item label="业务系统编码" prop="business_code">
+    <el-form-item label="业务系统编码" prop="business_code" v-if="formType">
       <el-input v-model="systemForm.business_code" :disabled="formType"/>
     </el-form-item>
     <el-form-item label="业务系统名称" prop="business_name">
@@ -32,7 +32,14 @@
       <el-input type="textarea" :rows="3" v-model="systemForm.business_desc" />
     </el-form-item>
      <el-form-item label="角色" prop="system_role_id" v-if="!formType">
-      <el-input v-model="systemForm.system_role_id" />
+     <el-select v-model="systemForm.system_role_id" placeholder="请选择角色" :disabled="true" style="width: 100%">
+        <el-option
+          v-for="item in roleList"
+          :key="item.role_id"
+          :label="item.role_name"
+          :value="item.role_id"
+        />
+      </el-select>
     </el-form-item>
      <el-form-item label="账号" prop="system_account">
       <el-input v-model="systemForm.system_account" />
@@ -55,7 +62,14 @@
       <el-input v-model="systemForm.access_address" />
     </el-form-item>
     <el-form-item label="开发厂商名称" prop="develop_id">
-      <el-input v-model="systemForm.develop_id" />
+      <el-select v-model="systemForm.develop_id" placeholder="请选择开发厂商" style="width: 100%">
+        <el-option
+          v-for="item in firmList"
+          :key="item.dict_id"
+          :label="item.dict_name"
+          :value="item.dict_id"
+        />
+      </el-select>
     </el-form-item>
     <el-form-item label="是否启用" prop="state">
       <bg-switch :labels="['否','是']" :values="[0,1]" v-model="systemForm.state"></bg-switch>
@@ -141,7 +155,7 @@ const validateSystemAccount = (rule, value, callback) => {
 
 const formRules = reactive({
   organization_id: [
-    { required: true, message: '请选择组织机构', trigger: 'blur' },
+    { required: true, message: '请选择组织机构', trigger: 'change' },
   ],
   business_name: [
     { required: true, message: '请输入业务系统名称', trigger: 'blur' },
@@ -164,10 +178,10 @@ const formRules = reactive({
   ],
 })
 
-
-
 const systemRef = ref(null)
 const emit = defineEmits(['action'])
+const roleList = ref([])
+const firmList = ref([])
 
 const submitForm = async () => {
   if (!systemRef) return
@@ -182,11 +196,12 @@ const submitForm = async () => {
 
 const clearForm = () => {
   if (!systemRef) return
-  systemRef.value.resetFields()
+  systemRef.value.resetFields();
+  systemForm.system_role_id = roleList.value[0].role_id;
 } 
 
 const setForm = (data) => {
-  systemForm.value = Object.assign(systemForm, data);
+  Object.assign(systemForm, data);
 }
 
 const orgData = ref([])
@@ -199,9 +214,11 @@ const getOrgTree = () => {
   $axios.get(`/apaas/system/v5/org/tree`)
      .then((res) => {
      if (res.data.code == 200) {
-         orgData.value = res.data.data || [];
+        const orgDataTemp =  res.data.data || []
+        orgDataTemp.shift()
+        orgData.value = orgDataTemp;
      }else {
-         $message.error(res.data.msg)
+         $message.error(res.data.data)
      }
      })
 }
@@ -216,9 +233,34 @@ const copyText = (data) => {
         }
       );
 }
+const getRoleList = () => {
+  $axios.get(`/apaas/system/v5/org/select/role?is_admin=1`)
+     .then((res) => {
+      if (res.data.code == 200) {
+            roleList.value = res.data.data;
+            systemForm.system_role_id = roleList.value[0].role_id;
+      }else {
+         
+      }
+     })
+}
+
+const getFirmList = () => {
+  $axios.get(`/apaas/system/v5/dictionary/developer/list`)
+     .then((res) => {
+      if (res.data.code == 200) {
+            firmList.value = res.data.data;
+
+      }else {
+         
+      }
+     })
+}
 
 onBeforeMount(() =>{
   getOrgTree()
+  getRoleList()
+  getFirmList()
 })
 
 onMounted(() => {
diff --git a/src/page/main/develop/account/detail/index.vue b/src/page/main/develop/account/detail/index.vue
index a4fb31f0cf63da4489feefc8b37b860afa71d2e1..4e63feb816592ab15fc9713a9b63293115048dcd 100644
--- a/src/page/main/develop/account/detail/index.vue
+++ b/src/page/main/develop/account/detail/index.vue
@@ -16,7 +16,8 @@
                 </div>
                 <div class="info_content">
                     <div class="img_box">
-                        <img src="/src/assets/imgs/home_ic_user.png" style="height: 96px;width: 96px;border-radius: 99px" alt="">
+                        <img v-if="logo" :src="logo" style="height: 96px;width: 96px;border-radius: 99px" alt="">
+                        <img v-else src="/src/assets/imgs/home_ic_user.png" style="height: 96px;width: 96px;border-radius: 99px" alt="">
                     </div>
                     <div class="info_box">
                         <bg-info :data="baseInfo"></bg-info>
@@ -44,71 +45,75 @@
 import { reactive, toRefs, ref, } from '@vue/reactivity'
 import { getCurrentInstance } from 'vue'
 import { computed, onBeforeMount } from '@vue/runtime-core'
-import { useRouter } from 'vue-router';
-
+import { useRoute, useRouter } from 'vue-router';
+const route = useRoute();
+const { proxy } = getCurrentInstance()
+const { $axios,$message } = proxy
 const baseInfo = reactive(
-    [
-    {
+    [{
       name: "所属机构",
-      value: "某某省/某某市/大数据局",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "业务系统编码",
-      value: "00000001",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "业务系统名称",
-      value: "大数据处理系统",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "账号",
-      value: "admin001",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "AppID",
-      value: "dasjkjjk",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "AppSecret",
-      value: "asda*******************jhjh",
-      nameWidth: 112
+      value: "",
+      copy_icon: true,
+      secret: true,
+      nameWidth: 130
     },
     {
       name: "创建人",
-      value: "admin（机构管理员）",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "创建时间",
-      value: "2022-01-01 10:10:10",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "是否启用",
-      value: "是",
-      nameWidth: 112
+      value: "",
+      state: "",
+      nameWidth: 130
     },
     {
-      name: "开发厂商名单",
-      value: "某某大数据开发商",
-      nameWidth: 112
+      name: "开发厂商名称",
+      value: "",
+      nameWidth: 130
     },
     {
       name: "访问地址",
-      value: "http://www.bigdata.com",
+      value: "",
       full: true,
-      nameWidth: 112
+      nameWidth: 130
     },
     {
       name: "业务系统描述",
-      value: "系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述",
+      value: "",
       full: true,
-      nameWidth: 112
+      nameWidth: 130
     },
   ]
   )
@@ -116,31 +121,62 @@ const baseInfo = reactive(
   const contactInfo = reactive(
     [{
       name: "联系人姓名",
-      value: "xxx",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "联系人手机号",
-      value: "15627365265",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
     },
     {
       name: "联系人邮箱",
-      value: "http://www.bigdata@163.com",
+      value: "",
       full: true,
-      nameWidth: 112
+      nameWidth: 130
     },
     {
       name: "备注",
-      value: "系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述",
+      value: "",
       full: true,
-      nameWidth: 112
+      nameWidth: 130
     },
-  ]
-  )
+  ])
+  const logo = ref('')
+
+  const getDetail = () => {
+      $axios.get(`/apaas/system/v5/user/detail/${route.query.id}`)
+             .then((res) => {
+             if (res.data.code == 200) {
+                 const detail = res.data.data; 
+                 baseInfo[0].value = detail.organization_name;
+                 baseInfo[1].value = detail.business_code;
+                 baseInfo[2].value = detail.business_name;
+                 baseInfo[3].value = detail.system_account;
+                 baseInfo[4].value = detail.app_id;
+                 baseInfo[5].value = detail.app_secret;
+                 baseInfo[6].value = detail.created_by;
+                 baseInfo[7].value = detail.created_time;
+                 baseInfo[8].value = detail.state === 1 ? '是' : '否';
+                 baseInfo[8].state = detail.state === 1 ? 'success' : 'default';
+                 baseInfo[9].value = detail.develop_id;
+                 baseInfo[10].value = detail.access_address;
+                 baseInfo[11].value = detail.business_desc;
+
+                 contactInfo[0].value = detail.contact_name;
+                 contactInfo[1].value = detail.contact_phone;
+                 contactInfo[2].value = detail.contact_email;
+                 contactInfo[3].value = detail.remark;
+
+                 logo.value = detail.logo;
+             }else {
+                 $message.error(res.data.data)
+             }
+         })
+  }
 
   onBeforeMount(() => {
-     
+     getDetail()
  })
 </script>
 
diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue
index 210af308c8aecf5aee768f4e6da6feed87bb2905..a2c24e5dbd60d1dd1e8f588acda67f4f2eb077a7 100644
--- a/src/page/main/develop/account/index.vue
+++ b/src/page/main/develop/account/index.vue
@@ -14,13 +14,20 @@
              <div class="tree_content">
                <div class="search"> 
                  <el-input
-                    v-model="search"
+                    v-model="filterTree"
                     placeholder="请输入组织名称搜索"
                     :prefix-icon="Search"
                   />
                </div>
                <div class="tree">
-                 <el-tree :data="orgData" :props="defaultProps" @node-click="handleNodeClick" :default-expand-all="true">
+                 <el-tree ref="treeRef" 
+                          :data="orgData" 
+                          :props="defaultProps" 
+                          @node-click="handleNodeClick"
+                          node-key="id"
+                          :highlight-current="true" 
+                          :filter-node-method="filterNode" 
+                          :default-expand-all="true">
                     <template #default="{ node, data }">
                       <div class="custom_tree_node">
                         <span
@@ -36,7 +43,7 @@
            </div>
            <div class="flex_right bgc_white">
              <div class="main_container">
-               <bg-filter-group @search="getTableRows" v-model="filter.search" placeholder="请输入关键字">
+               <bg-filter-group @search="changeSearch" v-model="filter.search" placeholder="请输入关键字">
                   <template v-slot:left_action>
                     <div class="apaas_button">
                     <el-button class="register_btn" type="primary" @click="addAccount">
@@ -50,14 +57,14 @@
                         重置密码
                     </el-button>
                     <span class="header_info">已选择<span style="color: #202531;font-weight: bold">{{selected.length}}</span>项</span>
-                    <span class="header_info name_btn" @click="clearSelected">清空</span>
+                    <span class="header_info can_click_text" @click="clearSelected">清空</span>
                   </div>
                   </template>
                 </bg-filter-group>
                 <div class="table_container apaas_scroll">
                   <bg-table ref="dataTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true" :select="true" @selectAc="selectRows">
                     <template v-slot:business_name="{ row }">
-                      <span @click="goDetail(row)" class="name_btn">
+                      <span @click="goDetail(row)" class="can_click_text">
                         {{ row.business_name }}
                       </span>
                     </template>
@@ -65,13 +72,13 @@
                       <bg-switch @click="stateChange(row)" :labels="['否','是']" :values="[0,1]" v-model="row.state"></bg-switch>
                     </template>
                     <template v-slot:action="{ row }">
-                      <bg-table-btn class="btn" @click="editAccount(row.id)">
+                      <bg-table-btn class="can_click_text" @click="editAccount(row.id)">
                         编辑
                       </bg-table-btn>
-                      <bg-table-btn class="btn" @click="editPsdAccount(row)">
+                      <bg-table-btn class="can_click_text" @click="editPsdAccount(row)">
                         修改密码
                       </bg-table-btn>
-                      <bg-table-btn class="btn"  @click="deleteAccount(row)">
+                      <bg-table-btn class="can_click_text"  @click="deleteAccount(row)">
                         删除
                       </bg-table-btn>
                     </template>
@@ -196,7 +203,7 @@
 <script setup>
 import { Search } from '@element-plus/icons-vue'
 import { reactive, toRefs, ref, } from '@vue/reactivity'
-import { getCurrentInstance } from 'vue'
+import { getCurrentInstance, watch, nextTick } from 'vue'
 import { computed, onBeforeMount } from '@vue/runtime-core'
 import { useRouter } from 'vue-router';
 import { edit } from 'ace-builds';
@@ -266,7 +273,9 @@ import CryptoJS from "crypto-js";
     password: '',
     confirm_password: '',
   })
-
+  const selectNode = ref(null)
+  const filterTree = ref('')
+  const treeRef = ref(null)
   const validatePass = (rule, value, callback) => {
     if (value !== passwordForm.password) {
       callback(new Error("密码输入不一致"))
@@ -278,6 +287,7 @@ import CryptoJS from "crypto-js";
   const passwordFormRules = reactive({
     password: [
       { required: true, message: '请输入密码', trigger: 'blur' },
+      {min: 8,message: '密码长度不得低于8位',trigger: 'blur'}
     ],
     confirm_password: [
       { required: true, message: '请确认密码', trigger: 'blur' },
@@ -288,11 +298,11 @@ import CryptoJS from "crypto-js";
   const router = useRouter();
 
   const getTableRows = () => {
-      let params = {...filter}
+      let params = {...filter, organization_id: selectNode.value}
       $axios.get(
           `/apaas/system/v5/user/list`,
           {
-            params,
+            params
           }
         )
         .then((res) => {
@@ -300,7 +310,7 @@ import CryptoJS from "crypto-js";
             tableRows.value = res.data.data || []
             tableTotal.value = res.data.total
           }else {
-            $message.error(res.data.msg)
+            $message.error(res.data.data)
           }
         })
   }
@@ -312,7 +322,11 @@ import CryptoJS from "crypto-js";
   }
 
   const handleNodeClick = (data) => {
-    console.log(data)
+    console.log(data.data_type)
+    if(data.data_type == 1) {
+      selectNode.value = data.id;
+      changePage(1)
+    }
   }
 
   const orgData = ref([])
@@ -327,12 +341,47 @@ import CryptoJS from "crypto-js";
       .then((res) => {
       if (res.data.code == 200) {
           orgData.value = res.data.data || [];
+          orgData.value.shift()
+          const orgList = searchOrg(orgData.value);
+          selectNode.value = orgList.length > 0 ? orgList[0].id : '';
+          nextTick(() =>{
+            if(orgList.length > 0) {
+              treeRef.value.setCurrentNode(orgList[0])
+            }
+          })
+          getTableRows()
       }else {
-          $message.error(res.data.msg)
+          $message.error(res.data.data)
       }
       })
   }
 
+  const searchOrg = (data) => {
+    const arr = []
+    data.forEach(item => {
+      if(item.data_type === 1) {
+        arr.push(item);
+        return 
+      }else {
+        if(item.Child){
+          searchOrg(item.Child)
+        }else {
+          return 
+        }
+      }
+    })
+    return arr;
+  }
+
+  watch(filterTree, (val) => {
+    treeRef.value.filter(val)
+  })
+
+  const filterNode = (value, data) => {
+    if (!value) return true
+    return data.name.includes(value)
+  }
+
   const stateChange = (row) => {
     const state = row.state.toString(); 
       $axios.post(
@@ -342,7 +391,7 @@ import CryptoJS from "crypto-js";
           if (res.data.code == 200) {
             getTableRows()
           }else {
-            $message.error(res.data.msg)
+            $message.error(res.data.data)
           }
         })
   }
@@ -350,7 +399,7 @@ import CryptoJS from "crypto-js";
   const changeSize = (size) => {
     filter.limit = size;
     filter.page = 1;
-    getTableRows()
+    changePage(1)
   }
 
   const changePage = (page) => {
@@ -358,6 +407,11 @@ import CryptoJS from "crypto-js";
     getTableRows()
   }
 
+  const changeSearch = (val) => {
+  filter.search = val
+    changePage(1)
+  } // 表格关键字筛选
+
   const goDetail = (params) => {
      router.push({
         path: "/develop/account/detail",
@@ -377,8 +431,12 @@ import CryptoJS from "crypto-js";
   }
 
   const deleteAccount = (data) => {
-     selectedRow.value = data;
-     deleteRowFlag.value = true;
+    if(data.state === 0) {
+      selectedRow.value = data;
+      deleteRowFlag.value = true;
+    }else {
+      $message.error('当前状态已启用，不可删除！')
+    }
   }
 
   const handleCloseDelete = () => {
@@ -398,7 +456,7 @@ import CryptoJS from "crypto-js";
              $message.success(res.data.msg)
              getTableRows()
           }else {
-            $message.error(res.data.msg)
+            $message.error(res.data.data)
           }
           handleCloseDelete();
         })
@@ -413,7 +471,7 @@ import CryptoJS from "crypto-js";
              $message.success(res.data.msg)
              getTableRows()
           }else {
-            $message.error(res.data.msg)
+            $message.error(res.data.data)
           }
           handleCloseRowDelete();
         })
@@ -451,7 +509,7 @@ import CryptoJS from "crypto-js";
              $message.success(res.data.msg)
              getTableRows()
           }else {
-            $message.error(res.data.msg)
+            $message.error(res.data.data)
           }
           handleCloseReset();
         })
@@ -482,7 +540,7 @@ import CryptoJS from "crypto-js";
           if (res.data.code == 200) {
              $message.success(res.data.msg)
           }else {
-            $message.error(res.data.msg)
+            $message.error(res.data.data)
           }
           handleCloseEdit();
         })
@@ -503,7 +561,7 @@ import CryptoJS from "crypto-js";
 
   onBeforeMount(() => {
     getOrgTree()
-    getTableRows()
+    //getTableRows()
     
   })
 
@@ -531,7 +589,7 @@ import CryptoJS from "crypto-js";
 .tree {
   overflow: auto;
   height: calc(100% - 65px);
-  padding: 5px;
+
 }
 .tree :deep() .el-tree-node>.el-tree-node__children {
   overflow: unset;
@@ -570,16 +628,6 @@ import CryptoJS from "crypto-js";
   bottom: unset;
   margin-top: 0px
 }
-.warning_info {
-  background-color: #f7f7f9;
-  font-size: 14px;
-	color: #404a62;
-  padding: 5px;
-  text-align: left;
-  margin: 20px 0;
-}
-.danger_info {
-  color: #d75138;
-}
+
 
 </style>
\ No newline at end of file
diff --git a/src/page/main/develop/menu/index.vue b/src/page/main/develop/menu/index.vue
index 1c254706eda777897b16c09062e8e2aa5efda3a0..aed04f84c613f61d8b70342c32a2b1017232adaa 100644
--- a/src/page/main/develop/menu/index.vue
+++ b/src/page/main/develop/menu/index.vue
@@ -17,7 +17,8 @@
                 />
              </div>
              <div class="tree">
-              <el-tree 
+              <el-tree
+                class="file-tree"
                 :data="data" 
                 :props="defaultProps" 
                 @node-click="handleNodeClick" 
@@ -26,6 +27,7 @@
                 node-key="menu_id"
                 ref="menuTree"
                 :filter-node-method="filterNode"
+                :expand-on-click-node="false"
               >
                 <template #default="{ node, data }">
                   <div class="custom-tree-node" pointer-events="none">
@@ -36,9 +38,12 @@
                       >{{ data.menu_name }}</span
                     >
                   </div>
-                  <span class="tree-action-box">
+                  <span 
+                    class="tree-action-box" 
+                    :class="{'position_sticky': isSticky(data.name) }"
+                    @click.stop="showAction($event, data,node)"
+                  >
                     <bg-icon
-                      @click.stop="showAction($event, data,node)"
                       class="tree-more"
                       icon="#bg-ic-s-more"
                     ></bg-icon>
@@ -55,7 +60,7 @@
                   <div class="action" @click="fileAction(1,selectData,selectParentData)">
                     新建本级
                   </div>
-                  <div class="action" :class="{'disable':selectData && selectData.menu_type == 2}" @click="fileAction(2,selectData,selectParentData,selectData.menu_type == 2)">
+                  <div class="action" @click="fileAction(2,selectData,selectParentData)">
                     新建下级
                   </div>
                   <div class="action" @click="fileAction(3,selectData,selectParentData)">
@@ -145,19 +150,29 @@ watch(() => state.search,(n,o) => {
   }, 500);
 }) // 树形搜索值
 
-const getMenuTree = () => {
+const getMenuTree = (type) => {
   axios
     .get(`/apaas/system/v5/menu/tree`)
     .then((res) => {
       if (res.data.code == 200) {
         state.data = res.data.data || []
         nextTick().then(() => {
-          if (state.selectData) {
-            state.menuTree && state.menuTree.setCurrentKey(state.selectData.menu_id);
-            handleNodeClick(state.selectData);
-          }else {
-            state.menuTree && state.menuTree.setCurrentKey(state.data[0].menu_id);
-            handleNodeClick(state.data[0]);
+          if (type) {
+            if (type == 1) { // 删除数据后默认选中父节点或第一个节点
+              state.menuTree && state.menuTree.setCurrentKey(state.selectParentData.menu_id);
+              handleNodeClick(state.selectParentData);
+            }else {
+              state.menuTree && state.menuTree.setCurrentKey(state.data[0].menu_id);
+              handleNodeClick(state.data[0]);
+            }
+          }else { // 新建，上下移，初始化时默认选中节点
+            if (state.selectData) {
+              state.menuTree && state.menuTree.setCurrentKey(state.selectData.menu_id);
+              handleNodeClick(state.selectData);
+            }else {
+              state.menuTree && state.menuTree.setCurrentKey(state.data[0].menu_id);
+              handleNodeClick(state.data[0]);
+            }
           }
         })
 
@@ -179,6 +194,14 @@ const findIndex= (code,arr) => {
   })
 } // 处理数据 用于判断能否上下移
 
+const isSticky = (data) => {
+  const canvas = document.createElement("canvas");
+  const context = canvas.getContext("2d");
+  context.font = '14px MicrosoftYaHei';
+  const { width } = context.measureText(data);
+  return width > 255 ? true : false;
+}
+
 const showAction = (e, data,node) => {
   acTop.value = ''
   acLeft.value = ''
@@ -217,6 +240,15 @@ const handleNodeClick = (data) => {
   state.selectData = data
   menuFormRef.value.setForm(state.selectData)
   closeAction()
+  if (menuFormRef) {
+    nextTick().then(() => {
+      menuFormRef.value.menuRef.validate(valid => {
+        if (!valid) {
+          menuFormRef.value.menuRef.clearValidate()
+        }
+      })
+    })
+  } // 清除表单验证
 } // 菜单树节点点击
 
 const filterNode = (val,data) => {
@@ -230,13 +262,15 @@ const fileAction = (val,data,parent,disabled=false) => {
   if (val == 1) { // 新建本级菜单
     state.addType = 1
     let newChild = {
-      menu_name: "新菜单",
-      menu_id: 'new' + state.newMenuId,
-      menu_type: 0,
-      dict_group_id: "",
-      state: 1,
-      menu_url: "",
-      menu_logo: "",
+      menu_name: "新菜单", // 菜单名称
+      menu_id: 'new' + state.newMenuId, // 菜单id，用于新增后选中
+      menu_type: !parent ? 0 : parent.menu_type == 0 ? 0 : parent.menu_type == 1 ? 1 : 2, // 新增本级的类型
+      dict_group_id: parent ? parent.dict_group_id : "", // 父级的分组 有则继承，无则自选
+      state: 1, // 启用状态
+      menu_url: "", // 路径
+      menu_logo: "", // 图标
+      level: data.level, // 当前的level
+      p_menu_type: parent ? parent.menu_type : 0 // 父级的类型，用于判断菜单下不能建目录
     }
     state.menuTree.insertAfter(newChild,parent? parent.Child[parent.Child.length-1] : state.data[state.data.length -1])
     state.menuTree && state.menuTree.setCurrentKey(newChild.menu_id);
@@ -250,11 +284,13 @@ const fileAction = (val,data,parent,disabled=false) => {
     let newChild = {
       menu_name: "新菜单",
       menu_id: 'new' + state.newMenuId,
-      menu_type: 0,
-      dict_group_id: "",
+      menu_type: data.menu_type == 0 ? 0 : data.menu_type == 1 ? 1 : 2,
+      dict_group_id: data.dict_group_id,
       state: 1,
       menu_url: "",
       menu_logo: "",
+      p_menu_type: data.menu_type,
+      level: data.level + 1
     }
     state.menuTree.append(newChild,data)
     state.menuTree && state.menuTree.setCurrentKey(newChild.menu_id);
@@ -268,7 +304,8 @@ const fileAction = (val,data,parent,disabled=false) => {
         if (res.data.code == 200) {
           ElMessage.success(res.data.data)
           state.selectData = null
-          getMenuTree()
+          let type = parent ? 1 : 2 // 1--有父级  2--无父级
+          getMenuTree(type)
         }else {
           ElMessage.error(res.data.data)
         }
@@ -384,9 +421,6 @@ const saveMenu = (el,type) => {
         }else { // 新增下级
           params.p_menu_id = state.selectParentData.menu_id
         }
-        if (params.menu_type != 0) {
-          params.dict_group_id = ""
-        }
         axios
           .post(`/apaas/system/v5/menu/add`,params)
           .then((res) => {
@@ -467,17 +501,25 @@ const {
   overflow: unset;
   /* padding-left: 16px; */
 }
-
+.file-tree :deep() .el-tree-node__content {
+  position: relative;
+}
 .tree-action-box {
   display: none;
   position: absolute;
   right: 0px;
+  top: 0px;
   background-color: #f2f3f7;
   width: 44px;
   text-align: center;
   height: 36px;
   line-height: 36px;
 }
+.position_sticky {
+  position: sticky;
+  position: -webkit-sticky;
+}
+
 .tree .el-tree-node__content:hover .tree-action-box {
   display: inline-block;
 }
diff --git a/src/page/main/develop/menu/menu-form.vue b/src/page/main/develop/menu/menu-form.vue
index 8bf536f55843a70b8a689c00d4f4358dcdd63c9d..05bc4abb2bed09c8ca530ea18ca615e40b804270 100644
--- a/src/page/main/develop/menu/menu-form.vue
+++ b/src/page/main/develop/menu/menu-form.vue
@@ -11,15 +11,15 @@
     <el-form-item label="菜单名称" prop="menu_name">
       <el-input v-model="menuForm.menu_name" show-word-limit maxlength="8" placeholder="请输入菜单名称" />
     </el-form-item>
-    <el-form-item label="类型" prop="menu_type">
+    <el-form-item label="类型" prop="menu_type" v-if="!topLevel">
       <el-radio-group v-model="menuForm.menu_type" :disabled="radioDisabled">
-        <el-radio :label="0">目录</el-radio>
-        <el-radio :label="1">菜单</el-radio>
+        <el-radio :label="0" :disabled="typeDisFlag != 0">目录</el-radio>
+        <el-radio :label="1" :disabled="typeDisFlag == 2">菜单</el-radio>
         <el-radio :label="2">子页面</el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="分组" prop="dict_group_id" v-if="menuForm.menu_type == 0">
-      <el-select v-model="menuForm.dict_group_id" placeholder="请选择分组">
+    <el-form-item label="分组" prop="dict_group_id" v-if="!topLevel">
+      <el-select v-model="menuForm.dict_group_id" :disabled="groupFlag" placeholder="请选择分组">
         <el-option
           v-for="item in groupList"
           :key="item.dict_id"
@@ -39,10 +39,10 @@
         inactive-text="否"
       />
     </el-form-item>
-    <el-form-item label="菜单路径" prop="menu_url">
+    <el-form-item label="菜单路径" :prop="topLevel ? '' : 'menu_url'">
       <el-input v-model="menuForm.menu_url" placeholder="请输入菜单路径" />
     </el-form-item>
-    <el-form-item label="菜单图标" prop="menu_logo" v-if="menuForm.menu_type !== 2">
+    <el-form-item label="菜单图标" prop="menu_logo">
       <div class="iconBox" :style="iconFlag ? {'border-color':'#2b4695'} : {} " @click="openIconbox">
         <div>
           <span>
@@ -129,7 +129,7 @@ const state = reactive({
       { required: true, message: '请选择菜单分组', trigger: 'change' },
     ],
     menu_url: [
-    { required: true, message: '请输入菜单路径', trigger: 'blur' },
+      { required: true, message: '请输入菜单路径', trigger: 'blur' },
     ]
   },
   groupList: [],
@@ -139,6 +139,9 @@ const state = reactive({
   showIconArr: [], // 展示的图标
   timer: null,
   radioDisabled: false,
+  topLevel: false,
+  typeDisFlag: null,
+  groupFlag: true,
 })
 
 const getGroupList = () => {
@@ -180,6 +183,18 @@ const searchIcon = () => {
 
 const setForm = (data) => {
   console.log(data)
+  if (data.level && data.level == 1) {
+    state.topLevel = true
+  }else {
+    state.topLevel = false
+    if (data.level == 2) {
+      state.groupFlag = false
+    }else {
+      state.groupFlag = true
+    }
+  }
+  state.typeDisFlag = data.p_menu_type
+  console.log(state.groupFlag)
   if (data.id) { // 编辑状态
     state.radioDisabled = true
   }else {
@@ -217,6 +232,9 @@ const {
   showIconArr,
   icon_search,
   radioDisabled,
+  topLevel,
+  typeDisFlag,
+  groupFlag,
 } = toRefs(state)
 
 defineExpose({ setForm , menuForm, menuRef })
diff --git a/src/page/main/system/organization/directory-form.vue b/src/page/main/system/organization/directory-form.vue
index 533f6dc939bf0d5ae824be40bb71280787b98812..b2786b2d3a8d42e19cc7d3a4ad5ec4f0e585b1ce 100644
--- a/src/page/main/system/organization/directory-form.vue
+++ b/src/page/main/system/organization/directory-form.vue
@@ -7,10 +7,18 @@
     ref="directoryRef"
     style="max-width: 80%"
   >
-    <el-form-item label="上级目录" prop="parent">
-      <el-input v-model="directoryForm.parent" style="width: 80%;" />
+    <el-form-item label="上级目录" prop="p_organization_id" v-if="formType === 'create'">
+      <!-- <el-input v-model="directoryForm.p_organization_id" style="width: 80%;" /> -->
+      <el-tree-select 
+          v-model="directoryForm.p_organization_id"
+          :data="orgData" 
+          :props="treeProps" 
+          :render-aftertreeProps-expand="false" 
+          :filter-node-method="filterNode"
+          :check-strictly="true" 
+          style="width: 80%;" />
       <el-form-item label="" style="padding-left: 16px">
-        <el-checkbox v-model="directoryForm.level" label="顶级"/>
+        <el-checkbox v-model="directoryForm.level" @change="isTop" label="顶级"/>
       </el-form-item>
     </el-form-item>
     
@@ -21,47 +29,102 @@
 </template>
 
 <script setup>
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance, nextTick } from 'vue'
+  const props = defineProps({
+  formType: {
+      type: String,
+      default: 'create', //false 新建 true 编辑
+    },
+  });
+  const { proxy } = getCurrentInstance()
+  const { $axios,$message } = proxy
 
-const directoryForm = reactive({
-  parent: '',
-  name: '',
-  level: ''
-})
-
-const directoryFormRules = reactive({
-  parent: [
-    { required: true, message: '请输入上级目录', trigger: 'blur' },
-  ],
-  name: [
-    { required: true, message: '请输入名称', trigger: 'blur' },
-  ],
-})
-const directoryRef = ref(null)
-const emit = defineEmits(['action'])
+  const directoryForm = reactive({
+    p_organization_id: '',
+    name: '',
+    level: false
+  })
 
-const submitForm = async () => {
-  if (!directoryRef) return
-  await directoryRef.value.validate((valid, fields) => {
-    if (valid) {
-      emit('action', directoryForm)
-    } else {
-      emit('action',null)
-    }
+  const directoryFormRules = reactive({
+    p_organization_id: [
+      { required: true, message: '请输入上级目录', trigger: 'blur' },
+    ],
+    name: [
+      { required: true, message: '请输入名称', trigger: 'blur' },
+    ],
   })
-}
-const clearForm = () => {
-  if (!directoryRef) return
-  directoryRef.value.resetFields()
-} 
+  const directoryRef = ref(null)
+  const emit = defineEmits(['action'])
+
+  const submitForm = async () => {
+    if (!directoryRef) return
+    await directoryRef.value.validate((valid, fields) => {
+      if (valid) {
+        emit('action', directoryForm)
+      } else {
+        emit('action',null)
+      }
+    })
+  }
+  const clearForm = () => {
+    if (!directoryRef) return
+    directoryRef.value.resetFields()
+  } 
+
+  const setForm = (data) => {
+    directoryForm.value = Object.assign(directoryForm, data);
+  }
+
+  const orgData = ref([])
+  const treeProps = {
+    label: 'name',
+    children: 'Child',
+    value: 'organization_id',
+    disabled: 'disabled'
+  }
+  const getOrgTree = () => {
+    $axios.get(`/apaas/system/v5/org/tree`)
+      .then((res) => {
+      if (res.data.code == 200) {
+          const orgDataTemp =  res.data.data || []
+          orgDataTemp.shift()
+          orgData.value = filterOrg(orgDataTemp);
+      }else {
+          $message.error(res.data.data)
+      }
+      })
+  }
+
+  const filterOrg = (data) => {
+      if(data.length > 0) {
+          data.forEach(item => {
+            item.disabled = item.data_type === 0 ? false : true;
 
-const setForm = (data) => {
-  directoryForm.value = Object.assign(directoryForm, data);
-}
+            if(item.Child){
+              filterOrg(item.Child)
+            }else {
+              return  
+            }
+        })
+      }
+    return data;
+  }
 
-onMounted(() => {
-   
-})
+  const filterNode = (value, data) => {
+    
+    return data.data_type === 0
+  }
+  const isTop = (data) => {
+    directoryForm.p_organization_id = data ? ' ' : ''; //空格绕过表单非空校验
+  }
+
+  onBeforeMount(() =>{
+    getOrgTree()
+  })
+
+  onMounted(() => {
+    
+  })
 
-defineExpose({ submitForm, clearForm, setForm })
+  defineExpose({ submitForm, clearForm, setForm })
 </script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue
index 2c2499f229d4222f744aa224b26659266968b9c5..c4bad606e9abf1c1402d2526be3f63662da95b76 100644
--- a/src/page/main/system/organization/index.vue
+++ b/src/page/main/system/organization/index.vue
@@ -17,46 +17,90 @@
                     v-model="search"
                     placeholder="请输入组织名称搜索"
                     :prefix-icon="Search"
+                    @input="searchChange"
                   />
                </div>
                <div class="tree">
-                  <tree @create="treeCreate"></tree>
+                  <tree ref="orgTree" @action="treeAction" @select="treeSelect"></tree>
                </div>
              </div>
            </div>
            <div class="flex_right">
              <div class="info_container bgc_white">
                <div class="title"><span  class="icon_box"><bg-icon class="step_icon" icon="#bg-ic-file"></bg-icon></span> 基本信息  <bg-icon style="font-size: 14px" class="step_icon" icon="#bg-ic-arrow-right"></bg-icon> </div>
-               <bg-info :data="baseInfo"></bg-info>
+               <bg-info v-if="selectTreeDataType === 1" :data="baseInfo"></bg-info>
+               <bg-info v-if="selectTreeDataType === 2" :data="baseInfo2"></bg-info>
              </div>
              <div class="main_container bgc_white">
-              <div class="apaas_button">
-                <el-button type="primary" @click="addAccount(0)">新建</el-button><el-button @click="addAccount(1)">编辑</el-button>
-              </div>
+                <bg-filter-group @search="changeSearch" v-model="filter.key_word" placeholder="请输入关键字">
+                    <template v-slot:left_action>
+                      <div class="apaas_button">
+                      <el-button class="register_btn" type="primary" @click="addAccount">
+                        <bg-icon style="font-size: 12px; color: #fff; margin-right: 8px" icon="#bg-ic-add"></bg-icon>
+                          {{selectTreeDataType === 1 ? '新增组织管理员' :  '新增平台用户' }}
+                      </el-button>
+                      <el-button class="register_btn" @click="deleteBatch">
+                          批量删除
+                      </el-button>
+                      <el-button class="register_btn" @click="resetPsd">
+                          重置密码
+                      </el-button>
+                      <span class="header_info">已选择<span style="color: #202531;font-weight: bold">{{selected.length}}</span>项</span>
+                      <span class="header_info name_btn" @click="clearSelected">清空</span>
+                    </div>
+                    </template>
+                    <template v-slot:filter_group>
+                      <div class="left-filter filter_list">
+                        <div class="filter_item">
+                          <span class="filter_title">启用状态</span>
+                          <el-select
+                            v-model="filter.state"
+                            placeholder="请选择"
+                            style="width: 300px"
+                          >
+                            <el-option
+                              v-for="(item, index) in stateOptions"
+                              :key="'pushOptions' + index"
+                              :label="item.name"
+                              :value="item.value"
+                            >
+                            </el-option>
+                          </el-select>
+                        </div>
+                      </div>
+                      <div class="right-action apaas_button">
+                        <el-button type="primary" @click="filterAction"> 查询 </el-button>
+                        <el-button type="default" @click="filterClear"> 重置 </el-button>
+                      </div>
+                    </template>
+                </bg-filter-group>
                 <div class="table_container apaas_scroll">
-                  <bg-table ref="bgTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true">
-                    <template v-slot:account="{ row }">
-                      <span @click="goDetail(row)" class="name_btn">
-                        {{ row.account }}
+                  <bg-table ref="dataTable" :headers="headers" :rows="tableRows" :isIndex="true" :stripe="true" :select="true" @selectAc="selectRows">
+                    <template v-slot:system_account="{ row }">
+                      <span @click="goDetail(row)" class="can_click_text">
+                        {{ row.system_account }}
                       </span>
                     </template>
+                    <template v-slot:state="{ row }">
+                      <bg-switch @click="stateChange(row)" :labels="['否','是']" :values="[0,1]" v-model="row.state"></bg-switch>
+                    </template>
                     <template v-slot:action="{ row }">
-                      <bg-table-btn class="btn">
+                      <bg-table-btn @click="editAccount(row)" class="can_click_text">
                         编辑
                       </bg-table-btn>
-                      <bg-table-btn class="btn">
+                      <bg-table-btn @click="editPsdAccount(row)" class="can_click_text">
                         修改密码
                       </bg-table-btn>
-                      <bg-table-btn class="btn">
+                      <bg-table-btn @click="deleteAccount(row)" class="can_click_text">
                         删除
                       </bg-table-btn>
                     </template>
                   </bg-table>
                   <div class="pagination_box">
                      <bg-pagination
-                    :page="1"
-                    :size="10"
-                    :total="100"
+                    :page="filter.page"
+                    :size="filter.limit"
+                    :total="tableTotal"
                     @change-page="changePage"
                     @change-size="changeSize"
                   >
@@ -71,9 +115,10 @@
           :title="action === 'create' ? '新增目录' : '编辑目录' "
           width="758px"
           :before-close="handleCloseDirectoryDirectory"
+          destroy-on-close
         >
           <div class="dialog_form">
-            <directoryForm ref="directoryFormRef" @action="getDirectoryFromData"></directoryForm>
+            <directoryForm ref="directoryFormRef" :form-type="directoryFormType" @action="getDirectoryFromData"></directoryForm>
           </div>
           <template #footer>
             <span class="dialog-footer">
@@ -87,9 +132,10 @@
           :title="action === 'create' ? '新增组织' : '编辑组织'"
           width="758px"
           :before-close="handleCloseOrg"
+          destroy-on-close
         >
           <div class="dialog_form">
-            <orgForm ref="orgFormRef" @action="getOrgFromData"></orgForm>
+            <orgForm ref="orgFormRef" :form-type="orgFormType" @action="getOrgFormData"></orgForm>
           </div>
           <template #footer>
             <span class="dialog-footer">
@@ -98,6 +144,120 @@
             </span>
           </template>
         </el-dialog>
+        <el-dialog
+          v-model="dialogDelNode"
+          title="删除"
+          width="520px"
+          :before-close="handleCloseDelNode"
+        >
+          <div class="dialog_form">
+            确认删除吗？
+          </div>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button @click="handleCloseDelNode">取消</el-button>
+              <el-button type="primary" @click="confirmDelNode">确认</el-button>
+            </span>
+          </template>
+        </el-dialog>
+        <el-dialog
+          v-model="deleteRowFlag"
+          title="删除"
+          width="520px"
+          :before-close="handleCloseRowDelete"
+        >
+          <div class="warning_info">
+            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
+            您正在对 <span class="danger_info">{{selectedRow.system_account}}</span>做删除操作。
+          </div>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button @click="handleCloseRowDelete">取消</el-button>
+              <el-button type="primary" @click="deleteRowConfirm">确定</el-button>
+            </span>
+          </template>
+        </el-dialog>
+        <el-dialog
+          v-model="editFlag"
+          title="修改密码"
+          width="520px"
+          :before-close="handleCloseEdit"
+        >
+          <div class="warning_info">
+            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
+            您正在对 <span class="danger_info">{{selectedRow.system_account}}</span>做修改密码操作，修改后旧密码将无法登录。
+           
+          </div>
+           <div>
+             <el-form
+                :label-position="'right'"
+                label-width="120px"
+                :model="passwordForm"
+                :rules="passwordFormRules"
+                ref="passwordRef"
+                style="max-width: 80%"
+              >
+                <el-form-item label="新密码" prop="password">
+                  <el-input v-model="passwordForm.password" :type="password_eye ? 'text' : 'password'" placeholder="请输入密码">
+                    <template #suffix>
+                      <bg-icon @click="password_eye = !password_eye" class="icon_eye"  icon="#bg-ic-eye"></bg-icon>
+                    </template>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="确认新密码" prop="confirm_password">
+                  <el-input v-model="passwordForm.confirm_password" :type="confirm_eye ? 'text' : 'password'" placeholder="请确认新密码"> 
+                    <template #suffix>
+                      <bg-icon @click="confirm_eye = !confirm_eye" class="icon_eye" icon="#bg-ic-eye"></bg-icon>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-form>
+          </div>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button @click="handleCloseEdit">取消</el-button>
+              <el-button type="primary" @click="editConfirm">确定</el-button>
+            </span>
+          </template>
+        </el-dialog>
+        <el-dialog
+          v-model="deleteFlag"
+          title="删除"
+          width="520px"
+          :before-close="handleCloseDelete"
+        >
+          <div class="warning_info">
+            <bg-icon style="font-size: 12px; color: #a9b1c7; mdeleteConfirmargin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
+            您正在对 <span class="danger_info">{{selectedName.join('、')}}</span>做删除操作。
+          </div>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button @click="handleCloseDelete">取消</el-button>
+              <el-button type="primary" @click="deleteConfirm">确定</el-button>
+            </span>
+          </template>
+        </el-dialog>
+        <el-dialog
+          v-model="resetFlag"
+          title="重置密码"
+          width="520px"
+          :before-close="handleCloseReset"
+        >
+          <div class="warning_info">
+            <bg-icon style="font-size: 12px; color: #a9b1c7; margin-right: 8px;vertical-align: baseline;" icon="#bg-ic-circle-tips"></bg-icon>
+            您正在对 <span class="danger_info">{{selectedName.join('、')}}</span>做重置密码操作。
+           
+          </div>
+           <div>
+              重置密码为123456，是否继续？
+            </div>
+          <template #footer>
+            <span class="dialog-footer">
+              <el-button @click="handleCloseReset">取消</el-button>
+              <el-button type="primary" @click="resetConfirm">确定</el-button>
+            </span>
+          </template>
+        </el-dialog>
     </div>
 </template>
 
@@ -110,65 +270,98 @@ import { useRouter } from 'vue-router';
 import tree from './tree.vue';
 import directoryForm from './directory-form.vue';
 import orgForm from './org-form.vue';
+import CryptoJS from "crypto-js"; 
+import { downloadFileFormatNew } from '@/services/helper'
+
+  const { proxy } = getCurrentInstance()
+  const { $axios,$message } = proxy
   
+  const dataTable = ref(null);
+  const toOrgDetail = () => {
+    router.push({
+        path: "/system/organization/org-detail",
+        query: {
+          id: selectTreeData.value.organization_id
+        }
+       
+      })
+  }
   const baseInfo = reactive(
     [
     {
       name: "机构类型",
-      value: "政务机构",
+      value: "",
       nameWidth: 130
     },
     {
       name: "组织机构代码",
-      value: "0000001",
+      value: "",
       nameWidth: 130
     },
     {
       name: "机构名称",
-      value: "科技局",
+      value: "",
+      callback: toOrgDetail,
       nameWidth: 130
     },
     {
       name: "创建时间",
-      value: "2022-10-10 10:10:10",
+      value: "",
       nameWidth: 130
     },
     {
       name: "组织管理员数量",
-      value: "10",
+      value: "",
       nameWidth: 130
     },
     {
       name: "业务系统数量",
-      value: "22",
+      value: "",
       nameWidth: 130
     },
-  ]
-  )
+  ])
+  const baseInfo2 = reactive(
+    [{
+      name: "机构名称",
+      value: "",
+      nameWidth: 130
+    },
+    {
+      name: "组织机构代码",
+      value: "",
+      nameWidth: 130
+    },
+    {
+      name: "用户数",
+      value: "",
+      nameWidth: 130,
+      full: true
+    },
+  ])
   const headers = reactive([
         {
           label: "账号",
-          prop: "account",
-          width: 180
+          prop: "system_account",
+          minWidth: 150
         },
         {
           label: "手机号",
-          prop: "phone",
-          minWidth: 180
+          prop: "contact_phone",
+          width: 150
         },
         {
           label: "角色",
-          prop: "role",
+          prop: "system_role",
           width: 150
         },
         {
           label: "创建时间",
-          prop: "create_time",
-          width: 150
+          prop: "created_time",
+          width: 200
         },
         {
           label: "是否启用",
-          prop: "is_use",
+          prop: "state",
           width: 80
         },
         {
@@ -177,38 +370,82 @@ import orgForm from './org-form.vue';
           width: 220,
           fixed: "right",
         },
-      ])
- 
-  const tableRows = reactive([
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-    {account: "admin",phone: "15625364536",role: "管理员",create_time: "2022-01-01 00:00",is_use: "是"},
-  ])
-  const search=ref("");
-
+      ]);
+ const stateOptions = ref([
+   {
+      name: "全部",
+      value: ""
+    },
+    {
+      name: "启用",
+      value: "1"
+    },
+    {
+      name: "禁用",
+      value: "0"
+    },
+ ])
+  const tableRows = ref([]);
+  const tableTotal = ref(0);
+  const orgTree = ref(null);
+  const selectTreeData = ref(null)
+  const selectTreeDataType = ref(2);
+  const dialogDelNode = ref(false)
   const router = useRouter();
+  const filter = reactive({
+        state: '',
+        key_word: "",
+        page: 1,
+        limit: 10,
+      });
+  const deleteFlag = ref(false)
+  const deleteRowFlag = ref(false)
+  const resetFlag = ref(false)
+  const selectedRow = ref({})
+  const selected = ref([])
+  const selectedName = ref([])
+  const editFlag = ref(false)
+  const password_eye = ref(false)
+  const confirm_eye = ref(false)
+  const passwordRef = ref(null)
+  const passwordForm = reactive({
+    password: '',
+    confirm_password: '',
+  })
+  const validatePass = (rule, value, callback) => {
+    if (value !== passwordForm.password) {
+      callback(new Error("密码输入不一致"))
+    } else {
+      callback()
+    }
+  }
+
+  const passwordFormRules = reactive({
+    password: [
+      { required: true, message: '请输入密码', trigger: 'blur' },
+      {min: 8,message: '密码长度不得低于8位',trigger: 'blur'}
+    ],
+    confirm_password: [
+      { required: true, message: '请确认密码', trigger: 'blur' },
+      { validator: validatePass, trigger: 'blur' }
+    ],
+  })
   
-  const addAccount = (params) => {
-    router.push({
-        path: "/system/organization/system-user",
+  const addAccount = () => {
+    if(selectTreeDataType.value === 1) {
+      router.push({
+        path: "/system/organization/org-user",
         query: {
-          type: params
+          orgId: selectTreeData.value.organization_id
         }
       })
+    }else {
+      router.push({
+        path: "/system/organization/platform-user",
+       
+      })
+    }
+    
   }
   const treeSelected = ref(null);
   const handleNodeClick = (data) => {
@@ -218,14 +455,35 @@ import orgForm from './org-form.vue';
 
 
   const changeSize = (size) => {
+    filter.limit = size;
+    changePage(1)
+  }
 
+  const changePage = (page) => {
+    filter.page = page;
+    getTableRows();
   }
 
-  const changePage = (size) => {
+  const changeSearch = (val) => {
+  filter.key_word = val
+    changePage(1)
+  } // 表格关键字筛选
 
-  }
+  const filterAction = () => {
+    changePage(1)
+  } // 查询按钮
 
-  const dialogDirectory = ref(false) 
+  const filterClear = () => {
+    filter.state = "";
+    filter.key_word = "";
+    filter.limit = 10
+    filter.page = 1
+    changePage(1)
+  } // 重置筛选项
+
+  const dialogDirectory = ref(false)
+  const directoryFormType = ref('create')
+  const orgFormType = ref('create')
   const handleCloseDirectory = () => {
     dialogDirectory.value = false;
   }
@@ -235,9 +493,42 @@ import orgForm from './org-form.vue';
     directoryFormRef.value.submitForm();
   }
 
+  //新增/编剧目录
   const getDirectoryFromData = (data) => {
-    console.log(111111)
-    console.log(data)
+    
+    if(directoryFormType.value === 'create') {
+      const params = {
+        p_organization_id: data.level ? "" : data.p_organization_id,
+        name: data.name,
+        data_type: 0
+      }
+      $axios.post(`/apaas/system/v5/org/add`, params)
+        .then((res) => {
+          if (res.data.code == 200) {
+            $message.success(res.data.msg)
+            orgTree.value.getOrgTree();
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseDirectory()
+        })
+    }else if(directoryFormType.value === 'edit') {
+      const params = {
+        name: data.name,
+        data_type: 0
+      }
+      $axios.put(`/apaas/system/v5/org/${selectTreeData.value.id}`, params)
+        .then((res) => {
+          if (res.data.code == 200) {
+            $message.success(res.data.msg)
+            orgTree.value.getOrgTree();
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseDirectory()
+        })
+    }
+    
   }
 
   const dialogOrg = ref(false) 
@@ -250,34 +541,174 @@ import orgForm from './org-form.vue';
     orgFormRef.value.submitForm();
   }
 
-  const getOrgFromData = (data) => {
-    console.log(111111)
-    console.log(data)
+  //新增/编辑组织
+  const getOrgFormData = (data) => {
+    if(orgFormType.value === 'create') {
+      const params = {
+        p_organization_id: data.level ? "" : data.p_organization_id,
+        name: data.name,
+        organization_code: data.organization_code,
+        description: data.description,
+        attachment:  data.attachment && data.attachment.length > 0 ? data.attachment.map(item => item.url).join(',') : '',
+        data_type: 1
+      }
+      $axios.post(`/apaas/system/v5/org/add`, params)
+        .then((res) => {
+          if (res.data.code == 200) {
+            $message.success(res.data.msg)
+            orgTree.value.getOrgTree();
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseOrg()
+        })
+    }else if(orgFormType.value === 'edit') {
+      const params = {
+        // p_organization_id: data.level ? "" : data.p_organization_id,
+        name: data.name,
+        organization_code: data.organization_code,
+        description: data.description,
+        attachment:  data.attachment && data.attachment.length > 0 ? data.attachment.map(item => item.url).join(',') : '',
+        data_type: 1
+      }
+      $axios.put(`/apaas/system/v5/org/${selectTreeData.value.id}`, params)
+        .then((res) => {
+          if (res.data.code == 200) {
+            $message.success(res.data.msg)
+            orgTree.value.getOrgTree();
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseOrg()
+        })
+    }
+    
+  }
+
+  const handleCloseDelNode = () => {
+    dialogDelNode.value = false;
+  }
+
+  //删除目录/组织
+  const confirmDelNode = () => {
+      $axios.delete(`/apaas/system/v5/org/${selectTreeData.value.id}`)
+        .then((res) => {
+          if (res.data.code == 200) {
+            $message.success(res.data.msg)
+            orgTree.value.getOrgTree();
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseDelNode()
+        })
   }
+
+  const moveOrg = (params) => {
+     $axios.put(`/apaas/system/v5/org/sort`,params)
+        .then((res) => {
+          if (res.data.code == 200) {
+            $message.success(res.data.msg)
+            orgTree.value.getOrgTree();
+          }else {
+            $message.error(res.data.data)
+          }
+        })
+  }
+
   const action = ref('create')
-  const treeCreate = (data) => {
+  const treeAction = (data) => {
     action.value = data.action
     if(data.action === 'create' || data.action === 'edit') {
       if(data.type === 'org') {
+        orgFormType.value = data.action;
         dialogOrg.value = true;
-        
-        if(data.data.value) {
-          orgFormRef.value.setForm({parent: data.data.value.dept});
-        }
-
+        nextTick(() => {
+          if(data.data) {
+            if(data.action === 'edit') {
+               orgFormRef.value.setForm({
+                 name: data.data.value.name,
+                 p_organization_id: data.data.value.p_organization_id,
+                 level: data.data.value.p_organization_id ? false : true,
+                 organization_code: data.data.value.organization_code,
+                 description: data.data.value.description,
+                 attachment: data.data.value.attachment.split(',').map(i => {return {name: downloadFileFormatNew(i),url: i}})
+                 });
+            }else if(data.action === 'create') {
+              orgFormRef.value.setForm({p_organization_id: data.data.value.organization_id});
+            }
+            
+          }
+        })
       }else {
+        directoryFormType.value = data.action;
         dialogDirectory.value = true;
         nextTick(()=> {
-          if(data.data.value) {
-          directoryFormRef.value.setForm({parent: data.data.value.dept});
+          if(data.data) {
+            if(data.action === 'edit') {
+              directoryFormRef.value.setForm({name: data.data.value.name});
+            }else if(data.action === 'create') {
+              directoryFormRef.value.setForm({p_organization_id: data.data.value.organization_id});
+            }
+            
         }
         })
       }
-    }else {
-      console.log(data.action)
+    }else if(data.action === 'delete'){
+      dialogDelNode.value = true;
+    }else if(data.action === 'mvup' || data.action === 'mvdown') {
+      moveOrg(data.data);
+    }
+  }
+
+  const treeSelect = (data) => {
+     selectTreeData.value = data.value;
+    if(data.value.data_type === 1 || data.value.data_type === 2) {
+      selectTreeDataType.value = data.value.data_type;
+    
+      getTableRows();
     }
   }
 
+  const getTableRows = () => {
+    let params = {...filter, organization_id: selectTreeData.value.organization_id,data_type: selectTreeData.value.data_type}
+      $axios.get(
+          `/apaas/system/v5/org/detail`,
+          {
+            params
+          }
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            tableRows.value = (res.data.data.org_users.data || []).map(item => {
+
+                item.system_role = item.system_role ? item.system_role.join('、') : '';
+                return item;
+            });
+            tableTotal.value = res.data.data.org_users.total;
+            if(params.data_type === 1) {
+              baseInfo[0].value = res.data.data.org_info.organization_type;
+              baseInfo[1].value = res.data.data.org_info.organization_code;
+              baseInfo[2].value = res.data.data.org_info.name;
+              baseInfo[3].value = res.data.data.org_info.created_time;
+              baseInfo[4].value = res.data.data.org_info.org_admin_number;
+              baseInfo[5].value = res.data.data.org_info.business_system_number;
+            }else {
+              baseInfo2[0].value = res.data.data.org_info.name;
+              baseInfo2[1].value = res.data.data.org_info.organization_code;
+              baseInfo2[2].value = res.data.data.org_info.platform_users_number;
+            }
+            console.log(baseInfo)
+            
+          }else {
+            $message.error(res.data.data)
+          }
+        })
+  }
+
+  const searchChange = (val) => {
+    orgTree.value.filterTree(val);
+  }
+
   const goDetail = (params) => {
      router.push({
         path: "/system/organization/user-detail",
@@ -287,6 +718,170 @@ import orgForm from './org-form.vue';
       })
   }
 
+  const stateChange = (row) => {
+    const state = row.state.toString(); 
+      $axios.post(
+          `/apaas/system/v5/user/state/${row.id}/${state}`,
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            getTableRows()
+          }else {
+            $message.error(res.data.data)
+          }
+        })
+  }
+
+  const editPsdAccount = (data) => {
+      selectedRow.value = data;
+      editFlag.value = true;
+  }
+
+  const handleCloseEdit = () => {
+      if (!passwordRef) return
+            passwordRef.value.resetFields()
+      editFlag.value = false;
+  }
+ const editConfirm = () => {
+   if (!passwordRef) return
+     passwordRef.value.validate((valid, fields) => {
+      if (valid) {
+          $axios.post(
+          `/apaas/system/v5/user/editpwd`,
+          {
+          id: selectedRow.value.id,
+          password: CryptoJS.AES.encrypt(passwordForm.password,"swuE9cmCZQwrkYRV").toString()
+          }
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+             $message.success(res.data.msg)
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseEdit();
+        })
+        
+      } 
+    })
+  }
+
+  const deleteAccount = (data) => {
+    if(data.state === 0) {
+      selectedRow.value = data;
+      deleteRowFlag.value = true;
+    }else {
+      $message.error('当前状态已启用，不可删除！')
+    }
+     
+  }
+
+  const handleCloseRowDelete = () => {
+      deleteRowFlag.value = false;
+  }
+
+  const deleteRowConfirm = () => {
+    $axios.delete(
+          `/apaas/system/v5/user/delete`,{data: {ids: [selectedRow.value.id]}}
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+             $message.success(res.data.msg)
+             getTableRows()
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseRowDelete();
+        })
+  }
+
+  const editAccount = (data) => {
+    if(selectTreeDataType === 1) {
+       router.push({
+        path: "/system/organization/org-user",
+        query: {
+          id: data.id
+        }
+      })
+    } else { router.push({
+        path: "/system/organization/platform-user",
+        query: {
+          id: data.id
+        }
+      })
+      
+    } 
+  }
+
+  const handleCloseDelete = () => {
+      deleteFlag.value = false;
+  }
+
+  const deleteConfirm = () => {
+    const ids = selected.value.map(item => item.id)
+     $axios.delete(
+          `/apaas/system/v5/user/delete`,{data: {ids: ids}}
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+             $message.success(res.data.msg)
+             getTableRows()
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseDelete();
+        })
+  }
+
+  const deleteBatch = () => {
+    if(selectedName.value.length > 0){
+      deleteFlag.value = true;
+    }else {
+       $message.error('请先选择需要操作的数据!')
+    }
+      
+  }
+
+  const handleCloseReset = () => {
+      resetFlag.value = false;
+  }
+
+  const resetPsd = () => {
+    if(selectedName.value.length > 0){
+       resetFlag.value = true;
+    }else {
+       $message.error('请先选择需要操作的数据!')
+    }
+      
+  }
+
+  const resetConfirm = () => {
+    const ids = selected.value.map(item => item.id)
+     $axios.post(
+          `/apaas/system/v5/user/resetpwd`,{ids: ids}
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+             $message.success(res.data.msg)
+             getTableRows()
+          }else {
+            $message.error(res.data.data)
+          }
+          handleCloseReset();
+        })
+  }
+
+  const selectRows = (data) => {
+    selected.value = data.selection;
+    selectedName.value = data.selection.map(item => item.system_account)
+  }
+
+  const clearSelected = () => {
+    dataTable.value.clearSelection();
+  }
+
+  
+
   onBeforeMount(() => {
    
   })
@@ -316,7 +911,7 @@ import orgForm from './org-form.vue';
 .tree {
   overflow: auto;
   height: calc(100% - 65px);
-  padding: 5px;
+  /* padding: 5px; */
 }
 .tree :deep() .el-tree-node>.el-tree-node__children {
   overflow: unset;
diff --git a/src/page/main/system/organization/org-detail/index.vue b/src/page/main/system/organization/org-detail/index.vue
index 565964c6a501f8f97155d4fdec9d0872d94b416d..acb3e0082d157fe5609095a99e555d704a7a3d51 100644
--- a/src/page/main/system/organization/org-detail/index.vue
+++ b/src/page/main/system/organization/org-detail/index.vue
@@ -21,25 +21,11 @@
                     <div class="org_file info_box">
                       <div class="pl-1">组织附件</div>
                       <div>
-                        <div class="file_item pl-1">
-                          <span><bg-icon  style="font-size: 24px" icon="#bg-ic-c-file-doc"></bg-icon></span>
-                          <span class="file_name">xxxxxxx协议.doc</span>
+                        <div class="file_item pl-1" v-for="(item, index) in fileList" :key="'file_'+index">
+                          <span><bg-icon  style="font-size: 24px" :icon="'#bg-ic-'+formatFile(item)"></bg-icon></span>
+                          <span class="file_name">{{downloadFileFormatNew(item)}}</span>
                           <span class="fr download_btn">
-                            <el-button type="primary" @click="downloadFile"><bg-icon  icon="#bg-ic-to-bottom"></bg-icon>下载</el-button>
-                          </span>
-                        </div>
-                        <div class="file_item pl-1">
-                          <span><bg-icon  style="font-size: 24px" icon="#bg-ic-c-file-zip"></bg-icon></span>
-                          <span class="file_name">xxxxxxx协议.zip</span>
-                          <span class="fr download_btn">
-                            <el-button type="primary"><bg-icon  icon="#bg-ic-to-bottom"></bg-icon>下载</el-button>
-                          </span>
-                        </div>
-                        <div class="file_item pl-1">
-                          <span><bg-icon  style="font-size: 24px" icon="#bg-ic-c-file-image"></bg-icon></span>
-                          <span class="file_name">xxxxxxx协议.jpg</span>
-                          <span class="fr download_btn">
-                            <el-button type="primary"><bg-icon  icon="#bg-ic-to-bottom"></bg-icon>下载</el-button>
+                            <el-button type="primary" @click="downloadFile(item)"><bg-icon  icon="#bg-ic-to-bottom"></bg-icon>下载</el-button>
                           </span>
                         </div>
                       </div>
@@ -58,9 +44,9 @@
                       </bg-table>
                       <div class="pagination_box">
                      <bg-pagination
-                        :page="1"
-                        :size="10"
-                        :total="100"
+                        :page="filter.page"
+                        :size="filter.limit"
+                        :total="tableTotal"
                         @change-page="changePage"
                         @change-size="changeSize"
                       >
@@ -76,33 +62,37 @@
 import { reactive, toRefs, ref, } from '@vue/reactivity'
 import { getCurrentInstance } from 'vue'
 import { computed, onBeforeMount } from '@vue/runtime-core'
-import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
+import { downloadFileFormatNew } from '@/services/helper'
+const { proxy } = getCurrentInstance()
+const { $axios,$message } = proxy
+const route = useRoute();
 
 const baseInfo = reactive(
     [
     {
       name: "机构名称",
-      value: "大数据局",
+      value: "",
       nameWidth: 130
     },
     {
       name: "组织机构代码",
-      value: "00000001",
+      value: "",
       nameWidth: 130
     },
     {
       name: "组织管理员数量",
-      value: "15",
+      value: "",
       nameWidth: 130
     },
     {
       name: "业务系统数量",
-      value: "10",
+      value: "",
       nameWidth: 130
     },
     {
       name: "组织描述",
-      value: "组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述组织描述",
+      value: "",
       nameWidth: 130
     },
   ])
@@ -110,48 +100,100 @@ const baseInfo = reactive(
   const headers = reactive([
         {
           label: "业务系统名称",
-          prop: "name",
+          prop: "business_name",
         },
         {
           label: "是否启用",
-          prop: "is_use",
+          prop: "state",
         },
         {
           label: "业务系统账号",
-          prop: "account",
+          prop: "system_account",
         },
       ])
  
-  const tableRows = reactive([
-    {name: '大数据处理系统',is_use: "是",account: "admin"},
-    {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    // {name: '大数据处理系统',is_use: "是",account: "admin"},
-    
-  ])
+  const tableRows = ref([])
+  const fileList = ref([])
+  const filter = reactive({
+        page: 1,
+        limit: 10,
+      });
+  const tableTotal = ref(0);
 
   const changeSize = (size) => {
+    filter.limit = size;
+    changePage(1)
+  }
 
+  const changePage = (page) => {
+    filter.page = page;
+    getSystemInfo();
   }
 
-  const changePage = (size) => {
+  const downloadFile = (data) => {
+    const a = document.createElement("a"); // 创建a标签
+      a.setAttribute("download", ""); // download属性
+      a.setAttribute("href", data); // href链接
+      a.click(); // 自执行点击事件
+  }
 
+  const formatFile = (url) => {
+    const file = url.split('.')[1];
+    let icon = ''
+    if(('docx').indexOf(file) !== -1) {
+      icon = 'c-file-doc'
+    }else if(('xlsx').indexOf(file) !== -1) {
+      icon = 'c-file-xlsx'
+    }else if(('pdf').indexOf(file) !== -1) {
+      icon = 'c-file-pdf'
+    }else if(('txt').indexOf(file) !== -1) {
+      icon = 'c-file-txt'
+    }else if(('zip').indexOf(file) !== -1) {
+      icon = 'c-file-zip'
+    }else if(('jpg,png').indexOf(file) !== -1) {
+      icon = 'c-file-image'
+    }else {
+      icon = 'txt'
+    }
+    return icon;
   }
 
-  const downloadFile = (data) => {
+  const getDetail = () => {
+      $axios.get(`/apaas/system/v5/org/detail?organization_id=${route.query.id}&key_word=&state=&limit=&page=&data_type=1`)
+                  .then((res) => {
+                  if (res.data.code == 200) {
+                      const detail = res.data.data.org_info;
+                      baseInfo[0].value = detail.name;
+                      baseInfo[1].value = detail.organization_code;
+                      baseInfo[2].value = detail.org_admin_number;
+                      baseInfo[3].value = detail.business_system_number;
+                      baseInfo[4].value = detail.description;
+                      fileList.value = detail.attachment ? detail.attachment.split(',') : [];
+                  }else {
+                      $message.error(res.data.data)
+                  }
+              })
+  }
 
+  const getSystemInfo = () => {
+    console.log(11111111)
+    const params = {...filter,organization_id: route.query.id}
+    $axios.get(`/apaas/system/v5/org/business/msg`,{params})
+            .then((res) => {
+            if (res.data.code == 200) {
+              tableRows.value = res.data.data || [];
+              tableTotal.value = res.data.total;
+            }else {
+                $message.error(res.data.data)
+            }
+        })
   }
 
   onBeforeMount(() => {
-     
+     if(route.query.id) {
+        getDetail()
+        getSystemInfo()
+    }
  })
 </script>
 
@@ -187,7 +229,7 @@ const baseInfo = reactive(
     margin-bottom: 40px;
 }
 .img_box {
-    width: 120px;
+    width: 120px\;
 }
 .info_box {
     width: 60%;
@@ -228,5 +270,12 @@ const baseInfo = reactive(
   line-height: 40px;
   padding-top: 5px;
 }
+.bg-pagination {
+  margin-top: 0px;
+}
+.info_content :deep() .bg-table .empty_container {
+  height: 160px;
+  padding-top: 25px;
+}
 
 </style>
\ No newline at end of file
diff --git a/src/page/main/system/organization/org-form.vue b/src/page/main/system/organization/org-form.vue
index dd18bc3c632f99a0536d321b706ba9d1c49804f6..1f6df04c6189d0366798110345834dd155735310 100644
--- a/src/page/main/system/organization/org-form.vue
+++ b/src/page/main/system/organization/org-form.vue
@@ -7,23 +7,25 @@
     ref="orgRef"
     style="max-width: 80%"
   >
-    <el-form-item label="上级目录" prop="parent">
-      <el-input v-model="orgForm.parent" style="width: 80%"/>
+    <el-form-item label="上级目录" prop="p_organization_id" v-if="formType === 'create'">
+      <el-tree-select v-model="orgForm.p_organization_id" :data="orgData" :props="treeProps" :render-after-expand="false" :filter-node-method="filterNode" :disabled="orgForm.level" :check-strictly="true" style="width: 80%;" />
       <el-form-item label="" style="padding-left: 16px">
-        <el-checkbox v-model="orgForm.level" label="顶级"/>
+        <el-checkbox v-model="orgForm.level" @change="isTop" label="顶级"/>
       </el-form-item>
     </el-form-item>
-    <el-form-item label="政务机构名称" prop="orgName">
-      <el-input v-model="orgForm.orgName" />
+    <el-form-item label="政务机构名称" prop="name">
+      <el-input v-model="orgForm.name" />
     </el-form-item>
-    <el-form-item label="组织机构代码" prop="code">
-      <el-input v-model="orgForm.code" />
+    <el-form-item label="组织机构代码" prop="organization_code">
+      <el-input v-model="orgForm.organization_code" />
     </el-form-item>
-    <el-form-item label="组织介绍" prop="desc">
-      <el-input type="textarea" :rows="3" v-model="orgForm.desc" />
+    <el-form-item label="组织介绍" prop="description">
+      <el-input type="textarea" :rows="3" v-model="orgForm.description" />
     </el-form-item>
     <el-form-item label="组织附件" prop="logo">
-       <bg-upload v-model="orgForm.file" customTips>
+       <bg-upload v-model="orgForm.attachment" customTips :limit="3" 
+                  :fileTypes="['doc','docx','xls','xlsx','pdf','jpg','jpeg','png','zip','rar']" 
+                  :otherInfo="'最多可上传三个附件，可上传zip，rar，doc，docx，xlsx，xls，png，jpg，可上传营业执照和相关协议文件等'">
           <span>将文件拖到此处，或 点击上传</span>
         </bg-upload>
     </el-form-item>
@@ -31,56 +33,111 @@
 </template>
 
 <script setup>
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from 'vue'
+ const props = defineProps({
+  formType: {
+      type: String,
+      default: 'create', //false 新建 true 编辑
+    },
+  });
+  const { proxy } = getCurrentInstance()
+  const { $axios,$message } = proxy
+  const orgForm = reactive({
+    p_organization_id: '',
+    level: false,
+    name: '',
+    organization_code: '',
+    description: '',
+    attachment: []
+  })
 
-const orgForm = reactive({
-  parent: '',
-  level: '',
-  orgName: '',
-  code: '',
-  desc: '',
-  desc: '',
-  file: ''
-})
+  const formRules = reactive({
+    p_organization_id: [
+      { required: true, message: '输入上级目录', trigger: 'blur' },
+    ],
+    name: [
+      { required: true, message: '请输入机构名称', trigger: 'blur' },
+    ],
+    organization_code: [
+      { required: true, message: '请输入组织机构代码', trigger: 'blur' },
+    ],
+  })
 
-const formRules = reactive({
-  parent: [
-    { required: true, message: '输入上级目录', trigger: 'blur' },
-  ],
-  orgName: [
-    { required: true, message: '请输入机构名称', trigger: 'blur' },
-  ],
-  code: [
-    { required: true, message: '请输入组织机构代码', trigger: 'blur' },
-  ],
-})
+  const orgRef = ref(null)
+  const emit = defineEmits(['action'])
 
-const orgRef = ref(null)
-const emit = defineEmits(['action'])
+  const submitForm = async () => {
+    if (!orgRef) return
+    await orgRef.value.validate((valid, fields) => {
+      if (valid) {
+        emit('action', orgForm)
+      } else {
+        emit('action',null)
+      }
+    })
+  }
 
-const submitForm = async () => {
-  if (!orgRef) return
-  await orgRef.value.validate((valid, fields) => {
-    if (valid) {
-      emit('action', orgForm)
-    } else {
-      emit('action',null)
-    }
-  })
-}
+  const clearForm = () => {
+    if (!orgRef) return
+    orgRef.value.resetFields()
+  } 
+
+  const setForm = (data) => {
+    orgForm.value = Object.assign(orgForm, data);
+  }
+
+  const orgData = ref([])
+  const treeProps = {
+    label: 'name',
+    children: 'Child',
+    value: 'organization_id',
+    disabled: 'disabled'
+  }
+  const getOrgTree = () => {
+    $axios.get(`/apaas/system/v5/org/tree`)
+      .then((res) => {
+      if (res.data.code == 200) {
+          const orgDataTemp =  res.data.data || []
+          orgDataTemp.shift()
+          orgData.value = filterOrg(orgDataTemp);
+          
+      }else {
+          $message.error(res.data.data)
+      }
+      })
+  }
 
-const clearForm = () => {
-  if (!orgRef) return
-  orgRef.value.resetFields()
-} 
+  const filterOrg = (data) => {
+      if(data.length > 0) {
+          data.forEach(item => {
+            item.disabled = item.data_type === 0 ? false : true;
 
-const setForm = (data) => {
-  orgForm.value = Object.assign(orgForm, data);
-}
+            if(item.Child){
+              filterOrg(item.Child)
+            }else {
+              return  
+            }
+        })
+      }
+    return data;
+  }
 
-onMounted(() => {
+  const filterNode = (value, data) => {
     
-})
+    return data.data_type === 0
+  }
+
+  const isTop = (data) => {
+    orgForm.p_organization_id = data ? ' ' : ''; //空格绕过表单非空校验
+  }
+
+  onBeforeMount(() => {
+    getOrgTree()
+  })
+
+  onMounted(() => {
+      
+  })
 
 defineExpose({ submitForm, clearForm, setForm })
 </script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/system-user/index.vue b/src/page/main/system/organization/org-user/index.vue
similarity index 60%
rename from src/page/main/system/organization/system-user/index.vue
rename to src/page/main/system/organization/org-user/index.vue
index 1dfb873eb0aa94ca837641966f6e955bcca9ffda..c1bab5f131caefabd6127ba09e89afade7cdb029 100644
--- a/src/page/main/system/organization/system-user/index.vue
+++ b/src/page/main/system/organization/org-user/index.vue
@@ -44,14 +44,17 @@
                      
                 </div>
                 <div class="content_main">
-                    <systemAccountForm v-show="step === 1" ref="systemAccountRef" @action="getSystemAccountFormData"></systemAccountForm>
-                    <systemPersonForm v-show="step === 2" ref="systemPersonRef" @action="getSystemPersonFormData"></systemPersonForm>
+                    <orgAccountForm v-show="step === 1" :form-type="route.query.id ? true : false" :id="route.query.id" ref="orgAccountRef" @action="getOrgAccountFormData"></orgAccountForm>
+                    <orgPersonForm v-show="step === 2" ref="orgPersonRef" @action="getOrgPersonFormData"></orgPersonForm>
                     <div class="process_end" v-show="step === 3">
                         <div>
-                            <div><img src="@/assets/imgs/img_data-complete.png" alt=""></div>
-                            <div class="font_bold">平台用户新增成功</div>
+                            <div>
+                                <img v-if="successFlag" src="@/assets/imgs/img_data-complete.png" alt="">
+                                <img v-else src="@/assets/imgs/img_data-fail.png" alt="">
+                            </div>
+                            <div class="font_bold">{{route.query.id ? (successFlag ? '组织用户编辑成功' : '组织用户编辑失败') : (successFlag ? '组织用户新增成功' : '组织用户新增失败')}}</div>
                             <el-button  @click="cancel">返回列表</el-button>
-                            <el-button type="primary" @click="continueCreate">继续创建</el-button>
+                            <el-button v-if="!route.query.id" type="primary" @click="continueCreate">继续创建</el-button>
                         </div>
                             
                     </div>
@@ -76,51 +79,88 @@
 
 <script setup>
 import { useRoute, useRouter } from 'vue-router';
-import systemAccountForm from './system-account-form.vue';
-import systemPersonForm from './system-person-form.vue';
-import { reactive, ref,onBeforeMount,toRefs,computed, onBeforeUnmount, onMounted  } from 'vue';
-
+import orgAccountForm from './org-account-form.vue';
+import orgPersonForm from './org-person-form.vue';
+import { reactive, ref,onBeforeMount,toRefs,computed, onBeforeUnmount, onMounted, getCurrentInstance } from 'vue';
+import CryptoJS from "crypto-js"; 
+const { proxy } = getCurrentInstance()
+const { $axios,$message } = proxy
 const route = useRoute();
 const router = useRouter();
 const step = ref(1);
-const systemAccountRef = ref(null);
-const systemPersonRef = ref(null);
+const orgAccountRef = ref(null);
+const orgPersonRef = ref(null);
 const formData = reactive({
-  org: '',
-  role: '',
-  logo: '',
-  account: '',
-  phone: '',
+  organization_id: '',
+  select_role: '',
+  logo: [],
+  system_account: '',
+  contact_phone: '',
   password: '',
   confirm_password: '',
-  is_use: 1,
+  state: 1,
 
-  name: '',
-  certificate_type: '',
-  certificate_account: '',
-  email: '',
+  contact_name: '',
+  document_type: '',
+  document_number: '',
+  contact_email: '',
   remark: '',
 }); //账号信息表单+个人信息表单
 
+const successFlag = ref(false)
+const orgId = ref('')
+
 // 下一步
 const nextStep = () => {
-    systemAccountRef.value.submitForm();
+    orgAccountRef.value.submitForm();
 }
 //账号信息表单检验触发事件 data为null 校验失败
-const getSystemAccountFormData = (data) => {
+const getOrgAccountFormData = (data) => {
         if(data) {
-            formData.value = Object.assign(formData,data);
+            Object.assign(formData,data);
             step.value = 2;
         }else {
 
         }
 }
 //个人信息表单检验触发事件 data为null 校验失败
-const getSystemPersonFormData = (data) => {
+const getOrgPersonFormData = (data) => {
     if(data) {
-        formData.value = Object.assign(formData,data);
-        console.log(formData);
-        step.value = 3;
+       if(data) {
+        Object.assign(formData,data);
+        if(route.query.id) {
+            let params = {
+                ...formData,
+                logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
+            }
+            $axios.put(`/apaas/system/v5/org/update/user/${route.query.id}`,params)
+                .then((res) => {
+                if (res.data.code == 200) {
+                    successFlag.value = true;
+                    step.value = 3;
+                }else {
+                    $message.error(res.data.data)
+                }
+            })
+
+        }else {
+            const params = {...formData,
+                            // organization_id: orgId.value,
+                            logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
+                            is_admin: 2,
+                            password: CryptoJS.AES.encrypt(formData.password,"swuE9cmCZQwrkYRV").toString()
+                            };
+            $axios.post(`/apaas/system/v5/org/add/user`,params)
+                .then((res) => {
+                if (res.data.code == 200) {
+                    successFlag.value = true;
+                    step.value = 3;
+                }else {
+                    $message.error(res.data.data)
+                }
+            })
+        }
+    }
     }
 }
 //上一步
@@ -129,50 +169,57 @@ const previousStep = () => {
 }
 //提交表单
 const submit = () => {
-    systemPersonRef.value.submitForm();
+    orgPersonRef.value.submitForm();
 }
 //继续创建 清空表单
 const continueCreate = () => {
-    systemAccountRef.value.clearForm();
-    systemPersonRef.value.clearForm();
+    orgAccountRef.value.clearForm();
+    orgPersonRef.value.clearForm();
     step.value = 1;
+    successFlag.value = false;
 }
 //取消
 const cancel = () => {
     router.go(-1);
 }
+const getDetail = () => {
+    $axios.get(`/apaas/system/v5/org/user/${route.query.id}`)
+                .then((res) => {
+                if (res.data.code == 200) {
+                    const form = res.data.data;
+                    orgAccountRef.value.setForm({
+                        organization_id: form.organization_id,
+                        select_role: form.select_role,
+                        logo: [{url:form.logo}],
+                        system_account: form.system_account,
+                        contact_phone: form.contact_phone,
+                        state: form.state,
+                        
+                    })
 
-onBeforeUnmount(()=>{
-    
-})
-onMounted(() => {
-    if(route.query.type === "1") {
-        setTimeout(()=> {
-            systemAccountRef.value.setForm({
-                org: 'a',
-                code: 'b',
-                name: 'b',
-                desc: 'b',
-                logo: ['b'],
-                role: 'b',
-                account: 'b',
-                password: 'b',
-                confirm_password: 'b',
-                url: 'b',
-                firm_name: 'b',
-                is_use: 'b',
-               
-            })
-            systemPersonRef.value.setForm({
-                contact_user: 'c',
-                phone: 'c',
-                email: 'c',
-                remark: 'c',
+                    orgPersonRef.value.setForm({
+                        contact_name: form.contact_name,
+                        document_type: form.document_type,
+                        document_number: form.document_number,
+                        contact_email: form.contact_email,
+                        remark: form.remark,
+                    })
+                }else {
+                    $message.error(res.data.data)
+                }
             })
-        },500)
+}
+
+onBeforeMount(() => {
+    if(route.query.id) {
+       getDetail()
     }
 })
 
+onMounted(() => {
+    
+})
+
 </script>
 
 <style scoped>
diff --git a/src/page/main/system/organization/org-user/org-account-form.vue b/src/page/main/system/organization/org-user/org-account-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..acca43ac73353457bb3d2662f3405050bff63105
--- /dev/null
+++ b/src/page/main/system/organization/org-user/org-account-form.vue
@@ -0,0 +1,224 @@
+<template>
+  <el-form
+    :label-position="'right'"
+    label-width="120px"
+    :model="orgAccountForm"
+    :rules="orgAccountFormRules"
+    ref="orgformAccountRef"
+    style="max-width: 66%"
+  >
+    <el-form-item label="所属组织机构" prop="organization_id">
+      <el-tree-select v-model="orgAccountForm.organization_id" :data="orgData" :props="treeProps" :render-after-expand="false" :disabled="true" style="width: 100%;"/>
+      <!-- <el-input v-model="orgAccountForm.organization_id" /> -->
+    </el-form-item>
+    <el-form-item label="角色" prop="select_role" v-if="!formType">
+      <el-select v-model="orgAccountForm.select_role" multiple placeholder="请选择角色" :disabled="true" style="width: 100%">
+        <el-option
+          v-for="item in roleList"
+          :key="item.role_id"
+          :label="item.role_name"
+          :value="item.role_id"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="头像" prop="logo">
+       <bg-upload-image v-model="orgAccountForm.logo" :showTips="true" :limit="1" :fileSize="500" :fileSizeUnit="'KB'" listType="picture-card" :accept="['.jpg','.jpeg','.png']" customTips="请选择图片上传：大小120 * 120像素支持jpg、png等格式，图片需小于500KB"></bg-upload-image>
+    </el-form-item>
+     <el-form-item label="账号" prop="system_account">
+      <el-input v-model="orgAccountForm.system_account" />
+    </el-form-item>
+    <el-form-item label="手机号" prop="contact_phone">
+      <el-input v-model="orgAccountForm.contact_phone" />
+    </el-form-item>
+     <el-form-item label="密码" prop="password" v-if="!formType">
+      <el-input type="password" v-model="orgAccountForm.password" />
+    </el-form-item>
+     <el-form-item label="确认密码" prop="confirm_password" v-if="!formType">
+      <el-input type="password" v-model="orgAccountForm.confirm_password" />
+    </el-form-item>
+  
+    <el-form-item label="是否启用" prop="state">
+      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="orgAccountForm.state"></bg-switch>
+    </el-form-item>
+    
+  </el-form>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from 'vue';
+import { useRoute } from 'vue-router';
+const { proxy } = getCurrentInstance()
+const { $axios,$message } = proxy
+const route = useRoute();
+const props = defineProps({
+  formType: {
+    type: Boolean,
+    default: false, //false 新建 true 编辑
+  },
+  id: {
+    type: String,
+    default: '', 
+  }
+});
+const orgAccountForm = reactive({
+  organization_id: '',
+  select_role: '',
+  logo: [],
+  system_account: '',
+  contact_phone: '',
+  password: '',
+  confirm_password: '',
+  state: 1,
+})
+
+const validatePass = (rule, value, callback) => {
+  if (value !== orgAccountForm.password) {
+    callback(new Error("密码输入不一致"))
+  } else {
+    callback()
+  }
+}
+
+const validateSystemAccount = (rule, value, callback) => {
+  let params = null;
+   if (props.id){
+     params = {id: parseInt(props.id),system_account: value,}
+   }else {
+     params = {system_account: value}
+   }
+
+  $axios.post(`/apaas/system/v5/user/check/account`,params)
+     .then((res) => {
+      if (res.data.code == 200) {
+            callback()
+      }else {
+          callback(new Error(res.data.data))
+      }
+     })
+  }
+
+  const checkPhone = (rule, value, callback) => {
+      var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
+      setTimeout(() => {
+        if (!phone_ruler.test(value)&&value.length!==0) {
+          callback(new Error("请输入正确的手机号码"));
+        } else {
+          callback();
+        }
+      });
+  };
+
+  const checkPhoneRepet = (rule, value, callback) => {
+    let params = null;
+    if (props.id){
+      params = {id: parseInt(props.id),contact_phone: value,}
+    }else {
+      params = {id: 0,contact_phone: value}
+    }
+
+    $axios.post(`/apaas/system/v5/org/check`,params)
+      .then((res) => {
+        if (res.data.code == 200) {
+              callback()
+        }else {
+            callback(new Error(res.data.data))
+        }
+      })
+    }
+
+const orgAccountFormRules = reactive({
+  organization_id: [
+    { required: true, message: '请选择组织', trigger: 'blur' },
+  ],
+  select_role: [
+    { required: true, message: '请选择角色', trigger: 'blur' },
+  ],
+  system_account: [
+    { required: true, message: '请输入账号', trigger: 'blur' },
+    { validator: validateSystemAccount, trigger: 'blur' },
+  ],
+  contact_phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { validator: checkPhone, trigger: 'blur' },
+    { validator: checkPhoneRepet, trigger: 'blur' }
+  ],
+ 
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+    {min: 8,message: '密码长度不得低于8位',trigger: 'blur'}
+  ],
+  confirm_password: [
+      { required: true, message: '请确认密码', trigger: 'blur' },
+    { validator: validatePass, trigger: 'blur' }
+  ],
+})
+
+const orgformAccountRef = ref(null)
+const emit = defineEmits(['action'])
+const roleList = ref([])
+
+const submitForm = async () => {
+  if (!orgformAccountRef) return
+  await orgformAccountRef.value.validate((valid, fields) => {
+    if (valid) {
+      emit('action', orgAccountForm)
+    } else {
+      emit('action',null)
+    }
+  })
+}
+
+const clearForm = () => {
+  if (!orgformAccountRef) return
+  orgformAccountRef.value.resetFields()
+  orgAccountForm.select_role = [roleList.value[0].role_id];
+
+} 
+
+const setForm = (data) => {
+  Object.assign(orgAccountForm, data);
+}
+
+const orgData = ref([])
+const treeProps = {
+  label: 'name',
+  children: 'Child',
+  value: 'organization_id'
+}
+const getOrgTree = () => {
+  $axios.get(`/apaas/system/v5/org/tree`)
+     .then((res) => {
+     if (res.data.code == 200) {
+         orgData.value = res.data.data || [];
+     }else {
+         $message.error(res.data.data)
+     }
+     })
+}
+
+const getRoleList = () => {
+  $axios.get(`/apaas/system/v5/org/select/role?is_admin=2`)
+     .then((res) => {
+      if (res.data.code == 200) {
+            roleList.value = res.data.data;
+            orgAccountForm.select_role = [roleList.value[0].role_id];
+      }else {
+         
+      }
+     })
+}
+
+onBeforeMount(() =>{
+  getOrgTree()
+  getRoleList()
+  orgAccountForm.organization_id = route.query.orgId;
+})
+
+
+onMounted(() => {
+    
+})
+
+
+defineExpose({ submitForm, clearForm, setForm })
+</script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/org-user/org-person-form.vue b/src/page/main/system/organization/org-user/org-person-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6d04139b8708adf1f9db9061ac40761b4f1d8b09
--- /dev/null
+++ b/src/page/main/system/organization/org-user/org-person-form.vue
@@ -0,0 +1,84 @@
+<template>
+  <el-form
+    :label-position="'right'"
+    label-width="120px"
+    :model="orgPersonForm"
+    :rules="orgPersonFormRules"
+    ref="orgPersonFormRef"
+    style="max-width: 66%"
+  >
+    <el-form-item label="联系人姓名" prop="contact_name">
+      <el-input v-model="orgPersonForm.contact_name" />
+    </el-form-item>
+    <el-form-item label="证件类型" prop="document_type">
+      <el-select v-model="orgPersonForm.document_type" placeholder="请选择证件类型" style="width: 100%">
+        <el-option
+          v-for="item in documentTypeList"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item label="证件号" prop="document_number">
+      <el-input v-model="orgPersonForm.document_number" />
+    </el-form-item>
+    <el-form-item label="联系人邮箱" prop="contact_email">
+      <el-input v-model="orgPersonForm.contact_email"/>
+    </el-form-item>
+     <el-form-item label="备注" prop="remark">
+      <el-input type="textarea" :rows="3" v-model="orgPersonForm.remark" />
+    </el-form-item>
+  </el-form>
+</template>
+
+<script setup>
+import { reactive, ref, onMounted } from 'vue'
+
+const orgPersonForm = reactive({
+  contact_name: '',
+  document_type: '',
+  document_number: '',
+  contact_email: '',
+  remark: '',
+})
+
+const documentTypeList = ref([{
+  label: '身份证',
+  value: 1
+}])
+
+const orgPersonFormRules = reactive({
+  contact_email: [
+    // { required: true, message: '请输入手机号', trigger: 'blur' },
+    { type: 'email',message: '请输入正确的邮箱', trigger: 'blur' }
+  ],
+})
+const orgPersonFormRef = ref(null)
+const emit = defineEmits(['action'])
+
+const submitForm = async () => {
+  if (!orgPersonFormRef) return
+  await orgPersonFormRef.value.validate((valid, fields) => {
+    if (valid) {
+      emit('action', orgPersonForm)
+    } else {
+      emit('action',null)
+    }
+  })
+}
+const clearForm = () => {
+  if (!orgPersonFormRef) return
+  orgPersonFormRef.value.resetFields()
+} 
+
+const setForm = (data) => {
+  Object.assign(orgPersonForm, data);
+}
+
+onMounted(() => {
+   
+})
+
+defineExpose({ submitForm, clearForm, setForm })
+</script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/platform-user/index.vue b/src/page/main/system/organization/platform-user/index.vue
index 252df2728b87e65a2179c1d5166c4f8b13fd03c8..f76a8fac15c8fb541e9db91d809a6925b8f08a01 100644
--- a/src/page/main/system/organization/platform-user/index.vue
+++ b/src/page/main/system/organization/platform-user/index.vue
@@ -9,7 +9,7 @@
         </div>
         <div class="page_content flex_cloumn">
             <div class="content_top apaas_scroll">
-                <div class="content_process">
+                <div class="content_process" v-if="!route.query.id">
                     <div>
                         <el-steps :active="step" >
                             <el-step title="" :class="{'process_complete': step > 1}">
@@ -44,21 +44,24 @@
                      
                 </div>
                 <div class="content_main">
-                    <platformAccountForm v-show="step === 1" ref="platformAccountFormRef" @action="getPlatformAccountFormData"></platformAccountForm>
+                    <platformAccountForm v-show="step === 1" :form-type="route.query.id ? true : false" :id="route.query.id" ref="platformAccountFormRef" @action="getPlatformAccountFormData"></platformAccountForm>
                     <platformPersonForm v-show="step === 2" ref="plplatformPersonFormRef" @action="getPlatformPersonFormData"></platformPersonForm>
                     <div class="process_end" v-show="step === 3">
                         <div>
-                            <div><img src="@/assets/imgs/img_data-complete.png" alt=""></div>
-                            <div class="font_bold">平台用户新增成功</div>
+                            <div>
+                                <img v-if="successFlag" src="@/assets/imgs/img_data-complete.png" alt="">
+                                <img v-else src="@/assets/imgs/img_data-fail.png" alt="">
+                            </div>
+                            <div class="font_bold">{{route.query.id ? (successFlag ? '平台用户编辑成功' : '平台用户编辑失败') : (successFlag ? '平台用户新增成功' : '平台用户新增失败')}}</div>
                             <el-button  @click="cancel">返回列表</el-button>
-                            <el-button type="primary" @click="continueCreate">继续创建</el-button>
+                            <el-button v-if="!route.query.id" type="primary" @click="continueCreate">继续创建</el-button>
                         </div>
                             
                     </div>
                 </div>
             </div>
             <div class="content_bottom" v-if="step !== 3">
-                <div v-show="step === 1">
+                <div v-show="!route.query.id && step === 1">
                     <el-button  @click="cancel">取消</el-button>
                     <el-button type="primary" @click="nextStep">下一步</el-button>
                 </div>
@@ -67,7 +70,10 @@
                     <el-button type="primary" @click="previousStep">上一步</el-button>
                     <el-button type="primary" @click="submit">提交</el-button>
                 </div>
-                
+                <div v-show="route.query.id">
+                    <el-button @click="cancel">取消</el-button>
+                    <el-button type="primary" @click="nextStep">保存</el-button>
+                </div>
             </div>
         </div>
 
@@ -78,8 +84,10 @@
 import { useRoute, useRouter } from 'vue-router';
 import platformAccountForm from './platform-account-form.vue';
 import platformPersonForm from './platform-person-form.vue';
-import { reactive, ref,onBeforeMount,toRefs,computed, onBeforeUnmount, onMounted  } from 'vue';
-
+import CryptoJS from "crypto-js"; 
+import { reactive, ref,onBeforeMount,toRefs,computed, onMounted, getCurrentInstance  } from 'vue';
+const { proxy } = getCurrentInstance()
+const { $axios,$message } = proxy
 const route = useRoute();
 const router = useRouter();
 const step = ref(1);
@@ -87,18 +95,21 @@ const platformAccountFormRef = ref(null);
 const plplatformPersonFormRef = ref(null);
 const formData = reactive({
   logo: '',
-  account: '',
-  phone: '',
+  system_account: '',
+  contact_phone: '',
   password: '',
   confirm_password: '',
-  role: '',
-  is_use: 1,
+  select_role: '',
+  state: '',
 
-  name: '',
-  email: '',
+  contact_name: '',
+  contact_email: '',
   remark: '',
 
 }); //账号信息表单+个人信息表单
+const orgId = ref(null);
+const successFlag = ref(false)
+
 
 // 下一步
 const nextStep = () => {
@@ -107,18 +118,66 @@ const nextStep = () => {
 //账号信息表单检验触发事件 data为null 校验失败
 const getPlatformAccountFormData = (data) => {
         if(data) {
-            formData.value = Object.assign(formData,data);
-            step.value = 2;
+            if(route.query.id) {
+                Object.assign(formData,data);
+                let params = {
+                    ...formData,
+                    logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
+                }
+                $axios.put(`/apaas/system/v5/org/update/user/${route.query.id}`,params)
+                    .then((res) => {
+                    if (res.data.code == 200) {
+                        successFlag.value = true;
+                        step.value = 3;
+                    }else {
+                        $message.error(res.data.data)
+                    }
+                })
+            }else {
+                Object.assign(formData,data);
+                step.value = 2;
+            }
+            
         }else {
 
         }
 }
 //个人信息表单检验触发事件 data为null 校验失败
 const getPlatformPersonFormData = (data) => {
-    if(data) {
-        formData.value = Object.assign(formData,data);
-        console.log(formData);
-        step.value = 3;
+       if(data) {
+        Object.assign(formData,data);
+        if(route.query.id) {
+            console.log(formData)
+            // let params = {
+                
+            // }
+            // $axios.post(`/apaas/system/v5/org/update/user/${route.query.id}`,params)
+            //     .then((res) => {
+            //     if (res.data.code == 200) {
+            //         successFlag.value = true;
+            //         step.value = 3;
+            //     }else {
+            //         $message.error(res.data.msg)
+            //     }
+            // })
+
+        }else {
+            const params = {...formData,
+                            organization_id: orgId.value,
+                            logo: formData.logo && formData.logo.length > 0 ? formData.logo[0].url : '',
+                            is_admin: 3,
+                            password: CryptoJS.AES.encrypt(formData.password,"swuE9cmCZQwrkYRV").toString()
+                            };
+            $axios.post(`/apaas/system/v5/org/add/user`,params)
+                .then((res) => {
+                if (res.data.code == 200) {
+                    successFlag.value = true;
+                    step.value = 3;
+                }else {
+                    $message.error(res.data.data)
+                }
+            })
+        }
     }
 }
 //上一步
@@ -134,42 +193,53 @@ const continueCreate = () => {
     platformAccountFormRef.value.clearForm();
     plplatformPersonFormRef.value.clearForm();
     step.value = 1;
+    successFlag.value = false;
 }
 //取消
 const cancel = () => {
     router.go(-1);
 }
 
-onBeforeUnmount(()=>{
-    
-})
-onMounted(() => {
-    if(route.query.type === "1") {
-        setTimeout(()=> {
-            platformAccountFormRef.value.setForm({
-                org: 'a',
-                code: 'b',
-                name: 'b',
-                desc: 'b',
-                logo: ['b'],
-                role: 'b',
-                account: 'b',
-                password: 'b',
-                confirm_password: 'b',
-                url: 'b',
-                firm_name: 'b',
-                is_use: 'b',
-               
-            })
-            plplatformPersonFormRef.value.setForm({
-                contact_user: 'c',
-                phone: 'c',
-                email: 'c',
-                remark: 'c',
+const  getOrgTree = () => {
+    $axios.get(`/apaas/system/v5/org/tree`)
+      .then((res) => {
+      if (res.data.code == 200) {
+          orgId.value = res.data.data[0].organization_id;
+      }else {
+          $message.error(res.data.data)
+      }
+      })
+  }
+
+const getDetail = () => {
+    $axios.get(`/apaas/system/v5/org/user/${route.query.id}`)
+                .then((res) => {
+                if (res.data.code == 200) {
+                    const form = res.data.data;
+                    platformAccountFormRef.value.setForm({
+                        logo: [{url:form.logo}],
+                        system_account: form.system_account,
+                        contact_phone: form.contact_phone,
+                        state: form.state,
+                        contact_name: form.contact_name,
+                        contact_email: form.contact_email,
+                        remark: form.remark,
+                    })
+                }else {
+                    $message.error(res.data.data)
+                }
             })
-        },500)
+}
+
+onBeforeMount(() => {
+    getOrgTree()
+    if(route.query.id) {
+        getDetail()
     }
 })
+onMounted(() => {
+    
+})
 
 </script>
 
diff --git a/src/page/main/system/organization/platform-user/platform-account-form.vue b/src/page/main/system/organization/platform-user/platform-account-form.vue
index d4521d993e83f43ee0adaa940d45366ad41af4bd..cba6151b6d482f419780ab512728f1657c0d0b15 100644
--- a/src/page/main/system/organization/platform-user/platform-account-form.vue
+++ b/src/page/main/system/organization/platform-user/platform-account-form.vue
@@ -10,39 +10,70 @@
     <el-form-item label="头像" prop="logo">
        <bg-upload-image v-model="platformAccountForm.logo" :showTips="true" :limit="1" :fileSize="500" :fileSizeUnit="'KB'" listType="picture-card" :accept="['.jpg','.jpeg','.png']" customTips="请选择图片上传：大小120 * 120像素支持jpg、png等格式，图片需小于500KB"></bg-upload-image>
     </el-form-item>
-     <el-form-item label="账号" prop="account">
-      <el-input v-model="platformAccountForm.account" />
+     <el-form-item label="账号" prop="system_account">
+      <el-input v-model="platformAccountForm.system_account" />
     </el-form-item>
-    <el-form-item label="手机号" prop="phone">
-      <el-input v-model="platformAccountForm.phone" />
+    <el-form-item label="手机号" prop="contact_phone">
+      <el-input v-model="platformAccountForm.contact_phone" />
     </el-form-item>
-     <el-form-item label="密码" prop="password">
+     <el-form-item v-if="!formType" label="密码" prop="password">
       <el-input type="password" v-model="platformAccountForm.password" />
     </el-form-item>
-     <el-form-item label="确认密码" prop="confirm_password">
+     <el-form-item v-if="!formType" label="确认密码" prop="confirm_password">
       <el-input type="password" v-model="platformAccountForm.confirm_password" />
     </el-form-item>
-    <el-form-item label="角色授权" prop="role">
-      <el-input v-model="platformAccountForm.role" />
+    <el-form-item v-if="!formType" label="角色授权" prop="select_role">
+      <el-select v-model="platformAccountForm.select_role" multiple placeholder="请选择角色" style="width: 100%">
+        <el-option
+          v-for="item in roleList"
+          :key="item.role_id"
+          :label="item.role_name"
+          :value="item.role_id"
+        />
+      </el-select>
     </el-form-item>
-    <el-form-item label="是否启用" prop="is_use">
-      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="platformAccountForm.is_use"></bg-switch>
+     <el-form-item v-if="formType" label="姓名" prop="contact_name">
+      <el-input v-model="platformAccountForm.contact_name" />
+    </el-form-item>
+    <el-form-item v-if="formType" label="邮箱" prop="contact_email">
+      <el-input v-model="platformAccountForm.contact_email"/>
+    </el-form-item>
+     <el-form-item v-if="formType" label="备注" prop="remark">
+      <el-input type="textarea" :rows="3" v-model="platformAccountForm.remark" />
+    </el-form-item>
+    <el-form-item label="是否启用" prop="state">
+      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="platformAccountForm.state"></bg-switch>
     </el-form-item>
     
   </el-form>
 </template>
 
 <script setup>
-import { reactive, ref, onMounted } from 'vue'
-
+import { reactive, ref, onMounted, onBeforeMount, getCurrentInstance } from 'vue'
+const { proxy } = getCurrentInstance()
+const { $axios,$message } = proxy
+const props = defineProps({
+  formType: {
+    type: Boolean,
+    default: false, //false 新建 true 编辑
+  },
+  id: {
+    type: String,
+    default: '', 
+  }
+});
 const platformAccountForm = reactive({
-  logo: '',
-  account: '',
-  phone: '',
+  logo: [],
+  system_account: '',
+  contact_phone: '',
   password: '',
   confirm_password: '',
-  role: '',
-  is_use: 1,
+  select_role: '',
+  state: 1,
+
+  contact_name: '',
+  contact_email: '',
+  remark: '',
  
 })
 
@@ -53,26 +84,81 @@ const validatePass = (rule, value, callback) => {
     callback()
   }
 }
+const checkPhone = (rule, value, callback) => {
+      var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
+      setTimeout(() => {
+        if (!phone_ruler.test(value)&&value.length!==0) {
+          callback(new Error("请输入正确的手机号码"));
+        } else {
+          callback();
+        }
+      });
+};
+
+const validateSystemAccount = (rule, value, callback) => {
+  let params = null;
+   if (props.id){
+     params = {id: parseInt(props.id),system_account: value,}
+   }else {
+     params = {system_account: value}
+   }
+
+  $axios.post(`/apaas/system/v5/user/check/account`,params)
+     .then((res) => {
+      if (res.data.code == 200) {
+            callback()
+      }else {
+          callback(new Error(res.data.data))
+      }
+     })
+  }
+
+  const checkPhoneRepet = (rule, value, callback) => {
+  let params = null;
+   if (props.id){
+     params = {id: parseInt(props.id),contact_phone: value,}
+   }else {
+     params = {id: 0,contact_phone: value}
+   }
+
+  $axios.post(`/apaas/system/v5/org/check`,params)
+     .then((res) => {
+      if (res.data.code == 200) {
+            callback()
+      }else {
+          callback(new Error(res.data.data))
+      }
+     })
+  }
 
 const platformAccountFormRules = reactive({
-  account: [
+  system_account: [
     { required: true, message: '请输入账号', trigger: 'blur' },
+    { validator: validateSystemAccount, trigger: 'blur' },
   ],
-  phone: [
+  contact_phone: [
     { required: true, message: '请输入手机号', trigger: 'blur' },
+    { validator: checkPhone, trigger: 'blur' },
+    { validator: checkPhoneRepet, trigger: 'blur' }
   ],
-  role: [
+  select_role: [
     { required: true, message: '请选择角色', trigger: 'blur' },
   ],
   password: [
     { required: true, message: '请输入密码', trigger: 'blur' },
+    {min: 8,message: '密码长度不得低于8位',trigger: 'blur'}
   ],
   confirm_password: [
       { required: true, message: '请确认密码', trigger: 'blur' },
     { validator: validatePass, trigger: 'blur' }
   ],
+  contact_email: [
+    { type: 'email',message: '请输入正确的邮箱', trigger: 'blur' }
+  ],
 })
 
+const roleList = ref([])
+
 
 
 const platformAccountRef = ref(null)
@@ -95,9 +181,24 @@ const clearForm = () => {
 } 
 
 const setForm = (data) => {
-  platformAccountForm.value = Object.assign(platformAccountForm, data);
+  Object.assign(platformAccountForm, data);
 }
 
+const getRoleList = () => {
+  $axios.get(`/apaas/system/v5/org/select/role?is_admin=3`)
+     .then((res) => {
+      if (res.data.code == 200) {
+            roleList.value = res.data.data;
+      }else {
+         
+      }
+     })
+}
+
+onBeforeMount(() => {
+  getRoleList();
+})
+
 onMounted(() => {
     
 })
diff --git a/src/page/main/system/organization/platform-user/platform-person-form.vue b/src/page/main/system/organization/platform-user/platform-person-form.vue
index f57525e7bcf442635464dfb9d32c3bc93e0b5a4d..ef722c1d0a34bf1078e89b6fe50fe2d76db72af2 100644
--- a/src/page/main/system/organization/platform-user/platform-person-form.vue
+++ b/src/page/main/system/organization/platform-user/platform-person-form.vue
@@ -7,13 +7,13 @@
     ref="platformPersonFormRef"
     style="max-width: 66%"
   >
-    <el-form-item label="姓名" prop="name">
-      <el-input v-model="platformPersonForm.name" />
+    <el-form-item label="姓名" prop="contact_name">
+      <el-input v-model="platformPersonForm.contact_name" />
     </el-form-item>
-    <el-form-item label="邮箱">
-      <el-input v-model="platformPersonForm.email"/>
+    <el-form-item label="邮箱" prop="contact_email">
+      <el-input v-model="platformPersonForm.contact_email"/>
     </el-form-item>
-     <el-form-item label="备注">
+     <el-form-item label="备注" prop="remark">
       <el-input type="textarea" :rows="3" v-model="platformPersonForm.remark" />
     </el-form-item>
   </el-form>
@@ -23,13 +23,15 @@
 import { reactive, ref, onMounted } from 'vue'
 
 const platformPersonForm = reactive({
-  name: '',
-  email: '',
+  contact_name: '',
+  contact_email: '',
   remark: '',
 })
 
 const platformPersonFormRules = reactive({
- 
+ contact_email: [
+    { type: 'email',message: '请输入正确的邮箱', trigger: 'blur' }
+  ],
 })
 const platformPersonFormRef = ref(null)
 const emit = defineEmits(['action'])
@@ -50,7 +52,7 @@ const clearForm = () => {
 } 
 
 const setForm = (data) => {
-  platformPersonForm.value = Object.assign(platformPersonForm, data);
+  Object.assign(platformPersonForm, data);
 }
 
 onMounted(() => {
diff --git a/src/page/main/system/organization/system-user/system-account-form.vue b/src/page/main/system/organization/system-user/system-account-form.vue
deleted file mode 100644
index 55a232dd460dc2d0ba844feca87399b1fc6d0e03..0000000000000000000000000000000000000000
--- a/src/page/main/system/organization/system-user/system-account-form.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <el-form
-    :label-position="'right'"
-    label-width="120px"
-    :model="systemAccountFormRef"
-    :rules="systemAccountFormRules"
-    ref="platformAccountRef"
-    style="max-width: 66%"
-  >
-    <el-form-item label="所属组织机构" prop="org">
-      <el-input v-model="systemAccountFormRef.org" />
-    </el-form-item>
-    <el-form-item label="角色" prop="role">
-      <el-input v-model="systemAccountFormRef.role" />
-    </el-form-item>
-    <el-form-item label="头像" prop="logo">
-       <bg-upload-image v-model="systemAccountFormRef.logo" :showTips="true" :limit="1" :fileSize="500" :fileSizeUnit="'KB'" listType="picture-card" :accept="['.jpg','.jpeg','.png']" customTips="请选择图片上传：大小120 * 120像素支持jpg、png等格式，图片需小于500KB"></bg-upload-image>
-    </el-form-item>
-     <el-form-item label="账号" prop="account">
-      <el-input v-model="systemAccountFormRef.account" />
-    </el-form-item>
-    <el-form-item label="手机号" prop="phone">
-      <el-input v-model="systemAccountFormRef.phone" />
-    </el-form-item>
-     <el-form-item label="密码" prop="password">
-      <el-input type="password" v-model="systemAccountFormRef.password" />
-    </el-form-item>
-     <el-form-item label="确认密码" prop="confirm_password">
-      <el-input type="password" v-model="systemAccountFormRef.confirm_password" />
-    </el-form-item>
-  
-    <el-form-item label="是否启用" prop="is_use">
-      <bg-switch :labels="['否','是']" :values="[0,1]" v-model="systemAccountFormRef.is_use"></bg-switch>
-    </el-form-item>
-    
-  </el-form>
-</template>
-
-<script setup>
-import { reactive, ref, onMounted } from 'vue'
-
-const systemAccountFormRef = reactive({
-  org: '',
-  role: '',
-  logo: '',
-  account: '',
-  phone: '',
-  password: '',
-  confirm_password: '',
-  is_use: 1,
- 
-})
-
-const validatePass = (rule, value, callback) => {
-  if (value !== systemAccountFormRef.password) {
-    callback(new Error("密码输入不一致"))
-  } else {
-    callback()
-  }
-}
-
-const systemAccountFormRules = reactive({
-  org: [
-    { required: true, message: '请选择组织', trigger: 'blur' },
-  ],
-  role: [
-    { required: true, message: '请选择角色', trigger: 'blur' },
-  ],
-  account: [
-    { required: true, message: '请输入账号', trigger: 'blur' },
-  ],
-  phone: [
-    { required: true, message: '请输入手机号', trigger: 'blur' },
-  ],
- 
-  password: [
-    { required: true, message: '请输入密码', trigger: 'blur' },
-  ],
-  confirm_password: [
-      { required: true, message: '请确认密码', trigger: 'blur' },
-    { validator: validatePass, trigger: 'blur' }
-  ],
-})
-
-
-
-const platformAccountRef = ref(null)
-const emit = defineEmits(['action'])
-
-const submitForm = async () => {
-  if (!platformAccountRef) return
-  await platformAccountRef.value.validate((valid, fields) => {
-    if (valid) {
-      emit('action', systemAccountFormRef)
-    } else {
-      emit('action',null)
-    }
-  })
-}
-
-const clearForm = () => {
-  if (!platformAccountRef) return
-  platformAccountRef.value.resetFields()
-} 
-
-const setForm = (data) => {
-  systemAccountFormRef.value = Object.assign(systemAccountFormRef, data);
-}
-
-onMounted(() => {
-    
-})
-
-
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/system-user/system-person-form.vue b/src/page/main/system/organization/system-user/system-person-form.vue
deleted file mode 100644
index f6a4be1b81403360b6e46d11eb668a491fe330c1..0000000000000000000000000000000000000000
--- a/src/page/main/system/organization/system-user/system-person-form.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <el-form
-    :label-position="'right'"
-    label-width="120px"
-    :model="contactForm"
-    :rules="contactFormRules"
-    ref="contactRef"
-    style="max-width: 66%"
-  >
-    <el-form-item label="联系人姓名" prop="name">
-      <el-input v-model="contactForm.name" />
-    </el-form-item>
-    <el-form-item label="证件类型" prop="certificate_type">
-      <el-input v-model="contactForm.certificate_type" />
-    </el-form-item>
-    <el-form-item label="证件号" prop="certificate_account">
-      <el-input v-model="contactForm.certificate_account" />
-    </el-form-item>
-    <el-form-item label="联系人邮箱">
-      <el-input v-model="contactForm.email"/>
-    </el-form-item>
-     <el-form-item label="备注">
-      <el-input type="textarea" :rows="3" v-model="contactForm.remark" />
-    </el-form-item>
-  </el-form>
-</template>
-
-<script setup>
-import { reactive, ref, onMounted } from 'vue'
-
-const contactForm = reactive({
-  name: '',
-  certificate_type: '',
-  certificate_account: '',
-  email: '',
-  remark: '',
-})
-
-const contactFormRules = reactive({
-})
-const contactRef = ref(null)
-const emit = defineEmits(['action'])
-
-const submitForm = async () => {
-  if (!contactRef) return
-  await contactRef.value.validate((valid, fields) => {
-    if (valid) {
-      emit('action', contactForm)
-    } else {
-      emit('action',null)
-    }
-  })
-}
-const clearForm = () => {
-  if (!contactRef) return
-  contactRef.value.resetFields()
-} 
-
-const setForm = (data) => {
-  contactForm.value = Object.assign(contactForm, data);
-}
-
-onMounted(() => {
-   
-})
-
-defineExpose({ submitForm, clearForm, setForm })
-</script>
\ No newline at end of file
diff --git a/src/page/main/system/organization/tree.vue b/src/page/main/system/organization/tree.vue
index 16403c6e979dde8f725aa7e756522df4491fbf97..499d63ca62a22142b4cc2d899f928de90f68ac27 100644
--- a/src/page/main/system/organization/tree.vue
+++ b/src/page/main/system/organization/tree.vue
@@ -1,20 +1,29 @@
 <template>
-    <el-tree class="file-tree" :data="data" :props="defaultProps" @node-click="handleNodeClick" :default-expand-all="true">
+    <el-tree 
+        ref="treeRef" 
+        class="file-tree" 
+        :data="orgData" 
+        :props="defaultProps" 
+        @node-click="handleNodeClick" 
+        node-key="id"
+        :highlight-current="true"
+        :filter-node-method="filterNode" 
+        :default-expand-all="true">
          <template #default="{ node, data }">
            <div class="custom_tree_node">
              <span
                class="label-text "
-               :class="{'is_active': selectData && selectData.dept === data.dept}"
-               :title="node.label"
-               >{{ node.label }}
+               :class="{'is_active': selectData && selectData.id === data.id}"
+               :title="data.name"
+               >{{ data.name }}
              </span>
-             <span v-if="data.dept === 1" class="tree-action-box first_node" @click.stop="showAction($event, data,node)">
+             <span v-if="data.data_type === 2" class="tree-action-box first_node" @click.stop="showAction($event, data,node)">
                <bg-icon
                  class="tree-more"
                  icon="#bg-ic-s-more"
                ></bg-icon>
              </span>
-             <span v-else class="tree-action-box" :class="{'position_sticky': isSticky(data.label) }" @click.stop="showAction($event, data,node)">
+             <span v-else class="tree-action-box" :class="{'position_sticky': isSticky(data.name) }" @click.stop="showAction($event, data,node)">
                <bg-icon
                  class="tree-more"
                  icon="#bg-ic-s-more"
@@ -29,162 +38,86 @@
          v-show="actionFlag"
          :style="{ top: acTop, left: acLeft }"
        >
-         <div v-if="selectData && selectData.dept === 1" class="action" @click="treeCreate({type: 'directory',target: null})">新建目录</div>
-         <div v-if="selectData && selectData.dept === 1" class="action" @click="treeCreate({type: 'org',target: null})" >新建组织</div>
+         <div v-if="selectData && selectData.data_type === 2" class="action" @click="treeAction({type: 'directory',action: 'create',target: null})">新建目录</div>
+         <div v-if="selectData && selectData.data_type === 2" class="action" @click="treeAction({type: 'org',action: 'create',target: null})" >新建组织</div>
 
-         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'create',target: 'local'})">新建本级目录</div>
-         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'create',target: 'child'})">新建下级目录</div>
-         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
-         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'org',action: 'create',target: 'child'})">新建下级组织</div>
-         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'edit',target: 'local'})">编辑目录</div>
-         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'delete',target: 'local'})">删除</div>
-         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'mvup',target: 'local'})">上移</div>
-         <div v-if="selectData && selectData.children" class="action" @click="treeCreate({type: 'directory',action: 'mvdown',target: 'local'})">下移</div>
+         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'create',target: 'local'})">新建本级目录</div>
+         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'create',target: 'child'})">新建下级目录</div>
+         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
+         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'org',action: 'create',target: 'child'})">新建下级组织</div>
+         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'edit',target: 'local'})">编辑目录</div>
+         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'delete',target: 'local'})">删除</div>
+         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvup',target: 'local'})">上移</div>
+         <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvdown',target: 'local'})">下移</div>
 
-         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
-         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'edit',target: 'local'})">编辑组织</div>
-         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'delete',target: 'local'})">删除</div>
-         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'mvup',target: 'local'})">上移</div>
-         <div v-if="selectData && !selectData.children &&  selectData.dept !== 1" class="action" @click="treeCreate({type: 'org',action: 'mvdown',target: 'local'})">下移</div>
+         <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
+         <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'edit',target: 'local'})">编辑组织</div>
+         <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'delete',target: 'local'})">删除</div>
+         <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'mvup',target: 'local'})">上移</div>
+         <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'mvdown',target: 'local'})">下移</div>
        </div>
     </Teleport>
 </template>
 
 <script setup>
-import { reactive, toRefs, ref, } from '@vue/reactivity'
-import { getCurrentInstance } from 'vue'
+import { reactive, toRefs, ref } from '@vue/reactivity'
+import { getCurrentInstance, watch, nextTick} from 'vue'
 import { computed, onBeforeMount, onBeforeUnmount } from '@vue/runtime-core'
 import { useRouter } from 'vue-router';
-
-  const data = [
-    {
-      label: '平台用户组织',
-      dept: 1
-    },
-    {
-      label: '湖北省efadsfasfdgsafgfdtrgsdfsfsd555',
-      dept: 4,
-      children: [
-        {
-          label: '武汉市啊实打实大苏打大阿斯顿发士大夫地',
-          dept: 666,
-          children: [
-            {
-              label: '公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅公安厅',
-              dept: 2
-            },
-            {
-              label: 'fddfsgdfgdfgdsfsffsdfsdfsdfwefadsgs',
-               dept: 3
-            },
-            {
-              label: '咯技术的卡洛斯达拉斯达拉斯昆德拉老师',
-              dept: 5,
-            },
-          ],
-        },
-        {
-          label: '荆州市',
-          dept: 6,
-          children: [
-            {
-              label: '公安局',
-              dept: 7,
-            },
-            {
-              label: '应急管理局',
-              dept: 8,
-            },
-          ],
-        }
-      ],
-    },
-    {
-      label: '四川省',
-      dept: 9,
-      children: [
-        {
-          label: '成都市',
-          dept: 10,
-          children: [
-            {
-              label: '天府新区',
-              dept: 11,
-            },
-          ],
-        },
-      ],
-    },
-    {
-      label: '比格大数据',
-      dept: 12,
-      children: [
-        {
-          label: '武汉研发中心',
-          dept: 13,
-          children: [
-            {
-              label: '研发部',
-              dept: 14,
-            },
-          ],
-        },
-        {
-          label: '西南大区',
-          dept: 15,
-          children: [
-            {
-              label: '事业部',
-              dept: 16,
-            },
-            {
-              label: '事业部',
-              dept: 17,
-            },
-            {
-              label: '事业部',
-              dept: 18,
-            },
-            {
-              label: '事业部',
-              dept: 19,
-            },
-            {
-              label: '事业部',
-              dept: 20,
-            },
-            {
-              label: '事业部',
-              dept: 21,
-            },
-            {
-              label: '事业部',
-              dept: 22,
-            },
-          ],
-        },
-      ],
-    },
-  ]
-
-  const defaultProps = {
-    children: 'children',
-    label: 'label',
-  }
+  const { proxy } = getCurrentInstance()
+  const { $axios,$message } = proxy
 
   const acTop = ref(0);
   const acLeft = ref(0);
   const actionFlag = ref(false)
   const selectData = ref(null)
   const selectDataParent = ref(null) 
+  const mvDataParent = ref(null)
+  const treeRef = ref(null)
+
+  const orgData = ref([])
+  const defaultProps = {
+    label: 'name',
+    children: 'Child',
+    value: 'organization_id'
+  }
+
+  const  getOrgTree = () => {
+    $axios.get(`/apaas/system/v5/org/tree`)
+      .then((res) => {
+      if (res.data.code == 200) {
+          orgData.value = res.data.data || [];
+          nextTick(() =>{
+            treeRef.value.setCurrentNode(orgData.value[0],true)
+            emit('select',ref(orgData.value[0]));
+          })
+          
+      }else {
+          $message.error(res.data.data)
+      }
+      })
+  }
+
+
+  const filterTree =(val) => {
+    treeRef.value.filter(val)
+  }
+
+  const filterNode = (value, data) => {
+    if (!value) return true
+    return data.name.includes(value)
+  }
+
   const showAction = (e, data,node) => {
     const rect = e.target.getBoundingClientRect(); //获取点击的dom的位置
     acTop.value = rect.y - 17 + "px";
     acLeft.value = rect.x + 35 + "px";
     actionFlag.value = true;
     selectData.value = data;
-    selectDataParent.value = node.parent.data.label ? node.parent.data : null;
+    selectDataParent.value = node.parent.data.name ? node.parent.data : null;
+    mvDataParent.value = node.parent.data.Child ? node.parent.data.Child : node.parent.data;
   };
+
   const isSticky = (data) => {
 
     const canvas = document.createElement("canvas");
@@ -202,27 +135,62 @@ import { useRouter } from 'vue-router';
   const emit = defineEmits(['action'])
   const handleNodeClick = (node,nodeAttr,treeNode,event) => {
     selectData.value = node;
-    emit('select',{node,nodeAttr,treeNode,event});
+    emit('select',selectData);
     //只读则无操作事件
       closeAction();
   }
 
-  const treeCreate = (params) => {
-    emit('create',{type: params.type,action: params.action,data: params.target === 'local'? selectDataParent : selectData});
+  const treeAction = (params) => {
+    emit('select',selectData);
+    let data = null;
+    if(params.action === 'create') {
+      if(params.target === 'local') {
+        data = selectDataParent;
+      }else if(params.target === 'child') {
+        data = selectData;
+      }else {
+        
+      }
+    }else if(params.action === 'mvup') {
+      if(mvDataParent.value.indexOf(selectData.value) === 0) {
+        $message.error('已经是第一个元素，不可上移')
+        return 0;
+      }else {
+        let brother = mvDataParent.value[mvDataParent.value.indexOf(selectData.value) - 1];
+        data = [{id: selectData.value.id,sort: brother.sort},{id: brother.id,sort: selectData.value.sort}]
+      }
+      
+    }else if(params.action === 'mvdown') {
+      if(mvDataParent.value.indexOf(selectData.value) === (mvDataParent.value.length-1)) {
+        $message.error('已经是最后一个元素，不可下移')
+        return 0;
+      }else {
+        let brother = mvDataParent.value[mvDataParent.value.indexOf(selectData.value) + 1];
+        data = [{id: selectData.value.id,sort: brother.sort},{id: brother.id,sort: selectData.value.sort}]
+      }
+    }else {
+      data = selectData;
+    }
+    emit('action',{type: params.type,action: params.action,
+                   data: data});
   }
   
   onBeforeMount(()=>{
     //只读则无操作事件
       window.addEventListener("click", closeAction);
       window.addEventListener("scroll", closeAction,true);
+      getOrgTree()
   })
   
   onBeforeUnmount(()=>{
     //只读则无操作事件
       window.removeEventListener('click', closeAction);
       window.removeEventListener('scroll', closeAction);
+      
   })
 
+  defineExpose({getOrgTree, filterTree })
+
 </script>
 
 <style scoped>
@@ -271,13 +239,14 @@ import { useRouter } from 'vue-router';
   padding: 8px 0;
   background-color: var(--el-tree-node-hover-bg-color);
 }
+
 .label-text:hover {
   padding: 8px 0;
   background-color: var(--el-tree-node-hover-bg-color);
 }
 .is_active {
   padding: 8px 0;
-  background-color: var(--el-tree-node-hover-bg-color);
+  background-color: var(--el-color-primary-light-9);
 }
 
 .custom_tree_node {
@@ -328,4 +297,8 @@ import { useRouter } from 'vue-router';
   z-index: 9;
 }
 
+.file-tree :deep().el-tree-node__content{
+  height: 36px!important;
+}
+
 </style>
\ No newline at end of file
diff --git a/src/page/main/system/organization/user-detail/index.vue b/src/page/main/system/organization/user-detail/index.vue
index ac3ba5d9f480222ea6fae6bdf1971a4a54588e13..aae92fa3b4758afe625a0c0f1087131be168ce9c 100644
--- a/src/page/main/system/organization/user-detail/index.vue
+++ b/src/page/main/system/organization/user-detail/index.vue
@@ -10,29 +10,31 @@
         <div class="page_content apaas_scroll">
                 <div class="info_row">
                 <div class="title">
-                    <div><span  class="icon_box"></span> 基础信息</div>
+                    <div><span  class="icon_box"></span> 账号信息</div>
                     <div class="dashed_line">
                     </div>
                 </div>
                 <div class="info_content">
                     <div class="img_box">
-                        <img src="/src/assets/imgs/home_ic_user.png" style="height: 96px;width: 96px;border-radius: 99px" alt="">
+                        <img v-if="logo" :src="logo" style="height: 96px;width: 96px;border-radius: 99px" alt="">
+                        <img v-else src="/src/assets/imgs/home_ic_user.png" style="height: 96px;width: 96px;border-radius: 99px" alt="">
                     </div>
                     <div class="info_box">
-                        <bg-info :data="baseInfo"></bg-info>
+                        <bg-info :data="accountInfo"></bg-info>
                     </div>
                 </div>
             </div>
             <div>
                 <div class="title">
-                    <div><span  class="icon_box"></span> 基础信息</div>
+                    <div><span  class="icon_box"></span> 个人信息</div>
                     <div class="dashed_line">
                     </div>
                 </div>
                 <div class="info_content">
                     <div class="img_box"></div>
                     <div class="info_box">
-                        <bg-info :data="contactInfo"></bg-info>
+                        <bg-info v-if="accountType === 2" :data="personInfo"></bg-info>
+                        <bg-info v-if="accountType === 3" :data="personInfo2"></bg-info>
                     </div>
                 </div>
             </div>
@@ -44,103 +46,145 @@
 import { reactive, toRefs, ref, } from '@vue/reactivity'
 import { getCurrentInstance } from 'vue'
 import { computed, onBeforeMount } from '@vue/runtime-core'
-import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 
-const baseInfo = reactive(
+const { proxy } = getCurrentInstance()
+const { $axios,$message } = proxy
+const route = useRoute();
+
+const accountInfo = reactive(
     [
     {
-      name: "所属机构",
-      value: "某某省/某某市/大数据局",
-      nameWidth: 112
+      name: "手机号",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "业务系统编码",
-      value: "00000001",
-      nameWidth: 112
+      name: "账号",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "业务系统名称",
-      value: "大数据处理系统",
-      nameWidth: 112
+      name: "角色",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "账号",
-      value: "admin001",
-      nameWidth: 112
+      name: "所属组织",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "AppID",
-      value: "dasjkjjk",
-      nameWidth: 112
+      name: "创建人",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "AppSecret",
-      value: "asda*******************jhjh",
-      nameWidth: 112
+      name: "创建账号",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "创建人",
-      value: "admin（机构管理员）",
-      nameWidth: 112
+      name: "最后编辑时间",
+      value: "",
+      nameWidth: 130
     },
     {
       name: "创建时间",
-      value: "2022-01-01 10:10:10",
-      nameWidth: 112
+      value: "",
+      nameWidth: 130
+    },
+  ]
+  )
+
+  const personInfo = reactive(
+    [{
+      name: "姓名",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "是否启用",
-      value: "是",
-      nameWidth: 112
+      name: "邮箱",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "开发厂商名单",
-      value: "某某大数据开发商",
-      nameWidth: 112
+      name: "证据类型",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "访问地址",
-      value: "http://www.bigdata.com",
-      full: true,
-      nameWidth: 112
+      name: "身份证号",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "业务系统描述",
-      value: "系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述",
+      name: "备注",
+      value: "",
       full: true,
-      nameWidth: 112
+      nameWidth: 130
     },
-  ]
-  )
+  ])
 
-  const contactInfo = reactive(
+    const personInfo2 = reactive(
     [{
-      name: "联系人姓名",
-      value: "xxx",
-      nameWidth: 112
-    },
-    {
-      name: "联系人手机号",
-      value: "15627365265",
-      nameWidth: 112
+      name: "姓名",
+      value: "",
+      nameWidth: 130
     },
     {
-      name: "联系人邮箱",
-      value: "http://www.bigdata@163.com",
-      full: true,
-      nameWidth: 112
+      name: "邮箱",
+      value: "",
+      nameWidth: 130
     },
     {
       name: "备注",
-      value: "系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述系统描述",
+      value: "",
       full: true,
-      nameWidth: 112
+      nameWidth: 130
     },
-  ]
-  )
+  ])
+
+  const logo = ref('')
+  const accountType = ref(2); //1.业务系统账号 2.组织管理员账号 3.平台用户账号
+
+  const getDetail = () => {
+      $axios.get(`/apaas/system/v5/org/user/${route.query.id}`)
+                  .then((res) => {
+                  if (res.data.code == 200) {
+                      const detail = res.data.data;
+                      accountInfo[0].value = detail.contact_phone;
+                      accountInfo[1].value = detail.system_account;
+                      accountInfo[2].value = detail.system_role && detail.system_role.length > 0 ? detail.system_role.join('、') : '';
+                      accountInfo[3].value = detail.organization;
+                      accountInfo[4].value = detail.created_by;
+                      accountInfo[5].value = detail.created_by_account;
+                      accountInfo[6].value = detail.updated_time;
+                      accountInfo[7].value = detail.created_time;
+
+                      personInfo[0].value = detail.contact_name;
+                      personInfo[1].value = detail.contact_email;
+                      personInfo[2].value = detail.document_type === 1 ? '身份证' : '';
+                      personInfo[3].value = detail.document_number;
+                      personInfo[4].value = detail.remark;
+
+                      personInfo2[0].value = detail.contact_name;
+                      personInfo2[1].value = detail.contact_email;
+                      personInfo2[2].value = detail.remark;
+
+                      logo.value = detail.logo;
+                      accountType.value = detail.is_admin;
+
+                  }else {
+                      $message.error(res.data.data)
+                  }
+              })
+  }
 
   onBeforeMount(() => {
-     
+     if(route.query.id) {
+        getDetail()
+    }
  })
 </script>
 
diff --git a/src/page/main/system/role/add/role_form.vue b/src/page/main/system/role/add/role_form.vue
index c8121e1d32eddf533c96411cf450a8416fa92033..f4f0184144493423cc015d12306bab00005bacf3 100644
--- a/src/page/main/system/role/add/role_form.vue
+++ b/src/page/main/system/role/add/role_form.vue
@@ -5,11 +5,11 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item> 系统管理 </el-breadcrumb-item>
         <el-breadcrumb-item to="/system/role"> 角色管理 </el-breadcrumb-item>
-        <el-breadcrumb-item> 新建 </el-breadcrumb-item>
+        <el-breadcrumb-item> {{route.query.id ? "编辑" : "新建"}} </el-breadcrumb-item>
       </el-breadcrumb>
     </div>
     <div class="main_container">
-      <div class="top_form">
+      <div class="top_form bg-scroll">
         <el-form
           ref="form"
           :rules="rules"
@@ -95,7 +95,7 @@ const roleState = reactive({
     data_purview: 3,
     state: 1,
     permission_arr: [],
-  },
+  }, // 表单项
   rules: {
     role_name: [
       { required: true, message: "请输入角色名称", trigger: "blur" },
@@ -112,13 +112,13 @@ const roleState = reactive({
     permission_arr: [
       { required: true, type: "array", validator: checkMenuLength, trigger: "change" }
     ]
-  },
+  }, // 表单校验规则
   defaultProps: {
     name: 'menu_name',
     value: 'id',
     children: 'Child',
-  },
-  permissionData: [],
+  }, // 菜单框默认配置
+  permissionData: [], // 菜单数据
 })
 const getMenuTree = () => {
   axios
@@ -130,22 +130,37 @@ const getMenuTree = () => {
         ElMessage.error(res.data.data)
       }
     })
-}
+} // 获取菜单数据
 
 const changeMenu = (val) => {
   roleState.formData.permission_arr = val
-}
+} // 修改选中的菜单
+
 const getRoleDetail = () => {
   axios
     .get(`/apaas/system/v5/role/detail/${route.query.id}`)
     .then((res) => {
       if (res.data.code == 200) {
-        console.log(res.data.data)
+        let { role_name, role_desc, data_purview, state, menus } = res.data.data
+        let permission_arr = []
+        if (menus && menus.length > 0) {
+          menus.forEach(e => {
+            permission_arr.push(e.id)
+          })
+        }
+        roleState.formData = {
+          role_name,
+          role_desc,
+          data_purview,
+          state,
+          permission_arr:[...permission_arr]
+        }
+        console.log(roleState.formData.permission_arr)
       }else {
         ElMessage.error(res.data.data)
       }
     })
-}
+} // 获取角色详情
 
 const saveRole = () => {
   roleState.form.validate(valid => {
@@ -169,7 +184,7 @@ const saveRole = () => {
             }
           })
       }else { // 编辑
-        params.id = route.query.id
+        params.id = +route.query.id
         axios
           .post(`/apaas/system/v5/role/update`,params)
           .then((res) => {
@@ -183,10 +198,12 @@ const saveRole = () => {
       }
     }
   })
-}
+} // 新增或编辑角色的保存
+
 onBeforeMount(() => {
   getMenuTree()
   if (route.query.id) {
+    // 有id表示是编辑，请求详情，回显
     getRoleDetail()
   }
 })
diff --git a/src/page/main/system/role/index.vue b/src/page/main/system/role/index.vue
index 2b510b8d164b23442138526b06f8065df6480071..b4690ee4f371e6d6bb69bb391b752fff0e7e6874 100644
--- a/src/page/main/system/role/index.vue
+++ b/src/page/main/system/role/index.vue
@@ -22,20 +22,26 @@
             <el-button class="register_btn" type="primary" @click="deleteRows">
                 批量删除
             </el-button>
+            <div class="select_text">
+              <span>已选择</span>
+              <span class="num">{{selection.length}}</span>
+              <span>项</span>
+              <span class="can_click_text" @click="clearRoleSelection">清空</span>
+            </div>
           </div>
         </template>
       </bg-filter-group>
       <div class="table_container">
         <div class="table bg-scroll">
           <bg-table 
-            ref="bgTable" 
+            ref="Bgtable" 
             :headers="headers" 
             :rows="tableRows" 
             :select="true" 
             :stripe="true" 
             canEdit
             canEditFlag='state' 
-            @select="selectRows"
+            @selectAc="selectRows"
           >
             <template v-slot:state="{ row }">
               <bg-switch 
@@ -50,13 +56,13 @@
               {{ row.created_time.split("+")[0].replace("T", " ").replace("Z", " ") }}
             </template>
             <template v-slot:action="{ row }">
-              <bg-table-btn class="btn" :click="()=>{edit_row(row)}" :disabled="row.state == 1 || row.role_type == 1">
+              <bg-table-btn class="can_click_text" :click="()=>{edit_row(row)}" :disabled="row.state == 1 || row.role_type == 1">
                 编辑
               </bg-table-btn>
-              <bg-table-btn class="btn" :click="()=>{edit_row(row)}" :disabled="row.role_type == 1">
+              <bg-table-btn class="can_click_text" :click="()=>{distribute_user(row)}" :disabled="row.cant_allot == 1">
                 分配用户
               </bg-table-btn>
-              <bg-table-btn class="btn" :click="()=>{delete_row(row)}" :disabled="row.state == 1 || row.role_type == 1">
+              <bg-table-btn class="can_click_text" :click="()=>{delete_row(row)}" :disabled="row.state == 1 || row.role_type == 1">
                 删除
               </bg-table-btn>
             </template>
@@ -72,7 +78,7 @@
         </bg-pagination>
       </div>
     </div>
-     <!-- 删除弹窗 -->
+    <!-- 删除弹窗 -->
     <el-dialog
       custom-class="dialog_box"
       title="提示"
@@ -84,7 +90,7 @@
         }
       "
     >
-      <div>确定要选中的数据吗？</div>
+      <div>确定要删除选中的数据吗？</div>
       <template v-slot:footer>
         <div class="apaas_button">
           <el-button type="default" @click="delDialog = false">取 消</el-button>
@@ -92,27 +98,117 @@
         </div>
       </template>
     </el-dialog>
+    <!-- 分配用户 -->
+    <el-dialog
+      custom-class="distribute_dialog"
+      title="分配用户"
+      v-model="distributeDialog"
+      width="1062px"
+      :before-close="
+        () => {
+          distributeDialog = false;
+        }
+      "
+    >
+      <div class="distribute_box">
+        <div class="topFilter">
+          <div class="left">
+            <span>已选择</span>
+            <span class="num">{{userSelection.length}}</span>
+            <span>项</span>
+            <span class="can_click_text" @click="clearUserSelection">清空</span>
+          </div>
+          <div class="right">
+            <el-select
+              v-model="userFilter.is_admin"
+              placeholder="请选择"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="(item, index) in userTypeList"
+                :key="'pushOptions' + index"
+                :label="item.name"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <el-cascader
+              v-model="userFilter.organization_id"
+              :options="orgList"
+              placeholder="请选择组织"
+              :props="{ expandTrigger: 'hover', label: 'name', value: 'id', emitPath: false, checkStrictly: true, children: 'Child'}"
+              :clearable="true"
+              collapse-tags
+              style="width: 200px"
+            >
+              <template #default="{ data }">
+                <span>{{ data.name }}</span>
+              </template>
+            </el-cascader>
+            <el-input
+              v-model="userFilter.search"
+              placeholder="请输入内容"
+              style="width: 200px"
+              :prefix-icon="Search"
+            />
+            <el-button type="primary" @click="searchAction">查询</el-button>
+            <el-button type="default" @click="clearAction">重置</el-button>
+          </div>
+        </div>
+        <div class="table_box">
+          <div class="user_table bg-scroll">
+            <bg-table 
+              ref="userTable" 
+              :headers="userHeaders" 
+              :rows="userRows" 
+              :select="true" 
+              :stripe="true"
+              @selectAc="selectUserRows"
+            >
+              <template v-slot:is_admin="{ row }">
+                {{ ["","业务系统账号","组织管理员账号","平台用户账号"][row.is_admin] }}
+              </template>
+            </bg-table>
+          </div>
+          <bg-pagination
+            :page="userFilter.page"
+            :size="userFilter.limit"
+            :total="total"
+            @change-page="changeUserPage"
+            @change-size="changeUserSize"
+          >
+          </bg-pagination>
+        </div>
+      </div>
+      <template v-slot:footer>
+        <div class="apaas_button">
+          <el-button type="default" @click="distributeDialog = false">取 消</el-button>
+          <el-button type="primary" @click="distribute">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+import { Search } from '@element-plus/icons-vue'
 import { reactive, toRefs, ref, onBeforeMount, nextTick } from 'vue'
 import axios from '../../../../request/http.js'
 import { ElMessage } from 'element-plus'
 import { useRouter } from 'vue-router'
 const router = useRouter()
+const Bgtable = ref(null)
+const userTable = ref(null)
 const state = reactive({
   filter: {
     page: 1,
     limit: 10,
     search: "",
-  },
-  
+  }, 
   headers: [
     {
       label: "角色名",
       prop: "role_name",
-      
       width: 220
     },
     {
@@ -154,6 +250,52 @@ const state = reactive({
   delDialog: false,
   delType: 1, // 删除类型  1-单条删除 2-批量删除
 })
+const userState = reactive({
+  userFilter: {
+    is_admin: "",
+    organization_id: "",
+    search: "",
+    limit: 10,
+    page: 1,
+  },
+  userTypeList: [
+    {
+      name: "全部类型",
+      value: ""
+    },
+    {
+      name: "组织管理员账号",
+      value: 2
+    },
+    {
+      name: "平台用户账号",
+      value: 3
+    },
+  ],
+  orgList: [],
+  userHeaders: [
+    {
+      label: "帐号",
+      prop: "system_account",
+    },
+    {
+      label: "类型",
+      prop: "is_admin",
+    },
+    {
+      label: "用户手机号",
+      prop: "contact_phone",
+    },
+    {
+      label: "所属组织",
+      prop: "organization_name",
+    },
+  ],
+  userRows: [],
+  total: 0,
+  userSelection: [],
+  distributeDialog: false, // 分配用户弹窗
+})
 const getRoleRows = () => {
   let params = {...state.filter}
   console.log(params)
@@ -168,6 +310,19 @@ const getRoleRows = () => {
       }
     })
 } // 获取角色列表
+
+const getOrgList = () => {
+  axios
+    .get(`/apaas/system/v5/org/tree`)
+    .then((res) => {
+      if (res.data.code == 200) {
+        console.log(res.data.data)
+        userState.orgList = res.data.data || []
+      }else {
+        ElMessage.error(res.data.data)
+      }
+    })
+} // 获取组织列表
 const changePage = (val) => {
   state.filter.page = val
   getRoleRows()
@@ -196,8 +351,12 @@ const changeUseRow = (row) => {
     })
 } // 更改启用禁用状态
 
-const selectRows = (rows) => {
-  state.selection = rows
+const selectRows = (data) => {
+  state.selection = data.selection
+} // 表格多选
+
+const clearRoleSelection = () => {
+  Bgtable.value.clearTable()
 }
 
 const register = () => {
@@ -215,6 +374,103 @@ const edit_row = (row) => {
   })
 } // 编辑角色
 
+const distribute_user = (row) => {
+  clearAction(1)
+  userState.distributeDialog = true
+  state.actionRow = row
+  getUserList()
+} // 分配角色按钮
+
+const getUserList = () => {
+  nextTick(() => {
+    clearUserSelection()
+  })
+  let params = {
+    limit: userState.userFilter.limit,
+    page: userState.userFilter.page,
+    search: userState.userFilter.search,
+    organization_id: userState.userFilter.organization_id,
+    is_admin: userState.userFilter.is_admin,
+    role_id: state.actionRow.id,
+  }
+  axios
+    .get(`/apaas/system/v5/role/allotment/list`,{params})
+    .then((res) => {
+      if (res.data.code == 200) {
+        console.log(res.data.data)
+        userState.userRows = res.data.data || []
+        userState.total = res.data.total
+        nextTick(() => {
+          userState.userRows.forEach(e => {
+            if(e.is_bind == 1) {
+              userTable.value.toggleRowSelection(e,true)
+            }
+          })
+        })
+      }else {
+        ElMessage.error(res.data.data)
+      }
+    })
+}
+const changeUserPage = (val) => {
+  userState.userFilter.page = val
+  getUserList()
+}
+
+const changeUserSize = (val) => {
+  userState.userFilter.limit = val
+  changeUserPage(1)
+}
+
+const searchAction = () => {
+  console.log(userState.userFilter)
+  changeUserPage(1)
+}
+
+const clearAction = (type) => {
+  userState.userFilter = {
+    is_admin: "",
+    organization_id: "",
+    search: "",
+    limit: 10,
+    page: 1,
+  }
+  if (type != 1) {
+    changeUserPage(1)
+  }
+}
+
+const clearUserSelection = () => {
+  userTable.value.clearTable()
+}
+
+const selectUserRows = (data) => {
+  userState.userSelection = data.selection
+}
+
+const distribute = () => {
+  let user_ids = []
+  userState.userSelection.forEach(e => {
+    user_ids.push(e.id)
+  })
+  let params = {
+    id: state.actionRow.id,
+    user_ids: user_ids
+  }
+  axios
+    .post(`/apaas/system/v5/role/allotment/user`,params)
+    .then((res) => {
+      if (res.data.code == 200) {
+        ElMessage.success(res.data.data)
+        userState.distributeDialog = false
+        changePage(1)
+      }else {
+        ElMessage.error(res.data.data)
+      }
+    })
+  
+}
+
 const delete_row = (row) => {
   state.actionRow = row
   state.delType = 1
@@ -242,7 +498,6 @@ const deleteData = () => {
   let params = {
     ids: [...ids]
   }
-  console.log(params)
   axios
     .delete(`/apaas/system/v5/role/delete`,{data: {ids:[...ids]}})
     .then((res) => {
@@ -257,6 +512,7 @@ const deleteData = () => {
 }
 onBeforeMount(() => {
   getRoleRows()
+  getOrgList()
 })
     
 const {
@@ -265,7 +521,19 @@ const {
   tableRows,
   tableTotal,
   delDialog,
+  selection,
 } = toRefs(state)
+
+const {
+  userFilter,
+  userTypeList,
+  orgList,
+  userHeaders,
+  userRows,
+  total,
+  userSelection,
+  distributeDialog,
+} =toRefs(userState)
 </script>
 
 <style lang="scss" scoped>
@@ -297,7 +565,76 @@ const {
         max-height: calc(100% - 64px);
       }
     }
+    .select_text {
+      display: inline-block;
+      margin-left: 40px;
+      font-size: 14px;
+      color: #404a62;
+      .num {
+        color: #202531;
+        font-weight: 700;
+        margin: 0 3px;
+      }
+      .can_click_text {
+        margin-left: 24px;
+      }
+    }
+  }
+  .distribute_dialog {
+    .distribute_box {
+      width: 100%;
+      height: 626px;
+      .topFilter {
+        height: 68px;
+        padding: 16px;
+        border-bottom: 1px solid #e6e9ef;
+        display: flex;
+        text-align: left;
+        font-size: 14px;
+        align-items: center;
+        .left {
+          width: 240px;
+          padding-left: 15px;
+          color: #404a62;
+          .num {
+            color: #202531;
+            font-weight: 700;
+            margin: 0 3px;
+          }
+          .can_click_text {
+            margin-left: 24px;
+          }
+        }
+        .right {
+          flex: 1;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          .el-button {
+            margin: 0;
+            width: 64px;
+          }
+        }
+      }
+      .table_box {
+        padding: 10px 16px;
+        height: calc(100% - 68px);
+        .user_table {
+          max-height: calc(100% - 48px);
+        }
+      }
+    }
   }
 }
-
+</style>
+<style>
+.distribute_dialog .el-dialog__footer {
+  padding: 16px!important;    
+}
+.distribute_dialog .el-dialog__body {
+  padding: 0px!important;    
+}
+.distribute_dialog {
+  margin-top: 130px!important;    
+}
 </style>
\ No newline at end of file
diff --git a/src/router/function.js b/src/router/function.js
index 4e487bb22190063a2210bd2c790aa804f54be7a1..f31fd4498faad138652937ae29e805fad58c07f3 100644
--- a/src/router/function.js
+++ b/src/router/function.js
@@ -180,7 +180,7 @@ var adminMenu = [
                 dict_group_id: "09938937-3db9-47de-b967-7777ea4ebb2d",
                 menuType: 2, //system:64c156e0-bfff-4bfc-a63a-56effe130a25:apaas后管,能力注册页等  font:2cb4f767-fad7-44f2-afa3-f055e15dd2b6:apaas前台页  manager:09938937-3db9-47de-b967-7777ea4ebb2d:apaas管理中心 知识中心：26d3903a-863e-4efc-b53e-0fb8772ddaa4
                 show: false,
-                path: "/system/organization/system-user",
+                path: "/system/organization/org-user",
               },
               {
                 menuName: "用户详情",
diff --git a/yarn.lock b/yarn.lock
index d5ba66d2d5049e600f5071212051b9f90e8ee504..90f2d699c67f1d46db954c96e49a12c8d7a2833c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24,17 +24,17 @@
   resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.0.6.tgz"
   integrity sha512-lPpG8hYkjL/Z97DH5Ei6w6o22Z4YdNglWCNYOPcB33JCF2A4wye6HFgSI7hEt9zdLyxlSpiqtgf9XcYU+m5mew==
 
-"@floating-ui/core@^0.7.3":
-  version "0.7.3"
-  resolved "https://registry.npmmirror.com/@floating-ui/core/-/core-0.7.3.tgz"
-  integrity sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==
+"@floating-ui/core@^1.0.1":
+  version "1.0.1"
+  resolved "https://mirrors.cloud.tencent.com/npm/@floating-ui%2fcore/-/core-1.0.1.tgz#00e64d74e911602c8533957af0cce5af6b2e93c8"
+  integrity sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==
 
-"@floating-ui/dom@^0.5.4":
-  version "0.5.4"
-  resolved "https://registry.npmmirror.com/@floating-ui/dom/-/dom-0.5.4.tgz"
-  integrity sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==
+"@floating-ui/dom@^1.0.1":
+  version "1.0.4"
+  resolved "https://mirrors.cloud.tencent.com/npm/@floating-ui%2fdom/-/dom-1.0.4.tgz#cc0f2a03db7193b1b932b90d09c5c81235682a60"
+  integrity sha512-maYJRv+sAXTy4K9mzdv0JPyNW5YPVHrqtY90tEdI6XNpuLOP26Ci2pfwPsKBA/Wh4Z3FX5sUrtUFTdMYj9v+ug==
   dependencies:
-    "@floating-ui/core" "^0.7.3"
+    "@floating-ui/core" "^1.0.1"
 
 "@intlify/core-base@9.1.10":
   version "9.1.10"
@@ -119,10 +119,10 @@
   resolved "https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.182.tgz"
   integrity sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==
 
-"@types/web-bluetooth@^0.0.14":
-  version "0.0.14"
-  resolved "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz"
-  integrity sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A==
+"@types/web-bluetooth@^0.0.16":
+  version "0.0.16"
+  resolved "https://mirrors.cloud.tencent.com/npm/@types%2fweb-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8"
+  integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==
 
 "@uppy/companion-client@^2.2.2":
   version "2.2.2"
@@ -357,25 +357,25 @@
   resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.38.tgz#e823f0cb2e85b6bf43430c0d6811b1441c300f3c"
   integrity sha512-dTyhTIRmGXBjxJE+skC8tTWCGLCVc4wQgRRLt8+O9p5ewBAjoBwtCAkLPrtToSr1xltoe3st21Pv953aOZ7alg==
 
-"@vueuse/core@^8.7.5":
-  version "8.9.4"
-  resolved "https://registry.npmmirror.com/@vueuse/core/-/core-8.9.4.tgz"
-  integrity sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q==
+"@vueuse/core@^9.1.0":
+  version "9.4.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/@vueuse%2fcore/-/core-9.4.0.tgz#afb30f9494b0954e51a489526566b14f1e2c5fb3"
+  integrity sha512-JzgenGj1ZF2BHOen5rsFiAyyI9sXAv7aKhNLlm9b7SwYQeKTcxTWdhudonURCSP3Egl9NQaRBzes2lv/1JUt/Q==
   dependencies:
-    "@types/web-bluetooth" "^0.0.14"
-    "@vueuse/metadata" "8.9.4"
-    "@vueuse/shared" "8.9.4"
+    "@types/web-bluetooth" "^0.0.16"
+    "@vueuse/metadata" "9.4.0"
+    "@vueuse/shared" "9.4.0"
     vue-demi "*"
 
-"@vueuse/metadata@8.9.4":
-  version "8.9.4"
-  resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.9.4.tgz"
-  integrity sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==
+"@vueuse/metadata@9.4.0":
+  version "9.4.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/@vueuse%2fmetadata/-/metadata-9.4.0.tgz#5c8eb105a8ad9eb7b47f78a226ff993560d0bd7f"
+  integrity sha512-7GKMdGAsJyQJl35MYOz/RDpP0FxuiZBRDSN79QIPbdqYx4Sd0sVTnIC68KJ6Oln0t0SouvSUMvRHuno216Ud2Q==
 
-"@vueuse/shared@8.9.4":
-  version "8.9.4"
-  resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-8.9.4.tgz"
-  integrity sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag==
+"@vueuse/shared@9.4.0":
+  version "9.4.0"
+  resolved "https://mirrors.cloud.tencent.com/npm/@vueuse%2fshared/-/shared-9.4.0.tgz#634022fe42b3d5ece1d81d749724966f5071c8c3"
+  integrity sha512-fTuem51KwMCnqUKkI8B57qAIMcFovtGgsCtAeqxIzH3i6nE9VYge+gVfneNHAAy7lj8twbkNfqQSygOPJTm4tQ==
   dependencies:
     vue-demi "*"
 
@@ -578,18 +578,18 @@ echarts@^5.3.3:
     tslib "2.3.0"
     zrender "5.3.2"
 
-element-plus@^2.2.9:
-  version "2.2.9"
-  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.2.9.tgz"
-  integrity sha512-jYbL0JkCdv95rkT6trZJjCAizLPySa0qcd2cgq+57SKQnCZAcNDDq4GbTuFRnNavdoeCJnuM3HIficTIUpsMOQ==
+element-plus@^2.2.19:
+  version "2.2.19"
+  resolved "https://mirrors.cloud.tencent.com/npm/element-plus/-/element-plus-2.2.19.tgz#c11cb84b35b7698b2f5fa7ec0fd98034f6861a9e"
+  integrity sha512-uN0gt9lUus/IHzu5J6vkbYoYJgUtU05osdtFv9RO27bHKOG5GN7dH6uA3OKfkQQ6R2sV8ZxY1rc9PH1X8Dgrow==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"
-    "@floating-ui/dom" "^0.5.4"
+    "@floating-ui/dom" "^1.0.1"
     "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7"
     "@types/lodash" "^4.14.182"
     "@types/lodash-es" "^4.17.6"
-    "@vueuse/core" "^8.7.5"
+    "@vueuse/core" "^9.1.0"
     async-validator "^4.2.5"
     dayjs "^1.11.3"
     escape-html "^1.0.3"
@@ -597,7 +597,7 @@ element-plus@^2.2.9:
     lodash-es "^4.17.21"
     lodash-unified "^1.0.2"
     memoize-one "^6.0.0"
-    normalize-wheel-es "^1.1.2"
+    normalize-wheel-es "^1.2.0"
 
 es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.14:
   version "0.10.62"
@@ -984,9 +984,9 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-normalize-wheel-es@^1.1.2:
+normalize-wheel-es@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz"
+  resolved "https://mirrors.cloud.tencent.com/npm/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz#0fa2593d619f7245a541652619105ab076acf09e"
   integrity sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==
 
 path-parse@^1.0.7: