qinzhipeng_v@didiglobal.com %!s(int64=4) %!d(string=hai) anos
pai
achega
f8cb7bab4d
Modificáronse 3 ficheiros con 65 adicións e 8 borrados
  1. 8 0
      src/api/workSchedule.js
  2. 1 1
      src/apiConfig/api.js
  3. 56 7
      src/views/workbench/team/index.vue

+ 8 - 0
src/api/workSchedule.js

@@ -286,3 +286,11 @@ export function getStaffByUsername(name) {
     method: 'get'
   })
 }
+
+// 获取部门下子部门
+export function getSubDeptInfoByParentDeptId(id) {
+  return request({
+    url: teamWorkbenchUrl + `/api/department/getSubDeptInfoByParentDeptId?deptId=${id}`,
+    method: 'get'
+  })
+}

+ 1 - 1
src/apiConfig/api.js

@@ -17,7 +17,7 @@ export const vehicleUrl_online = 'http://10.190.9.230:9999' // 虚拟硬件 zhih
 
 export const projectManagementUrl = requestIp + '/project-management' //项目管理
 
-export const teamWorkbenchUrl = requestIp + '/ldip-server' // 团队工作台
+export const teamWorkbenchUrl = requestIp + '/ldap-server' // 团队工作台
 
 export const ldapServer = requestIp + '/ldap-server' //邮箱查询
 

+ 56 - 7
src/views/workbench/team/index.vue

@@ -3,6 +3,8 @@
     <!-- 顶部导航栏 -->
     <el-header class="main-header">
       <div class="select-group">
+        <!-- <el-cascader ref="cascader" v-model="teamDepartment" :props="departmentOption" :show-all-levels="false" class="cascader" @change="departmentChange(teamDepartment)" />
+        <span class="el-dropdown-link" style="margin-right: 20px;" @click="setCascader">{{ teamBizName.length > 11 ? teamBizName.substring(0, 11) + '...' : teamBizName }} <i class="el-icon-arrow-down" /></span> -->
         <el-cascader ref="cascader" v-model="teamNames" collapse-tags :options="options" :props="props" class="cascader" @change="handleChange(teamNames, options)" />
         <span class="el-dropdown-link" style="margin-right: 20px;" @click="setCascader">{{ teamBizName.length > 11 ? teamBizName.substring(0, 11) + '...' : teamBizName }} <i class="el-icon-arrow-down" /></span>
         <el-cascader ref="cascader" v-model="bizIdCode" collapse-tags :options="searchEnum.businesslines" :props="propsBizId" class="cascader" @change="handleBizIdChange(bizIdCode, searchEnum.businesslines)" />
@@ -206,8 +208,9 @@ import {
   getTeamBugSummary,
   getTeamBugDisDataBy,
   teamReminding,
-  settingQueryBizAndTeamInfo,
-  getStaffByUsername
+  settingQueryBizAndTeamInfo
+  // getStaffByUsername,
+  // getSubDeptInfoByParentDeptId
 } from '@/api/workSchedule'
 import { getSeprateDayInfo, scheduleDelete } from '@/api/projectViewDetails'
 import modifySchedule from '@/views/projectManage/projectList/components/modifySchedule'
@@ -265,6 +268,13 @@ export default {
       dialog_team_visible: false, // 删除日程弹窗
       // teamName: '团队', // 团队名字
       teamNames: [],
+      teamDepartment: [], // 部门
+      // departmentOption: {
+      //   checkStrictly: true,
+      //   lazy: true,
+      //   lazyLoad: this.lazyLoad
+      // }, // 部门props
+      departmentData: [],
       bizIdCode: [-1],
       teamBizName: '团队',
       bizName: '业务线', // 业务线名字
@@ -307,6 +317,7 @@ export default {
         task: false,
         bug: false
       },
+      // deptCode1: '',
       idList: {// 所选项的idList
         requireList: [],
         taskList: [],
@@ -337,6 +348,7 @@ export default {
   },
   created() {
     this.settingGetBizList()
+    // this.getStaffByUsername()
     this.$nextTick(() => {
       this.activeName = this.$route.query.page ? this.$route.query.page : '1'
     })
@@ -344,16 +356,53 @@ export default {
   mounted() {
     this.queryTeamInfoList([-1])
     this.teamReminding()
-    this.getStaffByUsername()
   },
   methods: {
     setCascader() {
       this.$refs.cascader.$el.click()
     },
-    async getStaffByUsername() {
-      const res = await getStaffByUsername('qinzhipeng_v')
-      console.log(res, 'cdcdc')
-    },
+    // getStaffByUsername() {
+    //   getStaffByUsername('qinzhipeng_v').then(res => {
+    //     if (res.code === 200) {
+    //       this.deptCode1 = res.data.deptCode1
+    //     }
+    //   })
+    // },
+    // lazyLoad(node, resolve) {
+    //   setTimeout(() => {
+    //     this.getProvence(node, resolve)
+    //   }, 1000)
+    // },
+    // test
+    // getProvence(node, resolve) {
+    //   console.log(node, resolve, 'cdscds')
+    //   console.log(this.deptCode1, 'cdslfkmvdfklvcds')
+    //   getSubDeptInfoByParentDeptId(this.deptCode1).then(e => {
+    //     console.log(e.data, '你的技术')
+    //     // if (Array.isArray(e.data)) {
+    //     // const data =
+    //     // const nodes = null
+    //     // if() {
+    //     // nodes = [{ label: '城市运输与服务技术部', leaf: false, value: res.data.deptCode1 }]
+    //     // }else {
+    //     // nodes = e.data.map(item => ({
+    //     //   value: item.deptId,
+    //     //   label: item.deptName,
+    //     //   leaf: node.level >= 5 // 5层级
+    //     // }))
+    //     // }
+    //     const nodes = e.data.map(item => ({
+    //       value: item.deptId,
+    //       label: item.deptName,
+    //       leaf: node.level >= 5 // 5层级
+    //     }))
+    //     resolve(nodes)
+    //   // }
+    //   })
+    // },
+    // departmentChange(name) {
+    //   console.log(name, 'vdvsdvsd')
+    // },
     handleBizIdChange(val, option) {
       if (val.length > 0) {
         const one = val[0]