Merge branch 'http_mock' into qz_daily_0.0.1

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

@@ -21,7 +21,7 @@
         <el-row>
           <el-col :span="24" class="task-bot">
             <span class="from-names">测试结果：</span>
-            <span class="from-value" style="color:rgba(126,211,33,1);">通过</span>
+            <span :class="{'from-value': details.passStatus === 0, 'from-value1': details.passStatus === 1}"> {{ details.passStatus === 0 ? '通过' : '不通过' }}</span>
           </el-col>
         </el-row>
 
@@ -293,9 +293,6 @@ export default {
       margin-left: 10px;
       vertical-align: sub;
     }
-    .from-value {
-      margin-left: 30px;
-    }
     .report-taskList {
       font-size: 14px;
       font-family: MicrosoftYaHei;
@@ -395,6 +392,14 @@ export default {
     margin-bottom: 10px;
   }
 }
+.from-value {
+  margin-left: 30px;
+  color: rgba(126, 211, 33, 1);
+}
+.from-value1 {
+  margin-left: 30px;
+  color: red;
+}
 .setLine {
   padding: 10px 20px;
 }

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -38,9 +38,12 @@
       <div class="backStyle">{{ !releaseType ? '报告内容' : '模版内容' }}</div>
 
       <el-row class="from-margin">
-        <el-col :span="24">
+        <el-col :span="12" :class="{ Layout_space_between: !passStatus }">
           <span class="from-name">测试结果： </span>
-          <span class="from-value">通过</span>
+          <span v-if="passStatus" :class="{'from-value': from.passStatus === 0, 'from-value1': from.passStatus === 1}">{{ from.passStatus === 0 ? '通过' : '不通过' }} <i class="el-icon-edit rele-icon" @click="passStatus = false" /></span>
+          <el-select v-else v-model="from.passStatus" size="small" style="width:100%;" placeholder="请选择" @change="passStatus = true">
+            <el-option v-for="item in options" :key="item.value" :label="item.name" :value="item.value" />
+          </el-select>
         </el-col>
       </el-row>
 
@@ -127,12 +130,16 @@ export default {
   },
   data() {
     return {
+      passStatus: true,
       tpltId: '', // 模版id
       reportId: '', // 报告id
       taskId: [], // 创建准出的任务
       content: {}, // from
-      from: {}, // from-date
+      from: {
+        passStatus: 0
+      }, // from-date
       tasksOptions: [], // 关联任务
+      options: [{ value: 0, name: '通过' }, { value: 1, name: '不通过' }],
       tasksDetailList: [], // 关联任务
       selectTask: false,
       judge: false,
@@ -217,6 +224,7 @@ export default {
       this.$set(this.from, 'delayReason', from.delayReason) // 是否延期
       this.$set(this.from, 'content', from.content) // 富文本
       this.$set(this.from, 'delayReason', from.delayReason) // 延期原因
+      this.$set(this.from, 'passStatus', from.passStatus) // 测试结果
       this.fromData.content = from.content // 富文本
       if (from.devPlanTimeStart) {
         this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发开始时间-计划开发结束时间
@@ -243,6 +251,7 @@ export default {
         this.fromData = res.data
         this.modelID = res.data.id
         this.$set(this.from, 'moduleName', res.data.moduleName)
+        this.$set(this.from, 'passStatus', 0)
       }
     },
 
@@ -336,6 +345,7 @@ export default {
             } else {
               return false
             }
+            data.passStatus = this.from.passStatus // 测试结果
             data.bizId = this.from.bizId // 业务线
             data.moduleId = this.from.moduleId // 模块id
             data.content = this.fromData.content // 富文本
@@ -384,6 +394,7 @@ export default {
             } else {
               return false
             }
+            data.passStatus = this.from.passStatus // 测试结果
             data.bizId = this.bizId // 业务线
             data.moduleId = this.fromData.id // 模块id
             data.content = this.fromData.content // 富文本
@@ -483,6 +494,10 @@ export default {
       margin-left: 30px;
       color:rgba(126,211,33,1);
     }
+    .from-value1 {
+      margin-left: 30px;
+      color:red;
+    }
   }
   .report-taskList{
     font-size:14px;
@@ -505,4 +520,9 @@ export default {
   .from-margin {
     margin-bottom:20px;
   }
+  .rele-icon {
+    margin-left: 10px;
+    color: #409EFF;
+    cursor: pointer;
+  }
 </style>

src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -25,7 +25,7 @@
       <el-row>
         <el-col :span="24">
           <span class="from-names">测试结果：</span>
-          <span class="from-value">通过</span>
+          <span :class="{'from-value': fromCreateData.passStatus === 0, 'from-value1': fromCreateData.passStatus === 1}"> {{ fromCreateData.passStatus === 0 ? '通过' : '不通过' }}</span>
         </el-col>
       </el-row>
 
@@ -174,6 +174,10 @@ export default {
     margin-left: 30px;
     color: rgba(126, 211, 33, 1);
   }
+  .from-value1 {
+    margin-left: 30px;
+    color: red;
+  }
   .report-taskList {
     font-size: 14px;
     font-family: MicrosoftYaHei;