diff --git a/config/index.js b/config/index.js
index 0749e17b..c73b2764 100644
--- a/config/index.js
+++ b/config/index.js
@@ -17,6 +17,7 @@ module.exports = {
               '^/api/m1/xm': '/xm'
             }
       },
+       /**
        '/api/m1/sys': {
          target: 'http://localhost:7015',
          changeOrigin: true,
@@ -24,7 +25,7 @@ module.exports = {
            '^/api/m1/sys': '/sys'
          }
        },
-
+      **/
       // '/api/m1/pay': {
       //   target: 'http://localhost:7125',
       //   changeOrigin: true,
diff --git a/src/components/dateRange/index.vue b/src/components/dateRange/index.vue
index f164e24b..0dd2c45e 100644
--- a/src/components/dateRange/index.vue
+++ b/src/components/dateRange/index.vue
@@ -27,8 +27,12 @@ export default {
       dateRange(){
 
       },
-      value(){
-          this.initData();
+      value:{ 
+        deep:true,
+        handler(){
+           this.initData();
+        }
+         
       }
   },
   props: {
diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue
index 99c5c1ff..59558cb0 100644
--- a/src/views/xm/core/xmTask/XmTaskEdit.vue
+++ b/src/views/xm/core/xmTask/XmTaskEdit.vue
@@ -73,9 +73,11 @@
 							<el-col :span="8"> 
 								<el-form-item label="预计时间"> 
 											
-										<el-date-picker
+										<date-range
 										 style="display:inline;"
-											v-model="budgetDateRanger"
+											v-model="editForm"
+											start-key="startTime"
+											end-key="endTime"
 											@change="onBudgetDateRangerChange" 
 											type="daterange"
 											align="right"
@@ -86,7 +88,7 @@
 											value-format="yyyy-MM-dd HH:mm:ss"
 											:default-time="['00:00:00','23:59:59']"
 											:picker-options="pickerOptions"
-										></el-date-picker>
+										></date-range>
 								</el-form-item>  
 							</el-col> 
 
@@ -316,19 +318,8 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
 			'visible':function(visible) { 
 				this.fileVisible = visible;
 				if(visible==true){ 
-					this.editForm=Object.assign(this.editForm, this.xmTask);     
-					if(this.editForm.startTime && this.editForm.endTime){
-						this.budgetDateRanger=[this.editForm.startTime,this.editForm.endTime] 
-					}else{
-						this.budgetDateRanger=[]
-					}
-					if(this.editForm.actStartTime && this.editForm.actEndTime){
-						this.actDateRanger=[this.editForm.actStartTime,this.editForm.actEndTime] 
-					}else{
-						this.actDateRanger=[]
-					}
-					 
-					
+					this.editForm=Object.assign(this.editForm, this.xmTask);      
+					this.editFormBak=Object.assign({},this.editForm)
 					this.setSkills()
 					//从新打开页面时某些数据需要重新加载，可以在这里添加
 				}
@@ -492,10 +483,8 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
 				}
 			},
 
-			onBudgetDateRangerChange(){
-				var start= new Date(this.budgetDateRanger[0]);
-				var end= new Date(this.budgetDateRanger[1]); 
-				this.editXmTaskSomeFields(this.editForm,'dateRange',this.budgetDateRanger);
+			onBudgetDateRangerChange(){ 
+				this.editXmTaskSomeFields(this.editForm,'dateRange',{startTime:this.editForm.startTime,endTime:this.editForm.endTime});
 			},  
 			onSelectedTask(task){
 				this.selectTaskVisible=false;
@@ -550,8 +539,8 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
 				if( users==null || users.length==0 ){
 					this.groupUserSelectVisible=false; 
 					return
-				}
-				debugger;
+				}  
+				this.editFormBak=Object.assign({},this.editForm)
 				this.editForm.createUserid=users[0].userid
 				this.editForm.createUsername=users[0].username 
 				this.groupUserSelectVisible=false; 
@@ -562,10 +551,8 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
 			execGroupUserSelectConfirm:function(users){
 				if( users==null || users.length==0 ){
 					this.execGroupUserSelectVisible=false; 
-					this.editForm.executorUserid='';
-					this.editForm.executorUsername=''
 					return
-				}
+				} 
 				this.editForm.executorUserid=users[0].userid
 				this.editForm.executorUsername=users[0].username 
 				this.execGroupUserSelectVisible=false; 
@@ -624,8 +611,8 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
 					params.createUserid=$event.userid
 					params.createUsername=$event.username
 				}else if(fieldName==='dateRange'){
-					params.startTime=$event[0]
-					params.endTime=$event[1]
+					params.startTime=$event.startTime
+					params.endTime=$event.endTime
 				}else if(fieldName==='shareFee'){ 
 					if($event>1000){
 						this.editForm.shareFee=this.xmTask.shareFee
@@ -650,7 +637,10 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
 					if(tips.isOk){
 						this.$emit('edit-fields',params)
 						 Object.assign(row,params) 
+						 this.editFormBak=Object.assign({},row)
 					}else{
+						debugger;
+						Object.assign(this.editForm,this.editFormBak)
 						this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
 					}
 				})
@@ -663,18 +653,8 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue';
 			//在下面添加其它组件 'xm-task-edit':XmTaskEdit
 		},
 		mounted() { 
-			this.editForm=Object.assign(this.editForm, this.xmTask);   
-			if(this.editForm.startTime && this.editForm.endTime){
-				this.budgetDateRanger=[this.editForm.startTime,this.editForm.endTime] 
-			}else{
-				this.budgetDateRanger=[]
-			}
-			if(this.editForm.actStartTime && this.editForm.actEndTime){
-				this.actDateRanger=[this.editForm.actStartTime,this.editForm.actEndTime] 
-			}else{
-				this.actDateRanger=[]
-			}
-			
+			this.editForm=Object.assign(this.editForm, this.xmTask);    
+			this.editFormBak=Object.assign({},this.editForm)
 			this.setSkills();
 			initSimpleDicts('all',['planType','taskType','priority','xmTaskSettleSchemel','taskState']).then(res=>{
 				this.dicts=res.data.data;
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 45c2a2d1..c63ab221 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -536,9 +536,9 @@
                 width="120"
                 show-overflow-tooltip
               >
-                <template slot-scope="scope">
-                  <font>
-                  <span
+                <template slot-scope="scope"> 
+                  <span v-if="scope.row.ntype=='0'">
+                  <span 
                     v-for="(item, index) in [formatExeUsernames(scope.row)]"
                     :key="index"
                   >
@@ -547,8 +547,8 @@
                       @click.stop="showExecusers(scope.row)"
                       >{{ item.showMsg }}</el-link
                     >
+                  </span> 
                   </span>
-                  </font>
                 </template>
               </el-table-column>
               <el-table-column