From 1bdb5366a26a291ab2845386dc621d9223042a1e 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, 13 Jul 2022 18:04:36 +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/xmProject/XmProjectEdit.vue | 11 +++++----
 src/views/xm/core/xmTask/XmPhase.vue          | 17 +++++++++-----
 src/views/xm/core/xmTask/XmTaskMng.vue        | 23 +++++++++++--------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 43d8a214..9de79f4c 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -2,7 +2,11 @@
 	<section class="page-container padding border"> 
 		<el-row class="page-main" ref="table" :style="{overflowX:'auto',height:maxTableHeight+'px'}">  
 				<el-form :model="editForm"  label-width="120px" label-position="left" :rules="editFormRules" ref="editForm" class="editForm"> 
-						 
+						 					
+							<el-form-item label="名称" prop="name"  v-show="opType==='add'">  
+									<el-input  v-model="editForm.name" placeholder="项目名称" @change="editXmProjectSomeFields(editForm,'name',$event)"></el-input> 
+							</el-form-item>   
+							
 							<el-form-item label="项目代号" prop="code" v-if="opType==='add'">
 								<el-input v-model="editForm.code"  placeholder="项目代号，不可为空" >
 									<template slot="append">
@@ -13,10 +17,7 @@
 							</el-form-item>  	
 							<el-form-item label="编号代号" prop="code" v-else>  
 								 项目代号为<strong> {{editForm.code}} </strong>,打印在合同上，甲乙方共享;项目内部编号为<strong> {{editForm.id}} </strong>，用于内部流转，&nbsp;生成规则:代号-四位随机码 
-							</el-form-item>  					
-							<el-form-item label="名称" prop="name"  v-show="opType==='add'">  
-									<el-input  v-model="editForm.name" placeholder="项目名称" @change="editXmProjectSomeFields(editForm,'name',$event)"></el-input> 
-							</el-form-item>   
+							</el-form-item>  
 							<el-row>
 								<el-col :span="8">
 									<el-form-item label="项目类型"  prop="xmType">
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index c3522413..344f20ad 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -83,6 +83,16 @@
             trigger="manual"
             v-model="moreVisible"
           >
+							<el-row> 
+								<el-col :span="24"> 
+									<el-button  style="float:right;"
+									icon="el-icon-close"
+									@click="moreVisible=false"
+									type="text"
+									>关闭</el-button
+									>
+								</el-col>
+							</el-row> 
             <el-row>
               <el-col :span="24" style="padding-top: 5px" v-if="editForm && editForm.id">
                 <font class="more-label-font">当前选中的计划:</font> 
@@ -152,12 +162,7 @@
                   title="更换任务的上级，实现任务搬家功能"
                   icon="el-icon-upload2"
                   v-loading="load.edit"
-                > </el-button> 
-                <el-button 
-                  icon="el-icon-close"
-                  @click="moreVisible=false"
-                  >关闭</el-button
-                >
+                > </el-button>  
               </el-col>
             </el-row> 
             <el-button slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 9f7fb35b..bb1280da 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -77,6 +77,16 @@
             trigger="manual"
             v-model="moreVisible"
           >
+							<el-row> 
+								<el-col :span="24"> 
+									<el-button  style="float:right;"
+									icon="el-icon-close"
+									@click="moreVisible=false"
+									type="text"
+									>关闭</el-button
+									>
+								</el-col>
+							</el-row> 
             <el-row>
               <el-col :span="24" style="padding-top: 5px">
                 <font class="more-label-font">产品:</font
@@ -201,21 +211,14 @@
                   >众包</el-checkbox
                 > 
               </el-col>
-              <el-col :span="24" style="padding-top: 10px">
-                <el-button
+              <el-col :span="24" style="padding-top: 10px;">
+                <el-button 
                   type="primary"
                   icon="el-icon-search"
                   @click="searchXmTasks"
                   >查询</el-button
                 >
-              </el-col>
-              <el-col :span="24" style="padding-top: 10px">
-                <el-button 
-                  icon="el-icon-close"
-                  @click="moreVisible=false"
-                  >关闭</el-button
-                >
-              </el-col>
+              </el-col> 
             </el-row>  
             <el-button   slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
           </el-popover>