From 79a75ab23b440e948ded07f1e8e6eca607057d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 30 Jul 2022 18:23:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmMenu/XmMenuDetail.vue             |  4 ++--
 src/views/xm/core/xmMenu/XmMenuEdit.vue               |  2 +-
 src/views/xm/core/xmQuestion/XmQuestionDetail.vue     |  7 ++++++-
 src/views/xm/core/xmQuestion/XmQuestionEdit.vue       |  2 +-
 src/views/xm/core/xmTask/XmTaskDetail.vue             | 11 ++++++++---
 src/views/xm/core/xmTask/XmTaskEdit.vue               |  2 +-
 src/views/xm/core/xmTestCase/XmTestCaseDetail.vue     |  7 +++++--
 src/views/xm/core/xmTestCase/XmTestCaseEdit.vue       |  2 +-
 .../xm/core/xmTestPlanCase/XmTestPlanCaseDetail.vue   |  7 ++++++-
 .../xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue     |  2 +-
 src/views/xm/core/xmWorkload/XmWorkloadList.vue       |  2 +-
 11 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuDetail.vue b/src/views/xm/core/xmMenu/XmMenuDetail.vue
index 1e29c5ff..91aba859 100644
--- a/src/views/xm/core/xmMenu/XmMenuDetail.vue
+++ b/src/views/xm/core/xmMenu/XmMenuDetail.vue
@@ -1,5 +1,5 @@
 <template> 
-	<xm-menu-edit v-if="xmMenu" :xm-menu="xmMenu" :reload="reload" :visible="xmMenu&&xmMenu.menuId"></xm-menu-edit> 
+	<xm-menu-edit v-loading="load.list" v-if="xmMenu" :xm-menu="xmMenu" :reload="reload" :visible="xmMenu&&xmMenu.menuId"></xm-menu-edit> 
 </template>
 
 <script>    
@@ -7,7 +7,7 @@
 		props:['xmMenu','reload'],  
 		data() {
 			 return {
-				
+				load:{list:false}
 			 }
 		},//end data
 		methods: { 
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 001a9865..5f8da193 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -207,7 +207,7 @@
 						</el-tab-pane>
 						
 					
-					<el-tab-pane :label="'工时( '+editForm.actWorkload+' / '+editForm.budgetWorkload+' h )'" name="51"> 
+					<el-tab-pane :label="'工时( '+(editForm.actWorkload?editForm.actWorkload:0)+' / '+(editForm.budgetWorkload?editForm.budgetWorkload:0)+' h )'" name="51"> 
 						 <xm-workload-record v-if="activateTabPaneName=='51'" biz-type="5" :xm-menu="editForm" ></xm-workload-record>
 					</el-tab-pane>
 					<el-tab-pane label="链接" name="5">
diff --git a/src/views/xm/core/xmQuestion/XmQuestionDetail.vue b/src/views/xm/core/xmQuestion/XmQuestionDetail.vue
index 6ebb3e07..042a548b 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionDetail.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		 <xm-question-edit v-if="xmQuestionDb" :xm-question="xmQuestionDb"  :visible="showInfo"></xm-question-edit>
+		 <xm-question-edit v-load="load.list" v-if="xmQuestionDb" :xm-question="xmQuestionDb"  :visible="showInfo"></xm-question-edit>
 	</section>
 </template>
 
@@ -33,6 +33,7 @@
 		},
 		data() {
 			return { 
+				load:{list:false},
 				 xmQuestionDb:null,
 				 showInfo:false,
 			}
@@ -40,7 +41,11 @@
 		methods: { 
 			  
 			 getXmQuestion(id){
+				
+					this.load.list=true;
 				 listXmQuestion({id:id}).then(res=>{
+					
+					this.load.list=false;
 					 var tips = res.data.tips;
 					 if(tips.isOk){
 						 this.xmQuestionDb=res.data.data[0]
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 43ca55c4..aa87bade 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -143,7 +143,7 @@
 									</el-tab-pane> 
 									
 					
-									<el-tab-pane label="工时" name="55"> 
+									<el-tab-pane :label="'工时( '+(editForm.actWorkload?editForm.actWorkload:0)+' / '+(editForm.budgetWorkload?editForm.budgetWorkload:0)+' h )'" name="55"> 
 										<xm-workload-record v-if="activateTabPaneName=='55'" biz-type="2" :xm-question="editForm" ></xm-workload-record>
 									</el-tab-pane>
 									<el-tab-pane label="日志" name="4" v-if="opType!='add'"> 
diff --git a/src/views/xm/core/xmTask/XmTaskDetail.vue b/src/views/xm/core/xmTask/XmTaskDetail.vue
index 17f8c069..d82975cc 100644
--- a/src/views/xm/core/xmTask/XmTaskDetail.vue
+++ b/src/views/xm/core/xmTask/XmTaskDetail.vue
@@ -1,5 +1,5 @@
 <template>
- 	<xm-task-edit v-if="xmTaskDb&&xmTaskDb.id && showInfo" :xm-task="xmTaskDb"  :visible="showInfo"></xm-task-edit>
+ 	<xm-task-edit v-loading="load.list" v-if="xmTaskDb&&xmTaskDb.id && showInfo" :xm-task="xmTaskDb"  :visible="showInfo"></xm-task-edit>
  </template>
 
 <script> 
@@ -32,19 +32,24 @@
 		},
 		data() {
 			return { 
+				load:{list:false},
 				 xmTaskDb:null, 
 				 showInfo:false,
 			}
 		},//end data
 		methods: { 
 			  
-			 getTask(id){
-				debugger;
+			 getTask(id){ 
+
 				if(!id){
 					this.xmTaskDb=null
 					return;
 				}
+				
+					this.load.list=true;
 				 listXmTask({id:id}).then(res=>{
+					
+					this.load.list=false;
 					 var tips = res.data.tips;
 					 if(tips.isOk){
 						 this.xmTaskDb=res.data.data[0] 
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index fdf37d11..058c96d9 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -262,7 +262,7 @@
 						</el-row>
 					</el-tab-pane>
 					
-					<el-tab-pane :label="'工时( '+editForm.actWorkload+' / '+editForm.budgetWorkload+' h )'" name="5"> 
+					<el-tab-pane :label="'工时( '+(editForm.actWorkload?editForm.actWorkload:0)+' / '+(editForm.budgetWorkload?editForm.budgetWorkload:0)+' h )'" name="5"> 
 						 <xm-workload-record v-if="activateTabPaneName=='5'" biz-type="1" :xm-task="editForm" ></xm-workload-record>
 					</el-tab-pane>
 					<el-tab-pane label="预算金额" name="6"> 
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseDetail.vue b/src/views/xm/core/xmTestCase/XmTestCaseDetail.vue
index 6aee547e..42cc5ecb 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseDetail.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseDetail.vue
@@ -1,5 +1,5 @@
 <template>
- 	<xm-test-case-edit v-if="xmTestCaseDb&&xmTestCaseDb.id && showInfo" :xm-test-case="xmTestCaseDb"  :visible="showInfo"></xm-test-case-edit>
+ 	<xm-test-case-edit v-load="load.list" v-if="xmTestCaseDb&&xmTestCaseDb.id && showInfo" :xm-test-case="xmTestCaseDb"  :visible="showInfo"></xm-test-case-edit>
  </template>
 
 <script> 
@@ -32,6 +32,7 @@
 		},
 		data() {
 			return { 
+				load:{list:false},
 				 xmTestCaseDb:null, 
 				 showInfo:false,
 			}
@@ -43,7 +44,9 @@
 					this.xmTestCaseDb=null
 					return;
 				}
-				 listXmTestCase({id:id}).then(res=>{
+				this.load.list=true;
+				 listXmTestCase({id:id}).then(res=>{ 
+					this.load.list=false;
 					 var tips = res.data.tips;
 					 if(tips.isOk){
 						 this.xmTestCaseDb=res.data.data[0] 
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index 80586dd4..02aa52f8 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -88,7 +88,7 @@
 								<xm-test-plan-case-mng :xm-test-casedb="xmTestCasedb" :xm-test-case="editForm" v-if="activeTab=='3'"></xm-test-plan-case-mng>
 							</el-tab-pane>
 							
-							<el-tab-pane label="工时" name="55"> 
+							<el-tab-pane :label="'工时( '+(editForm.actWorkload?editForm.actWorkload:0)+' / '+(editForm.budgetWorkload?editForm.budgetWorkload:0)+' h )'" name="55"> 
 								<xm-workload-record v-if="activeTab=='55'" biz-type="3" :xm-test-case="editForm" ></xm-workload-record>
 							</el-tab-pane>
 							<el-tab-pane name="4" label="日志" v-if="opType!=='add'"></el-tab-pane>
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseDetail.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseDetail.vue
index 438f6ad4..096b6334 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseDetail.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseDetail.vue
@@ -1,5 +1,5 @@
 <template>
- 	<xm-test-plan-case-edit v-if="xmTestPlanCaseDb&&xmTestPlanCaseDb.caseId && showInfo" :xm-test-case="xmTestPlanCaseDb"  :visible="showInfo"></xm-test-plan-case-edit>
+ 	<xm-test-plan-case-edit v-loading="load.list" v-if="xmTestPlanCaseDb&&xmTestPlanCaseDb.caseId && showInfo" :xm-test-case="xmTestPlanCaseDb"  :visible="showInfo"></xm-test-plan-case-edit>
  </template>
 
 <script> 
@@ -32,6 +32,7 @@
 		},
 		data() {
 			return { 
+				load:{list:false},
 				 xmTestPlanCaseDb:null, 
 				 showInfo:false,
 			}
@@ -43,7 +44,11 @@
 					this.xmTestPlanCaseDb=null
 					return;
 				}
+				
+					this.load.list=true;
 				 listXmTestPlanCase({planId:planId,caseId:caseId}).then(res=>{
+					
+					this.load.list=false;
 					 var tips = res.data.tips;
 					 if(tips.isOk){
 						 this.xmTestPlanCaseDb=res.data.data[0] 
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
index 2de21d19..14e2dc33 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
@@ -133,7 +133,7 @@
 						</el-row>
 					</el-tab-pane>
 					
-					<el-tab-pane label="工时" name="55"> 
+					<el-tab-pane :label="'工时( '+(editForm.actWorkload?editForm.actWorkload:0)+' / '+(editForm.budgetWorkload?editForm.budgetWorkload:0)+' h )'" name="55"> 
 						<xm-workload-record v-if="activateName=='55'" biz-type="4" :xm-test-plan-case="editForm" ></xm-workload-record>
 					</el-tab-pane>
 					<el-tab-pane name="4" label="附件">
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadList.vue b/src/views/xm/core/xmWorkload/XmWorkloadList.vue
index 172fc4d9..12e9f4b1 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadList.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadList.vue
@@ -75,7 +75,7 @@
 		    XmWorkloadEdit,
 			
 			"xm-task-detail":()=>import("../xmTask/XmTaskDetail"),
-			"xm-question-detail":()=>import("../xmQuestion/XmQuestionMng"),
+			"xm-question-detail":()=>import("../xmQuestion/XmQuestionDetail"),
 			"xm-test-case-detail":()=>import("../xmTestCase/XmTestCaseDetail"),
 			"xm-test-plan-case-detail":()=>import("../xmTestPlanCase/XmTestPlanCaseDetail"),
 			"xm-menu-detail":()=>import("../xmMenu/XmMenuDetail"),