Selaa lähdekoodia

优化任务详情页面顶部提示

qinzhipeng_v 5 vuotta sitten
vanhempi
sitoutus
06e9bab20b

+ 12 - 36
src/views/Platform/presentation/testPresentation.vue

@@ -107,14 +107,6 @@
           <el-select v-model="queryData.code" 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>
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="创建测试报告和准出报告时,当前的任务状态为‘测试中’,创建提测报告时,当前的任务状态为‘开发中’"
-            placement="bottom"
-          >
-            <i style="color: red; margin-left: 10px;" class="el-icon-warning-outline" />
-          </el-tooltip>
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button type="primary" size="mini" @click="createPresentation(queryData.code)">创建</el-button>
@@ -313,40 +305,24 @@ export default {
 
     createPresentation(e) {
       if (e !== '') {
-        var taskData = ''
-        this.restaurants.map(item => {
-          item.id === e ? taskData = item : ''
-        })
         switch (this.ins) {
           case 1:
-            if (taskData.status !== 3) {
-              this.$message({ message: '存在状态不是【测试中】的任务,请将任务状态为【测试中】才可测试,请检查!', type: 'warning' })
-            } else {
-              this.dialogDaily = true
-              this.$nextTick(() => {
-                this.$refs.DailyReport.init(7, [e])
-              })
-            }
+            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])
-              })
-            }
+            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])
-              })
-            }
+            this.dialogVisible1 = true
+            this.$nextTick(() => {
+              this.$refs.TestReport.init(7, [e])
+            })
             break
         }
         this.$set(this.queryData, 'code', '')

+ 6 - 30
src/views/projectManage/projectList/components/taskList.vue

@@ -228,40 +228,16 @@ export default {
       }
     },
     filtrateTest() { // 提测筛选
-      const isDevelop = this.curcentList.every(item => {
-        return item.statusString === '开发中'
+      this.dialogTestReport = true
+      this.$nextTick(() => {
+        this.$refs.TestReport.init(7, this.curcentList.map(item => { return item.id }))
       })
-      if (!isDevelop) {
-        this.$message({
-          message: '存在状态不是【开发中】的任务,请将任务状态为【开发中】才可提测,请检查!',
-          type: 'error',
-          duration: 3000,
-          offset: 150
-        })
-      } else {
-        this.dialogTestReport = true
-        this.$nextTick(() => {
-          this.$refs.TestReport.init(7, this.curcentList.map(item => { return item.id }))
-        })
-      }
     },
     filtrateAllow() { // 准出筛选
-      const isDevelop = this.curcentList.every(item => {
-        return item.statusString === '测试中'
+      this.dialogClientReport = true
+      this.$nextTick(() => {
+        this.$refs.ClientReport.init(7, this.curcentList.map(item => { return item.id }))
       })
-      if (!isDevelop) {
-        this.$message({
-          message: '存在状态不是【测试中】的任务,请将任务状态为【测试中】才可准出,请检查!',
-          type: 'error',
-          duration: 3000,
-          offset: 150
-        })
-      } else {
-        this.dialogClientReport = true
-        this.$nextTick(() => {
-          this.$refs.ClientReport.init(7, this.curcentList.map(item => { return item.id }))
-        })
-      }
     },
     filtrateDaily() { // 建立日报
       this.dialogDailyReport = true

+ 1 - 1
src/views/projectManage/taskList/dialog/taskDialog.vue

@@ -8,7 +8,7 @@
         <el-date-picker
           v-model="date"
           type="date"
-          placeholder="选择日期时间"
+          :clearable="false"
           format="yyyy.MM.dd"
           value-format="yyyy.MM.dd"
           style="width: 100%;"

+ 0 - 6
src/views/projectManage/taskList/taskViewDetails.vue

@@ -2,10 +2,6 @@
   <div @click="display = false">
     <div class="bgbugTa" style="background-color:#F2F3F6;display:flex;align-items: center;justify-content: center;">
       <el-container>
-        <div v-if="isHeadShow" style="width:98%;margin: 15px auto 0 auto;height:53px;background:rgba(255,255,255,1);border-radius:4px;color:#F56C6C;font-size:16px;display: flex;align-items: center;">
-          <i class="el-icon-warning-outline" style="margin-left: 20px;" />
-          <span style="margin-left: 4px;">请将排期事件里的排期填写完整,否则无法判断任务健康状态,健康状态会显示未知。</span>
-        </div>
         <el-header class="bgborder bgborderButton" style=" margin: 15px 1%; height:60px;display: flex; justify-content: space-between; align-items: center;">
           <div style="float: left;display: flex; justify-content: space-between; align-items: center;">
             <span :style="{ background: bgStyle, color:colorStyle } " class="timeStyle">
@@ -557,7 +553,6 @@ export default {
         }
       },
       dialogVisible1: false, // 提测弹窗
-      isHeadShow: false,
       showTaskDialog: false, // 状态弹窗
       radio: '列表',
       modalShow: false, // 弹窗(新建)
@@ -834,7 +829,6 @@ export default {
         if (this.task_form.stageString === '未知') {
           this.bgStyle = '#f4f4f5'
           this.colorStyle = '#909399'
-          this.isHeadShow = true
         }
         this.task_form.stageString === '正常' ? this.bgStyle = '#69B3FF' : ''
         this.task_form.stageString === '延期' ? this.bgStyle = '#FF8952' : ''