From a73827439e771199b002aa059f252a97fccfd923 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 Jun 2022 11:02:19 +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/xmMenuWorkItem/XmSubBugList.vue  |  9 ++++++---
 src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue | 11 +++++++----
 src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue |  9 ++++++---
 src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue |  4 ++--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
index 06e4c75b..469240cc 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubBugList.vue
@@ -79,8 +79,8 @@
       </el-row>
       <xm-group-dialog ref="xmGroupDialog" :sel-project=" {id:linkProjectId} " :is-select-single-user="1" @user-confirm="onUserConfirm"></xm-group-dialog> 
 	        <el-dialog :title="'新增缺陷'" :visible.sync="addFormVisible" append-to-body modal-append-to-body>
-          <el-form :model="addForm" :rules="addFormRules">
-            <el-form-item>
+          <el-form :model="addForm" :rules="addFormRules" ref="addForm">
+            <el-form-item  prop="name">
 				<template slot="label">
 				<div class="icon" style="background-color: #F56C6C;">
 					<i class="el-icon-warning"></i>
@@ -145,7 +145,8 @@ export default {
 	  addFormVisible:false,
 	  addFormRules:{
 		  name:[
-			  {required:true,message:'名称不能为空',trigger:'change'}
+			  {required:true,message:'名称不能为空',trigger:'change'},
+			  { min: 2, max: 250, message: '名称长度在 2 到 250 个字符', trigger: 'change' },//长度
 		  ]
 	  },
       sels:[],
@@ -199,6 +200,7 @@ export default {
       } 
     }, 
     addXmBug(){ 
+		this.$refs.addForm.validate().then(res=>{ 
        var question={menuId:this.parentXmMenu.menuId,menuName:this.parentXmMenu.menuName,productId:this.parentXmMenu.productId,iterationId:this.parentXmMenu.iterationId,iterationName:this.parentXmMenu.iterationName}
              question.priority='3'
              question.verNum=this.parentXmMenu.sinceVersion;
@@ -220,6 +222,7 @@ export default {
 								}
 								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
 							}).catch( err  => this.load.edit=false);
+		})
     },  
       showAdd() {
           this.addFormVisible=true;
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
index 1def64c8..b180a3eb 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubMenuList.vue
@@ -87,8 +87,8 @@
 
 			
       <el-dialog :title="'新增'+calcMenuLabel.label" :visible.sync="addFormVisible" append-to-body modal-append-to-body>
-          <el-form :model="addForm" :rules="addFormRules">
-            <el-form-item>
+          <el-form :model="addForm" :rules="addFormRules" ref="addForm">
+            <el-form-item  prop="menuName">
 				<template slot="label">
 				<div  class="icon" :style="{backgroundColor: calcMenuLabel.color }">
 					<i :class="calcMenuLabel.icon"></i>
@@ -155,7 +155,8 @@ export default {
 	  addFormVisible:false,
 	  addFormRules:{
 		  menuName:[
-			  {required:true,message:'名称不能为空',trigger:'change'}
+			  {required:true,message:'名称不能为空',trigger:'change'},
+			  { min: 2, max: 250, message: '名称长度在 2 到 250 个字符', trigger: 'change' },//长度
 		  ]
 	  },
       dicts:{},
@@ -281,7 +282,8 @@ export default {
       } 
     }, 
     addXmMenu( ){ 
-       var menu={...this.parentXmMenu}
+		this.$refs.addForm.validate().then(valid=>{
+       		var menu={...this.parentXmMenu}
              menu.mmUserid=this.userInfo.userid
              menu.mmUsername=this.userInfo.username
              menu.seqNo=this.parentXmMenu.seqNo+"."+(parseInt(this.parentXmMenu.childrenCnt)+1)
@@ -301,6 +303,7 @@ export default {
 								}
 								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
 							}).catch( err  => this.load.edit=false);
+		});
     },  
       showAdd(dclass) {
 		  this.addForm.menuName=this.parentXmMenu.menuName+'---请修改'
diff --git a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
index 85622b5d..e528b98d 100644
--- a/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmMenuWorkItem/XmSubTaskList.vue
@@ -81,8 +81,8 @@
       </el-row>
       
       <el-dialog title="新增任务" :visible.sync="addFormVisible" append-to-body modal-append-to-body>
-          <el-form :model="addForm" :rules="addFormRules">
-            <el-form-item label="任务名称">
+          <el-form :model="addForm" :rules="addFormRules" ref="addForm">
+            <el-form-item label="任务名称" prop="name">
               
             <template slot="label">
             <div class="icon" style="background-color:  #1CC7EA;">
@@ -151,7 +151,8 @@ export default {
       addForm:{name:''},
       addFormRules: {
 					name: [
-						{ required: true, message: '任务名称不能为空', trigger: 'change' }
+						{ required: true, message: '任务名称不能为空', trigger: 'change' },
+						{ min: 2, max: 150, message: '任务名称长度在 2 到 150 个字符', trigger: 'change' },//长度
 					],  
 				},
       addFormVisible:false,
@@ -204,6 +205,7 @@ export default {
       } 
     }, 
     addXmTask(){ 
+      this.$refs.addForm.validate().then(valid=>{ 
        var task={...this.addForm,menuId:this.parentXmMenu.menuId,menuName:this.parentXmMenu.menuName,productId:this.parentXmMenu.productId,iterationId:this.parentXmMenu.iterationId,iterationName:this.parentXmMenu.iterationName}
              task.priority='3'
              task.verNum=this.parentXmMenu.sinceVersion;
@@ -226,6 +228,7 @@ export default {
 								}
 								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' });
 							}).catch( err  => this.load.edit=false);
+        })
     },  
       showAdd() {
         this.addForm.name=this.parentXmMenu.menuName
diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
index 73426dc4..820adcab 100644
--- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
+++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue
@@ -161,7 +161,7 @@ export default {
       addFormRules:{
 					name: [
 						{ required: true, message: '名称不能为空', trigger: 'change' },
-						{ min: 2, max: 150, message: '名称长度在 0 到 150 个字符', trigger: 'change' },//长度
+						{ min: 2, max: 150, message: '名称长度在 2 到 150 个字符', trigger: 'change' },//长度
 					],
       },
       sels:[],
@@ -211,7 +211,7 @@ export default {
         this.getXmTasks();
     }, 
     addXmTask(){ 
-      this.$refs.addForm.validate().then(res=>{
+      this.$refs.addForm.validate().then(valid=>{
         var task={...this.parentXmTask,name:this.addForm.name,id:null,parentTaskid:this.parentXmTask.id,parentTaskname:this.parentXmTask.name}
              task.priority='3'
              task.verNum=this.parentXmTask.sinceVersion;