添加成员筛选功能

src/components/newLayout/Aside.vue

@@ -18,7 +18,7 @@
         >
           <img src="../../assets/业务线选择.png" class="business-logo"><span v-show="showBizIdSelect">项目管理首页</span>
         </div>
-        {{ bizName }}
+        <span style="font-size: 16px;">{{ bizName }}</span>
         <div
           class="icon-select"
           @mouseenter="showBizIdSelect = true"

src/components/select/searchPeople.vue

@@ -17,6 +17,7 @@
       :key="item.idap"
       :label="item.name"
       :value="item.idap"
+      @click.native="$emit('memberData', item)"
     >
       <div class="item-style">
         <div class="item-detail">{{ item.deptName }}</div>
@@ -60,6 +61,7 @@ export default {
     return {
       searchValue: this.value,
       loading: false,
+      memberObj: {},
       options: [],
       firstGetArr: true // 是否第一次获取数组
     }
@@ -67,6 +69,7 @@ export default {
   watch: {
     value: {
       handler(newV, oldV) {
+        console.log(this.searchValue, newV, this.searchValue === newV)
         if (this.searchValue === newV) {
           return
         }

src/icons/svg/select-business.svg

@@ -1,10 +1,11 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12.498" height="11.601" viewBox="0 0 12.498 11.601">
+<svg xmlns="http://www.w3.org/2000/svg" width="11.735" height="10.893" viewBox="0 0 11.735 10.893">
   <g id="组_2643" data-name="组 2643" transform="translate(6386.718 121.762)">
     <g id="组_2644" data-name="组 2644" transform="translate(-6386.718 -121.762)">
-      <path id="减去_1" data-name="减去 1" d="M3.584,4.137a6.168,6.168,0,0,1-1.457-.16A4.116,4.116,0,0,1,1,3.539a2.345,2.345,0,0,1-.734-.652A1.365,1.365,0,0,1,0,2.087a1.475,1.475,0,0,1,.255-.818A2.282,2.282,0,0,1,.988.585,4.056,4.056,0,0,1,2.156.126a2.867,2.867,0,0,1,.672-.1c.1-.006.213-.013.377-.025L2.78.544C1.383.678.652,1.4.652,2.047c0,.831,1.336,1.508,2.979,1.508,1.705,0,2.958-.634,2.978-1.508a.906.906,0,0,0-.226-.624.021.021,0,0,0-.009-.012l.274-.355h0a.846.846,0,0,1,.329.255,1.037,1.037,0,0,1,.26.743,1.34,1.34,0,0,1-.279.806,2.464,2.464,0,0,1-.774.662,4.539,4.539,0,0,1-1.158.449,5.828,5.828,0,0,1-1.28.164Z" transform="translate(0 6.742)" fill="#333"/>
-      <g id="点击添加" transform="matrix(0.799, 0.602, -0.602, 0.799, 6.33, 0)">
-        <path id="路径_13033" data-name="路径 13033" d="M5.643,0H2.093a1.076,1.076,0,0,0-.979.625.455.455,0,0,0-.023.053L.142,3.532A1.169,1.169,0,0,0,.595,5.107a1.193,1.193,0,0,0,1.416-.175V7.488a1.238,1.238,0,0,0,2.475,0V5.4c2.106-.185,2.128-.188,2.143-.191A1.194,1.194,0,0,0,7.723,4.07c0-.041,0-.137-.636-3.164C6.9.224,6.534,0,5.643,0ZM1.7.906A.438.438,0,0,1,2.093.648h3.55c.7,0,.73.112.814.411.221,1.056.584,2.806.617,3.026-.01.293-.289.444-.551.487l-2.39.211a.324.324,0,0,0-.3.323V7.488a.589.589,0,0,1-1.178,0V3.407A.324.324,0,0,0,2.032,3.3L1.64,4.372a.558.558,0,0,1-.723.172.524.524,0,0,1-.25-.321.513.513,0,0,1,.054-.4.324.324,0,0,0,.028-.062L1.7.906Zm0,0" transform="translate(0 0)" fill="#333"/>
+      <path id="减去_1" data-name="减去 1" d="M3.365,3.885A5.792,5.792,0,0,1,2,3.734,3.865,3.865,0,0,1,.937,3.323a2.2,2.2,0,0,1-.689-.612A1.282,1.282,0,0,1,0,1.96a1.385,1.385,0,0,1,.239-.768A2.143,2.143,0,0,1,.928.55a3.809,3.809,0,0,1,1.1-.432A2.692,2.692,0,0,1,2.656.024c.089-.005.2-.012.354-.024l-.4.511c-1.312.126-2,.805-2,1.412,0,.781,1.255,1.416,2.8,1.416,1.6,0,2.777-.6,2.8-1.416a.851.851,0,0,0-.212-.586.02.02,0,0,0-.009-.011L6.242.993h0a.794.794,0,0,1,.309.239.974.974,0,0,1,.244.7,1.258,1.258,0,0,1-.262.757,2.314,2.314,0,0,1-.727.622,4.262,4.262,0,0,1-1.087.422,5.472,5.472,0,0,1-1.2.154Z" transform="translate(0 6.331)" fill="#409eff"/>
+      <g id="点击添加" transform="matrix(0.799, 0.602, -0.602, 0.799, 5.944, 0)">
+        <path id="路径_13033" data-name="路径 13033" d="M5.3,0H1.965a1.01,1.01,0,0,0-.919.587.427.427,0,0,0-.021.05L.134,3.316A1.1,1.1,0,0,0,.559,4.8a1.12,1.12,0,0,0,1.33-.164v2.4a1.162,1.162,0,0,0,2.324,0V5.074c1.978-.173,2-.177,2.013-.179A1.121,1.121,0,0,0,7.251,3.822c0-.038,0-.129-.6-2.971C6.476.21,6.135,0,5.3,0Zm-3.7.851A.411.411,0,0,1,1.965.609H5.3c.656,0,.686.105.764.386.207.992.548,2.635.579,2.841-.009.275-.271.417-.517.457l-2.244.2a.3.3,0,0,0-.278.3V7.031a.553.553,0,0,1-1.106,0V3.2a.3.3,0,0,0-.59-.1L1.54,4.105a.524.524,0,0,1-.679.161.492.492,0,0,1-.234-.3.482.482,0,0,1,.05-.371A.3.3,0,0,0,.7,3.536L1.595.851Zm0,0" transform="translate(0 0)" fill="#409eff"/>
       </g>
     </g>
   </g>
 </svg>
+

src/views/ToConfigure/components/AddTeamMembers.vue

@@ -72,7 +72,11 @@ export default {
     data: {
       handler(newV) {
         if (newV) {
+          console.log(newV, '团队')
           this.type = newV
+          if (this.type.optionList) {
+            this.teamMemberList.push({ ...this.type.optionList, memberName: this.type.optionList.name, memberIDAP: this.type.optionList.idap })
+          }
         }
       },
       deep: true,
@@ -81,7 +85,9 @@ export default {
   },
   methods: {
     async teamChange(val) {
-      this.teamMemberList.push(val)
+      console.log(val, 'cdscs')
+      const data = this.teamMemberList.find(item => { return item.memberIDAP === val.memberIDAP })
+      data ? this.$message('不能重复添加') : this.teamMemberList.push(val)
       this.teamData = null
       this.options = []
     },

src/views/ToConfigure/components/MemberDetails.vue

@@ -3,15 +3,16 @@
     <div class="team_space_between">
       <div style="flex: 1;display: flex; justify-content: space-start;">
         <div class="team_title">{{ titleName === '全部成员' || titleName === '未加入团队的成员' ? '成员' : '团队' }}-{{ titleName }} </div>
-        <searchPeople :value.sync="member_query_name" :size="'medium'" placeholder="人员筛选框" style="width: 30%; line-height: 40px;" @change="getMenber(member_query_name)" />
+        <searchPeople :value.sync="member_query_name" :size="'medium'" placeholder="人员筛选框" style="width: 30%; line-height: 40px;" @memberData="getOptions" @change="getMenber(member_query_name)" />
       </div>
       <el-button v-if="titleName === '全部成员' || titleName === '未加入团队的成员'" type="primary" size="mini" icon="el-icon-plus" @click="setMember({}, '添加成员')">添加成员</el-button>
-      <el-button v-else type="primary" size="mini" icon="el-icon-plus" @click="setTeamMember">添加团队成员</el-button>
+      <el-button v-else type="primary" size="mini" icon="el-icon-plus" @click="setTeamMember(1)">添加团队成员</el-button>
     </div>
     <el-main>
       <div v-if="addMember" align="center">
         <div>人员不是{{ titleName === '全部成员' ? '业务线' : '团队' }}成员！
-          <el-button v-if="titleName === '全部成员' || titleName === '未加入团队的成员'" type="text" size="mini" @click="setMember({}, '添加成员')">添加成员</el-button>
+          <el-button v-if="titleName === '全部成员' || titleName === '未加入团队的成员'" type="text" size="mini" @click="setMember(optionList, '添加成员', 1)">添加成员</el-button>
+          <el-button v-else type="text" size="mini" @click="setTeamMember(2)">添加团队成员</el-button>
         </div>
       </div>
       <el-table v-if="!addMember" :data="AllMember" max-height="610" :header-cell-style="{ backgroundColor: '#F4F4F4', color: '#444444', fontSize: '14px', fontWeight: '500'}">
@@ -89,6 +90,7 @@ export default {
       curIndex: 1,
       type: '',
       total: 0,
+      optionList: {},
       member_query_name: '', // 筛选
       memberSetupShow: false, // 团队成员移除。取消负责人。设置负责人
       teamMemberSetupShow: false, // 添加团队成员loading
@@ -158,6 +160,9 @@ export default {
       this.teamMemberSetupShow = false
       this.$emit('update')
     },
+    getOptions(val) {
+      this.optionList = val
+    },
     async getMenber(menber) {
       console.log(menber, 'cdsnckjdsnnk')
       const people = menber || ''
@@ -196,15 +201,17 @@ export default {
 
       console.log(menber)
     },
-    setMember(data, name) { // 团队成员移除。取消负责人。设置负责人
+    setMember(data, name, index) { // 团队成员移除。取消负责人。设置负责人
       data.teamName = this.titleName
       this.member_information = {
         data: data,
         name: name
       }
+      index ? this.member_information.index = index : ''
       this.memberSetupShow = true
     },
-    setTeamMember() { // 添加团队成员
+    setTeamMember(index) { // 添加团队成员
+      index === 2 ? this.type.optionList = this.optionList : delete this.type.optionList
       this.teamMemberSetupShow = true
     },
     handleSizeChange(val) {

src/views/ToConfigure/components/memberSetup.vue

@@ -76,7 +76,15 @@ export default {
   methods: {
     async teamModifyTeam() {
       this.titleName = this.type.name
-      this.type.name === '添加成员' ? '' : this.teamData = this.type.data
+      if (this.type.name === '添加成员') {
+        if (this.type.index) {
+          const data = []
+          data.push(this.type.data.idap)
+          this.$set(this.teamData, 'createMember', data)
+        }
+      } else {
+        this.teamData = this.type.data
+      }
       const res = await teamQueryTeamListBelowBiz(this.bizId)
       if (res.code === 200) {
         this.teamOption = res.data

src/views/projectManage/components/demand.vue

@@ -574,7 +574,7 @@ export default {
   opacity:1;
 }
 .demandeta {
-  font-size:12px;
+  font-size:14px;
   font-family:MicrosoftYaHei;
   line-height:14px;
   color:rgba(51,51,51,1);

src/views/projectManage/dialog_vue.vue

@@ -33,7 +33,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="业务线" prop="bizId">
-              <el-select v-model="task_form.bizId" :disabled="task_form.source !== 2" placeholder="请选择" style="width:100%" filterable @change="task_change_bizId(task_form.bizId)">
+              <el-select v-model="task_form.bizId" :disabled="tit_Name === '编辑任务' || task_form.source !== 2" placeholder="请选择" style="width:100%" filterable @change="task_change_bizId(task_form.bizId)">
                 <el-option-group v-for="group in bizList" :key="group.code" :label="group.name">
                   <el-option v-for="item in group.options" :key="item.code" :label="item.name" :value="item.code" />
                 </el-option-group>
@@ -59,7 +59,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="模块" prop="moduleIds">
-              <el-cascader v-model="task_form.moduleIds" clearable collapse-tags :props="props" :options="business_platform_Modular" placeholder="请选择" style="width: 20vw" @click.native="bugDataGet" />
+              <el-cascader v-model="task_form.moduleIds" clearable collapse-tags :props="props" :options="business_platform_Modular" placeholder="请选择" style="width: 20vw" />
             </el-form-item>
             <el-form-item label="测试负责人">
               <el-select v-model="task_form.qaOwner" filterable clearable remote placeholder="请输入姓名或邮箱前缀" :remote-method="remoteMethod1" :loading="loading" style="width: 20vw">
@@ -167,7 +167,7 @@ export default {
   },
   mounted() {
     this.get_taskSelect()
-    this.bugDataGet()
+    this.bugDataGet(this.bizId)
   },
   methods: {
     analysisBizId_id() { // 解析路由中的bizId_id
@@ -291,6 +291,7 @@ export default {
       if (res.code === 200) {
         this.demandList = res.data.filter(item => item.id !== -1)
       }
+      this.bugDataGet(biz)
     },
     create_task(e) { // 创建任务（保存）
       this.$refs['task_form'].validate((valid) => {
@@ -427,8 +428,8 @@ export default {
       e === 1 ? this.show_Client = true : ''
       e === 2 ? this.show_Client = false : ''
     },
-    bugDataGet() { // 所属模块
-      settingQueryBizModuleList(this.bizId).then(res => {
+    bugDataGet(bizId) { // 所属模块
+      settingQueryBizModuleList(bizId).then(res => {
         this.business_platform_Modular = res.data.map(item => ({
           ...item,
           value: item.id,