From 422d51add56908229d67ad1337b5abb18a3f8403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 17 Feb 2023 17:38:06 +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

---
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  2 +-
 .../xm/core/xmTestCase/XmTestCaseEdit.vue     | 30 +++----
 .../xm/core/xmTestCase/XmTestCaseMng.vue      |  8 +-
 .../xm/core/xmTestPlanCase/TestStepResult.vue |  2 +-
 .../xmTestPlanCase/XmTestPlanCaseEdit.vue     | 82 ++++++++++---------
 .../core/xmTestPlanCase/XmTestPlanCaseMng.vue |  2 +-
 6 files changed, 64 insertions(+), 62 deletions(-)

diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 1c3d2fcf..56d0d722 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -207,7 +207,7 @@
 			</el-dialog>
 
 			<!--新增 XmQuestion xm_question界面-->
-			<el-dialog title="新增缺陷"  :visible.sync="addFormVisible"   width="90%" top="10px"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="新增缺陷"  :visible.sync="addFormVisible" fullscreen  width="90%" top="10px"  append-to-body   :close-on-click-modal="false">
 				<xm-question-add  :xm-menu="xmMenu" op-type="add" :xm-test-plan-case="xmTestPlanCase" :xm-test-plan="xmTestPlan" :xm-product="filters.product" :xm-iteration="xmIteration" :xm-test-case="xmTestCase" :qtype="qtype" :sel-project=" filters.selProject " :xm-question="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-question-add>
 			</el-dialog>
  			<xm-group-dialog ref="xmGroupDialog" :sel-project=" filters.selProject " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-dialog> 
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index 9206f276..7727a8a9 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -25,7 +25,7 @@
 							<el-input v-model="editForm.verNum" placeholder="版本号" :maxlength="50" @change="editSomeFields(editForm,'verNum',$event)"></el-input>
 						</el-form-item>   
 					</el-col>
-					<el-col :span="18" class="border padding">
+					<el-col :span="18" class="border padding-left padding-right padding-top">
 
 						<el-form-item label="用例标题" prop="caseName">    
  									<el-input v-model="editForm.caseName" placeholder="测试用例 标题"  @change="editSomeFields(editForm,'caseName',$event)"></el-input> 
@@ -48,12 +48,11 @@
 								<el-col :span="6">  
 									<mdp-select-dict-x label="优先级" :dict="dicts['priority']" v-model="editForm.cpriority"  @change="editSomeFields(editForm,'cpriority',$event)"></mdp-select-dict-x>
 								</el-col> 
-								
-							</el-row>
+							</el-row> 
 						<el-tabs v-model="activeTab">
 							<el-tab-pane name="1" label="基本信息">
 								<el-form-item label="" prop="preRmark" label-width="0px">
-									<el-row class="label-font-color padding-top">
+									<el-row class="label-font-color">
 										前置条件
 									</el-row> 
 									<el-row>
@@ -61,7 +60,7 @@
 									</el-row> 
 								</el-form-item>   
 								<el-form-item label="" prop="testStep" label-width="0px">
-									<el-row class="label-font-color padding-top">
+									<el-row class="label-font-color">
 										测试步骤
 									</el-row> 
 									<el-row>
@@ -72,7 +71,7 @@
 									</el-row>
 								</el-form-item>     
 								<el-form-item label="" prop="caseRmark" label-width="0px">
-									<el-row class="label-font-color padding-top">
+									<el-row class="label-font-color">
 										用例描述
 									</el-row> 
 									<el-row>
@@ -88,25 +87,26 @@
 								<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="'工时( '+(editForm.actWorkload?editForm.actWorkload:0)+' / '+(editForm.budgetWorkload?editForm.budgetWorkload:0)+' h )'" name="55"> 
+							<el-tab-pane :label="'工时( '+( editForm.actWorkload||0)+' / '+( 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>
 						</el-tabs>
 						
-				
+						<el-row v-if="opType=='add'" class="padding">
+							<span style="float:right;">
+							<el-button @click.native="handleCancel">取消</el-button>
+							<el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button>
+							</span>
+						</el-row>  
 					</el-col>
 					
-				</el-row>     
+				</el-row> 
+  
 			</el-form>
 		</el-row>
 
-		<el-row v-if="opType=='add'" >
-			<span style="float:right;">
-		    <el-button @click.native="handleCancel">取消</el-button>
-            <el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button>
-			</span>
-		</el-row>
+
 		<el-dialog append-to-body title="需求选择"  :visible.sync="menuVisible" width="80%" top="20px"  :close-on-click-modal="false">
 			<xm-menu-select :is-select-menu="true" checkScope="3"  @selected="onMenuSelected" :xm-product="{id:editForm.productId}"></xm-menu-select>
 		</el-dialog>
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index bcc4f83d..7742f9d7 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
-        <el-row>
-            <el-col :span="6" class="padding-right">
+        <el-row :gutter="10">
+            <el-col :span="6">
                 <xm-func-select v-if="xmProductCpd"  :xm-product="xmProductCpd" @row-click="onXmFuncRowClick"> 
                 </xm-func-select>
             </el-col>
@@ -73,12 +73,12 @@
                 
 		<el-row>
 			<!--编辑 XmTestCase 测试用例界面-->
-			<el-dialog title="编辑测试用例" :visible.sync="editFormVisible"  width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="编辑测试用例" :visible.sync="editFormVisible" fullscreen width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
 			    <xm-test-case-edit op-type="edit" :xm-test-case="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @edit-fields="onEditFields"></xm-test-case-edit>
 			</el-dialog>
 
 			<!--新增 XmTestCase 测试用例界面-->
-			<el-dialog title="新增测试用例" :visible.sync="addFormVisible"  width="90%" top="20px"  append-to-body  :close-on-click-modal="false">
+			<el-dialog title="新增测试用例" :visible.sync="addFormVisible" fullscreen width="90%" top="20px"  append-to-body  :close-on-click-modal="false">
 			    <xm-test-case-edit op-type="add" :xm-menu="xmMenu" :xm-product="xmProduct" :xm-test-casedb="xmTestCasedb" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-test-case-edit>
 			</el-dialog>
 	    </el-row>
diff --git a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
index f7a3d211..2dc0317b 100644
--- a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
+++ b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
@@ -35,7 +35,7 @@
 							<my-input class="padding-right" v-model="item.aresult" clearable placeholder="步骤结果"></my-input> 
 						</el-col>
 						<el-col :span="3">  
-								<mdp-select-dict-x   :dict="dicts['testStepTcode']" v-model="item.tcode" :get-icon="getExecStatusIcon"></mdp-select-dict-x> 
+								<mdp-select-dict-x label="结果"  :dict="dicts['testStepTcode']" v-model="item.tcode" :get-icon="getExecStatusIcon"></mdp-select-dict-x> 
  						</el-col> 
 						<el-col :span="1"> 
 							<slot name="addBug">
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
index 2cb5a272..44920a2f 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
@@ -1,9 +1,9 @@
 <template>
 	<section > 
-		<el-row :style="{overflow:'auto',maxHeight:maxTableHeight+'px'}" ref="table">
+		<el-row>
 		<!--编辑界面 XmTestPlanCase 测试计划与用例关系表--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editFormRef" label-position="left" > 
-				<el-row>
+				<el-row ref="table">
 					<el-col  :span="6" class="border padding">
 					
 						<el-form-item label="测试库" prop="casedbName">
@@ -29,8 +29,8 @@
 							<el-input v-model="editForm.verNum" placeholder="版本号" :maxlength="50" @change="editSomeFields(editForm,'verNum',$event)"></el-input>
 						</el-form-item>   
 					</el-col>
-					<el-col :span="18" class="border padding">
-				<el-form-item label="" prop="caseName" label-width="0px">  
+					<el-col :span="18" class="border padding-left padding-right padding-top">
+						<el-form-item label="" prop="caseName" label-width="0px">  
 					
 					<el-row>
 					<span class="title-font-size">{{editForm.caseName}}</span> 
@@ -39,22 +39,28 @@
 					<span > 用例编号:  {{editForm.caseId}}  </span> 
 					</el-row>
 					<el-row class="padding">
-						<el-col :span="8"> 
+						<el-col :span="6"> 
 							   <mdp-select-user-xm label="执行人" userid-key="execUserid" username-key="execUsername" v-model="editForm" @change="editSomeFields(editForm,'execUserid',$event)"></mdp-select-user-xm>
 						</el-col> 
-						<el-col :span="8">  
+						<el-col :span="6">  
 							<mdp-select-dict-x label="优先级" :dict="dicts['priority']" v-model="editForm.priority"  @change="editSomeFields(editForm,'priority',$event)"></mdp-select-dict-x>
 						</el-col> 
 						
-						<el-col :span="8">  
+						<el-col :span="6">  
 							<mdp-select-dict-x label="执行结果" :dict="dicts['testStepTcode']" v-model="editForm.execStatus" :get-icon="getExecStatusIcon"  @change="editSomeFields(editForm,'execStatus',$event)"></mdp-select-dict-x> 
 						</el-col> 
+						<el-col :span="6">  
+							<el-button v-if="opType!='add'" style="margin-top:12px;float:right;" @click="$emit('next')" type="primary">下一条</el-button>  
+							<el-row v-if="opType=='add'">
+								<el-button @click.native="handleCancel">取消</el-button>
+								<el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button>
+							</el-row>
+ 						</el-col> 
 					</el-row>
  				</el-form-item>  
 				<el-tabs v-model="activateName" >
-					<el-tab-pane name="1" label="用例信息"  >
-						<el-row  >
-						<el-row class="padding-top">
+					<el-tab-pane name="1" label="用例信息"  > 
+						<el-row>
 							<el-col :span="6">
 								<el-row class="label-font-size">
 									用例状态
@@ -100,8 +106,19 @@
 								{{editForm.preRemark?editForm.preRemark:'无'}}
 							</el-row>  
 						</el-row>
+						
 						<el-row class="padding-top"> 
 							<el-row class="label-font-size padding-top">
+								备注
+							</el-row> 
+							<el-row class="padding">
+								{{editForm.caseRemark?editForm.caseRemark:'无'}}
+							</el-row>  
+						</el-row>  
+ 					</el-tab-pane> 
+					<el-tab-pane name="21" label="测试步骤"> 
+						<el-row> 
+							<el-row class="label-font-size">
 								测试步骤
 							</el-row> 
 							<el-row class="padding">
@@ -109,31 +126,22 @@
 									<el-button slot="addBug" @click="addBugVisible=true" icon="el-icon-plus"  circle></el-button> 
 								</test-step-result>
 							</el-row> 
-							<el-row v-if="opType!='add' && editFormBak.testStep!=editForm.testStep" > 
-								<el-button v-loading="load.edit" type="primary" @click.native="editSomeFields(editForm,'testStep',editForm.testStep)" :disabled="load.edit==true">保存测试步骤</el-button>
-							</el-row>
-						</el-row>
-						<el-row class="padding-top"> 
-							<el-row class="label-font-size padding-top">
-								备注
+							<el-row class="label-font-size">
+								执行备注
 							</el-row> 
 							<el-row class="padding">
-								{{editForm.caseRemark?editForm.caseRemark:'无'}}
+								<el-input type="textarea" :rows="6" v-model="editForm.remark" placeholder="执行备注" :maxlength="2147483647" @change="editSomeFields(editForm,'remark',$event)"></el-input>
 							</el-row>  
-						</el-row>
-						
-						<el-form-item label="执行备注" prop="remark">
-							<el-input type="textarea" :rows="6" v-model="editForm.remark" placeholder="执行备注" :maxlength="2147483647" @change="editSomeFields(editForm,'remark',$event)"></el-input>
-						</el-form-item> 
-						</el-row>
- 					</el-tab-pane> 
-					<el-tab-pane name="3" label="缺陷"> 
-						<el-row v-if="activateName=='3'">
-							<xm-question-mng   :xm-test-plan-case="editForm"  :xm-product="{id:editForm.productId,productName:editForm.productName}" :sel-project="{id:editForm.projectId,name:editForm.projectName}"></xm-question-mng>
+							<el-row v-if="opType!='add' && editFormBak.testStep!=editForm.testStep" > 
+								<el-button v-loading="load.edit" type="primary" @click.native="editSomeFields(editForm,'testStep',editForm.testStep)" :disabled="load.edit==true">保存测试步骤</el-button>
+							</el-row>
 						</el-row>
 					</el-tab-pane>
+					<el-tab-pane name="3" label="缺陷"> 
+ 						<xm-question-mng   v-if="activateName=='3'" :xm-test-plan-case="editForm"  :xm-product="{id:editForm.productId,productName:editForm.productName}" :sel-project="{id:editForm.projectId,name:editForm.projectName}"></xm-question-mng>
+ 					</el-tab-pane>
 					
-					<el-tab-pane :label="'工时( '+(editForm.actWorkload?editForm.actWorkload:0)+' / '+(editForm.budgetWorkload?editForm.budgetWorkload:0)+' h )'" name="55"> 
+					<el-tab-pane :label="'工时( '+( editForm.actWorkload||0)+' / '+( 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="附件">
@@ -146,22 +154,16 @@
 					
 				</el-row>    
 			</el-form> 
-		</el-row>
-		<el-row>   
-				<el-button style="margin-top:12px;float:right;" @click="$emit('next')" type="primary">下一条</el-button> 
-		</el-row>
-		<el-row v-if="opType=='add'">
-		    <el-button @click.native="handleCancel">取消</el-button>
-            <el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button>
-		</el-row>
+		</el-row> 
+
 				
 		
-		<el-dialog append-to-body title="需求明细"  :visible.sync="menuFormVisible" width="80%"  top="20px"  :close-on-click-modal="false">
+		<el-dialog append-to-body title="需求明细"  :visible.sync="menuFormVisible" fullscreen width="80%"  top="20px"  :close-on-click-modal="false">
 			<xm-menu-edit :visible="menuFormVisible"  :reload="true" :xm-menu="{menuId:editForm.menuId,menuName:editForm.menuName}" ></xm-menu-edit>
 		</el-dialog>
 		
 		<!--新增 XmQuestion xm_question界面-->
-		<el-dialog title="新增缺陷"  :visible.sync="addBugVisible"   width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
+		<el-dialog title="新增缺陷"  :visible.sync="addBugVisible" fullscreen  width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
 			<xm-question-add  op-type="add" :xm-product="{id:editForm.productId,productName:editForm.productName}" :xm-test-plan-case="editForm"  :sel-project=" {id:editForm.projectId,name:editForm.projectName} "  :visible="addBugVisible" @cancel="addBugVisible=false" ></xm-question-add>
 		</el-dialog> 
 	</section>
@@ -325,7 +327,7 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 		    this.$nextTick(() => {
                 initDicts(this);  
                 this.initData()
-                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)-100
+                this.maxTableHeight = util.calcMaxHeight(this.$refs.table.$el)
             });
 		}
 	}
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
index 74b7456a..1e206a97 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
@@ -78,7 +78,7 @@
         </el-row>
 		<el-row>
 			<!--编辑 XmTestPlanCase 测试计划与用例关系表界面-->
-			<el-dialog title="测试执行" :visible.sync="editFormVisible"    width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
+			<el-dialog title="测试执行" :visible.sync="editFormVisible"  fullscreen  width="90%" top="20px"  append-to-body   :close-on-click-modal="false">
 			    <xm-test-plan-case-edit op-type="edit" :xm-test-plan-case="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit" @edit-fields="onEditFields" @next="nextEdit"></xm-test-plan-case-edit>
 			</el-dialog>