完善

src/api/requirement.js

@@ -10,7 +10,7 @@ export function getRequirement(data) {
   })
 }
 
-export function getSearchInfo() {
+export function showRequirementEnum() {
   return request({
     url: requestIp + '/config/showRequirementEnum',
     method: 'get'

src/views/projectManage/requirement/details/index.vue

@@ -119,9 +119,7 @@
           </el-row>
           <el-row v-if="requirement.dependOnRelease">
             <el-col :span="8">涉及的客户端:</el-col>
-            <el-col :span="16">
-              {{ getAppClientName() }}
-            </el-col>
+            <el-col :span="16">{{ getAppClientName() }}</el-col>
           </el-row>
         </div>
       </el-aside>
@@ -176,8 +174,7 @@
         <el-table-column prop="qaList" label="测试" min-width="10%">
           <template v-slot="scope">{{ getQaOrRdNameList(scope.row.qaList) }}</template>
         </el-table-column>
-      </el-table>
-      123
+      </el-table>123
       <el-container style="margin: 2%;font-size: 14px;color: #333333">
         <el-aside width="30%">
           <div>预期上线版本:123</div>
@@ -236,7 +233,7 @@
 <script>
 import {
   getRequirementById,
-  getSearchInfo,
+  showRequirementEnum,
   getTaskStatusMapInfo,
   getBugStatusMapInfo,
   getTaskByRequireId,
@@ -427,7 +424,7 @@ export default {
     }
   },
   mounted() {
-    this.getSearchInfo().then(res => {
+    this.showRequirementEnum().then(res => {
       this.getRequirementById()
     })
     this.getTaskStatusMapInfo()
@@ -439,6 +436,7 @@ export default {
     getCommentList() {
       getCommentList({ type: 4, joinId: this.id }).then(res => {
         this.comments = res.data
+        console.log(this.comments)
       })
     },
     addComment() {
@@ -526,8 +524,8 @@ export default {
       }
       return names.join('\n')
     },
-    getSearchInfo() {
-      return getSearchInfo().then(res => {
+    showRequirementEnum() {
+      return showRequirementEnum().then(res => {
         this.searchInfo = res.data
         for (const i in this.searchInfo.belongingProject) {
           this.projectOb[

src/views/projectManage/requirement/list/create.vue

@@ -187,6 +187,7 @@ export default {
           for (const i in this.form) {
             this.form[i] = null
           }
+          this.form.dependOnRelease = 0
         }
         this.$emit('cancel', false)
       }
@@ -198,6 +199,7 @@ export default {
     },
     confirm: function() {
       for (const i in this.form) {
+        console.log(i)
         if (!this.form[i]) {
           if (i === 'name') {
             this.$message.warning('需求名称为空，请输入需求名称')

src/views/projectManage/requirement/list/index.vue

@@ -161,7 +161,7 @@
 <script>
 import {
   getRequirement,
-  getSearchInfo,
+  showRequirementEnum,
   getMemberInfo
 } from '@/api/requirement.js'
 import RequirementCreate from './create'
@@ -215,7 +215,7 @@ export default {
     }
   },
   mounted() {
-    this.getSearchInfo().then(res => {
+    this.showRequirementEnum().then(res => {
       this.getTableData()
     })
   },
@@ -228,8 +228,8 @@ export default {
         this.loading = false
       })
     },
-    getSearchInfo() {
-      return getSearchInfo().then(res => {
+    showRequirementEnum() {
+      return showRequirementEnum().then(res => {
         this.searchInfo = res.data
         for (const i in this.searchInfo.belongingProject) {
           this.projectOb[this.searchInfo.belongingProject[i].code] = this.searchInfo.belongingProject[i].msg

src/views/projectManage/version/list/index.vue

@@ -32,7 +32,6 @@
             </el-dropdown-menu>
           </el-dropdown>
         </el-col>
-        {{ searchForm }}
       </el-row>
     </el-header>
     <el-main class="layout_main version_list_layout_main">
@@ -48,26 +47,30 @@
         :cell-style="{textAlign: 'center'}"
         @current-change="handleCurrentRowChange"
       >
-        <el-table-column prop="priority" label="优先级" min-width="8%">
+        <el-table-column prop="priority" label="优先级" min-width="6%">
           <template v-slot="scope">
             <div class="div_priority" :style="{background: priorityColors[scope.row.priority%priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="requirementName" label="需求名称" min-width="10%">
+        <el-table-column prop="requirementName" label="需求名称" min-width="20%">
           <template v-slot="scope">
             <div>
               {{ scope.row.requirementName }}
-              <div class="div_requirement_name">123</div>
+              <div v-if="scope.row.delay" class="div_requirement_name">{{ searchTitle.version +'版本已延期' }}</div>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="bizId" label="业务线" min-width="10%">
+        <el-table-column prop="bizId" label="业务线" min-width="8%">
           <template v-slot="scope">
             {{ versionEnum.bizTypeMap[scope.row.bizId] }}
           </template>
         </el-table-column>
         <el-table-column prop="pmName" label="PM" min-width="10%" />
-        <el-table-column prop="status" label="状态" min-width="10%" />
+        <el-table-column prop="status" label="状态" min-width="8%">
+          <template v-slot="scope">
+            {{ versionEnum.requirementStatusMap[scope.row.status] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="statusInfoCountList" label="任务" min-width="35%">
           <template v-slot="scope">
             <version-chart
@@ -92,7 +95,7 @@
         layout="->,total, sizes, prev, pager, next, jumper"
         :current-page="searchForm.curIndex"
         :page-size="searchForm.pageSize"
-        :page-sizes="[10,30,50,total]"
+        :page-sizes="[15,30,45,total]"
         :total="total"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -127,7 +130,7 @@ export default {
         clientType: null,
         versionType: null,
         curIndex: 1,
-        pageSize: 10
+        pageSize: 15
       },
       versionEnum: {
         requirementStatusMap: {},
@@ -270,26 +273,6 @@ export default {
     this.showVersionEnum()
   },
   methods: {
-    getPriorityTagType(priority) {
-      let type
-      switch (priority) {
-        case 0:
-          type = 'danger'
-          break
-        case 1:
-          type = 'warning'
-          break
-        case 2:
-          type = ''
-          break
-        case 3:
-          type = 'success'
-          break
-        default:
-          type = 'info'
-      }
-      return type
-    },
     handleCommand(command) {
       switch (command.flag) {
         case 1:
@@ -444,6 +427,9 @@ export default {
   margin: auto;
 }
 .div_requirement_name {
+  width:fit-content;
+  margin: auto;
+  padding: 0px 5px 0 10px;
   background: #F56C6C;
   color: #ffffff;
   -webkit-clip-path: polygon(15% 0, 100% 0, 100% 100%, 15% 100%, 0 50%);