From 85d9e7e4a7a96dbe8923d6aea5f7e0415cd9eb62 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:08:33 +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/router/routes_xm.js                                   | 8 +++-----
 src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue   | 8 ++++----
 src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue | 8 ++++----
 .../xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue | 2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index abe4e5db..9f1826b9 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -172,13 +172,11 @@ export default {
         { path: 'xmProject/XmProjectCost', component: _import('xm/core/xmProject/XmProjectCost'), name: 'XmProjectCost', meta: { title: '应付款'}},    
 
         { path: 'xmTaskSbill/XmTaskSbillMng', component: _import('xm/core/xmTaskSbill/XmTaskSbillMng'), name: 'XmTaskSbilllMng', meta: { title: '任务结算单'}},    
-        { path: 'xmTaskWorkload/XmTaskWorkloadInfoMy', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfoMy'), name: 'XmTaskWorkloadInfoMy', meta: { title: '工时确认(我)'}},  
-        { path: 'xmTaskWorkload/WorkloadSetDayListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报表(我)'}},
+         { path: 'xmTaskWorkload/WorkloadSetDayListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayListMy'), name: 'WorkloadSetDayListMy', meta: { title: '工时日报表(我)'}},
         { path: 'xmTaskWorkload/WorkloadSetMonthListMy', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthListMy'), name: 'WorkloadSetMonthListMy', meta: { title: '工时月报表(我)'}},
         { path: 'xmTaskWorkload/XmTaskWorkloadInfoToSet', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfoToSet'), name: 'XmTaskWorkloadInfoToSet', meta: { title: '待结算工时'}}, 
-        { path: 'xmTaskWorkload/XmTaskWorkloadInfo', component: _import('xm/core/xmTaskWorkload/XmTaskWorkloadInfo'), name: 'XmTaskWorkloadInfo', meta: { title: '工时确认'}},
-        { path: 'xmTaskWorkload/WorkloadSetDayList', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayList'), name: 'WorkloadSetDayList', meta: { title: '工时日报表'}},
-        { path: 'xmTaskWorkload/WorkloadSetMonthList', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthList'), name: 'WorkloadSetMonthList', meta: { title: '工时月报表'}},
+         { path: 'xmTaskWorkload/WorkloadSetDayList', component: _import('xm/core/xmTaskWorkload/WorkloadSetDayList'), name: 'WorkloadSetDayList', meta: { title: '工时日报'}},
+        { path: 'xmTaskWorkload/WorkloadSetMonthList', component: _import('xm/core/xmTaskWorkload/WorkloadSetMonthList'), name: 'WorkloadSetMonthList', meta: { title: '工时月报'}},
       ]
     }
   ]
diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
index 34c947d1..174fbff3 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
@@ -123,7 +123,7 @@
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【已确认】工时记录'">
                    <xm-task-workload-simple-list-for-biz-date  :visible="scope.row.bizDate==editForm.bizDate && columnProp=='hadConfirmWorkload'"   wstatus="1"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
-                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadConfirmWorkload}}h</el-link>
+                        <el-link type="success" slot="reference" style="display:inline;">{{scope.row.hadConfirmWorkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column>
@@ -138,7 +138,7 @@
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【无须结算】工时记录'">
                    <xm-task-workload-simple-list-for-biz-date  :visible="scope.row.bizDate==editForm.bizDate && columnProp=='notNeedSetWorkload'"  wstatus="1" sstatus="0"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
-                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.notNeedSetWorkload}}h</el-link>
+                        <el-link type="info" slot="reference" style="display:inline;">{{scope.row.notNeedSetWorkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column>
@@ -153,7 +153,7 @@
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【待结算】工时记录'">
                    <xm-task-workload-simple-list-for-biz-date  :visible="scope.row.bizDate==editForm.bizDate && columnProp=='toSetSworkload'"  wstatus="1" sstatus="1"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
-                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toSetSworkload}}h</el-link>
+                        <el-link type="warning" slot="reference" style="display:inline;">{{scope.row.toSetSworkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column>
@@ -201,7 +201,7 @@
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【已结算】工时记录'">
                    <xm-task-workload-simple-list-for-biz-date  :visible="scope.row.bizDate==editForm.bizDate && columnProp=='hadSetSworkload'"   wstatus="1" sstatus="4" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-date="scope.row.bizDate"></xm-task-workload-simple-list-for-biz-date>
-                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadSetSworkload}}h</el-link>
+                        <el-link type="danger" slot="reference" style="display:inline;">{{scope.row.hadSetSworkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column> 
diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
index 2cbe8a8e..a2ca9c4d 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
@@ -123,7 +123,7 @@
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已确认】工时记录'">
                    <xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadConfirmWorkload'"  wstatus="1"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
-                        <el-link type="primary" slot="reference" >{{scope.row.hadConfirmWorkload}}h</el-link>
+                        <el-link type="success" slot="reference" >{{scope.row.hadConfirmWorkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column>
@@ -138,7 +138,7 @@
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【无须结算】工时记录'">
                    <xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='notNeedSetWorkload'" wstatus="1" sstatus="0"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
-                        <el-link type="primary" slot="reference" >{{scope.row.notNeedSetWorkload}}h</el-link>
+                        <el-link type="info" slot="reference" >{{scope.row.notNeedSetWorkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column>
@@ -153,7 +153,7 @@
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【待结算】工时记录'">
                    <xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='toSetSworkload'" wstatus="1" sstatus="1"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
-                        <el-link type="primary" slot="reference" >{{scope.row.toSetSworkload}}h</el-link>
+                        <el-link type="warning" slot="reference" >{{scope.row.toSetSworkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column>
@@ -201,7 +201,7 @@
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已结算】工时记录'">
                    <xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadSetSworkload'"  wstatus="1" sstatus="4" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
-                        <el-link type="primary" slot="reference" >{{scope.row.hadSetSworkload}}h</el-link>
+                        <el-link type="danger" slot="reference" >{{scope.row.hadSetSworkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column> 
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
index 26557282..01ecf00d 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
@@ -1,7 +1,7 @@
 <template>
 	<section> 
 		<el-row class="padding-top"> 
-			<el-table ref="xmTaskWorkloadTable" :data="xmTaskWorkloads" :row-style="{height:'50px'}"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="xmTaskWorkloadTable" :max-height="maxTableHeight" :data="xmTaskWorkloads" :row-style="{height:'50px'}"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="55" show-overflow-tooltip></el-table-column>
  				<el-table-column prop="username" label="姓名" width="120" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="bizDate" label="登记日期" width="120" show-overflow-tooltip></el-table-column>