From bffab80cb7066dd2da750186fc22952d486b6c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 20 Jul 2022 14:51:15 +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/xmTestPlanCase/TestStepResult.vue |  8 ++++----
 .../xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue   | 13 ++++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
index 3577cd2b..6cbcc816 100644
--- a/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
+++ b/src/views/xm/core/xmTestPlanCase/TestStepResult.vue
@@ -7,10 +7,10 @@
 						<el-col :span="1">
 							步骤
 						</el-col>
-						<el-col :span="13">
+						<el-col :span="11">
 							操作
 						</el-col> 
-						<el-col :span="6">
+						<el-col :span="8">
 							实际结果
 						</el-col>
 						<el-col :span="2">
@@ -25,11 +25,11 @@
 						<el-col :span="1">
 							{{index+1}}
 						</el-col>
-						<el-col :span="13">
+						<el-col :span="11">
 							<span><span style="color:#C0C4CC;">操作：</span>{{item.op}}</span><br/>
 							<span><span style="color:#C0C4CC;">预期：</span>{{item.eresult}}</span>
  						</el-col> 
-						<el-col :span="6">
+						<el-col :span="8">
 							<my-input class="padding-right" v-model="item.aresult" clearable placeholder="步骤结果"></my-input> 
 						</el-col>
 						<el-col :span="2">
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
index 7d0931b2..26104789 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseEdit.vue
@@ -24,7 +24,12 @@
 					<el-input v-model="editForm.remark" placeholder="执行备注" :maxlength="2147483647" @change="editSomeFields(editForm,'remark',$event)"></el-input>
 				</el-form-item> 
 				<el-form-item label="测试步骤" prop="testStep">
+					<el-row>
 					 <test-step-result v-model="editForm.testStep"></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-form-item> 
 				
 				<el-form-item label="测试结果" prop="execStatus">
@@ -41,9 +46,6 @@
 		</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>
 	</section>
 </template>
 
@@ -156,6 +158,11 @@ TestStepResult,
                 let params={};
                 params['pkList']=[row].map(i=>{ return { caseId:i.caseId,  planId:i.planId}})
                 params[fieldName]=$event
+				if(fieldName!='testStep'){
+					if(this.editForm.testStep!=this.editFormBak.testStep){
+						params.testStep=this.editForm.testStep
+					}
+				}
                 var func = editSomeFieldsXmTestPlanCase
                 func(params).then(res=>{
                   let tips = res.data.tips;