From 17859fe2b3c73ac99a200b389f2fc5543375eee2 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, 3 Aug 2022 23:41:58 +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/xmTestPlan/rpt/CompsCard.vue      |  6 ++---
 src/views/xm/core/xmTestPlan/rpt/CompsSet.vue |  9 +------
 .../xm/core/xmTestPlan/xmTestRptOverview.vue  | 25 +++++++++++++------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
index c6016503..ff178bcd 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
@@ -1,10 +1,10 @@
 <template>
 <section>
     <el-row  class="page-center border">
-        <el-col :span="rptConfigVisible?6:0" :style="{height:maxTableHeight+'px',overflow:'auto'}">
-            <comps-set :comp-ids="compIds" @row-click="onCompSelect"></comps-set>
+        <el-col :span="6" :style="{height:maxTableHeight+'px',overflow:'auto'}">
+            <comps-set v-if="rptConfigVisible" :comp-ids="compIds" @row-click="onCompSelect"></comps-set>
         </el-col>
-        <el-col :span="rptConfigVisible?18:24" :style="{height:maxTableHeight+'px',overflow:'auto'}" ref="table">
+        <el-col :span="18" :style="{height:maxTableHeight+'px',overflow:'auto'}" ref="table" class="border">
             <div>
                 <div class="empty" v-if="compCfgList.length == 0" >
                     <el-empty description="暂未选择模块"></el-empty>
diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue b/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
index f6596149..3b3d1d20 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
@@ -51,14 +51,7 @@ export default {
                     name: '报告总览',
                     compDesc: '可以直接显示全部待审批列表，也可根据审批分类详细筛选单条待审批事项',
                     isChecked: false,
-                },
-                {
-                    compId: 'xmTestRptSummary',
-                    icon: img2,
-                    name: '报告总结',
-                    compDesc: '可以直接显示全部任务列表，也可根据状态、类型详细筛选分类的任务',
-                    isChecked: false,
-                },
+                }, 
                 {
                     compId: 'xmTestPlanCaseExecStatusDist',
                     icon: img3,
diff --git a/src/views/xm/core/xmTestPlan/xmTestRptOverview.vue b/src/views/xm/core/xmTestPlan/xmTestRptOverview.vue
index d5ecbab3..7ba77ae2 100644
--- a/src/views/xm/core/xmTestPlan/xmTestRptOverview.vue
+++ b/src/views/xm/core/xmTestPlan/xmTestRptOverview.vue
@@ -71,11 +71,15 @@
 				</el-form-item>   
 			</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>
+		<el-row class="padding-bottom">
+			<span>报告总结</span>
+		</el-row>
+		<el-row> 
+			<el-input  type="textarea" :rows="8" v-model="editForm.summaryRemark"></el-input>
+		</el-row>
+		<el-row v-if="editForm.summaryRemark!==editFormBak.summaryRemark" >
+			<span style="float:right;"> 
+            <el-button type="primary" @click.native="editSomeFields(editForm,'summaryRemark',editForm.summaryRemark)">提交</el-button>
 			</span>
 		</el-row>
 	</section>
@@ -126,9 +130,14 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 					 
 				},
 				editForm: {
-					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:''
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+				
+				editFormBak: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
 				},
                 maxTableHeight:300,
+				summaryRemarkEditVisible:false,
 			}//end return
 		},//end data
 		methods: {
@@ -203,7 +212,7 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
                   let tips = res.data.tips;
                   if(tips.isOk){
                     this.editFormBak=[...this.editForm]
-					this.$emit('edit-fields',params)
+					this.$emit('edit-fields',params) 
                   }else{
                     Object.assign(this.editForm,this.editFormBak)
                     this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
@@ -214,7 +223,7 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 				this.editForm.projectId=row.id
 				this.editForm.projectName=row.name
 				this.editForm.name=this.editForm.projectName+'-测试计划-V1.0'
-			}
+			}, 
 		},//end method
 		mounted() {
 		    this.$nextTick(() => {