优化

src/views/reportManagement/ReleaseReport/components/iconDisplay.vue

@@ -31,7 +31,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="bugStatusName" label="缺陷状态" align="center" min-width="100" />
-      <el-table-column prop="priorityLevel" label="缺陷等级" align="center" min-width="100" />
+      <el-table-column prop="priorityName" label="缺陷等级" align="center" min-width="100" />
       <el-table-column prop="creatorList" label="提报人" align="center" min-width="90" />
       <el-table-column prop="assignerList" label="责任人" align="center" min-width="90" />
       <el-table-column prop="currentHandlerList" label="修复人" align="center" min-width="90" />

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -52,7 +52,7 @@
       <el-row v-if="from.deliverTestPlanTime < from.deliverTestActualTime " class="from-margin">
         <el-col :span="24" class="Layout_space_between">
           <span class="from-namea"><span v-if="!releaseType" style="color:red;">*</span>提测延期原因 : </span>
-          <el-input v-model="from.delayReason" size="small" :disabled="releaseType" placeholder="请输入准出原因" style="width: 100%;" />
+          <el-input v-model="from.delayReason" size="small" :disabled="releaseType" placeholder="请输入提测原因" style="width: 100%;" />
         </el-col>
       </el-row>
 
@@ -150,7 +150,7 @@ export default {
     return {
       tableData: [],
       tpltId: '', // 模版id
-      taskId: [], // 创建准出的任务
+      taskId: [], // 创建提测的任务
       fromCreateData: {}, // from
       tasksOptions: [], // 关联任务
       tasksDetailList: [], // 关联任务
@@ -159,7 +159,7 @@ export default {
         reportName: ''
       },
       appClient: [], // 跟版客户端
-      releaseType: true, // 新建模版还是新建准出报告
+      releaseType: true, // 新建模版还是新建提测报告
       loading: false // loading状态
     }
   },
@@ -189,7 +189,6 @@ export default {
     },
     taskIds: {
       handler(newV) {
-        console.log(newV, '111111')
         if (newV[0]) {
           newV.map(item => {
             this.remoteMethod_data(item)
@@ -210,6 +209,7 @@ export default {
         const from = res.data
         this.from.id = from.id
         this.$set(this.from, 'reportName', from.reportName) // 报告名称
+        this.$set(this.from, 'delayReason', from.delayReason) // 延期原因
         this.setFromData(from)
         res.data.taskIds.map(item => {
           this.remoteMethod_data(item)
@@ -239,7 +239,6 @@ export default {
       if (from.devActualTimeStart) {
         this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
       }
-      this.$set(this.from, 'delayReason', from.delayReason) // 延期原因
       this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
       this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
       this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0：否 1：是
@@ -305,7 +304,6 @@ export default {
 
     // 创建提测报告
     reportreleaseCreate(val) {
-      console.log(val, '每次你就撒不出困境吧')
       this.$refs.fromCreateData.validate(async(valid) => {
         if (valid) {
           this.loading = true
@@ -327,6 +325,12 @@ export default {
             data.delayReason = this.from.delayReason
             data.deliverTestPlanTime = this.from.deliverTestPlanTime // 计划提测时间
             data.deliverTestActualTime = this.from.deliverTestActualTime // 实际提测时间
+            if (this.from.deliverTestPlanTime < this.from.deliverTestActualTime && !this.from.delayReason) {
+              this.$message({ type: 'warning', message: '提测延期原因不能为空' })
+              return false
+            } else {
+              data.delayReason = this.from.delayReason // 是否延期
+            }
             if (this.from.devPlanTimeStart) {
               data.devPlanTimeStart = this.from.devPlanTimeStart[0] // 计划开发开始时间
               data.devPlanTimeEnd = this.from.devPlanTimeStart[1] // 计划开发结束时间
@@ -346,7 +350,6 @@ export default {
               }
             })
           } else {
-            console.log(this.fromCreateData, 'cdsc')
             const data = {}
             data.reportName = this.from.reportName
             data.content = this.fromCreateData.content
@@ -356,6 +359,12 @@ export default {
             data.delayReason = this.from.delayReason
             data.deliverTestPlanTime = this.from.deliverTestPlanTime // 计划提测时间
             data.deliverTestActualTime = this.from.deliverTestActualTime // 实际提测时间
+            if (this.from.deliverTestPlanTime < this.from.deliverTestActualTime && !this.from.delayReason) {
+              this.$message({ type: 'warning', message: '提测延期原因不能为空' })
+              return false
+            } else {
+              data.delayReason = this.from.delayReason // 是否延期
+            }
             if (this.from.devPlanTimeStart) {
               data.devPlanTimeStart = this.from.devPlanTimeStart[0] // 计划开发开始时间
               data.devPlanTimeEnd = this.from.devPlanTimeStart[1] // 计划开发结束时间