优化

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

@@ -20,7 +20,7 @@
             <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="OldDaily(scope.row ,'提测报告')">{{ scope.row.name }}</a>
-              <br>{{ scope.row.returnReason }}
+              <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">
@@ -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="dailyDataStatus ? OldDaily(scope.row ,'测试日报') :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="releaseDataStatus ? OldDaily(scope.row ,'准出报告') : 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">
@@ -392,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,
@@ -405,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 })
         }

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/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/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">