From 756c1fc5075636c7c833286cd0bc02d258e1275e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 23 Jul 2022 15:23:59 +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/components/DateField/index.vue            |  28 +-
 src/components/DateRangeField/index.vue       | 251 ++++++++++++++++++
 src/main.js                                   |   2 +
 .../xm/core/components/XmIterationSelect.vue  |   4 +-
 .../xm/core/xmIteration/XmIterationAdd.vue    | 193 --------------
 .../xm/core/xmIteration/XmIterationBox.vue    |   4 +-
 .../xm/core/xmIteration/XmIterationEdit.vue   |  76 +++---
 .../xmIteration/XmIterationForLinkComplex.vue |   4 +-
 .../xm/core/xmIteration/XmIterationInfo.vue   |   2 +-
 .../xm/core/xmIteration/XmIterationMng.vue    |   4 +-
 src/views/xm/core/xmProduct/XmProductEdit.vue |   6 +-
 src/views/xm/core/xmProject/XmProjectEdit.vue |   6 +-
 12 files changed, 316 insertions(+), 264 deletions(-)
 create mode 100644 src/components/DateRangeField/index.vue
 delete mode 100644 src/views/xm/core/xmIteration/XmIterationAdd.vue

diff --git a/src/components/DateField/index.vue b/src/components/DateField/index.vue
index 086e7742..2f6ba5ac 100644
--- a/src/components/DateField/index.vue
+++ b/src/components/DateField/index.vue
@@ -96,38 +96,22 @@
           if(!item){
             return ""
           }else{
-            return item.icon?"":item.name
+            return item
           }
         },
         getMyColor(item){
-          if(item){
-           
-            if(this.getColor){
-                return this.getColor(item)
-            } 
-            return util.getColor(item)
-            
+          if(this.getColor){
+             return this.getColor(item)
           }else{
-            if(this.getColor){
-                return this.getColor(this.myVal)
-            }else{
-              return util.getColor(this.myVal)
-            }
-          }
+            return util.getColor(item)
+          } 
         },
         getMyIcon(item){
-          if(item){ 
-            if(this.getIcon){
+           if(this.getIcon){
                 return this.getIcon(item)
-            } 
-            return "el-icon-date";
-          }else{
-            if(this.getIcon){
-                return this.getIcon(this.myVal)
             }else{
               return "el-icon-date"
             }
-          }
         },
         initData(){
              this.myVal=this.value
diff --git a/src/components/DateRangeField/index.vue b/src/components/DateRangeField/index.vue
new file mode 100644
index 00000000..a9264f5d
--- /dev/null
+++ b/src/components/DateRangeField/index.vue
@@ -0,0 +1,251 @@
+<template>   
+<div class="field-box">  
+							<el-avatar class="avater" :icon="getMyIcon(dateRange)" :style="{backgroundColor:getMyColor(dateRange)}">{{getMyAvaterInfo(dateRange)}}</el-avatar> 
+							
+              <div class="field-info">
+                <slot name="field-info" :value="dateRange">
+								<span class="field-value">{{formatDateRange(dateRange) }} </span>
+                <slot name="label">
+								  <span class="field-label">{{label}}</span>
+                </slot>
+                </slot>
+							</div>   
+							<div v-if="disabled!==true" class="my-select" name="select" :value="dateRange">
+                
+              <el-date-picker :type="type" :style="styleObj"  v-model="dateRange" :value-format="valueFormat" :format="format" 
+                  unlink-panels 
+                  :range-separator="rangeSepaSrator"
+                  :start-placeholder="startPlaceholder"
+                  :end-placeholder="endPlaceholder"
+                  :default-range="[-30,0]"
+                  @change="onDateRangeChange"
+                  :picker-options="pickerOptions"   
+                  ></el-date-picker>  
+              </div>
+						</div>  
+</template>
+
+<script> 
+import util from '@/common/js/util'
+export default {
+  name: 'date-range',
+  components: {   },
+  computed: {
+     
+  },
+  data(){
+      return {
+          dateRange:[],
+      }
+  },
+  watch:{
+      dateRange(){
+
+      },
+      value:{ 
+        deep:true,
+        handler(){
+           this.initData();
+        }
+         
+      }
+  },
+  props: {
+      
+    value: {
+      
+    }, 
+    label:{
+      type:String,
+      default:'起止时间',
+    },
+    type: {
+      type: String,
+      default: 'daterange'
+    }, 
+    startKey: {
+      type: String,
+      default: 'startTime'
+    }, 
+     
+    styleObj:{
+        typeof:Object,
+        default:function(){return { maxWidth:'100%' }}
+    },
+    
+    endKey: {
+      type: String,
+      default: 'endTime'
+    }, 
+    
+    valueFormat: {
+      type: String,
+      default: 'yyyy-MM-dd HH:mm:ss'
+    }, 
+    
+    format: {
+      type: String,
+      default: 'yyyy-MM-dd'
+    }, 
+    startPlaceholder: {
+      type: String,
+      default: '开始日期'
+    }, 
+    
+    endPlaceholder: {
+      type: String,
+      default: '结束日期'
+    }, 
+    rangeSepaSrator:{ 
+      type: String,
+      default: '~'
+    },
+    pickerOptions:{
+        typeof:Object,
+        default:function(){return util.getPickerOptions('datarange')}
+    },
+    autoDefault:{
+        type:Boolean,
+        default:true,
+    },
+    defaultRange:{
+        type:Array,
+        default:function(){
+            return [-15,15]
+        }
+    }
+  },
+  methods: { 
+      formatDateRange(dateRange){
+        if(!dateRange||dateRange.length==0){
+          return ""
+        }else{
+          if(dateRange.length==1){
+            return util.formatDate(new Date(dateRange[0]),this.format)
+          }else if(dateRange.length==2){
+             return util.formatDate(new Date(dateRange[0]),this.format)+this.rangeSepaSrator+util.formatDate(new Date(dateRange[1]),this.format)
+          }
+        }
+      },
+      initData(){
+          this.dateRange=[];
+          if(this.value instanceof Array){
+              this.dateRange=this.value
+          }else if(this.value instanceof Object){
+            if(this.value && this.value[this.startKey] && this.value[this.endKey]){
+              this.dateRange=[this.value[this.startKey],this.value[this.endKey]]
+            }
+          }
+          if( !this.dateRange || this.dateRange.length===0){
+              if(this.autoDefault===true || (this.autoDefault!==false && this.defaultRange && this.defaultRange.length==2)){
+                  var now=new Date();
+                  var start=new Date(); 
+                  var end=new Date(); 
+                  start.setTime(now.getTime() + 3600 * 1000 * 24 * this.defaultRange[0]);
+                  end.setTime(now.getTime() + 3600 * 1000 * 24 * this.defaultRange[1]);
+                  this.dateRange.push(util.formatDate(start,this.valueFormat))
+                  this.dateRange.push(util.formatDate(end,this.valueFormat))
+                this.onDateRangeChange(this.dateRange);
+              }
+          }
+          
+      },
+      onDateRangeChange(dates){ 
+          if(this.value && this.value instanceof Object){
+            if(dates && dates.length===2){
+                this.value[this.startKey]=dates[0]
+                this.value[this.endKey]=dates[1]
+            }else if(dates && dates.length===1){
+                this.value[this.startKey]=dates[0]
+                this.value[this.endKey]=null
+            }else if(dates && dates.length===0){
+                this.value[this.startKey]=null
+                this.value[this.endKey]=null
+            }
+            this.$emit('input',this.value)
+          }else if(this.value instanceof Array){
+               this.$emit('input',dates)
+          }
+          this.$emit('change',dates)
+      },
+      getMyAvaterInfo(item){
+          if(!item||item.length==0){
+            return ""
+          }else{
+            return item[0]
+          }
+        },
+        getMyColor(item){
+          if(this.getColor){
+             return this.getColor(item)
+          }
+          if(item && item.length>0){ 
+            return util.getColor(item[0]) 
+          }else{ 
+              return util.getColor("") 
+          }
+        },
+        getMyIcon(item){
+          if(this.getIcon){
+             return this.getIcon(item)
+          }else{
+             return "el-icon-date";
+          } 
+        },
+  },
+  mounted(){
+      this.initData();
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+ 
+
+
+.field-box {  
+    display: flex;
+    margin-right:5px;
+    align-items: center;
+	  cursor: pointer;
+    .avater { 
+		  background-color:#FF9F73;
+    }
+
+    .field-info {
+        margin-left: 10px;
+        display: flex;
+        flex-direction: column;
+        .field-value {  
+            font-size: 16px;  
+        } 
+        .field-label{   
+          font-size: 14px;
+          color: #C0C4CC;
+        }
+        
+    }
+	.my-select{
+    margin-left: 5px;
+    margin-right:5px; 
+		display: none;  
+	}
+	.btn{
+		margin-top: 0px;
+		visibility:hidden; 
+	} 
+	 
+}
+ .field-box:hover .btn{
+		visibility: visible !important;
+}
+ .field-box:hover .my-select{
+  
+    margin-left: 5px;
+    display: inline;
+} 
+ .field-box:hover .field-info{ 
+    display: none;
+} 
+</style>
diff --git a/src/main.js b/src/main.js
index 81391818..1942eb60 100644
--- a/src/main.js
+++ b/src/main.js
@@ -29,6 +29,7 @@ import DictTag from '@/components/DictTag/index'
 import DictField from '@/components/DictField/index'
 import MyInput from '@/components/MDinput/index'
 import DateField from '@/components/DateField/index'
+import DateRangeField from '@/components/DateRangeField/index'
 import UserField from '@/components/UserField/index'
 
 Vue.prototype.$echarts = echarts
@@ -39,6 +40,7 @@ Vue.component('dict-tag',DictTag)
 Vue.component('dict-field',DictField)
 Vue.component('my-input',MyInput)
 Vue.component('date-field',DateField)
+Vue.component('date-range-field',DateRangeField)
 Vue.component('user-field',UserField)
 Vue.use(Element, {
   size: 'small', // set element-ui default size
diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index 4b0ad899..55e7699d 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -116,7 +116,7 @@
 		
 	
         <el-dialog append-to-body :visible.sync="addIterationVisible" width="70%">
-          <xm-iteration-add
+          <xm-iteration-add op-type="add"
             :xm-product="productId?{ id: productId, name: '' }:null"
 			:sel-project="linkProjectId?{id:linkProjectId,name:''}:null"
             @cancel="addIterationVisible = false"
@@ -136,7 +136,7 @@
   
 	const map=new Map();
 	import { mapGetters } from 'vuex' 
-	import XmIterationAdd from "../xmIteration/XmIterationAdd.vue";
+	import XmIterationAdd from "../xmIteration/XmIterationEdit.vue";
 
 	export default {
 		computed: {
diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
deleted file mode 100644
index 1e7dd57f..00000000
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-	<section class="padding border">
-		<el-row>
-			<!--新增界面 XmIteration 迭代定义--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">   
-				<el-form-item label="归属产品" prop="productId">  
-						<xm-product-select v-if="!xmProduct||!xmProduct.id" ref="xmProductSelect" :auto-select="true" :link-project-id="selProject?selProject.id:null"   @row-click="onProductRowClick" @clear="onProductClearSelect" @close="productSelectVisible=false"></xm-product-select>
- 
-					<span v-else>{{addForm.productName?addForm.pproductName:addForm.productId}}</span>
-				</el-form-item> 
-				<el-form-item label="上线时间" prop="onlineTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'onlineTime',$event)"></el-date-picker>
-				</el-form-item>   
-				<el-form-item label="起止时间" prop="startTime">
-					<date-range :auto-default="true" start-key="startTime" end-key="endTime" v-model="addForm" placeholder="选择日期"   value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></date-range>
-				</el-form-item>   
-				<el-form-item label="迭代名称" prop="iterationName">
-					<el-input v-model="addForm.iterationName" placeholder="迭代名称" minlength="10"></el-input>
-					<font color="blue">格式如下： 上线日期+主题+V版本号 例如： 2021.6.15购书商城V1.0.9 &nbsp;&nbsp;留空，选日期后自动填写迭代名称</font>
-				</el-form-item>  
-				<el-form-item label="负责人姓名" prop="adminUsername">
-					{{addForm.adminUsername}} <el-button @click="userSelectVisible=true">选择负责人</el-button>
-				</el-form-item>     
-				<el-form-item  style="float:right;"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>   
-				</el-form-item> 
-			</el-form>
-		</el-row>
-		
-		<el-drawer append-to-body title="选择员工" :visible.sync="userSelectVisible" size="60%">
-        	<users-select :select-userids="[]" @confirm="onUserSelected" ref="usersSelect"></users-select>
-      	</el-drawer>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
-	import { addXmIteration } from '@/api/xm/core/xmIteration';
-	import { mapGetters } from 'vuex'	
-	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
-
-	import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmIteration','visible', 'selProject','xmProduct'],
-		watch: {
-	      'xmIteration':function( xmIteration ) {
-	        this.addForm = xmIteration;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){  
-				this.addForm.cuserid=this.userInfo.userid
-				this.addForm.cusername=this.userInfo.username
-				this.addForm.adminUserid=this.userInfo.userid
-				this.addForm.adminUsername=this.userInfo.username;
-				if(this.xmProduct && this.xmProduct.id){
-					
-					this.addForm.productId=this.xmProduct.id
-					this.addForm.productName=this.xmProduct.productName;
-				}
-	      	}
-	      },
-		  'addForm.onlineTime':function(val){
-			  if(!val){
-				  return;
-			  }
-			  var date=val.substr(0,10)
-			  date=date.replaceAll('-','');
-			  this.addForm.iterationName=date+(this.addForm.productName?this.addForm.productName:'-请修改-')+'V1.0.0'
-		  },
-		  'addForm.productName':function(val){
-			  var date=this.addForm.onlineTime
-			  if(!date){
-				  return;
-			  }
-			  date=date.substr(0,10)
-			  date=date.replaceAll('-','');
-			  this.addForm.iterationName=date+(this.addForm.productName?this.addForm.productName:'-请修改-')+'V1.0.0'
-		  }
-	    },
-		data() {
-			return {
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					iterationName: [
-						{ required: true, message: '迭代名称不能为空', trigger: 'change' },
-						{ min:10,max:250, message: '名称长度在10-250个字符', trigger: 'change' }
-					], 
-					productId: [
-						{ required: true, message: '产品编号不能为空', trigger: 'change' }
-					], 
-					onlineTime: [
-						{ required: true, message: '上线时间不能为空', trigger: 'change' }
-					],
-					startTime:[ 
-						{ required: true, message: '开始时间不能为空', trigger: 'change' }
-					],
-				},
-				//新增界面数据 迭代定义,
-				addForm: {
-					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',seqNo:'',istatus:'',cuserid:'',cusername:'',remark:'',iphase:'',isTpl:'',productId:''
-				},
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				userSelectVisible:false,
-				productSelectVisible:false,
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$emit('cancel');
-			},
-			//新增提交XmIteration 迭代定义 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {  
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {  
-						var params={...this.addForm} 
-						this.$confirm('确认提交迭代吗？', '提示', {}).then(() => { 
-							this.load.add=true 
-							addXmIteration(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){ 
-									this.$emit('submit',res.data.data);//  @submit="afterAddSubmit"
-								}
-								this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: "表单验证不通过", type: 'error' }); 
-					}
-				});
-			},
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-			
-			onUserSelected: function(users) {
-				if(users.length>1){
-					this.$notify.error("只能选一个人");
-					return;
-				}
-				var user=users[0]
-				this.addForm.adminUserid=user.userid
-				this.addForm.adminUsername=user.username
-				this.userSelectVisible = false;
-			},	
-			onProductRowClick(product){
-				this.addForm.productId=product.id
-				this.addForm.productName=product.productName
-				this.productSelectVisible=false;
-			}, 
-			onProductClearSelect(){ 
-				this.addForm.productId=''
-				this.addForm.productName=''
-				this.productSelectVisible=false;
-			}
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-			//在下面添加其它组件 'xm-iteration-edit':XmIterationEdit
-			UsersSelect,XmProductSelect,
-		},
-		mounted() {
-
-			this.addForm=Object.assign(this.addForm, this.xmIteration);   
-			this.addForm.cuserid=this.userInfo.userid
-			this.addForm.cusername=this.userInfo.username
-			this.addForm.adminUserid=this.userInfo.userid
-			this.addForm.adminUsername=this.userInfo.username;
-			if(this.xmProduct && this.xmProduct.id){
-				
-				this.addForm.productId=this.xmProduct.id
-				this.addForm.productName=this.xmProduct.productName;
-			}
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmIteration/XmIterationBox.vue b/src/views/xm/core/xmIteration/XmIterationBox.vue
index a547950d..02792abe 100644
--- a/src/views/xm/core/xmIteration/XmIterationBox.vue
+++ b/src/views/xm/core/xmIteration/XmIterationBox.vue
@@ -92,7 +92,7 @@
 
 			<!--新增 XmIteration 迭代定义界面-->
 			<el-drawer title="新增迭代定义" :visible.sync="addFormVisible"  size="50%"  append-to-body  :close-on-click-modal="false">
-				<xm-iteration-add :xm-iteration="addForm" :parent-iteration="parentIteration" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-iteration-add>
+				<xm-iteration-add op-type="add" :xm-iteration="addForm" :parent-iteration="parentIteration" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-iteration-add>
 			</el-drawer>
 
 			<!--新增 XmIteration 迭代定义界面-->
@@ -115,7 +115,7 @@
 	import {  loadTasksToXmIterationState } from '@/api/xm/core/xmIterationState';
 	import { addXmIterationLink,delXmIterationLink } from '@/api/xm/core/xmIterationLink';
 
-	import  XmIterationAdd from './XmIterationAdd';//新增界面
+	import  XmIterationAdd from './XmIterationEdit';//新增界面
 	import  XmIterationEdit from './XmIterationEdit';//修改界面
 	import  XmIterationStateMng from '../xmIterationState/XmIterationStateMng';//修改界面
   import XmGantt from '../components/xm-gantt';
diff --git a/src/views/xm/core/xmIteration/XmIterationEdit.vue b/src/views/xm/core/xmIteration/XmIterationEdit.vue
index 62727088..7cb33da9 100644
--- a/src/views/xm/core/xmIteration/XmIterationEdit.vue
+++ b/src/views/xm/core/xmIteration/XmIterationEdit.vue
@@ -1,39 +1,44 @@
 <template>
-	<section class="padding border">
-		 
-		<el-row style="padding-left:70px;">
-			 <font color="blue" style="text-align:center;">注意：请尽量在评审会阶段把需求明确.<br/>进入计划会后，不允许再添加需求进入迭代。原则上需求评审后需求只出不进。</font>
-		</el-row>
+	<section class="padding border"> 
 		<el-row>
 			<!--新增界面 XmIteration 迭代定义--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">  
+			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm" label-position="left">  
 				<el-form-item label="迭代名称" prop="iterationName">
-					<el-input v-model="editForm.iterationName" placeholder="迭代名称"  @change="editSomeFields(editForm,'iterationName',$event)"></el-input>
+					<el-input v-model="editForm.iterationName" placeholder="迭代名称 选择上线日期后会自动生成名字"  @change="editSomeFields(editForm,'iterationName',$event)"></el-input>
+
 				</el-form-item> 
-				<el-form-item label="序号" prop="seqNo">
+				<el-form-item label="序号" prop="seqNo" v-if="opType!=='add'">
 					<el-input v-model="editForm.seqNo" placeholder="如1.0，2.0，1.1.1等"  @change="editSomeFields(editForm,'seqNo',$event)"></el-input>
 				</el-form-item> 
-				<el-form-item label="状态" prop="istatus">
-					
-					<el-select v-model="editForm.istatus" @change="editSomeFields(editForm,'istatus',$event)">
-					<el-option v-for="(item,index) in dicts['iterationStatus']" :key="index" :value="item.id" :label="item.name"></el-option>
-					</el-select>
-				</el-form-item> 
-				<el-form-item label="起止时间" prop="startTime">
-					<date-range :auto-default="false" start-key="startTime" end-key="endTime" v-model="editForm" placeholder="选择日期"   value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'startTime',$event)"></date-range>
-				</el-form-item>  
-				<el-form-item label="上线时间" prop="onlineTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'onlineTime',$event)"></el-date-picker>
-				</el-form-item>   
-				<el-form-item label="负责人姓名" prop="adminUsername">
-					{{editForm.adminUsername}} <el-button type="text" @click="userSelectVisible=true">选择负责人</el-button>
-				</el-form-item>      
+				<el-row>
+					 
+					<el-col :span="12"> 
+						<el-form-item prop="onlineTime" label-width="0px">
+							<date-field label="上线时间"  type="date" placeholder="选择日期" v-model="editForm.onlineTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'onlineTime',$event)"></date-field>
+						</el-form-item>   
+					</el-col>
+					<el-col :span="12"> 
+				
+						<el-form-item prop="startTime"  label-width="0px">
+							<date-range-field label="起止时间" :auto-default="false" start-key="startTime" end-key="endTime" v-model="editForm" placeholder="选择日期"   value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'startTime',$event)"></date-range-field>
+						</el-form-item>  
+					</el-col>
+				</el-row>   
+				<el-row>
+					<el-col :span="12"> 
+						<el-form-item prop="adminUserid" label-width="0px">
+							<xm-user-field label="负责人姓名" v-model="editForm" userid-key="adminUserid" username-key="adminUsername"  @change="editSomeFields(editForm,'adminUserid',$event)"></xm-user-field>
+						</el-form-item>   
+					</el-col>
+					<el-col :span="12">
+						<el-form-item  prop="istatus" label-width="0px">
+							<dict-field label="状态" :dict="dicts['iterationStatus']" v-model="editForm.istatus" @change="editSomeFields(editForm,'istatus',$event)"></dict-field>
+							
+						</el-form-item> 
+					</el-col> 
+				</el-row>   
 			</el-form>
-		</el-row>
-		
-		<el-drawer append-to-body title="选择员工" :visible.sync="userSelectVisible" size="60%">
-        	<users-select v-if="userSelectVisible" :select-userids="[]" @confirm="onUserSelected" ref="usersSelect"></users-select>
-      	</el-drawer>
+		</el-row> 
 	</section>
 </template>
 
@@ -41,8 +46,8 @@
 	import util from '@/common/js/util';//全局公共库 
 	import { initDicts,editXmIteration,editSomeFieldsXmIteration } from '@/api/xm/core/xmIteration';
 	import { mapGetters } from 'vuex'	
-	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
-
+ 
+	import XmUserField from "@/views/xm/core/components/XmUserField";
 	
 	export default { 
 		computed: {
@@ -63,7 +68,7 @@
 				}
 			} 
 		},
-		props:['xmIteration','visible'],
+		props:['xmIteration','visible','opType'],
 		watch: {
 			'xmIteration':{
 				handler(){
@@ -121,11 +126,14 @@
 			},	
 
             editSomeFields(row,fieldName,$event){ 
+				if(this.opType==='add'){
+					return;
+				}
                 let params={};
                 params['ids']=[row].map(i=>i.id)
 				if(fieldName=='adminUserid'){
-					params['adminUserid']=$event.userid 
-					params['adminUsername']=$event.username
+					params['adminUserid']=$event[0].userid 
+					params['adminUsername']=$event[0].username
 				}else if(fieldName=='startTime'){
 					params['startTime']=row.startTime
 					params['endTime']=row.endTime
@@ -151,7 +159,7 @@
 		},//end method
 		components: {  
 			//在下面添加其它组件 'xm-iteration-edit':XmIterationEdit
-			UsersSelect
+			XmUserField
 		},
 		mounted() { 
 			this.$nextTick(()=>{
diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
index 4ec10ac1..19048524 100644
--- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
@@ -325,7 +325,7 @@
 		</el-row>
 		
 		<el-dialog  width="60%" top="20px" :visible.sync="iterationAddVisible" append-to-body>  
-					<xm-iteration-add  :xm-product="xmProduct" :sel-project="selProject" :visible="iterationAddVisible" @cancel="iterationAddVisible=false" @submit="afterIterationAddSubmit"></xm-iteration-add>
+					<xm-iteration-add op-type="add"  :xm-product="xmProduct" :sel-project="selProject" :visible="iterationAddVisible" @cancel="iterationAddVisible=false" @submit="afterIterationAddSubmit"></xm-iteration-add>
  		</el-dialog> 
 	</section>
 </template>
@@ -347,7 +347,7 @@
 	import XmIterationOverview from "./XmIterationOverview";
 
 	import XmIterationEdit from './XmIterationEdit.vue'; 
-	import  XmIterationAdd from './XmIterationAdd';//新增界面
+	import  XmIterationAdd from './XmIterationEdit';//新增界面
 	import XmReport from "@/views/xm/rpt/reportIndex";
 
 	import XmIterationMenuMng from '../xmIterationMenu/XmIterationMenuMng.vue';
diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue
index cf05e78e..bb98b650 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfo.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfo.vue
@@ -388,7 +388,7 @@
     </el-row>
     
 		<el-dialog  width="60%" top="20px" :visible.sync="iterationAddVisible" append-to-body>  
-					<xm-iteration-add  :xm-product="xmProduct" :sel-project="selProject" :visible="iterationAddVisible" @cancel="iterationAddVisible=false" @submit="afterIterationAddSubmit"></xm-iteration-add>
+					<xm-iteration-add op-type="add"  :xm-product="xmProduct" :sel-project="selProject" :visible="iterationAddVisible" @cancel="iterationAddVisible=false" @submit="afterIterationAddSubmit"></xm-iteration-add>
  		</el-dialog> 
   </section>
 </template>
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index be2c2b18..0a80978d 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -253,7 +253,7 @@
         append-to-body
         :close-on-click-modal="false"
       >
-        <xm-iteration-add
+        <xm-iteration-add op-type="add"
           :xm-product="xmProduct"
           :sel-project="selProject"
           :xm-iteration="addForm"
@@ -312,7 +312,7 @@ import {
   delXmIterationLink,
 } from "@/api/xm/core/xmIterationLink";
 
-import XmIterationAdd from "./XmIterationAdd"; //新增界面
+import XmIterationAdd from "./XmIterationEdit"; //新增界面
 import XmIterationEdit from "./XmIterationEdit"; //修改界面
 import XmIterationStateMng from "../xmIterationState/XmIterationStateMng"; //修改界面
 import XmGantt from "../components/xm-gantt";
diff --git a/src/views/xm/core/xmProduct/XmProductEdit.vue b/src/views/xm/core/xmProduct/XmProductEdit.vue
index 2024a2aa..2b407bb8 100644
--- a/src/views/xm/core/xmProduct/XmProductEdit.vue
+++ b/src/views/xm/core/xmProduct/XmProductEdit.vue
@@ -312,9 +312,9 @@ export default {
 		}
       let params = {};
       params["ids"] = [row].map((i) => i.id);
-      if (fieldName == "adminUserid") {
-        params["adminUserid"] = $event[0].userid;
-        params["adminUsername"] = $event[0].username;
+      if (fieldName == "admUserid") {
+        params["admUserid"] = $event[0].userid;
+        params["admUsername"] = $event[0].username;
       } else if (fieldName == "assUserid") {
         params["assUserid"] = $event[0].userid;
         params["assUsername"] = $event[0].username;
diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue
index 32712530..de95a317 100644
--- a/src/views/xm/core/xmProject/XmProjectEdit.vue
+++ b/src/views/xm/core/xmProject/XmProjectEdit.vue
@@ -880,9 +880,9 @@
 				 
 				
 				
-				if (fieldName == "adminUserid") {
-					params["adminUserid"] = $event[0].userid;
-					params["adminUsername"] = $event[0].username;
+				if (fieldName == "admUserid") {
+					params["admUserid"] = $event[0].userid;
+					params["admUsername"] = $event[0].username;
 				} else if (fieldName == "assUserid") {
 					params["assUserid"] = $event[0].userid;
 					params["assUsername"] = $event[0].username;