状态颜色变更

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

@@ -58,7 +58,7 @@
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="'status'+scope.row.status"
+            :class="{'status0':scope.row.status===0,'status1':scope.row.status > 0 && scope.row.status <100,'status2':scope.row.status===100,}"
             class="btns"
             size="mini"
             @change="changeStatus(scope.row)"
@@ -89,12 +89,6 @@
     <DailyReport v-if="dialogDailyReport" ref="DailyReport" />
     <ClientReport v-if="dialogClientReport" ref="ClientReport" />
     <taskDialog v-if="showTaskDialog" :show.sync="showTaskDialog" :task-id="taskId.id" :status-name="taskId.statusString" @getList="get_allTask" />
-    <normal-dialog :show-dialog.sync="statusDialog" :title="'状态变更：已上线'" :width="'50%'" @confirm="confirmStatus()">
-      <div class="dialog-change-status">
-        <span>实际上线时间：</span>
-        <el-date-picker v-model="changeStatusDate" type="date" style="width:100%;" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss" />
-      </div>
-    </normal-dialog>
     <!-- 批量排期 -->
     <modify-schedule
       v-if="visibleSchedule"
@@ -116,11 +110,9 @@ import { taskUpdate } from '@/api/projectViewDetails'
 import { configShowTaskEnum } from '@/api/taskIndex'
 import scheduleList from './scheduleList'
 import modifySchedule from './modifySchedule'
-import normalDialog from '@/components/dialog/normalDialog'
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
 export default {
   components: {
-    normalDialog,
     TestReport,
     DailyReport,
     ClientReport,
@@ -147,7 +139,6 @@ export default {
       dialogTestReport: false, // 提测
       dialogDailyReport: false, // 日报
       dialogClientReport: false, // 准出
-      statusDialog: false, // 修改状态弹框
       changeStatusDate: null, // 状态改变时间
       nowChangeTask: null, // 当前正在改变的任务对象
       taskId: '', // 将要修改状态的任务id
@@ -192,7 +183,7 @@ export default {
       isEx ? this.expandArr = this.all_task.map(item => item.id) : this.expandArr = []
     },
     async changeStatus(e) { // 状态改变
-      if (e.status === 2 || e.status === 4 || e.status === 5) {
+      if (e.status === 70 || e.status === 90 || e.status === 100) {
         this.taskId = e
         this.allStatus.map(item => {
           item.code === e.status ? this.taskId.statusString = item.msg : ''
@@ -209,7 +200,7 @@ export default {
         const taskInfoDO = e
         const resTask = await taskUpdate({ taskInfoDO, user })
         if (resTask.code === 200) {
-          this.$message({ message: resTask.msg, type: 'success', offset: 150 })
+          this.$message({ message: '修改成功', type: 'success', offset: 150 })
         }
       }
     },
@@ -219,7 +210,7 @@ export default {
       taskInfoDO.onlineRealTime = this.changeStatusDate
       const resTask = await taskUpdate({ taskInfoDO, user })
       if (resTask.code === 200) {
-        this.$message({ message: resTask.msg, type: 'success', offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', offset: 150 })
       }
     },
     handleSelectionChange(val) { // 任务列表删选操作
@@ -347,10 +338,10 @@ export default {
 .status0 {
   @include setStatus(#409EFF)
 }
-.status1, .status2, .status3, .status4{
+.status1{
   @include setStatus(#FF8952)
 }
-.status5 {
+.status2 {
   @include setStatus(#7ED321)
 }
 .expand i {

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

@@ -58,7 +58,7 @@
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="'status'+scope.row.status"
+            :class="{'status0':scope.row.status===0,'status1':scope.row.status > 0 && scope.row.status <100,'status2':scope.row.status===100,}"
             class="btns"
             size="mini"
             @change="changeStatus(scope.row)"
@@ -86,12 +86,6 @@
     <DailyReport v-if="dialogDailyReport" ref="DailyReport" />
     <ClientReport v-if="dialogClientReport" ref="ClientReport" />
     <task-dialog v-if="showTaskDialog" :show.sync="showTaskDialog" :task-id="taskId.id" :status-name="taskId.statusString" @getList="get_allTask" />
-    <normal-dialog :show-dialog.sync="statusDialog" :title="'状态变更：已上线'" :width="'50%'" @confirm="confirmStatus()">
-      <div class="dialog-change-status">
-        <span>实际上线时间：</span>
-        <el-date-picker v-model="changeStatusDate" type="date" style="width:100%;" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss" />
-      </div>
-    </normal-dialog>
     <!-- 批量排期 -->
     <modify-schedule
       v-if="visibleSchedule"
@@ -112,12 +106,10 @@ import { taskUpdate } from '@/api/projectViewDetails'
 import { configShowTaskEnum } from '@/api/taskIndex'
 import scheduleList from './scheduleList'
 import modifySchedule from './modifySchedule'
-import normalDialog from '@/components/dialog/normalDialog'
 import '@/styles/PublicStyle/index.scss'
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
 export default {
   components: {
-    normalDialog,
     TestReport,
     DailyReport,
     ClientReport,
@@ -143,7 +135,6 @@ export default {
       dialogTestReport: false, // 提测
       dialogDailyReport: false, // 日报
       dialogClientReport: false, // 准出
-      statusDialog: false, // 修改状态弹框
       changeStatusDate: null, // 状态改变时间
       nowChangeTask: null, // 当前正在改变的任务对象
       taskId: '', // 将要修改状态的任务id
@@ -185,7 +176,7 @@ export default {
       isEx ? this.expandArr = this.all_task.map(item => item.id) : this.expandArr = []
     },
     async changeStatus(e) { // 状态改变
-      if (e.status === 2 || e.status === 4 || e.status === 5) {
+      if (e.status === 70 || e.status === 90 || e.status === 100) {
         this.taskId = e
         this.allStatus.map(item => {
           item.code === e.status ? this.taskId.statusString = item.msg : ''
@@ -344,10 +335,10 @@ export default {
 .status0 {
   @include setStatus(#409EFF)
 }
-.status1, .status2, .status3, .status4{
+.status1{
   @include setStatus(#FF8952)
 }
-.status5 {
+.status2 {
   @include setStatus(#7ED321)
 }
 .expand i {

src/views/projectManage/taskList/dialog/taskDialog.vue

@@ -64,7 +64,6 @@ export default {
     statusName: {
       immediate: true,
       handler(statusName) {
-        console.log(statusName, 'ddddd')
         if (statusName === '已提测') {
           this.name = this.measurementTime
           this.codeName = this.measurementTimeName
@@ -95,15 +94,15 @@ export default {
     },
     task_status_uptate(e) {
       if (this.statusName === '已提测') {
-        this.taskData.status = 2
+        this.taskData.status = 70
         this.taskData.launchTestRealTime = e
       }
       if (this.statusName === '已准出') {
-        this.taskData.status = 4
+        this.taskData.status = 90
         this.taskData.testFinishRealTime = e
       }
       if (this.statusName === '已上线') {
-        this.taskData.status = 5
+        this.taskData.status = 100
         this.taskData.onlineRealTime = e
       }
       const taskInfoDO = this.taskData

src/views/projectManage/taskList/taskViewDetail.vue

@@ -486,7 +486,7 @@ export default {
       }
     },
     async updateStatus(e) { // 状态改变
-      if (e.value === 2 || e.value === 4 || e.value === 5) {
+      if (e.status === 70 || e.status === 90 || e.status === 100) {
         this.taskIds = this.form_query
         this.allStatus.map(item => {
           item.code === e.value ? this.taskIds.statusString = e.label : ''

src/views/workbench/team/components/taskList.vue

@@ -52,7 +52,7 @@
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="'status'+scope.row.status"
+            :class="{'status0':scope.row.status===0,'status1':scope.row.status > 0 && scope.row.status <100,'status2':scope.row.status===100,}"
             class="btns"
             size="mini"
             @change="changeStatus(scope.row)"
@@ -92,12 +92,6 @@
     <DailyReport v-if="dialogDailyReport" ref="DailyReport" />
     <ClientReport v-if="dialogClientReport" ref="ClientReport" />
     <taskDialog v-if="showTaskDialog" :show.sync="showTaskDialog" :task-id="taskId.id" :status-name="taskId.statusString" @getList="get_allTask" />
-    <normal-dialog :show-dialog.sync="statusDialog" :title="'状态变更：已上线'" :width="'50%'" @confirm="confirmStatus()">
-      <div class="dialog-change-status">
-        <span>实际上线时间：</span>
-        <el-date-picker v-model="changeStatusDate" type="date" style="width:100%;" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss" />
-      </div>
-    </normal-dialog>
     <!-- 批量排期 -->
     <modify-schedule
       v-if="visibleSchedule"
@@ -118,11 +112,9 @@ import { taskSelfList, taskTeamList } from '@/api/workSchedule'
 import { taskUpdate } from '@/api/projectViewDetails'
 import { configShowTaskEnum } from '@/api/taskIndex'
 import modifySchedule from '@/views/projectManage/projectList/components/modifySchedule'
-import normalDialog from '@/components/dialog/normalDialog'
 import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog' // 任务状态修改（已上线/已提测/已准出）
 export default {
   components: {
-    normalDialog,
     TestReport,
     DailyReport,
     ClientReport,
@@ -161,7 +153,6 @@ export default {
       dialogTestReport: false, // 提测
       dialogDailyReport: false, // 日报
       dialogClientReport: false, // 准出
-      statusDialog: false, // 修改状态弹框
       changeStatusDate: null, // 状态改变时间
       nowChangeTask: null, // 当前正在改变的任务对象
       taskId: '', // 将要修改状态的任务id
@@ -240,7 +231,7 @@ export default {
       }
     },
     async changeStatus(e) { // 状态改变
-      if (e.status === 2 || e.status === 4 || e.status === 5) {
+      if (e.status === 70 || e.status === 90 || e.status === 100) {
         this.taskId = e
         this.allStatus.map(item => {
           item.code === e.status ? this.taskId.statusString = item.msg : ''
@@ -257,7 +248,7 @@ export default {
         const taskInfoDO = e
         const resTask = await taskUpdate({ taskInfoDO, user })
         if (resTask.code === 200) {
-          this.$message({ message: resTask.msg, type: 'success', offset: 150 })
+          this.$message({ message: '修改成功', type: 'success', offset: 150 })
           this.get_allTask()
         }
       }
@@ -268,7 +259,7 @@ export default {
       taskInfoDO.onlineRealTime = this.changeStatusDate
       const resTask = await taskUpdate({ taskInfoDO, user })
       if (resTask.code === 200) {
-        this.$message({ message: resTask.msg, type: 'success', offset: 150 })
+        this.$message({ message: '修改成功', type: 'success', offset: 150 })
       }
     },
     handleSelectionChange(val) { // 任务列表删选操作
@@ -387,10 +378,10 @@ export default {
 .status0 {
   @include setStatus(#409EFF)
 }
-.status1, .status2, .status3, .status4{
+.status1{
   @include setStatus(#FF8952)
 }
-.status5 {
+.status2 {
   @include setStatus(#7ED321)
 }
 .search-control {