成员管理 - 权限管理 - 项目管理开发

src/api/ApiModel.ts

@@ -47,7 +47,11 @@ export interface menuParam{
     icon?:string,
     parent_id?:string|number,
     id?:string|number,
-    p_id?:any
+    p_id?:any,
+    name?:string,
+    note?:string,
+    permission_ids?:any,
+    permission_levels?:any,
 }
 export interface accountParam extends pageParams{
     username?:string,
@@ -236,6 +240,16 @@ export interface departParams{
     name?:string,
     pid?:string|number,
     id?:string|number,
+    note?:string,
+    head_user_id?:any,
+    show_type?:string|number,
+    department_ids?:any,
+    user_ids?:any,
+    username?:string,
+    password?:string,
+    department_id?:any,
+    role_id?:any,
+    keyword?:string
 }
 
 

src/api/api.ts

@@ -131,6 +131,19 @@ export enum Api{
     project_edit = '/api/sys/projectsEdit',
     project_dele = '/api/sys/projectsDel',
 
+    //权限
+    limit_add = '/api/sys/roleAdd',
+    limit_list = '/api/sys/roleList',
+    limit_edit = '/api/sys/roleEdit',
+    limit_dele = '/api/sys/roleDel',
+
+    //人员
+    user_list = '/api/sys/userList',
+    user_add = '/api/sys/userAdd',
+    user_edit = '/api/sys/userEdit',
+    user_dele = '/api/sys/userDel',
+
+
 
 
 

src/components/businessMoudle/limitManage/addPage.vue

@@ -0,0 +1,224 @@
+<template>
+  <div class="addPageBox"  v-loading="loading">
+    <Drawer :drawerShow="drawer_show" @close="closeEvent" :title="pageInfo.title" drawerSize="70%" :closeOnModal="false">
+      <template v-slot:content>
+      <div style="background-color: #fff;height: 100%">
+        <div class="itemBox">
+          <div class="title">基础信息</div>
+          <div class="contBox">
+            <Input ref="InputRef_name" spanFS="14px" title="权限名称" spanTitleWidth="100px" inputWidth="300px" placeholderTxt="权限名称" />
+            <Input ref="InputRef_note" spanFS="14px" class="tMar20" spanTitleWidth="100px" inputWidth="300px" title="权限描述" placeholderTxt="权限描述"/>
+          </div>
+        </div>
+
+        <div class="itemBox">
+          <div class="title">权限配置</div>
+          <div class="contBox">
+            <!--  列表-->
+            <TableList
+                ref="tableListRef"
+                :tableData="pageInfo.menuList"
+                :descol="tableInfo.descolList"
+            >
+              <template v-slot:subPage="slotProps">
+                <div>
+                  <el-checkbox-group v-model="slotProps.row.pageCheckList">
+                    <el-checkbox v-for="sub in slotProps.row.subList" :label="sub.id" :key="sub.id">{{sub.title}}</el-checkbox>
+                  </el-checkbox-group>
+                </div>
+              </template>
+              <template v-slot:limit="slotProps">
+                <div class="text-center" v-if="slotProps.row.title !== '首页'">
+                  <el-radio-group v-model="slotProps.row.limitCheckList">
+                    <el-radio :label="1">个人</el-radio>
+                    <el-radio :label="2">部门</el-radio>
+                    <el-radio :label="3">公司</el-radio>
+                    <el-radio :label="4">项目</el-radio>
+                  </el-radio-group>
+                </div>
+              </template>
+            </TableList>
+          </div>
+        </div>
+
+        <div class="itemBox">
+          <div class="contBox">
+            <el-button type="primary" plain @click="closeEvent" size="large">&nbsp;&nbsp;取消&nbsp;&nbsp;</el-button>
+            <el-button type="primary" @click="confirmEvent" size="large">&nbsp;&nbsp;确定&nbsp;&nbsp;</el-button>
+          </div>
+        </div>
+      </div>
+      </template>
+    </Drawer>
+  </div>
+</template>
+<script setup lang="ts">
+import {getCurrentInstance, nextTick, reactive, ref} from "vue";
+import Drawer from '@/components/capsulationMoudle/_drawer.vue'
+import Input from '@/components/capsulationMoudle/_input.vue'
+import {menuParam, reactiveTableAndAny} from "@/api/ApiModel";
+import TableList from '@/components/capsulationMoudle/tableList.vue'
+import {ElMessage} from "element-plus";
+import {Api} from "@/api/api";
+import {publicTableTs} from "@/components/businessMoudle/tableInfo";
+
+const { proxy } = getCurrentInstance() as any;
+// 全局方法定义
+const NumberHandle = proxy.$NumberHandle
+
+const emit = defineEmits<{
+  (event: "init"): void;
+}>();
+
+const props = withDefaults(defineProps<{
+  folderObj?:any
+}>(), {
+  folderObj:{}
+})
+
+const loading = ref<boolean>(false)
+// 表格数据公共ts
+const descolParams = reactive([
+  { name:'功能模块',column:'title',},
+  { name:'页面范畴',column:'subPage',slotFlag: true},
+  { name:'数据权限',column:'limit',slotFlag: true},
+])
+const { tableInfo,tableListRef,total } = publicTableTs(descolParams)
+
+const pageInfo = reactive<reactiveTableAndAny>({
+  title:'新增权限',
+  menuList:[],
+  editId:-1
+})
+
+// 切换显隐
+const drawer_show = ref<boolean>(false)
+const switchShow = (val:boolean,item?:any)=>{
+  drawer_show.value = val
+  nextTick(async ()=>{
+    if(val){
+      await getMenuList()
+      if(item!.id){
+        pageInfo.editId = item!.id
+        InputRef_name.value!.value = item.name
+        InputRef_note.value!.value = item.note
+        pageInfo.menuList.forEach(sub=>{
+          for(let i in item.permission_levels){
+            if(sub.levelName == i){
+              sub.limitCheckList = item.permission_levels[i]
+            }
+          }
+        })
+      }else{
+        pageInfo.editId =  -1
+        InputRef_name.value!.value = ''
+        InputRef_note.value!.value = ''
+      }
+
+    }
+  })
+}
+
+const closeEvent = () => {
+  drawer_show.value = false
+}
+const InputRef_name = ref<{value:string}>()
+const InputRef_note = ref<{value:string}>()
+const confirmEvent = async () => {
+  loading.value = true
+  let ids:any = []
+  let levels:any = {}
+  pageInfo.menuList.forEach(item=>{
+    ids = ids.concat(item.pageCheckList)
+    let newObj:any = {}
+    newObj[item.levelName] = item.limitCheckList
+    levels = Object.assign(levels,newObj)
+  })
+  const paramsModel = reactive<menuParam>({
+    name:InputRef_name.value!.value,
+    note:InputRef_note.value!.value,
+    permission_ids:ids,
+    permission_levels:JSON.stringify(levels),
+  })
+  let api = Api.limit_add
+  if(pageInfo.editId > 0){
+    api = Api.limit_edit
+    paramsModel.id = pageInfo.editId
+  }
+  let res:any = await proxy.$http.post(api,paramsModel)
+  loading.value = false
+  ElMessage.info(res.errMsg)
+  if(res&&res.errNo=='0'){
+    closeEvent()
+    emit('init')
+  }
+}
+
+
+
+//菜单列表
+const getMenuList = async () => {
+  let res:any = await proxy.$http.get(Api.menu_list)
+  if(res&&res.errNo=='0'){
+    pageInfo.menuList = res.rst
+    pageInfo.menuList.forEach(sub=>{
+      if(sub.title == '首页'){
+        sub.subList = [{id:7,title:'首页'}]
+      }else{
+        getSubMenuList(sub.id).then(result =>{
+          sub.subList = result
+        })
+        if(sub.title == '广告管理'){
+          sub.levelName = 'ad'
+        }else if(sub.title == '系统管理'){
+          sub.levelName = 'system'
+        }else if(sub.title == '素材管理'){
+          sub.levelName = 'material'
+        }
+      }
+    })
+  }
+}
+
+//子菜单列表
+const getSubMenuList = async (id:number) => {
+  const paramsModel = reactive<menuParam>({
+    parent_id:id,
+  })
+  let res:any = await proxy.$http.get(Api.menu_list,paramsModel)
+  return res&&res.errNo=='0' ? res.rst : []
+}
+
+// 父组件共享值
+defineExpose({
+  switchShow,
+});
+</script>
+<style scoped lang="scss">
+.addPageBox{
+  :deep(.el-drawer__header){
+    margin-bottom: 0;
+    background-color: #fff;
+    padding-bottom: 20px;
+    color: #161E46;
+    font-weight: 600;
+  }
+  :deep(.el-drawer__body){
+    background-color: #F7F7F7;
+  }
+}
+
+.itemBox{
+  margin-bottom: 10px;
+  .title{
+    width: 100%;
+    padding: 27px 33px 10px;
+    font-weight: 600;
+    font-size: 16px;
+  }
+  .contBox{
+    background-color: #fff;
+    padding: 18px 33px;
+  }
+}
+</style>

src/components/businessMoudle/limitManage/index.vue

@@ -13,17 +13,21 @@
   >
     <template v-slot:operate="slotProps">
       <div class="text-center">
-        <span class="operate_text lMar8 pointer" @click="editEvent(slotProps.row)">编辑</span>
+        <span class="operate_text lMar8 pointer" @click="limitsAdd(slotProps.row)">编辑</span>
         <Popconfirm @confirm="deleEvent(slotProps.row)"/>
       </div>
     </template>
   </TableList>
+
+
+  <AddPage ref="AddPageRef" @init="init"></AddPage>
 </template>
 <script setup lang="ts">
 import {nextTick, onMounted, reactive, ref, getCurrentInstance} from 'vue'
 import Popconfirm from '@/components/capsulationMoudle/_popconfirm.vue'
 import TableList from '@/components/capsulationMoudle/tableList.vue'
-import { adqParam, reactiveTableAndAny} from "@/api/ApiModel";
+import AddPage from './addPage.vue'
+import {departParams} from "@/api/ApiModel";
 import {Api} from "@/api/api";
 import {ElMessage} from "element-plus";
 import { publicTableTs } from '@/components/businessMoudle/tableInfo'
@@ -33,31 +37,30 @@ const { proxy } = getCurrentInstance() as any;
 
 // 表格数据公共ts
 const descolParams = reactive([
-  { name:'权限名称',column:'account_name',},
-  { name:'描述',column:'account_id',cancleForMat:true},
+  { name:'权限名称',column:'name',},
+  { name:'描述',column:'note',cancleForMat:true},
   { name:'更新时间',column:'created_at'},
   { name:'操作',column:'operate',slotFlag: true},
 ])
 const { tableInfo,tableListRef,total } = publicTableTs(descolParams)
 
-const limitsAdd = () => {
 
+const AddPageRef = ref<{switchShow:(val:boolean,item?:any)=>void}>()
+const limitsAdd = (item?:any) => {
+  nextTick(()=>{
+    AddPageRef.value!.switchShow(true,item||'')
+  })
 }
 
 const InputRef_text = ref<{value:string}>()
 
 //账号列表
-const init = async (page?:any,pageSize?:any) => {
+const init = async () => {
   tableListRef.value!.loading = true
-  const paramsModel = reactive<adqParam>({
-    page:page?page:1,
-    page_size:pageSize?pageSize:20,
-  })
-  let res:any = await proxy.$http.get(Api.adq_list,paramsModel)
+  let res:any = await proxy.$http.get(Api.limit_list)
   tableListRef.value!.loading = false
   if(res&&res.errNo=='0'){
-    tableInfo.tableList = res.rst.data
-    total.value = res.rst.pageInfo.total
+    tableInfo.tableList = res.rst
   }else{
     ElMessage.error(res.errMsg)
   }
@@ -65,10 +68,10 @@ const init = async (page?:any,pageSize?:any) => {
 
 const deleEvent = async (item:any) => {
   tableListRef.value!.loading = true
-  const paramsModel = reactive<adqParam>({
-    account_id:item.id
+  const paramsModel = reactive<departParams>({
+    id:item.id
   })
-  let res:any = await proxy.$http.post(Api.adq_dele,paramsModel)
+  let res:any = await proxy.$http.post(Api.limit_dele,paramsModel)
   tableListRef.value!.loading = false
   ElMessage.info(res.errMsg)
   if(res&&res.errNo=='0'){
@@ -76,9 +79,6 @@ const deleEvent = async (item:any) => {
   }
 }
 
-const editEvent = (item:any) => {
-
-}
 
 
 onMounted( async ()=>{

src/components/businessMoudle/memberManage/dialog/addMember.vue

@@ -8,20 +8,24 @@
           dialog-title="添加人员">
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
-        <Input ref="nameRef" spanTitleWidth="50px" title="用户名" :haveTag="true"/>
-        <Input ref="nameRef" spanTitleWidth="50px" title="密码" :haveTag="true"/>
-        <div class="flex">
-          <Input ref="nameRef" spanTitleWidth="50px" title="部门" :haveTag="true"/>
-          <span>
-            <el-icon :size="20"><i-ep-Plus/></el-icon>
-            添加部门
-          </span>
+        <Input ref="nameRef" spanTitleWidth="80px" title="用户名" :haveTag="true"/>
+        <Input ref="psdRef" spanTitleWidth="80px" class="tMar20" title="密码" :haveTag="true"/>
+        <div class="flex tMar20">
+          <span class="spanTitle f14" style="width: 80px;">部门</span>
+          <el-tree-select v-model="pageInfo.treeValue"
+                          filterable
+                          :highlight-current="true"
+                          :props="defaultProps"
+                          node-key="id"
+                          :data="pageInfo.departList"
+                          :render-after-expand="false" />
         </div>
         <Select ref="ideaManRef"
+                spanTitleWidth="80px"
+                class="tMar20"
                 :clearFlag="true"
                 title="权限"
-                :optObj="{k:'id',la:'username',val:'id'}"
-                @changeEvent="init()" @clearEvent="init()"
+                :optObj="{k:'id',la:'name',val:'id'}"
                 :options="pageInfo.limitList"/>
 
       </div>
@@ -35,7 +39,7 @@ import Dialog from '@/components/capsulationMoudle/_dialog.vue'
 import Input from '@/components/capsulationMoudle/_input.vue'
 import {getCurrentInstance, nextTick, onMounted, reactive, ref} from "vue";
 import {ElMessage} from "element-plus";
-import {fileParam, reactiveTableAndAny} from "@/api/ApiModel";
+import {departParams, fileParam, reactiveTableAndAny} from "@/api/ApiModel";
 import {Api} from "@/api/api";
 
 const { proxy } = getCurrentInstance() as any;
@@ -47,12 +51,22 @@ const emit = defineEmits<{
 }>();
 
 
+const defaultProps = {
+  children: 'childs',
+  label: 'name',
+}
+
 const pageInfo = reactive<reactiveTableAndAny>({
-  limitList:[]
+  limitList:[],
+  departList:[],
+  editId:-1,
+  treeValue:''
 })
 
 const nameRef=ref<{value:string}>()
-const markRef=ref<{value:string}>()
+const psdRef=ref<{value:string}>()
+const bumenRef=ref<{value:string}>()
+const ideaManRef=ref<{value:string}>()
 const loading=ref<boolean>(false)
 const confirmEvent = async () => {
   if(nameRef.value!.value==''){
@@ -60,12 +74,18 @@ const confirmEvent = async () => {
     return
   }
   loading.value = true
-  const paramsModel = reactive<fileParam>({
-    pid:0,
-    name:nameRef.value!.value,
-    remarks:markRef.value!.value,
+  const paramsModel = reactive<departParams>({
+    username:nameRef.value!.value,
+    password:psdRef.value!.value,
+    department_id:pageInfo.treeValue+'',
+    role_id:ideaManRef.value!.value,
   })
-  let res:any = await proxy.$http.post(Api.file_add,paramsModel)
+  let api:string = Api.user_add
+  if(pageInfo.editId > 0){
+    api = Api.user_edit
+    paramsModel.id = pageInfo.editId
+  }
+  let res:any = await proxy.$http.post(api,paramsModel)
   loading.value = false
   if(res&&res.errNo=='0'){
     let resNew:any = res.rst
@@ -76,14 +96,45 @@ const confirmEvent = async () => {
   }
 }
 
+const init_depart = async () => {
+  let res:any = await proxy.$http.get(Api.depart_list)
+  if(res&&res.errNo=='0'){
+    let resNew:any = res.rst
+    pageInfo.departList = resNew
+  }else{
+    ElMessage.error(res.errMsg)
+  }
+}
 
+const init_limit = async () => {
+  let res:any = await proxy.$http.get(Api.limit_list)
+  if(res&&res.errNo=='0'){
+    pageInfo.limitList = res.rst
+  }else{
+    ElMessage.error(res.errMsg)
+  }
+}
 // 切换显隐
 const dialogShow = ref<boolean>(false)
-const switchShow = (val:boolean)=>{
+const switchShow = (val:boolean,item?:any)=>{
   dialogShow.value = val
   if(val){
     nextTick(()=>{
-      nameRef.value!.value = ''
+      init_limit()
+      init_depart()
+      if(item!.id){
+        pageInfo.editId = item!.id
+        nameRef.value!.value = item!.username
+        psdRef.value!.value = ''
+        pageInfo.treeValue = item!.department_id
+        ideaManRef.value!.value = item!.role_id
+      }else{
+        pageInfo.editId =  -1
+        nameRef.value!.value = ''
+        psdRef.value!.value = ''
+        pageInfo.treeValue = ''
+        ideaManRef.value!.value = ''
+      }
     })
   }
 }

src/components/businessMoudle/memberManage/index.vue

@@ -1,19 +1,15 @@
 <template>
+
   <div class="screenBox_mini tMar0">
-    <Select ref="ideaManRef"
-            :clearFlag="true"
-            title="账号状态"
-            selectWidth="160px"
-            :optObj="{k:'id',la:'username',val:'id'}"
-            @changeEvent="init()" @clearEvent="init()"
-            :options="pageInfo.accStatusList"/>
-    <Input ref="InputRef_text" title="" placeholderTxt="用户名或邮箱" @changeEvent="init()" @clearEvent="init()"/>
+    <Input ref="InputRef_text" title="" placeholderTxt="名称" @changeEvent="init()" @clearEvent="init()"/>
   </div>
+
+
+
   <div class="albumBox flex">
     <div class="albumTree">
       <div class="title flex">
         <el-button type="primary" plain @click="newAddEvent">添加部门</el-button>
-        <Input ref="InputRef_text" title="" placeholderTxt="搜索部门" @changeEvent="init()" @clearEvent="init()"/>
       </div>
       <div class="companyBox">北京酷炫网络技术股份有限公司</div>
       <div class="treeBox" v-loading="treeLoading">
@@ -43,7 +39,6 @@
     <div class="albumContent">
       <div class="title flex">
         <el-button type="primary" @click="newAddEvent_member">新增成员</el-button>
-        <el-button type="primary" plain @click="startEvent">启用</el-button>
       </div>
       <div class="contentBox tMar10" v-loading="fileLoading">
         <!--  列表-->
@@ -56,9 +51,7 @@
         >
           <template v-slot:operate="slotProps">
             <div class="text-center">
-              <span class="operate_text lMar8">编辑</span>
-              <Popconfirm key="psd" popTxt="重置密码" @confirm="resetPsd(slotProps.row)"/>
-              <Popconfirm key="ty" popTxt="停用" @confirm="outService(slotProps.row)"/>
+              <span class="operate_text lMar8" @click="newAddEvent_member(slotProps.row)">编辑</span>
             </div>
           </template>
         </TableList>
@@ -68,6 +61,8 @@
 
 <!--  添加部门-->
   <AddDepartment ref="AddDepartmentRef" @init="init"></AddDepartment>
+  <!--  添加部门-->
+  <AddMember ref="AddMemberRef" @init="initList"></AddMember>
 </template>
 <script setup lang="ts">
 import {getCurrentInstance, nextTick, onMounted, reactive, ref} from "vue";
@@ -81,6 +76,7 @@ import {ElMessage} from "element-plus";
 import {publicTableTs} from "@/components/businessMoudle/tableInfo";
 import Popconfirm from '@/components/capsulationMoudle/_popconfirm.vue'
 import AddDepartment from '@/components/businessMoudle/memberManage/dialog/addDepartment.vue'
+import AddMember from '@/components/businessMoudle/memberManage/dialog/addMember.vue'
 
 const { proxy } = getCurrentInstance() as any;
 // 全局方法定义
@@ -100,6 +96,7 @@ const pageInfo = reactive<reactiveTableAndAny>({
   treeId:0,
   accStatusList:[]
 })
+const InputRef_text = ref<{value:string}>()
 const currentPage = ref<number>(1)
 const pageSize = ref<number>(20)
 const fileLoading = ref<boolean>(false)
@@ -108,14 +105,15 @@ const treeLoading = ref<boolean>(false)
 
 // 表格数据公共ts
 const descolParams = reactive([
-  { name:'用户名',column:'account_name',},
-  { name:'部门',column:'account_id'},
-  { name:'权限',column:'type_name',},
-  { name:'状态',column:'username',},
+  { name:'用户名',column:'username',},
+  { name:'部门',column:'department'},
+  { name:'权限',column:'role',},
   { name:'操作',column:'operate',slotFlag: true},
 ])
 const { tableInfo,tableListRef,total } = publicTableTs(descolParams)
 
+
+
 // 专辑树点击
 interface Tree {
   label: string
@@ -123,6 +121,7 @@ interface Tree {
 }
 
 const AddDepartmentRef = ref<{switchShow:(val:boolean,info?:any)=>void}>()
+const AddMemberRef = ref<{switchShow:(val:boolean,info?:any)=>void}>()
 const newAddEvent = () => {
   nextTick(()=>{
     AddDepartmentRef.value!.switchShow(true)
@@ -152,8 +151,10 @@ const deleDepart = async (id:any) => {
     ElMessage.error(res.errMsg)
   }
 }
-const newAddEvent_member = () => {
-
+const newAddEvent_member = (item?:any) => {
+  nextTick(()=>{
+    AddMemberRef.value!.switchShow(true,item)
+  })
 }
 const startEvent = () => {
 
@@ -166,10 +167,21 @@ const init = async () => {
   if(res&&res.errNo=='0'){
     let resNew:any = res.rst
     pageInfo.treeList = resNew
-    // if(pageInfo!.treeList!.length>0){
-    //   pageInfo.treeId = pageInfo.treeList[pageInfo.treeList.length-1].id
-    //   nextTick(()=>{treeRef.value!.setCurrentKey(pageInfo.treeId)})
-    // }
+  }else{
+    ElMessage.error(res.errMsg)
+  }
+}
+
+const initList = async () => {
+  fileLoading.value = true
+  const paramsModel = reactive<departParams>({
+    keyword:InputRef_text.value!.value,
+  })
+  let res:any = await proxy.$http.get(Api.user_list,paramsModel)
+  fileLoading.value = false
+  if(res&&res.errNo=='0'){
+    let resNew:any = res.rst
+    tableInfo.tableList = resNew
   }else{
     ElMessage.error(res.errMsg)
   }
@@ -187,6 +199,7 @@ const outService = (item:any)=>{
 onMounted(()=>{
   nextTick(async ()=>{
     await init()
+    await initList()
   })
 })
 </script>

src/components/businessMoudle/projectManage/dialog/addProject.vue

@@ -11,15 +11,14 @@
     <template v-slot:content>
       <div class="dialogBox" v-loading="loading">
         <Input ref="nameRef" spanTitleWidth="80px" inputWidth="80%" title="项目名称" :haveTag="true" :haverMar15="false"/>
-        <Input ref="nameRef" class="tMar20" spanTitleWidth="80px" inputWidth="80%" title="备注" :haverMar15="false"/>
+        <Input ref="noteRef" class="tMar20" spanTitleWidth="80px" inputWidth="80%" title="备注" :haverMar15="false"/>
         <Select ref="ideaManRef"
                 class="tMar20"
                 :clearFlag="true"
                 title="项目负责人"
                 selectWidth="190px"
                 :optObj="{k:'id',la:'username',val:'id'}"
-                @changeEvent="init()" @clearEvent="init()"
-                :options="pageInfo.chargeList"/>
+                :options="pageInfo.userList"/>
 
         <div class="flex tMar20" style="align-items: flex-start">
           <span class="spanTitle f14" style="width: 80px;">项目负责人</span>
@@ -31,35 +30,38 @@
                           :title="coverRadioList.name"
                           @returnEvent="val=>{coverRadioList.radioVal = val}"></RadioGroup>
             </div>
-            <template v-show="coverRadioList.radioVal == 'appiont'">
+            <div v-show="coverRadioList.radioVal == '2'">
               <div class="cascader-container left">
                 <div class="cascader-title">
-                  <div class="tab-label active"> 部门 </div>
-                  <div class="tab-label"> 人员 </div>
+                  <span class="tab-label" :class="pageInfo.titleAc == '1' ? 'active' : ''" @click="pageInfo.titleAc = '1'"> 部门 </span>
+                  <span class="tab-label" :class="pageInfo.titleAc == '2' ? 'active' : ''" @click="pageInfo.titleAc = '2'"> 人员 </span>
                 </div>
-                <div class="cascader-list">
-                  <el-tree :data="pageInfo.treeList" :props="defaultProps" show-checkbox />
+                <div class="cascader-list" v-show="pageInfo.titleAc == '1'">
+                  <el-tree ref="treeCascaderRef" @change="handleChange" node-key="id" :data="pageInfo.treeList" :props="defaultProps" show-checkbox />
                 </div>
-                <div class="cascader-list member-parent">
-
+                <div class="cascader-list member-parent" v-show="pageInfo.titleAc == '2'">
+                  <el-tree ref="treeCascaderRef_user" @change="handleChange_user" node-key="id" :data="pageInfo.userList" :props="defaultProps_user" show-checkbox />
                 </div>
-
               </div>
               <div class="cascader-container right">
                 <div class="cascader-title">
-                  <span>已选可见人员(4)</span>
-                  <span class="clear">清空</span>
+                  <span>已选可见人员({{pageInfo.chooseMemberList.length + pageInfo.chooseMemberList_user.length}})</span>
+                  <span class="clear" @click="clearEvent">清空</span>
                 </div>
                 <div class="cascader-list">
-                  <div class="choose-member">
+                  <div class="choose-member" v-for="item in pageInfo.chooseMemberList" :key="item.id">
+                    <p class="choose">
+                      <span class="ellipsis">{{item.name || '-'}}</span>
+                    </p>
+                  </div>
+                  <div class="choose-member" v-for="item in pageInfo.chooseMemberList_user" :key="item.id">
                     <p class="choose">
-                      <span class="ellipsis"></span><el-icon :size="14" color="#999" class="pointer"><i-ep-Close /></el-icon>
+                      <span class="ellipsis">{{item.username || '-'}}</span>
                     </p>
                   </div>
                 </div>
-
               </div>
-            </template>
+            </div>
           </div>
         </div>
 
@@ -90,6 +92,10 @@ const defaultProps = {
   children: 'childs',
   label: 'name',
 }
+const defaultProps_user = {
+  children: 'childs',
+  label: 'username',
+}
 interface radioFace{
   value:number | string,
   name:string,
@@ -102,11 +108,11 @@ const coverRadioList = reactive<radioFace>({
   value:1,
   name:'项目负责人',
   EgName:'cover',
-  radioVal:'all',
+  radioVal:'1',
   haveNotes:false,
   list:[
-    {name:'所有人可见',value:'all'},
-    {name:'指定成员可见',value:'appiont'},
+    {name:'所有人可见',value:'1'},
+    {name:'指定成员可见',value:'2'},
   ]
 })
 
@@ -117,8 +123,35 @@ const pageInfo = reactive<reactiveTableAndAny>({
   title:'新增项目',
   chargeList:[],
   visibleVal:'',
+  titleAc:'1',
+  chooseMemberList:[],
+  chooseMemberList_user:[],
+  userList:[]
 })
 
+const clearEvent = () => {
+  nextTick(()=>{
+    pageInfo.chooseMemberList = []
+    pageInfo.chooseMemberList_user = []
+    treeCascaderRef.value!.setCheckedNodes([])
+    treeCascaderRef_user.value!.setCheckedNodes([])
+  })
+}
+
+const treeCascaderRef = ref()
+const treeCascaderRef_user = ref()
+const handleChange = (val:any) => {
+  nextTick(()=>{
+    pageInfo.chooseMemberList = treeCascaderRef.value!.getCheckedNodes()
+  })
+}
+
+const handleChange_user = () => {
+  nextTick(()=>{
+    pageInfo.chooseMemberList_user = treeCascaderRef_user.value!.getCheckedNodes()
+  })
+}
+
 const init = async () => {
   let res:any = await proxy.$http.get(Api.depart_list)
   if(res&&res.errNo=='0'){
@@ -129,8 +162,20 @@ const init = async () => {
   }
 }
 
+const init_userList = async () => {
+  let res:any = await proxy.$http.get(Api.user_list)
+  if(res&&res.errNo=='0'){
+    let resNew:any = res.rst
+    pageInfo.userList = resNew
+  }else{
+    ElMessage.error(res.errMsg)
+  }
+}
+
 const treeValue=ref('')
 const nameRef=ref<{value:string}>()
+const noteRef=ref<{value:string}>()
+const ideaManRef=ref<{value:any}>()
 const loading=ref<boolean>(false)
 const confirmEvent = async () => {
   if(nameRef.value!.value==''){
@@ -138,14 +183,18 @@ const confirmEvent = async () => {
     return
   }
   loading.value = true
-  let api:string = Api.depart_add
+  let api:string = Api.project_add
   const paramsModel = reactive<departParams>({
-    pid:treeValue.value,
     name:nameRef.value!.value,
+    note:noteRef.value!.value,
+    head_user_id:ideaManRef.value!.value,
+    show_type:coverRadioList.radioVal,
+    department_ids:pageInfo.chooseMemberList.map((el)=>{return el.id}),
+    user_ids:pageInfo.chooseMemberList_user.map((el)=>{return el.id}),
   })
   if(pageInfo.editId){ // 编辑
     paramsModel.id = pageInfo.editId
-    api = Api.depart_edit
+    api = Api.project_edit
   }
   let res:any = await proxy.$http.post(api,paramsModel)
   loading.value = false
@@ -166,13 +215,24 @@ const switchShow = (val:boolean,info?:any)=>{
   if(val){
     nextTick(async ()=>{
       nameRef.value!.value = ''
+      noteRef.value!.value = ''
+      ideaManRef.value!.value = ''
+      coverRadioList.radioVal = '1'
+      pageInfo.chooseMemberList = []
+      pageInfo.chooseMemberList_user = []
       treeValue.value = ''
       pageInfo.editId = ''
+      pageInfo.title = '新增项目'
       await init()
+      await init_userList()
       if(info?.id){ // 编辑
         pageInfo.editId = info?.id
         nameRef.value!.value = info.name
-        treeValue.value = info.pid
+        noteRef.value!.value = info.note
+        ideaManRef.value!.value = info.head_user_id
+        coverRadioList.radioVal = info.show_type + ''
+        pageInfo.chooseMemberList = []
+        pageInfo.chooseMemberList_user = []
         pageInfo.title = '编辑项目'
       }
     })

src/components/businessMoudle/projectManage/index.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="screenBox flex">
+    <Input ref="InputRef_text" title="项目名称" placeholderTxt="项目名称" @changeEvent="init()" @clearEvent="init()"/>
+
     <el-button type="primary" class="lMarauto"  @click="addEvent()">新增项目</el-button>
   </div>
 
@@ -13,7 +15,7 @@
   >
     <template v-slot:operate="slotProps">
       <div class="text-center">
-        <span class="operate_text lMar8 pointer" @click="editEvent(slotProps.row)">编辑</span>
+        <span class="operate_text lMar8 pointer" @click="addEvent(slotProps.row)">编辑</span>
         <Popconfirm @confirm="deleEvent(slotProps.row)"/>
       </div>
     </template>
@@ -24,9 +26,10 @@
 </template>
 <script setup lang="ts">
 import {nextTick, onMounted, reactive, ref, getCurrentInstance} from 'vue'
+import Input from '@/components/capsulationMoudle/_input.vue'
 import Popconfirm from '@/components/capsulationMoudle/_popconfirm.vue'
 import TableList from '@/components/capsulationMoudle/tableList.vue'
-import { adqParam, reactiveTableAndAny} from "@/api/ApiModel";
+import {adqParam, departParams, reactiveTableAndAny} from "@/api/ApiModel";
 import {Api} from "@/api/api";
 import {ElMessage} from "element-plus";
 import { publicTableTs } from '@/components/businessMoudle/tableInfo'
@@ -37,16 +40,19 @@ const { proxy } = getCurrentInstance() as any;
 
 // 表格数据公共ts
 const descolParams = reactive([
-  { name:'权限名称',column:'account_name',},
-  { name:'描述',column:'account_id',cancleForMat:true},
-  { name:'更新时间',column:'created_at'},
+  { name:'项目名称',column:'name',},
+  { name:'备注',column:'note',cancleForMat:true},
+  { name:'项目负责人',column:'head_user'},
+  { name:'创建人',column:'create_user'},
+  { name:'创建时间',column:'created_at'},
+  { name:'关联账户数',column:'account_num'},
   { name:'操作',column:'operate',slotFlag: true},
 ])
 const { tableInfo,tableListRef,total } = publicTableTs(descolParams)
 
-const addEvent = () => {
+const addEvent = (item?:any) => {
   nextTick(()=>{
-    AddProjectRef.value!.switchShow(true)
+    AddProjectRef.value!.switchShow(true,item||'')
   })
 }
 
@@ -57,15 +63,13 @@ const InputRef_text = ref<{value:string}>()
 //账号列表
 const init = async (page?:any,pageSize?:any) => {
   tableListRef.value!.loading = true
-  const paramsModel = reactive<adqParam>({
-    page:page?page:1,
-    page_size:pageSize?pageSize:20,
+  const paramsModel = reactive<departParams>({
+    name:InputRef_text.value!.value,
   })
-  let res:any = await proxy.$http.get(Api.adq_list,paramsModel)
+  let res:any = await proxy.$http.get(Api.project_list,paramsModel)
   tableListRef.value!.loading = false
   if(res&&res.errNo=='0'){
-    tableInfo.tableList = res.rst.data
-    total.value = res.rst.pageInfo.total
+    tableInfo.tableList = res.rst
   }else{
     ElMessage.error(res.errMsg)
   }
@@ -73,10 +77,10 @@ const init = async (page?:any,pageSize?:any) => {
 
 const deleEvent = async (item:any) => {
   tableListRef.value!.loading = true
-  const paramsModel = reactive<adqParam>({
-    account_id:item.id
+  const paramsModel = reactive<departParams>({
+    id:item.id
   })
-  let res:any = await proxy.$http.post(Api.adq_dele,paramsModel)
+  let res:any = await proxy.$http.post(Api.project_dele,paramsModel)
   tableListRef.value!.loading = false
   ElMessage.info(res.errMsg)
   if(res&&res.errNo=='0'){

src/components/capsulationMoudle/_drawer.vue

@@ -1,6 +1,7 @@
 <template>
   <el-drawer :model-value="drawerShow"
              direction="rtl"
+             :close-on-click-modal="closeOnModal"
              :before-close="handleClose"
              :show-close="false"
              :size="drawerSize">
@@ -28,12 +29,14 @@ const props = withDefaults(defineProps<{
   title?: string,
   drawerShow:boolean,
   drawerSize?:string,
-  headerSlotFlag?:boolean
+  headerSlotFlag?:boolean,
+  closeOnModal?:boolean
 }>(),{
   title: '',
   drawerShow:false,
   drawerSize:'80%',
-  headerSlotFlag:false
+  headerSlotFlag:false,
+  closeOnModal:true
 })
 // 监听弹框显示
 // watch(() => props.drawerShow, isShow => {