panxiandiao_i 5 жил өмнө
parent
commit
dac4b9b223

+ 9 - 0
src/api/defectManage.js

@@ -75,3 +75,12 @@ export function bugGetEnum() {
     method: 'get'
   })
 }
+
+// 项目获取
+export function projectListOnlyInfo(data) {
+  return request({
+    url: mockUrl + '/project/listOnlyInfo',
+    method: 'post',
+    data
+  })
+}

+ 40 - 6
src/views/Platform/defectManagement.vue

@@ -8,16 +8,19 @@
             <el-input v-model="queryCode.assigner" placeholder="责任人" autocomplete="off" clearable size="medium" style="width:13%;margin-right: 15px;" />
             <el-input v-model="queryCode.creator" placeholder="提交人" autocomplete="off" clearable size="medium" style="width:13%;margin-right: 15px;" />
             <el-input v-model="queryCode.bugName" placeholder="主题" autocomplete="off" clearable size="medium" style="width:13%;margin-right: 15px;" />
-            <el-select v-model="queryCode.taskId" size="medium" style="width:15%;margin-right: 15px;" clearable filterable placeholder="任务">
-              <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
+            <el-select v-model="queryCode.projectId" size="medium" style="width:15%;margin-right: 15px;" clearable filterable placeholder="项目">
+              <el-option v-for="item in projectStr" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
+            <!-- <el-select v-model="queryCode.taskId" size="medium" style="width:15%;margin-right: 15px;" clearable filterable placeholder="任务">
+              <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select> -->
             <el-select v-model="queryCode.statusList" size="medium" style="width:17.5%;margin-right: 15px;" multiple filterable clearable collapse-tags placeholder="bug状态">
               <el-option v-for="item in bugStatusStr" :key="item.code" :label="item.name" :value="item.code" />
             </el-select>
             <el-select v-model="queryCode.priorityList" size="medium" style="width:15%;margin-right: 15px;" multiple filterable clearable collapse-tags placeholder="级别">
               <el-option v-for="item in bugStatusPriority" :key="item.code" :label="item.name" :value="item.code" />
             </el-select>
-            <el-button type="primary" size="medium" style="margin-right:10px;" icon="el-icon-plus" circle @click="timeShow = !timeShow, groupShow = !groupShow, isPlatformShow = !isPlatformShow, queryCode.platformType = '', queryCode.repairResult = '', queryCode.teamId = '', isBusinessShow === true ? isBusinessShow = false : isBusinessShow = false" />
+            <el-button type="primary" size="medium" style="margin-right:10px;" icon="el-icon-plus" circle @click="showOrHide()" />
           </div>
           <div class="set-between">
             <el-button type="primary" size="medium" plain @click="dataQuery(queryCode)">查询</el-button>
@@ -35,6 +38,9 @@
           end-placeholder="创建结束时间"
           clearable
         />
+        <el-select v-show="groupShow" v-model="queryCode.taskId" size="medium" style="width:17.5%;margin-right: 15px;" clearable filterable placeholder="任务">
+          <el-option v-for="item in taskIdStr" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
         <el-select v-if="isPlatformShow" v-model="queryCode.platformType" size="medium" style="width:17.5%;margin-right: 15px;" clearable placeholder="平台类型" @change="clickChangeBusiness(queryCode.platformType)">
           <el-option v-for="item in platformTypeStr" :key="item.code" :label="item.name" :value="item.code" />
         </el-select>
@@ -456,7 +462,7 @@
   </div></template>
 
 <script>
-import { bugList, bugGet, bugDelete, bugUpdate, bugCreate, bugCopy, taskListCreate, bugGetEnum } from '@/api/defectManage'
+import { bugList, bugGet, bugDelete, bugUpdate, bugCreate, bugCopy, taskListCreate, bugGetEnum, projectListOnlyInfo } from '@/api/defectManage'
 import { projectGetTypeMap, groupDataGet, teamMembers } from '@/api/projectPage.js'
 import axios from 'axios'
 
@@ -467,6 +473,7 @@ export default {
       isPlatformShow: false,
       isBusinessShow: false,
       groupShow: false,
+      projectStr: [],
       bugTypeStr: [],
       groupTypeStr: [],
       bugStatusStr: [],
@@ -506,6 +513,7 @@ export default {
       curIndex: 1,
       total: 0,
       show2: '',
+      indexPage: {},
       form: {
         id: ''
       },
@@ -532,7 +540,19 @@ export default {
       formUpdateValue: {},
       optionsCurrentHandlerQA: [],
       optionsCurrentHandlerRD: [],
-      queryCode: {},
+      queryCode: {
+        repairResult: '',
+        teamId: '',
+        clientType: '',
+        platformType: '',
+        taskId: '',
+        priorityList: [],
+        statusList: [],
+        projectId: '',
+        bugName: '',
+        creator: '',
+        assigner: ''
+      },
       statusShow: false,
       repairShow: false,
       timeShow: false,
@@ -569,6 +589,9 @@ export default {
         pageSize: this.pageSize,
         curIndex: this.curIndex
       }
+      projectListOnlyInfo({ bizId: this.bizJson }).then(res => {
+        res.code === 200 ? this.projectStr = res.data : this.errorFun(res.msg)
+      })
       bugList(this.indexPage).then(res => {
         if (res.code === 200) {
           this.statistics = res.query
@@ -579,6 +602,16 @@ export default {
         }
       })
     },
+    showOrHide() {
+      this.timeShow = !this.timeShow
+      this.groupShow = !this.groupShow
+      this.isPlatformShow = !this.isPlatformShow
+      this.$set(this.queryCode, 'taskId', '')
+      this.$set(this.queryCode, 'platformType', '')
+      this.$set(this.queryCode, 'repairResult', '')
+      this.$set(this.queryCode, 'teamId', '')
+      this.isBusinessShow === true ? this.isBusinessShow = false : this.isBusinessShow = false
+    },
     bugListSelect() {
       bugGetEnum().then(res => {
         this.bugStatusStr = res.data.bugEnumList
@@ -826,12 +859,13 @@ export default {
         this.businessTypeStr = this.platformTypeStr.filter(value => value.code === e)[0].child
         this.$set(this.queryCode, 'clientType', '')
       } else {
+        this.queryCode.clientType = ''
         this.isBusinessShow = false
       }
     },
     clickChangeModule(e) {
       if (!e) {
-        this.isBusinessShow = false
+        this.queryCode.clientType = ''
       }
     },
     dataQueryInSearch(e) {