From 2f1eac6c2e1666c3356c4a8df68137f2cd7cd1fb 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 17:45:09 +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

---
 .../xmTaskWorkload/WorkloadSetDayList.vue     | 16 +++++-----
 .../xmTaskWorkload/WorkloadSetMonthList.vue   | 32 +++++++++----------
 .../XmTaskWorkloadSimpleListForBizDate.vue    |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
index 010b62ad..34c947d1 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
@@ -92,7 +92,7 @@
         >
           <template slot-scope="scope">  
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】所有工时记录'">
-                   <xm-task-workload-simple-list-for-biz-date  v-if="scope.row.bizDate==editForm.bizDate && columnProp=='workload'"    :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>
+                   <xm-task-workload-simple-list-for-biz-date  :visible="scope.row.bizDate==editForm.bizDate && columnProp=='workload'"    :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.workload}}h</el-link>
                </el-popover>
 		  </template>
@@ -107,7 +107,7 @@
           <template slot-scope="scope">  
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【待确认】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-date  v-if="scope.row.bizDate==editForm.bizDate && columnProp=='toConfirmWorkload'"   wstatus="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>
+                   <xm-task-workload-simple-list-for-biz-date  :visible="scope.row.bizDate==editForm.bizDate && columnProp=='toConfirmWorkload'"   wstatus="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.toConfirmWorkload}}h</el-link>
                </el-popover>
 		  </template>
@@ -122,7 +122,7 @@
           <template slot-scope="scope"> 
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【已确认】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-date  v-if="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>
+                   <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-popover>
 		  </template>
@@ -137,7 +137,7 @@
           <template slot-scope="scope"> 
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【无须结算】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-date  v-if="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>
+                   <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-popover>
 		  </template>
@@ -152,7 +152,7 @@
           <template slot-scope="scope">
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【待结算】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-date  v-if="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>
+                   <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-popover>
 		  </template>
@@ -168,7 +168,7 @@
           <template slot-scope="scope">  
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【已提交审核】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-date  v-if="scope.row.bizDate==editForm.bizDate && columnProp=='hadCommitSworkload'"  wstatus="1" sstatus="2"  :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>
+                   <xm-task-workload-simple-list-for-biz-date  :visible="scope.row.bizDate==editForm.bizDate && columnProp=='hadCommitSworkload'"  wstatus="1" sstatus="2"  :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.hadCommitSworkload}}h</el-link>
                </el-popover>
 			
@@ -184,7 +184,7 @@
           <template slot-scope="scope">  
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【已审核】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-date  v-if="scope.row.bizDate==editForm.bizDate && columnProp=='hadAgreeSworkload'"   wstatus="1" sstatus="3" :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>
+                   <xm-task-workload-simple-list-for-biz-date  :visible="scope.row.bizDate==editForm.bizDate && columnProp=='hadAgreeSworkload'"   wstatus="1" sstatus="3" :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.hadAgreeSworkload}}h</el-link>
                </el-popover>
 		  </template>
@@ -200,7 +200,7 @@
           <template slot-scope="scope">  
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizDate + '】【已结算】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-date  v-if="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>
+                   <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-popover>
 		  </template>
diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
index 0bcbd098..2cbe8a8e 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
@@ -92,8 +92,8 @@
         >
           <template slot-scope="scope">  
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】所有工时记录'">
-                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'"    :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" style="display:inline;">{{scope.row.workload}}h</el-link>
+                   <xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'"    :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.workload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column>
@@ -107,8 +107,8 @@
           <template slot-scope="scope">  
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【待确认】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='toConfirmWorkload'"  wstatus="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" style="display:inline;">{{scope.row.toConfirmWorkload}}h</el-link>
+                   <xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='toConfirmWorkload'"  wstatus="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.toConfirmWorkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column>
@@ -122,8 +122,8 @@
           <template slot-scope="scope"> 
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已确认】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-month v-if="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" style="display:inline;">{{scope.row.hadConfirmWorkload}}h</el-link>
+                   <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-popover>
 		  </template>
         </el-table-column>
@@ -137,8 +137,8 @@
           <template slot-scope="scope"> 
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【无须结算】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-month v-if="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" style="display:inline;">{{scope.row.notNeedSetWorkload}}h</el-link>
+                   <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-popover>
 		  </template>
         </el-table-column>
@@ -152,8 +152,8 @@
           <template slot-scope="scope">
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【待结算】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-month v-if="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" style="display:inline;">{{scope.row.toSetSworkload}}h</el-link>
+                   <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-popover>
 		  </template>
         </el-table-column>
@@ -168,8 +168,8 @@
           <template slot-scope="scope">  
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已提交审核】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'" wstatus="1" sstatus="2"  :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" style="display:inline;">{{scope.row.hadCommitSworkload}}h</el-link>
+                   <xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'" wstatus="1" sstatus="2"  :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.hadCommitSworkload}}h</el-link>
                </el-popover>
 			
 		</template>
@@ -184,8 +184,8 @@
           <template slot-scope="scope">  
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已审核】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadAgreeSworkload'"  wstatus="1" sstatus="3" :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" style="display:inline;">{{scope.row.hadAgreeSworkload}}h</el-link>
+                   <xm-task-workload-simple-list-for-biz-month :visible="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadAgreeSworkload'"  wstatus="1" sstatus="3" :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.hadAgreeSworkload}}h</el-link>
                </el-popover>
 		  </template>
         </el-table-column> 
@@ -200,8 +200,8 @@
           <template slot-scope="scope">  
 		  	
 		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已结算】工时记录'">
-                   <xm-task-workload-simple-list-for-biz-month v-if="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" style="display:inline;">{{scope.row.hadSetSworkload}}h</el-link>
+                   <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-popover>
 		  </template>
         </el-table-column> 
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
index 8e01f950..26557282 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
@@ -305,7 +305,7 @@
 			this.$nextTick(() => { 
 				initDicts(this); 
 				this.initData() 
-				this.searchXmTaskWorkloads(); 
+				//this.searchXmTaskWorkloads(); 
                 this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTaskWorkloadTable.$el)
 
         	});