洪海涛 4 years ago
parent
commit
c506e13344

+ 8 - 1
src/views/projectManage/bugList/bugindex.vue

@@ -215,6 +215,10 @@
                         :picker-options="pickerOptions"
                       />
                     </div>
+                    <div class="Layout searchItem">
+                      <div class="queryName marginLeft">标签</div>
+                      <TagSearch v-model="formInline.tags" type="BUG" placeholder="请选择" @change="query_project(form_all)" />
+                    </div>
                   </div>
                   <div align="right">
                     <el-button type="text" @click="showSaveSearch = true">保存筛选项</el-button>
@@ -284,13 +288,16 @@ import {
   getFilterItem
 } from '@/api/defectManage'
 import '@/views/projectManage/bugList/css/index.css'
+import TagSearch from '@/components/Tag/TagSearch'
+
 export default {
   components: {
     createdBug,
     normalDialog,
     filterList,
     bugTableDialog,
-    searchPeople
+    searchPeople,
+    TagSearch
   },
   data() {
     return {

+ 7 - 1
src/views/projectManage/bugList/details/index.vue

@@ -160,6 +160,9 @@
                   <el-form-item label="Hold次数">
                     <div class="bug_manage_div">{{ bug.holdCount }}</div>
                   </el-form-item>
+                  <el-form-item label="标签">
+                    <Tag v-model="bug.tags" type="BUG" @change="bugUpdate(bug,'details')" />
+                  </el-form-item>
                 </el-form>
               </el-aside>
               <el-aside width="49%">
@@ -575,6 +578,7 @@ import normalArea from '@/components/input/normalArea' // 富文本
 import 'tinymce/plugins/table'// 插入表格插件
 // import 'tinymce/themes/silver/theme'
 // import 'tinymce/icons/default/icons'
+import Tag from '@/components/Tag'
 
 document.body.onpaste = function(event) {
   const data = (event.clipboardData || window.clipboardData)
@@ -598,7 +602,8 @@ export default {
     statusChange,
     searchPeople,
     ElImageViewer,
-    normalArea
+    normalArea,
+    Tag
   },
   props: {
     id: {
@@ -1075,6 +1080,7 @@ export default {
             document.getElementsByClassName('scop')[0].scrollTop = 0
           }
           this.bug = res.data
+          this.bug.tags = res.data.tags || []
           this.bizId = this.bug.bizId
           this.bug.currentHandler = res.data.currentHandler.split(',')
           this.bug.assigner = res.data.assigner.split(',')

+ 6 - 1
src/views/projectManage/taskList/taskViewDetail.vue

@@ -796,6 +796,7 @@ export default {
       const res = await taskGet(this.taskId)
       if (res.code === 200) {
         this.form_query = res.data
+        this.form_query.tags = res.data.tags || []
         if (!this.loaded) {
           this.loaded = true
         }
@@ -1287,5 +1288,9 @@ export default {
   margin: 12px 10px 0 0;
   width: 300px;
 }
-
+.tag-from {
+  .el-form-item__content {
+    width: calc(100% - 100px);
+  }
+}
 </style>