From 59c73ee01c60ec37dd01daa44286e4fefdf4837d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 7 Jul 2022 21:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue     | 4 +++-
 src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue   | 4 +++-
 .../xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue   | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
index 174fbff3..1a9dd1c1 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="padding">
-    <el-row :gutter="5">
+    <el-row :gutter="5" v-loading="load.list">
       <el-col :span="18">
         <div>
           <div
@@ -300,10 +300,12 @@ export default {
       if (this.filters.taskId) {
         params.taskId = this.filters.taskId;
       }
+      this.load.list=true
       listProjectWorkloadSetDay(params).then((res) => {
         this.xmProjectWorkloadSetDays = res.data.tips.isOk
           ? res.data.data
           : this.xmProjectWorkloadSetDays;
+          this.load.list=false;
       });
     },
     initData() {
diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
index a2ca9c4d..5ce7a2cf 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="padding">
-    <el-row :gutter="5">
+    <el-row :gutter="5" v-loading="load.list">
       <el-col :span="18">
         <div>
           <div
@@ -300,10 +300,12 @@ export default {
       if (this.filters.taskId) {
         params.taskId = this.filters.taskId;
       }
+	  this.load.list=true;
       listProjectWorkloadSetMonth(params).then((res) => {
         this.xmProjectWorkloadSetMonths = res.data.tips.isOk
           ? res.data.data
           : this.xmProjectWorkloadSetMonths;
+		  this.load.list=false;
       });
     },
     initData() {
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
index 01ecf00d..2a3e9d88 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
@@ -30,6 +30,12 @@
 						</span>
 					 </template>
 				 </el-table-column>
+				 <el-table-column prop="taskState" label="任务状态" width="80" show-overflow-tooltip>
+					 <template slot-scope="scope">
+						<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'taskState',scope.row.taskState)" :key="index" :type="item.className">{{item.name}}</el-tag>
+					 </template>
+
+				</el-table-column>
 				 <el-table-column prop="ttype" label="任务类型" width="80" show-overflow-tooltip>
 					 <template slot-scope="scope">
 						<el-tag v-for="(item,index) in formatDictsWithClass(dicts,'taskType',scope.row.ttype)" :key="index" :type="item.className">{{item.name}}</el-tag>