优化排期描述

src/api/toConfigure.js

@@ -143,9 +143,9 @@ export function teamAddMemberToGroup(data) {
 }
 
 // 全部成员搜索
-export function getMembersBelowBiz(data) {
+export function getMembersBelongBiz(data) {
   return request({
-    url: TeamManagement + `/setting/getMembersBelowBiz`,
+    url: TeamManagement + `/setting/getMembersBelongBiz`,
     method: 'post',
     data
   })
@@ -159,3 +159,12 @@ export function getMembersWithoutTeam(data) {
     data
   })
 }
+
+// 团队成员搜索
+export function queryMemberInfoByIDAPorNameAndTeam(data) {
+  return request({
+    url: TeamManagement + `/member/queryMemberInfoByIDAPorNameAndTeam`,
+    method: 'post',
+    data
+  })
+}

src/views/ToConfigure/components/MemberDetails.vue

@@ -68,7 +68,7 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import { teamQueryTeamInfo, settingGetMembersBelowBiz, settingGetMembersWithoutTeam, getMembersBelowBiz, getMembersWithoutTeam } from '@/api/toConfigure.js'
+import { teamQueryTeamInfo, settingGetMembersBelowBiz, settingGetMembersWithoutTeam, getMembersBelongBiz, getMembersWithoutTeam, queryMemberInfoByIDAPorNameAndTeam } from '@/api/toConfigure.js'
 import memberSetup from './memberSetup.vue'
 import teamMember from './AddTeamMembers.vue'
 import searchPeople from '@/components/select/searchPeople' // 人员select
@@ -122,7 +122,9 @@ export default {
   },
   methods: {
     async settingGetMembersBelowBiz() {
+      console.log(this.type, 'cdscnijsdbnckj')
       if (this.bizId === -1) return
+      this.member_query_name = []
       this.addMember = false
       if (this.type === 'all') {
         this.titleName = '全部成员'
@@ -157,11 +159,14 @@ export default {
       this.$emit('update')
     },
     async getMenber(menber) {
+      console.log(menber, 'cdsnckjdsnnk')
+      const people = menber || ''
       if (this.type === 'all') {
-        const data = { bizId: this.bizId, people: menber }
-        const res = await getMembersBelowBiz(data)
+        const data = { bizId: this.bizId, people: people }
+        const res = await getMembersBelongBiz(data)
         if (res.code === 200 && res.data[0]) {
           this.AllMember = res.data
+          this.total = res.total
           this.addMember = false
         } else {
           this.addMember = true
@@ -169,7 +174,24 @@ export default {
       } else if (this.type === 'not') {
         const data = { bizId: this.bizId, memberIDAP: menber, pageSize: 10, curIndex: 1 }
         const res = await getMembersWithoutTeam(data)
-        if (res.code === 200) this.AllMember = res.data
+        if (res.code === 200 && res.data[0]) {
+          this.AllMember = res.data
+          this.total = res.total
+          this.addMember = false
+        } else {
+          this.addMember = true
+        }
+      } else {
+        const people = menber || ''
+        const data = { bizId: this.bizId, memberIDAP: people, teamId: this.type.code, needPhoto: true }
+        const res = await queryMemberInfoByIDAPorNameAndTeam(data)
+        if (res.code === 200 && res.data[0]) {
+          this.AllMember = res.data
+          this.total = res.total
+          this.addMember = false
+        } else {
+          this.addMember = true
+        }
       }
 
       console.log(menber)

src/views/projectManage/components/demand.vue

@@ -158,19 +158,13 @@
     <el-row>
       <span class="demandLayout">排期：</span>
       <span class="demandeta">{{ dataList.startTime || '' }} ~ {{ dataList.endTime }}</span>
-      <span style="color: #cccccc">{{ '(' + dataList.scheduleTimeAnnotation[-1] + ')' }}</span>
+      <span style="color: #999999; font-size: 14px;">{{ '(' + dataList.scheduleTimeAnnotation.所有 + ')' }}</span>
     </el-row>
     <el-row :gutter="20">
       <el-col v-for="(item, index) in scheduleDetail" :key="index" :span="12">
         <span class="demandLayout">{{ index }}：</span>
         <span class="demandeta">{{ item.startTime }} ~ {{ item.endTime }}</span>
-        <span v-show="index === '开发'" style="color: #cccccc">{{ '(' + dataList.scheduleTimeAnnotation[0] + ')' }}</span>
-        <span v-show="index === '用例'" style="color: #cccccc">{{ '(' + dataList.scheduleTimeAnnotation[1] + ')' }}</span>
-        <span v-show="index === '联调'" style="color: #cccccc">{{ '(' + dataList.scheduleTimeAnnotation[2] + ')' }}</span>
-        <span v-show="index === '提测'" style="color: #cccccc">{{ '(' + dataList.scheduleTimeAnnotation[3] + ')' }}</span>
-        <span v-show="index === '测试'" style="color: #cccccc">{{ '(' + dataList.scheduleTimeAnnotation[4] + ')' }}</span>
-        <span v-show="index === '准出'" style="color: #cccccc">{{ '(' + dataList.scheduleTimeAnnotation[5] + ')' }}</span>
-        <span v-show="index === '上线'" style="color: #cccccc">{{ '(' + dataList.scheduleTimeAnnotation[6] + ')' }}</span>
+        <span style="color: #999999; font-size: 14px;">{{ '(' + dataList.scheduleTimeAnnotation[index] + ')' }}</span>
       </el-col>
     </el-row>
     <el-row>

src/views/projectManage/projectList/components/scheduleList.vue

@@ -73,7 +73,7 @@
     </el-table>
     <div class="bottom-detail">
       <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #cccccc">{{ '(' + scheduleDetail.scheduleTimeAnnotation[-1] + ')' }}</span></el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>
         <el-col :span="6">

src/views/projectManage/requirement/components/scheduleList.vue

@@ -43,7 +43,7 @@
     </el-table>
     <div class="bottom-detail">
       <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #cccccc">{{ '(' + scheduleDetail.scheduleTimeAnnotation[-1] + ')' }}</span></el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2" style="width: 100px">预计上线版本：</el-col>
         <el-col :span="6">

src/views/projectManage/taskList/components/scheduleList.vue

@@ -104,7 +104,7 @@
     </el-table>
     <div class="bottom-detail">
       <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #cccccc">{{ '(' + scheduleDetail.scheduleTimeAnnotation[-1] + ')' }}</span></el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
       <el-row>预计上线版本：
         <span v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length > 0">
           <span v-for="item in scheduleDetail.preOnlineVersion" :key="item">{{ item }}</span>

src/views/projectManage/version/components/scheduleList.vue

@@ -76,7 +76,7 @@
     </el-table>
     <div class="bottom-detail">
       <el-row>交付日期：{{ scheduleDetail.endTime }}</el-row>
-      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #cccccc">{{ '(' + scheduleDetail.scheduleTimeAnnotation[-1] + ')' }}</span></el-row>
+      <el-row>排期：{{ scheduleDetail.startTime | handlerDate }} ~ {{ scheduleDetail.endTime | handlerDate }} <span style="color: #999999; font-size: 14px;">{{ '(' + scheduleDetail.scheduleTimeAnnotation.所有 + ')' }}</span></el-row>
       <el-row v-if="scheduleDetail.preOnlineVersion && scheduleDetail.preOnlineVersion.length>0">
         <el-col :span="2">预计上线版本：</el-col>
         <el-col :span="6">