Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/views/Platform/presentation/acceptTheReport.vue

@@ -137,12 +137,20 @@ export default {
       fromCreateData: {}
     }
   },
-  created() {
-    this.idGet()
+  watch: {
+    message: {
+      handler(newV) {
+        console.log(newV, 'ccnidsncinsdicnsidcnsdncios')
+        this.$nextTick(() => {
+          this.idGet(newV)
+        })
+      },
+      immediate: true
+    }
   },
   methods: {
-    idGet() {
-      this.fromCreateData = this.message
+    idGet(val) {
+      this.fromCreateData = val
 
       if (this.fromCreateData.type === 2) {
         this.towShow = false

src/views/projectManage/requirement/requirementDetail.vue

@@ -163,12 +163,10 @@
               <div>需求计划
                 <el-tooltip class="item" effect="dark" :content="isScheduleLocked === 1? '点击解锁排期' : '点击锁定排期'" placement="top">
                   <span
+                    v-if="!form_query.needGrey"
                     class="titleStatus"
-                    :class="[
-                      isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock',
-                      form_query.needGrey ? 'color_sty': ''
-                    ]"
-                    @click="form_query.needGrey ? changeSchedule : ''"
+                    :class="isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock'"
+                    @click="changeSchedule"
                   >
                     {{ isScheduleLocked === 1 ? '已锁定' : '未锁定' }}
                   </span>
@@ -816,15 +814,5 @@ export default {
 .el-btn-size {
    margin: 10px 30px;
 }
-
-.color_sty {
-  color: #eee;
-}
-
-//   >>>.el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label:before {
-//     content: '';
-//     color: #F56C6C;
-//     margin-right: 4px;
-// }
 </style>
 

src/views/projectManage/taskList/components/reportList.vue

@@ -6,7 +6,7 @@
           <div class="title-left-icon" />
           <div class="title-left-name">提测报告</div>
         </div>
-        <el-button class="task-report-btn" type="text" @click="getTest(10086)">{{ dataStatus?'查看历史':"回到最新" }}</el-button>
+        <el-button class="task-report-btn" type="text" @click="getTest()">{{ dataStatus?'回到最新':"查看历史" }}</el-button>
       </div>
       <div class="detail-info">
         <el-table
@@ -18,9 +18,9 @@
         >
           <el-table-column label="标题名称" min-width="120">
             <template slot-scope="scope">
-              <a v-if="dataStatus" href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 2)">{{ scope.row.reportName }}</a>
-              <a v-if="!dataStatus" href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 2)">{{ scope.row.name }}</a>
-              <br>{{ scope.row.returnReason }}
+              <a v-if="!dataStatus" href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 2)">{{ scope.row.reportName }}</a>
+              <a v-if="dataStatus" href="javascript:void(0)" style="color:#20a0ff" @click="OldDaily(scope.row ,'提测报告')">{{ scope.row.name }}</a>
+              <br><div v-if="scope.row.returnReason" style="color:red;">打回原因：{{ scope.row.returnReason }}</div>
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="100" align="center">
@@ -30,14 +30,14 @@
           </el-table-column>
           <el-table-column label="报告人" min-width="100" align="center">
             <template slot-scope="scope">
-              <span v-if="dataStatus">{{ scope.row.reportorObject === null ? '' : scope.row.reportorObject.name }}</span>
-              <span v-if="!dataStatus">{{ scope.row.createrObject.name }}</span>
+              <span v-if="!dataStatus">{{ scope.row.reportorObject === null ? '' : scope.row.reportorObject.name }}</span>
+              <span v-if="dataStatus">{{ scope.row.createrObject.name }}</span>
             </template>
           </el-table-column>
           <el-table-column label="创建日期" min-width="100" align="center">
             <template slot-scope="scope">{{ scope.row.gmtCreate }}</template>
           </el-table-column>
-          <el-table-column v-if="dataStatus" label="操作" width="200">
+          <el-table-column v-if="!dataStatus" label="操作" width="200">
             <template slot-scope="scope">
               <div v-if="scope.row.status === 1 ? false : true">
                 <span v-if="scope.row.status === 3 ? true : false" class="btn" @click="back(1,scope.row.id, scope.row)">通过</span>
@@ -90,7 +90,7 @@
         <el-table :data="dailyData" size="small" :header-cell-style="{ color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500' }" show-overflow-tooltip="true">
           <el-table-column label="标题名称" min-width="120">
             <template slot-scope="scope">
-              <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 0)">{{ scope.row.reportName }}</a>
+              <a href="javascript:void(0)" style="color:#20a0ff" @click="!dailyDataStatus ? OldDaily(scope.row ,'测试日报') :toReportView(scope.row, 0)">{{ scope.row.reportName }}</a>
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="100" align="center">
@@ -156,7 +156,7 @@
         <el-table :data="clientData" size="small" :header-cell-style="{ color: 'rgb(74, 74, 74)', fontSize: '14px', fontWeight: '500' }" show-overflow-tooltip="true">
           <el-table-column label="标题名称" min-width="120">
             <template slot-scope="scope">
-              <a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 1)">{{ scope.row.reportName }}</a>
+              <a href="javascript:void(0)" style="color:#20a0ff" @click="!releaseDataStatus ? OldDaily(scope.row ,'准出报告') : toReportView(scope.row, 1)">{{ scope.row.reportName }}</a>
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="100" align="center">
@@ -216,6 +216,19 @@
     <Test-report v-if="dialogTest" ref="TestReport" />
     <Daily-report v-if="dialogDaily" ref="DailyReport" />
     <ReleaseReport v-if="dialogClient" ref="ClientReport" />
+
+    <el-dialog :title="title" :visible.sync="reportDaily" class="public_task" width="70%" :close-on-click-modal="false">
+      <div class="blueStripe" />
+      <div v-if="title === '测试日报'" style=" margin-bottom: 2%; height: 600px; overflow:scroll; overflow-x: hidden">
+        <testPresenyL v-if="testPresenyL" :message="message" />
+      </div>
+      <div v-if="title === '准出报告'" style=" margin-bottom: 2%; height: 600px; overflow:scroll; overflow-x: hidden">
+        <ResultPageyL v-if="ResultPageyL" :message="message" />
+      </div>
+      <div v-if="title === '提测报告'" style=" margin-bottom: 2%; height: 600px; overflow:scroll; overflow-x: hidden">
+        <acceptTheReport v-if="acceptTheReport" :message="message" />
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -226,6 +239,9 @@ import {
   launchTestDelete
 } from '@/api/taskIndex' // ajax
 import '@/styles/PublicStyle/index.scss'
+import testPresenyL from '@/views/reportManagement/daily/components/testPresenyL.vue' // 老日报数据
+import ResultPageyL from '@/views/reportManagement/ReleaseReport/components/ResultPageyL.vue' // 老准出报告
+import acceptTheReport from '@/views/reportManagement/Testing/components/acceptTheReport.vue' // 老提测报告
 import TestReport from '@/views/reportManagement/components/TestingReport' // 提测
 import DailyReport from '@/views/reportManagement/components/DailyReport' // 日报
 import ReleaseReport from '@/views/reportManagement/components/ReleaseReport' // 准出
@@ -235,10 +251,18 @@ export default {
   components: {
     TestReport,
     DailyReport,
-    ReleaseReport
+    ReleaseReport,
+    acceptTheReport,
+    testPresenyL,
+    ResultPageyL
   },
   data() {
     return {
+      title: '测试日报',
+      ResultPageyL: false,
+      acceptTheReport: false,
+      testPresenyL: false,
+      reportDaily: false,
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       taskId: Number(this.$route.query.id), // 任务id
@@ -286,15 +310,18 @@ export default {
   },
   methods: {
     async getTest(val) { // 获取提测
-      val === 10086 ? this.dataStatus = !this.dataStatus : ''
       if (this.dataStatus) {
+        this.dataStatus = false
         const data = { taskId: this.taskId, bizId: localStorage.getItem('bizId'), curIndex: this.testPages.curIndex, pageSize: this.testPages.pageSize }
         const res = await reportdelivertestGetByTaskId(data)
         if (res.code === 200) {
           this.testData = res.data.list
           this.testPages.total = res.data.total
         }
-      } else {
+        return false
+      }
+      if (!this.dataStatus) {
+        this.dataStatus = true
         const params = { taskId: this.taskId, curIndex: this.testPages.curIndex, pageSize: this.testPages.pageSize }
         const res = await launchTest(params)
         if (res.code === 200) {
@@ -365,7 +392,6 @@ export default {
     },
     async passOrBackSend() { // 提测打回
       this.dialog_testData = false
-      // const userData = { id: '', ename: this.userInformation, name: this.userNames }
       if (this.Str === '通过' || this.Str === '打回') {
         const data = {
           id: this.reportData.id,
@@ -378,6 +404,7 @@ export default {
         }
         const res = await reportdelivertestUpdate(data)
         if (res.code === 200) {
+          this.dataStatus = true
           this.getTest()
           this.$message({ message: res.msg, type: 'success', offset: 150 })
         }
@@ -389,6 +416,24 @@ export default {
       }
     },
 
+    OldDaily(val, name) {
+      this.title = name
+      this.reportDaily = true
+      if (this.title === '测试日报') {
+        this.testPresenyL = true
+        this.message = val
+      }
+      if (this.title === '准出报告') {
+        this.ResultPageyL = true
+        this.message = val
+      }
+      if (this.title === '提测报告') {
+        console.log(val, 'cdnscjsbd')
+        this.acceptTheReport = true
+        this.message = val
+      }
+    },
+
     async dailySend(e) { // 测试日报删除
       console.log(e)
       const res = await dailyReportDelete({}, this.CallBackId)

src/views/projectManage/taskList/taskViewDetail.vue

@@ -160,12 +160,10 @@
               <div>任务计划
                 <el-tooltip class="item" effect="dark" :content="isScheduleLocked === 1? '点击解锁排期' : '点击锁定排期'" placement="top">
                   <span
+                    v-if="!form_query.needGrey"
                     class="titleStatus"
-                    :class="[
-                      isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock',
-                      form_query.needGrey ? 'color_sty': ''
-                    ]"
-                    @click="form_query.needGrey ? changeSchedule: ''"
+                    :class=" isScheduleLocked === 1 ? 'el-icon-lock' : 'el-icon-unlock'"
+                    @click="changeSchedule"
                   >
                     {{ isScheduleLocked === 1 ? '已锁定' : '未锁定' }}
                   </span>
@@ -892,9 +890,6 @@ export default {
 .el-btn-size {
    margin: 10px 30px;
 }
-.color_sty {
-  color: #eee;
-}
 </style>
 
 <style>

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -33,7 +33,7 @@
         </el-col>
       </el-row>
 
-      <el-row v-if="from.isDelay === 1 || from.releasePlanTime > from.releaseActualTime" style="margin: 20px 0">
+      <el-row v-if="from.isDelay === 1 || from.releasePlanTime < from.releaseActualTime" style="margin: 20px 0">
         <!-- 准出是否延期 1 延期，0未延期 -->
         <el-col :span="24" class="Layout_space_between">
           <span class="from-namea"><span v-if="!releaseType" style="color:red;">*</span>准出延期原因 : </span>

src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -33,7 +33,7 @@
         </el-col>
       </el-row>
 
-      <el-row v-if="fromCreateData.releasePlanTime > fromCreateData.releaseActualTime">
+      <el-row v-if="fromCreateData.releasePlanTime < fromCreateData.releaseActualTime">
         <el-col :span="24" class="Layout_space_between">
           <span class="parent-style">准出延期原因 : {{ fromCreateData.delayReason }}</span>
         </el-col>

src/views/reportManagement/Testing/TestingPreview.vue

@@ -55,7 +55,7 @@
           <span class="parent-style">CodeReview：{{ fromCreateData.isCodeReview === 0 ? '否' : '是' }}</span>
         </el-col>
         <el-col v-if="fromCreateData.isCodeReview === 1" :span="12" class="Layout_space_between">
-          <span class="parent-style">执行人：{{ fromCreateData.codeReviewExecutor }}</span>
+          <span v-for="(item, index) in fromCreateData.codeReviewExecutorObject" :key="index" class="parent-style">执行人：{{ item.name }}</span>
         </el-col>
       </el-row>
       <div class="backStyle">需求列表</div>

src/views/reportManagement/Testing/components/acceptTheReport.vue

@@ -137,12 +137,19 @@ export default {
       fromCreateData: {}
     }
   },
-  created() {
-    this.idGet()
+  watch: {
+    message: {
+      handler(newV) {
+        this.$nextTick(() => {
+          this.idGet(newV)
+        })
+      },
+      immediate: true
+    }
   },
   methods: {
-    idGet() {
-      this.fromCreateData = this.message
+    idGet(val) {
+      this.fromCreateData = val
 
       if (this.fromCreateData.type === 2) {
         this.towShow = false

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -29,7 +29,7 @@
         </el-col>
       </el-row>
 
-      <el-row v-if="from.isDelay === 1" class="from-margin">
+      <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%;" />

src/views/reportManagement/testPresentation.vue

@@ -27,7 +27,7 @@
             <template slot-scope="scope">
               <a v-if="title === '测试日报' || title === '准出报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ scope.row.reportName }}</a>
               <a v-if="title === '提测报告'" href="javascript:void(0)" style="color:#20a0ff" @click="history ? toReportView(scope.row) : OldDaily(scope.row)">{{ history ? scope.row.reportName : scope.row.name }}</a>
-              <div v-if="title === '提测报告'">{{ scope.row.returnReason }}</div>
+              <div v-if="title === '提测报告' && scope.row.returnReason" style="color: red;">打回报告：{{ scope.row.returnReason }}</div>
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="150">
@@ -493,6 +493,7 @@ export default {
         this.message = val
       }
       if (this.title === '提测报告') {
+        console.log(val, 'cdnscjsbd')
         this.acceptTheReport = true
         this.message = val
       }