From a6c4bac90787fc485afb031aa7c50ed70e3651eb 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:41:48 +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/components/MDinput/index.vue                |  3 +--
 src/views/xm/core/xmTestCase/TestStepConfig.vue | 14 +++++++-------
 src/views/xm/core/xmTestCase/XmTestCaseEdit.vue | 12 ++++++++++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/components/MDinput/index.vue b/src/components/MDinput/index.vue
index f93ae258..068a3023 100644
--- a/src/components/MDinput/index.vue
+++ b/src/components/MDinput/index.vue
@@ -154,8 +154,7 @@ export default {
   }
 
   // Component:
-  .material-input__component {
-    margin-top: 36px;
+  .material-input__component { 
     position: relative;
     * {
       box-sizing: border-box;
diff --git a/src/views/xm/core/xmTestCase/TestStepConfig.vue b/src/views/xm/core/xmTestCase/TestStepConfig.vue
index ae619653..094a8a48 100644
--- a/src/views/xm/core/xmTestCase/TestStepConfig.vue
+++ b/src/views/xm/core/xmTestCase/TestStepConfig.vue
@@ -23,19 +23,18 @@
 							{{index+1}}
 						</el-col>
 						<el-col :span="9">
-							<el-input style="width:95%;" v-model="item.op" clearable placeholder="操作步骤"></el-input>
+							<my-input class="padding-right" v-model="item.op" clearable placeholder="操作步骤"></my-input>
 						</el-col>
 						<el-col :span="9">
-							<el-input style="width:95%;" v-model="item.eresult" clearable placeholder="预期结果"></el-input>
+							<my-input class="padding-right" v-model="item.eresult" clearable placeholder="预期结果"></my-input>
 						</el-col>
-						<el-col :span="4">
+						<el-col :span="4" style="margin-bottom:0px;">
 							<el-button  @click.prevent="removeExtInfosItem(item,index)" icon="el-icon-delete">
 							</el-button><el-button @click="addExtInfosItem(item,index)" icon="el-icon-plus"></el-button> 
 						</el-col> 
 				</el-row>
-				<el-form-item> 
-					<el-button @click="addExtInfosFirstItem" icon="el-icon-plus"><slot>新增一行</slot></el-button> 
-					<el-button @click="save" icon="el-icon-save"><slot>完成</slot></el-button> 
+				<el-form-item v-if="!extInfosList || extInfosList.length<=0"> 
+					<el-button @click="addExtInfosFirstItem" icon="el-icon-plus"><slot>新增一行</slot></el-button>  
 				</el-form-item>
 			</el-form>  
 		   </el-row>
@@ -45,6 +44,7 @@
 <script> 
 	import { mapGetters } from 'vuex'
 	 
+	import MyInput from '@/components/MDinput/index';
  	
 	export default {  
 		name: 'testStepConfig',
@@ -109,7 +109,7 @@
 			}
 		},//end methods
 		components: {  
-			 
+			 MyInput
 		},
 		mounted() { 
 			 this.initData();
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index 3fadf42e..8e984335 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -13,7 +13,12 @@
 					<el-input v-model="editForm.verNum" placeholder="版本号" :maxlength="50" @change="editSomeFields(editForm,'verNum',$event)"></el-input>
 				</el-form-item>  
 				<el-form-item label="测试步骤" prop="testStep">
-					 <test-step-config v-model="editForm.testStep" @finish="editSomeFields(editForm,'testStep',$event)"></test-step-config>
+					<el-row>
+					 	<test-step-config v-model="editForm.testStep" @finish="editSomeFields(editForm,'testStep',$event)"></test-step-config>
+					 </el-row>
+					 <el-row v-if="opType!=='add' && editForm.testStep!=editFormBak.testStep">
+						<el-button type="primary" @click="editSomeFields(editForm,'testStep',editForm.testStep)">保存测试步骤</el-button>
+					 </el-row>
 				</el-form-item>    
 				<el-form-item label="关联需求" prop="menuName">
 					 {{editForm.menuName?editForm.menuName:'暂无关联需求'}} <el-button type="text" @click="menuVisible=true">选择需求</el-button>
@@ -90,6 +95,9 @@ TestStepConfig,
 						//{ required: true, message: '主键不能为空', trigger: 'blur' }
 					]
 				},
+				editFormBak: {
+					id:'',caseName:'',caseRemark:'',testStep:'',expectResult:'',menuId:'',menuName:'',ctime:'',ltime:'',luserid:'',lusername:'',cbranchId:'',moduleId:'',moduleName:'',caseStatus:'',cuserid:'',cusername:'',productId:'',verNum:'',casedbId:'',casedbName:''
+				},
 				editForm: {
 					id:'',caseName:'',caseRemark:'',testStep:'',expectResult:'',menuId:'',menuName:'',ctime:'',ltime:'',luserid:'',lusername:'',cbranchId:'',moduleId:'',moduleName:'',caseStatus:'',cuserid:'',cusername:'',productId:'',verNum:'',casedbId:'',casedbName:''
 				},
@@ -177,7 +185,7 @@ TestStepConfig,
                 func(params).then(res=>{
                   let tips = res.data.tips;
                   if(tips.isOk){
-                    this.editFormBak=[...this.editForm]
+                    this.editFormBak={...this.editForm}
 					this.$emit('edit-fields',params)
                   }else{
                     Object.assign(this.editForm,this.editFormBak)