youhua

src/views/Platform/presentation/DailyNewsAdded.vue

@@ -94,6 +94,9 @@ export default {
       var url = location.href // 获取url中"?"符后的字串
       var arr = url.split('=')
       this.fromCreateData = this.message
+      this.$nextTick(() => {
+        this.editor.value = this.fromCreateData.testExplain
+      })
       var Ts_Ids = ''
       this.fromCreateData.taskIds ? Ts_Ids = this.fromCreateData.taskIds : Ts_Ids = [Number(arr[1])]
       bugDailyList({ taskIds: Ts_Ids }).then(res => {

src/views/Platform/presentation/testPresentation.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="eleStyle">
     <div class="header_sty">
-      <!--日报报告-->
       <el-tabs v-model="activeName" style="margin: 2%; min-height: 80vh; font-size: 14px;" @tab-click="handleClick">
         <el-tab-pane label="日报报告" name="first">
           <div style="margin: 30px 0;">搜索
             <el-input v-model="state" size="medium" filterable placeholder="搜索" style="width:20%;margin: 0 10px;" @change="getList(state)" />
-            <el-button type="primary" size="medium" plain @click="getQueryData(), centerDialogVisible = true">新建日报报告</el-button>
+            <el-button type="primary" size="medium" plain @click="getQueryData(1), centerDialogVisible = true">新建日报报告</el-button>
           </div>
           <template>
             <el-table :data="tableData" size="mini" :header-cell-style="{ background: '#F2F3F6' }" fit border style="width: 100%">
@@ -37,7 +36,7 @@
         <el-tab-pane label="准出报告" name="second">
           <div style="margin: 30px 0;">搜索
             <el-input v-model="state" size="medium" filterable placeholder="搜索" style="width:20%; margin: 0 10px;" @change="getListPern(state)" />
-            <el-button type="primary" size="medium" plain @click="getQueryData(), centerDialogVisible1 = true">新建准出报告</el-button>
+            <el-button type="primary" size="medium" plain @click="getQueryData(2), centerDialogVisible = true">新建准出报告</el-button>
           </div>
           <template>
             <el-table :data="tableData1" size="mini" :header-cell-style="{ background: '#F2F3F6' }" fit border style="width: 100%">
@@ -71,7 +70,7 @@
         <el-tab-pane label="提测报告" name="third">
           <div style="margin: 30px 0;">搜索
             <el-input v-model="state" size="medium" filterable placeholder="搜索" style="width:20%; margin: 0 10px;" @change="getListTest(state)" />
-            <el-button type="primary" plain size="medium" @click="getQueryData(), centerDialogVisible2 = true">新建提测报告</el-button>
+            <el-button type="primary" plain size="medium" @click="getQueryData(3), centerDialogVisible = true">新建提测报告</el-button>
           </div>
           <template>
             <el-table :data="tableData2" size="mini" :header-cell-style="{ background: '#F2F3F6' }" fit border style="width: 100%">
@@ -101,7 +100,7 @@
           <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total2" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </el-tab-pane>
       </el-tabs>
-      <!-- 日报 -->
+      <!-- 日报/准出/提测选择任务 -->
       <el-dialog title="选择任务" :visible.sync="centerDialogVisible" width="30%" center>
         <div style="display: flex; align-items: center; justify-content: space-between; ">
           <div style="width:100px;">选择任务 :</div>
@@ -113,30 +112,6 @@
           <el-button type="primary" size="mini" @click="createPresentation(queryData.code)">创建</el-button>
         </span>
       </el-dialog>
-      <!-- 准出 -->
-      <el-dialog title="选择任务" :visible.sync="centerDialogVisible1" width="30%" center>
-        <div style="display: flex; align-items: center; justify-content: space-between; ">
-          <div style="width:100px;">选择任务 :</div>
-          <el-select v-model="queryData.ClientReport" filterable placeholder="请选择任务" size="mini" style="width:100%;">
-            <el-option v-for="item in restaurants" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button type="primary" size="mini" @click="selectionReport1(queryData.ClientReport)">创建</el-button>
-        </span>
-      </el-dialog>
-      <!-- 提测 -->
-      <el-dialog title="选择任务" :visible.sync="centerDialogVisible2" width="30%" center>
-        <div style="display: flex; align-items: center; justify-content: space-between; ">
-          <div style="width:100px;">选择任务 :</div>
-          <el-select v-model="queryData.TestReport" filterable placeholder="请选择任务" size="mini" style="width:100%;">
-            <el-option v-for="item in restaurants" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
-        </div>
-        <span slot="footer" class="dialog-footer">
-          <el-button type="primary" size="mini" @click="selectionReport(queryData.TestReport)">创建</el-button>
-        </span>
-      </el-dialog>
     </div>
     <TestReport v-if="dialogVisible1" ref="TestReport" />
     <DailyReport v-if="dialogDaily" ref="DailyReport" />
@@ -185,10 +160,9 @@ export default {
         id: '',
         name: ''
       },
-      centerDialogVisible2: false,
       data_type: {},
       total1: 0, // 准出
-      centerDialogVisible1: false,
+      ins: '',
       dialogVisible1: false, // 提测弹窗
       dialogDaily: false,
       dialogClient: false,
@@ -308,46 +282,9 @@ export default {
         this.$refs.TestReport.init(2, data)
       })
     },
-    selectionReport1(e) {
-      if (e !== '') {
-        var taskData = ''
-        this.restaurants.map(item => {
-          item.id === e ? taskData = item : ''
-        })
-        if (taskData.status !== 3) {
-          this.$message({ message: '存在状态不是【测试中】的任务，请将任务状态为【测试中】才可准出，请检查！', type: 'warning' })
-        } else {
-          this.dialogClient = true
-          this.$nextTick(() => {
-            this.$refs.ClientReport.init(7, [e])
-          })
-        }
-      } else {
-        this.$message({ message: '提示，请选择要添加的任务ID', type: 'warning' })
-        return false
-      }
-    },
-    selectionReport(e) {
-      if (e !== '') {
-        var taskData = ''
-        this.restaurants.map(item => {
-          item.id === e ? taskData = item : ''
-        })
-        if (taskData.status !== 1) {
-          this.$message({ message: '存在状态不是【开发中】的任务，请将任务状态为【开发中】才可提测，请检查！', type: 'warning' })
-        } else {
-          this.dialogVisible1 = true
-          this.$nextTick(() => {
-            this.$refs.TestReport.init(7, [e])
-          })
-        }
-      } else {
-        this.centerDialogVisible2 = true
-        this.$message({ message: '提示，请选择要添加的任务ID', type: 'warning' })
-      }
-    },
     // 获取任务数据
     getQueryData(e) {
+      this.ins = e
       this.$set(this.queryData, 'TestReport', '')
       this.$set(this.queryData, 'ClientReport', '')
       this.$set(this.queryData, 'code', '')
@@ -359,14 +296,42 @@ export default {
 
     createPresentation(e) {
       if (e !== '') {
-        this.queryData.state = ''
-        this.centerDialogVisible = false
-        this.dialogDaily = true
-        this.$nextTick(() => {
-          this.$refs.DailyReport.init(7, [e])
+        var taskData = ''
+        this.restaurants.map(item => {
+          item.id === e ? taskData = item : ''
         })
+        switch (this.ins) {
+          case 1:
+            this.dialogDaily = true
+            this.$nextTick(() => {
+              this.$refs.DailyReport.init(7, [e])
+            })
+            break
+          case 2:
+            if (taskData.status !== 3) {
+              this.$message({ message: '存在状态不是【测试中】的任务，请将任务状态为【测试中】才可准出，请检查！', type: 'warning' })
+            } else {
+              this.dialogClient = true
+              this.$nextTick(() => {
+                this.$refs.ClientReport.init(7, [e])
+              })
+            }
+            break
+          case 3:
+            if (taskData.status !== 1) {
+              this.$message({ message: '存在状态不是【开发中】的任务，请将任务状态为【开发中】才可提测，请检查！', type: 'warning' })
+            } else {
+              this.dialogVisible1 = true
+              this.$nextTick(() => {
+                this.$refs.TestReport.init(7, [e])
+              })
+            }
+            break
+        }
+        this.$set(this.queryData, 'code', '')
+        this.centerDialogVisible = false
       } else {
-        this.$message({ type: 'error', message: '请选择任务' })
+        this.$message({ message: '提示，请选择要添加的任务ID', type: 'warning' })
       }
     },
     createFilter(queryString) {