qinzhipeng_v 5 years ago
parent
commit
51c9c214df

+ 9 - 9
src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -59,7 +59,7 @@
         </el-col>
         <el-col v-if="from.followVersion === 1" :span="12" class="Layout_flex_start">
           <span class="from-namer">跟版客户端</span>
-          <el-select v-model="from.involveAppString" filterable remote size="small" :disabled="releaseType" clearable placeholder="请选择" style="width: -webkit-fill-available;">
+          <el-select v-model="from.involveApp" filterable remote size="small" :disabled="releaseType" clearable placeholder="请选择" style="width: -webkit-fill-available;">
             <el-option v-for="item in appClient" :key="item.code" :label="item.msg" :value="item.code" />
           </el-select>
         </el-col>
@@ -177,9 +177,9 @@ export default {
         this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
         this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
         this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
-        this.from.involveAppString = from.involveAppString // 跟版客户端
-        this.from.followVersion = from.followVersion // 是否跟版1 跟版 2 不跟版
-        this.from.isCodeReview = from.isCodeReview // 是否code review 0:否 1:是
+        this.$set(this.from, 'involveApp', from.involveApp) // 跟版客户端
+        this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
+        this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0:否 1:是
         this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
       }
     },
@@ -193,9 +193,9 @@ export default {
         this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
         this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
         this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
-        this.from.involveAppString = from.involveAppString // 跟版客户端
-        this.from.followVersion = from.followVersion // 是否跟版1 跟版 2 不跟版
-        this.from.isCodeReview = from.isCodeReview // 是否code review 0:否 1:是
+        this.$set(this.from, 'involveApp', from.involveApp) // 跟版客户端
+        this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
+        this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0:否 1:是
         this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
       }
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })
@@ -239,7 +239,7 @@ export default {
               data.devActualTimeStart = this.from.devActualTimeStart[0] // 实际开发开始时间
               data.devActualTimeEnd = this.from.devActualTimeStart[1] // 实际开发结束时间
             }
-            data.involveAppString = this.from.involveAppString // 跟版客户端
+            data.involveApp = this.from.involveApp // 跟版客户端
             data.followVersion = this.from.followVersion // 是否跟版1 跟版 2 不跟版
             data.isCodeReview = this.from.isCodeReview // 是否code review 0:否 1:是
             data.codeReviewExecutor = this.from.codeReviewExecutor ? this.from.codeReviewExecutor.toString() : '' // 执行人
@@ -266,7 +266,7 @@ export default {
               data.devActualTimeStart = this.from.devActualTimeStart[0] // 实际开发开始时间
               data.devActualTimeEnd = this.from.devActualTimeStart[1] // 实际开发结束时间
             }
-            data.involveAppString = this.from.involveAppString // 跟版客户端
+            data.involveApp = this.from.involveApp // 跟版客户端
             data.followVersion = this.from.followVersion // 是否跟版1 跟版 2 不跟版
             data.isCodeReview = this.from.isCodeReview // 是否code review 0:否 1:是
             data.codeReviewExecutor = this.from.codeReviewExecutor ? this.from.codeReviewExecutor.toString() : '' // 执行人

+ 4 - 0
src/views/reportManagement/components/TestingReport.vue

@@ -267,6 +267,10 @@ export default {
 
     handleClose() {
       this.dialogDaliy = false
+      this.reportTamplate = false
+      this.showOne = false // 隐藏第一步
+      this.newDailyTemplate = false // 隐藏第二步
+      this.dailyPreview = false // 展示第三部
       this.$emit('getList')
     }
   }