From 26e3e4049674cbdd342669b9ce8a5e141d214e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 25 Jul 2022 00:45:27 +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/xmTask/XmTaskAdd.vue  | 32 +++++++------------------
 src/views/xm/core/xmTask/XmTaskEdit.vue | 31 ++++++++++--------------
 2 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue
index 25fe1abf..72db87af 100644
--- a/src/views/xm/core/xmTask/XmTaskAdd.vue
+++ b/src/views/xm/core/xmTask/XmTaskAdd.vue
@@ -2,30 +2,21 @@
 	<section> 
 		<el-row>
 			<!--新增界面 XmTask xm_task-->
-			<el-form :model="addForm"  label-width="120px" label-position="left" :rules="addFormRules" ref="addForm"> 
+			<el-form :model="addForm"  label-width="125px" label-position="left" :rules="addFormRules" ref="addForm"> 
 						<el-row class="label-font-color"> 
   									<span>归属项目：{{addForm.projectName?addForm.projectName:''}}{{addForm.projectId?'('+addForm.projectId+')':''}} &nbsp;&nbsp;</span>
  									<span v-if="addForm.productId">归属产品：{{addForm.productId?addForm.productId:''}}  </span>
 						</el-row>
-						<el-row :gutter="10">
-							<el-col :span="6">
-								<el-form-item label="序号" prop="sortLevel" >  
+						<el-row :gutter="10"> 
+								<el-form-item  prop="name"> 
 									<template slot="label"> 
 									<div    class="big-icon" :style="{backgroundColor:   addForm.ntype==='0'?'#409EFF':'#E6A23C'}">
 										<i :class="  addForm.ntype==='0'?'el-icon-s-operation':'el-icon-odometer' " ></i>
 									</div>  
-									{{addForm.ntype==='0'?'序号/任务':'序号/计划'}}
+									{{addForm.ntype==='0'?'任务名称':'计划名称'}}
 									</template>
-									<el-input  v-model="addForm.sortLevel"    placeholder="如1.0或者1.2.3等" title="序号，如1.0、1.1.1或者1，2，3等"></el-input> 
- 
-								</el-form-item>  
-							</el-col>
-							<el-col :span="18"> 
-								<el-form-item label="" prop="name" label-width="0"> 
 										<el-input v-model="addForm.name" placeholder="名称" ></el-input>   
-								</el-form-item> 
-							</el-col>
-							
+								</el-form-item>   
 						</el-row>
 						
 						
@@ -96,13 +87,11 @@
 								</el-form-item> 
 							</el-col>  
 						</el-row> 
-						<el-row> 
+						<el-row>  
 							
 							<el-col :span="12">
-								<el-form-item  label="优先级别" prop="level">  
-									<el-select v-model="addForm.level">
-											<el-option v-for="i in dicts.priority" :label="i.name" :key="i.id" :value="i.id"></el-option> 
-									</el-select>    
+								<el-form-item label="排序序号" prop="sortLevel" >   
+									<el-input  v-model="addForm.sortLevel" style="max-width:90%;"   placeholder="如1.0或者1.2.3等" title="序号，如1.0、1.1.1或者1，2，3等" ></el-input> 
 								</el-form-item>  
 							</el-col>
 							<el-col :span="12"> 
@@ -316,10 +305,7 @@
 					],
 					taskState: [
 						{ required: true, message: '请选择任务状态', trigger: 'change' }
-					],
-					sortLevel: [
-						{ required: true, message: '排序号不能为空', trigger: 'change' }
-					],
+					], 
 					// execuser:[{
 					// 	validator: validateExec, trigger: 'blur'
 					// }],
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 88e4c0c1..54ebf9a9 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -110,21 +110,15 @@
  									<span>归属项目：{{editForm.projectName?editForm.projectName:''}}{{editForm.projectId?'('+editForm.projectId+')':''}} &nbsp;&nbsp;</span>
  									<span v-if="editForm.productId">归属产品：{{editForm.productId?editForm.productId:''}}  </span>
 						</el-row>
-						<el-row :gutter="10">
-							<el-col :span="6">
-								<el-form-item label="序号" prop="sortLevel" >  
+						<el-row :gutter="10"> 
+							<el-col :span="24"> 
+								<el-form-item  prop="name" > 
 									<template slot="label"> 
 									<div    class="big-icon" :style="{backgroundColor:   editForm.ntype==='0'?'#409EFF':'#E6A23C'}">
 										<i :class="  editForm.ntype==='0'?'el-icon-s-operation':'el-icon-odometer' " ></i>
 									</div>  
-									{{editForm.ntype==='0'?'序号/任务':'序号/计划'}}
+									{{editForm.ntype==='0'?' 任务名称':' 计划名称'}}
 									</template>
-									<el-input  v-model="editForm.sortLevel"    placeholder="如1.0或者1.2.3等" title="序号，如1.0、1.1.1或者1，2，3等"  @change="editXmTaskSomeFields(editForm,'sortLevel',$event)"></el-input> 
- 
-								</el-form-item>  
-							</el-col>
-							<el-col :span="18"> 
-								<el-form-item label="" prop="name" label-width="0"> 
 										<el-input v-model="editForm.name" placeholder="名称" @change="editXmTaskSomeFields(editForm,'name',$event)"></el-input>   
 								</el-form-item> 
 							</el-col>
@@ -132,7 +126,7 @@
 						</el-row>
 						
 						
-						<el-row> 
+						<el-row class="padding"> 
 							<el-col :span="8"> 
 								<mdp-field-x v-model="editForm.parentTaskname" label="上级计划" icon="el-icon-odometer" color="#E6A23C">
 									<el-button slot="oper"
@@ -153,7 +147,7 @@
  							</el-col>  
 							
 						</el-row>
-						<el-row> 
+						<el-row class="padding"> 
 							<el-col :span="8"> 
  									<mdp-select-dict-x  :label="editForm.ntype=='0'?'任务状态':'计划状态'" :dict="dicts['taskState']" v-model="editForm.taskState" @change="editXmTaskSomeFields(editForm,'taskState',$event)"></mdp-select-dict-x>
 							</el-col> 
@@ -209,6 +203,11 @@
 						</el-row> 
 						<el-row> 
 							
+							<el-col :span="12">
+								<el-form-item label="排序序号" prop="sortLevel" >   
+									<el-input  v-model="editForm.sortLevel" style="max-width:90%;"   placeholder="如1.0或者1.2.3等" title="序号，如1.0、1.1.1或者1，2，3等" ></el-input> 
+								</el-form-item>  
+							</el-col>
 							<el-col :span="12">
 								<el-form-item  label="优先级别" prop="level">  
 									<el-select v-model="editForm.level" @change="editXmTaskSomeFields(editForm,'level',$event)">
@@ -1045,13 +1044,7 @@
 
 </script>
 
-<style scoped>
-.el-form-item{
-	margin-bottom: 15px;
-}
-.el-form-item__content{
-	margin-left: 0;
-}
+<style scoped> 
  
 
 .step-btn{