qinzhipeng_v 5 gadi atpakaļ
vecāks
revīzija
0beb5109cf
2 mainītis faili ar 26 papildinājumiem un 15 dzēšanām
  1. 1 1
      src/utils/request.js
  2. 25 14
      src/views/projectManage/bugList/bugindex.vue

+ 1 - 1
src/utils/request.js

@@ -117,7 +117,7 @@ service.interceptors.response.use(
         location.href = loginUrl
       }
     } else {
-      error.message = 'error'
+      error.message = '网络请求超时,请检查网络信息!'
       Message({
         message: error.message,
         type: 'warning',

+ 25 - 14
src/views/projectManage/bugList/bugindex.vue

@@ -494,10 +494,6 @@
                   >
                     <el-option v-for="item in bugEnumList" :key="item.code" :label="item.name" :value="item.code" />
                   </el-select>
-                  <!-- <el-select v-if="scope.row.isSelected" ref="inputVal" v-model="scope.row.status" size="small" @blur="selectStatus(scope.row)" @change="blurEvent(scope.row, scope.row.status)">
-                    <el-option v-for="item in bugEnumList" :key="item.code" :label="item.name" :value="item.code" @click.native="blurEvent(scope.row, scope.row.status)" />
-                  </el-select>
-                  <span v-else :style="{color: statusColors[scope.row.status % statusColors.length]}" style=" cursor: pointer;" @click="bugStatusChange(scope.row)">{{ scope.row.bugStatusName }}</span> -->
                 </template>
               </el-table-column>
               <el-table-column prop="taskName" label="所属任务" align="center" min-width="250" show-overflow-tooltip />
@@ -633,7 +629,7 @@ import {
   getFilterList,
   getFilterItem
 } from '@/api/defectManage'
-import { getCommentList } from '@/api/requirement.js'
+// import { getCommentList } from '@/api/requirement.js'
 import { memberQueryMemberInfoByIDAPorName } from '@/api/projectIndex'
 import '@/views/projectManage/bugList/css/index.css'
 export default {
@@ -872,7 +868,20 @@ export default {
         const objData = { bugBaseInfo: row, user: userData }
         bugUpdate(objData).then(res => {
           row.isSelected = !row.isSelected
-          this.getBugList()
+          if (res.code === 200) {
+            this.$message({
+              showClose: true,
+              message: res.msg,
+              type: 'success'
+            })
+          } else {
+            this.getBugList()
+            this.$message({
+              showClose: true,
+              message: res.msg,
+              type: 'error'
+            })
+          }
         })
         return
       }
@@ -895,7 +904,6 @@ export default {
           this.$message.warning('请选择缺陷原因')
         }
         this.postDialogForm()
-        this.getCommentList()
       } else if (this.statusDialogTitle === '已完成') {
         if (typeof this.statusDialogForm.bugReason === 'undefined' || this.statusDialogForm.bugReason === null) {
           this.$message.warning('请选择缺陷原因')
@@ -912,19 +920,15 @@ export default {
           return
         }
         this.postDialogForm()
-        this.getCommentList()
         this.statusDialogVisible = false
       }
-      this.getBugList()
-    },
-    getCommentList() {
-      getCommentList({ type: 2, joinId: this.staData.id }).then(res => {
-        // this.comments = res.data
-      })
     },
     postDialogForm() {
       const userData = { id: '', ename: this.userInformation, name: this.userNames }
       this.staData.status = this.statusId
+      this.staData.reasonOrDesc = this.statusDialogForm.reasonOrDesc
+      this.staData.repairResult = this.statusDialogForm.repairResult
+      this.staData.bugReason = this.statusDialogForm.bugReason
       const objData = { bugBaseInfo: this.staData, user: userData }
       bugUpdate(objData).then(res => {
         if (res.code === 200) {
@@ -935,6 +939,13 @@ export default {
             message: res.msg,
             type: 'success'
           })
+        } else if (res.code !== 200) {
+          this.$message({
+            showClose: true,
+            message: res.msg,
+            type: 'error'
+          })
+          this.getBugList()
         }
       })
     },