From a56c39af9811b7293a40fcfb1fa30adb1ef86e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 31 Jul 2022 16:55:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmTestPlan/XmTestPlanInfo.vue     |  16 +-
 .../xm/core/xmTestPlan/XmTestPlanRpt.vue      | 210 ++++++++++++++++++
 2 files changed, 220 insertions(+), 6 deletions(-)
 create mode 100644 src/views/xm/core/xmTestPlan/XmTestPlanRpt.vue

diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index fa6acca0..19e21008 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -10,10 +10,13 @@
                      <el-divider direction="vertical"></el-divider>
                      {{xmTestPlan.name}}
                      <el-divider direction="vertical"></el-divider>
-                     <el-link :type="subPage=='testPlanCase'?'primary':''" @click="subPage='testPlanCase'">执行测试</el-link>
+                     <el-link :type="subPage=='testPlanCase'?'primary':''" @click="subPage='testPlanCase'"><i class="el-icon-video-play"></i>&nbsp;执行测试</el-link>
                      <el-divider direction="vertical"></el-divider>
-                     <el-link :type="subPage=='testBug'?'primary':''"  @click="subPage='testBug'">缺陷</el-link>
-
+                     <el-link :type="subPage=='testBug'?'primary':''"  @click="subPage='testBug'"><i class="el-icon-question"></i>&nbsp;缺陷</el-link>
+                     
+                    <el-divider direction="vertical"> 
+                    </el-divider>
+                        <el-link :type="subPage=='testRpt'?'primary':''"  @click="subPage='testRpt'"><span><i class="el-icon-pie-chart"></i>&nbsp;报告</span></el-link>
                      <span style="float:right;">
                         <span > 
                           <el-tag style="margin-top:5px;" v-for="(item,index) in formatDictsWithClass(dicts,'testPlanStatus',xmTestPlan.status)" :key="index" :type="item.className">{{item.name}}</el-tag> 
@@ -21,9 +24,6 @@
                            <div style="display:inline-flex"><el-progress  style="width:100px;" :stroke-width="22" :text-inside="true"  :status="calcYiCeshiCases>0 && xmTestPlan.errCases<=0 ?'success':'exception'" :percentage="calcProgress"></el-progress>
                            </div>
                         </span>
-                        <el-divider direction="vertical"> 
-                        </el-divider>
-                         <el-link><span><i class="el-icon-pie-chart"></i>&nbsp;报告</span></el-link>
                         <el-divider direction="vertical"></el-divider>
 
                      </span>
@@ -35,6 +35,10 @@
                 <el-row v-if="subPage=='testBug'">
                      <xm-question-mng   :xm-test-plan="xmTestPlan" :xm-test-casedb="xmTestCasedb" :xm-product="{id:xmTestPlan.productId,productName:xmTestPlan.productName}" :sel-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}"></xm-question-mng>
                 </el-row>
+                
+                <el-row v-if="subPage=='testRpt'">
+                     <xm-test-plan-rpt   :xm-test-plan="xmTestPlan"></xm-test-plan-rpt >
+                </el-row>
             </el-row> 
             <xm-test-plan-mng v-else @select="onTestPlanSelect" :xm-test-casedb="xmTestCasedb"> </xm-test-plan-mng>
         </el-row>     
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanRpt.vue b/src/views/xm/core/xmTestPlan/XmTestPlanRpt.vue
new file mode 100644
index 00000000..79c29b1a
--- /dev/null
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanRpt.vue
@@ -0,0 +1,210 @@
+<template>
+	<section  class="padding"> 
+		<el-row ref="table">
+		<!--编辑界面 XmTestPlan 测试计划--> 
+			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editFormRef" label-position="left">
+			
+				<el-form-item label="归属项目" prop="projectId">
+					 
+					<span v-if="opType=='add'">
+					 	<xm-project-select v-if="!selProject || !selProject.id" ref="xmProjectSelect" :link-product-id="xmTestCasedb? xmTestCasedb.productId:null"  @row-click="onPorjectConfirm" :auto-select="false">
+							<span slot="title">选择项目</span>
+						</xm-project-select>
+						<div v-else>{{editForm.projectName}}</div>
+					</span> 
+ 					<div v-else>{{editForm.projectName}}</div>
+				</el-form-item>  
+				 <el-form-item prop="name" label-width="0px">
+				  <el-row class="padding-bottom">
+					<my-input v-model="editForm.name" placeholder="计划名称" :maxlength="255" @change="editSomeFields(editForm,'name',$event)"></my-input>
+ 				  </el-row>
+				  </el-form-item>
+				<el-row class="padding">
+					<el-col :span="8">
+						<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="editForm" @change="editSomeFields(editForm,'cuserid',$event)"></mdp-select-user-xm>
+					</el-col>
+					<el-col :span="8">
+						<mdp-select-dict-x label="状态" :dict="dicts['testPlanStatus']" v-model="editForm.status"  @change="editSomeFields(editForm,'status',$event)"></mdp-select-dict-x>
+					</el-col>
+					
+					<el-col :span="8">
+						<mdp-select-dict-x label="测试结果" :dict="dicts['testPlanTcode']" v-model="editForm.tcode"  @change="editSomeFields(editForm,'tcode',$event)"></mdp-select-dict-x>
+					</el-col>
+				</el-row>   
+ 				<el-form-item label="归属测试库" prop="casedbName">
+					{{editForm.casedbName}}
+				</el-form-item>  
+				<el-form-item label="归属产品" prop="productName">
+					{{editForm.productName}}
+				</el-form-item>  
+				 
+				<el-form-item label="起止时间" prop="stime">
+					<mdp-date-range :auto-default="false" placeholder="选择日期" v-model="editForm" start-key="stime" end-key="etime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'stime',editForm)"></mdp-date-range>
+				</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>
+			</span>
+		</el-row>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import config from "@/common/config"; //全局公共库import
+ 	import { initDicts, addXmTestPlan,editXmTestPlan,editSomeFieldsXmTestPlan } from '@/api/xm/core/xmTestPlan';
+	import { mapGetters } from 'vuex'
+	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
+	
+import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修改界面
+	export default {
+	    name:'xmTestPlanEdit',
+	    components: {
+			XmProjectSelect,MdpSelectUserXm,
+        },
+		computed: {
+		    ...mapGetters([ 'userInfo'  ]),
+
+		},
+		props:['xmTestPlan','visible','opType','selProject','xmTestCasedb'],
+
+		watch: {
+	      'xmTestPlan':function( xmTestPlan ) {
+	        if(xmTestPlan){
+	            this.editForm = {...xmTestPlan};
+	        }
+
+	      },
+	      'visible':function(visible) { 
+	      	if(visible==true){
+ 	      		this.initData()
+	      	}
+	      } 
+	    },
+		data() {
+			return {
+			    currOpType:'add',//add/edit
+ 				load:{ list: false, edit: false, del: false, add: false },//查询中...
+				dicts:{
+					testPlanStatus:[],
+					testPlanTcode:[],
+
+				},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
+				editFormRules: {
+					name: [
+						{ required: true, message: '测试计划名称不能为空', trigger: 'change' },
+						{ min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'change' },//长度
+					],
+					projectId: [
+						{ required: true, message: '项目不能为空', trigger: 'change' }, 
+					],
+				},
+				editForm: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:''
+				},
+                maxTableHeight:300,
+			}//end return
+		},//end data
+		methods: {
+
+		    ...util,
+
+			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
+			handleCancel:function(){
+				this.$refs['editFormRef'].resetFields();
+				this.$emit('cancel');
+			},
+			//新增、编辑提交XmTestPlan 测试计划父组件监听@submit="afterEditSubmit"
+			saveSubmit: function () {
+				this.$refs.editFormRef.validate((valid) => {
+					if (valid) {
+						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
+							this.load.edit=true
+							let params = Object.assign({}, this.editForm);
+							var func=addXmTestPlan
+							if(this.currOpType=='edit'){
+							    func=editXmTestPlan
+							}
+							func(params).then((res) => {
+                                this.load.edit=false
+                                var tips=res.data.tips;
+                                if(tips.isOk){
+                                    this.editForm=res.data.data
+                                    this.initData()
+                                    this.currOpType="edit";
+                                    this.$emit('submit');//  @submit="afterAddSubmit"
+                                }
+                                this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
+                            }).catch( err =>this.load.edit=false);
+						});
+					}else{
+					    this.$notify({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' });
+					}
+				});
+			},
+			initData: function(){
+			    this.currOpType=this.opType
+			    if(this.xmTestPlan){
+                    this.editForm = Object.assign({},this.xmTestPlan);
+                }
+
+                if(this.opType=='edit'){
+
+                }else{
+
+                }
+                this.editFormBak={...this.editForm}
+            },
+
+            editSomeFields(row,fieldName,$event){
+                if(this.opType=='add'){
+                    return;
+                }
+                let params={};
+                params['ids']=[row].map(i=>i.id)
+                
+				if(fieldName=='stime'){
+					params[fieldName]=$event.stime
+					params.etime=$event.etime
+				}else if(fieldName=='cuserid'){
+					params[fieldName]=$event[0].userid
+					params.cusername=$event[0].username
+				}else{
+					params[fieldName]=$event
+				}
+                var func = editSomeFieldsXmTestPlan
+                func(params).then(res=>{
+                  let tips = res.data.tips;
+                  if(tips.isOk){
+                    this.editFormBak=[...this.editForm]
+					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'})
+                  }
+                }).catch((e)=>Object.assign(this.editForm,this.editFormBak))
+            },
+			onPorjectConfirm(row){
+				this.editForm.projectId=row.id
+				this.editForm.projectName=row.name
+				this.editForm.name=this.editForm.projectName+'-测试计划-V1.0'
+			}
+		},//end method
+		mounted() {
+		    this.$nextTick(() => {
+                initDicts(this);
+                this.initData()
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
+            });
+		}
+	}
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file