diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index d6156a3ea..613177483 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1051,6 +1051,7 @@ class ProjectController extends AbstractController
      * @apiGroup project
      * @apiName task__easylists
 
+     * @apiParam {String} [taskid]         排除的任务ID
      * @apiParam {String} [userid]         用户ID（如：1,2）
      * @apiParam {String} [timerange]      时间范围（如：2022-03-01 12:12:12,2022-05-01 12:12:12）
      *
@@ -1062,24 +1063,31 @@ class ProjectController extends AbstractController
     {
         User::auth();
         //
-        $userid = trim(Request::input('userid'));
+        $taskid = trim(Request::input('taskid'));
+        $userid = Request::input('userid');
         $timerange = Request::input('timerange');
         // 
-        $list = ProjectTask::query()
-            ->select('project_tasks.id', 'project_tasks.name', 'project_tasks.created_at', 'project_tasks.updated_at')
+        $list = ProjectTask::with(['taskUser'])
+            ->select('projects.name as project_name', 'project_tasks.id', 'project_tasks.name', 'project_tasks.start_at', 'project_tasks.end_at')
+            ->join('projects','project_tasks.project_id','=','projects.id')
             ->leftJoin('project_task_users', function ($query) {
-                $query->on('project_tasks.id', '=', 'project_task_users.task_id');
+                $query->on('project_tasks.id', '=', 'project_task_users.task_id')->where('project_task_users.owner', '=', 1);
             })
-            ->whereIn('project_task_users.userid', explode(',', $userid))
+            ->whereIn('project_task_users.userid', is_array($userid) ? $userid : explode(',', $userid) )
             ->when(!empty($timerange), function ($query) use ($timerange) {
                 if (!is_array($timerange)) {
                     $timerange = explode(',', $timerange);
                 }
                 if (Base::isDateOrTime($timerange[0]) && Base::isDateOrTime($timerange[1])) {
-                    $query->whereBetween('project_tasks.created_at', [Carbon::parse($timerange[0])->startOfDay(), Carbon::parse($timerange[1])->endOfDay()]);
+                    $query->where('project_tasks.start_at', '>=', Carbon::parse($timerange[0])->startOfDay());
+                    $query->where('project_tasks.end_at', '<=', Carbon::parse($timerange[1])->endOfDay());
                 }
             })
+            ->when(!empty($taskid), function ($query) use ($taskid) {
+                $query->where('project_tasks.id', "!=", $taskid);
+            })
             ->whereNull('complete_at')
+            ->distinct()
             ->orderByDesc('project_tasks.id')
             ->paginate(Base::getPaginate(200, 100));
         // 
diff --git a/language/original-web.txt b/language/original-web.txt
index f3d8519f8..de73a197e 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -1248,4 +1248,5 @@ Markdown 格式发送
 确定要离开会议吗？
 继续
 退出
-会议组件加载失败！
\ No newline at end of file
+会议组件加载失败！
+以下人员以存在任务
\ No newline at end of file
diff --git a/resources/assets/js/components/TagInput.vue b/resources/assets/js/components/TagInput.vue
index db0c2e769..627fc69f0 100755
--- a/resources/assets/js/components/TagInput.vue
+++ b/resources/assets/js/components/TagInput.vue
@@ -1,8 +1,15 @@
 <template>
     <div class="common-tag-input" :class="{focus:isFocus}" @paste="pasteText($event)" @click="focus">
-        <div class="tags-item" v-for="(text, index) in disSource">
-            <span class="tags-content" @click.stop="">{{text}}</span><span class="tags-del" @click.stop="delTag(index)">&times;</span>
-        </div>
+        <Draggable
+            :list="disSource"
+            :animation="150"
+            tag="ul"
+            draggable=".column-item"
+        >
+            <div class="tags-item column-item"  v-for="(text, index) in disSource">
+                <span class="tags-content" @click.stop="edit(disSource,index)">{{text}}</span><span class="tags-del" @click.stop="delTag(index)">&times;</span>
+            </div>
+        </Draggable>
         <textarea
             ref="myTextarea"
             class="tags-input"
@@ -22,8 +29,10 @@
 </template>
 
 <script>
+    import Draggable from 'vuedraggable'
     export default {
         name: 'TagInput',
+        components: {Draggable},
         props: {
             value: {
                 default: ''
@@ -52,11 +61,13 @@
         },
         data() {
             const disSource = [];
-            this.value?.split(",").forEach(item => {
-                if (item) {
-                    disSource.push(item)
-                }
-            });
+            if( this.value ){
+                this.value?.split(",").forEach(item => {
+                    if (item) {
+                        disSource.push(item)
+                    }
+                });
+            }
             return {
                 minWidth: 80,
 
@@ -69,7 +80,19 @@
 
                 disSource,
 
-                isFocus: false
+                isFocus: false,
+
+                editShow: false,
+                editData:{
+                    index:0,
+                    disSource:[],
+                    name:""
+                },
+                addRule: {
+                    name: [
+                        { required: true, message: this.$L('请填写名称！'), trigger: 'change' },
+                    ]
+                },
             }
         },
         mounted() {
@@ -80,13 +103,15 @@
                 this.wayMinWidth();
             },
             value(val) {
-                let disSource = [];
-                val?.split(",").forEach(item => {
-                    if (item) {
-                        disSource.push(item)
-                    }
-                });
-                this.disSource = disSource;
+                if( val && typeof val == 'string' ){
+                    let disSource = [];
+                    val?.split(",").forEach(item => {
+                        if (item) {
+                            disSource.push(item)
+                        }
+                    });
+                    this.disSource = disSource;
+                }
             },
             disSource(val) {
                 let temp = '';
@@ -109,6 +134,26 @@
             }
         },
         methods: {
+            edit(disSource,index){
+                this.editData.disSource = disSource
+                this.editData.index = index
+                this.editData.name = disSource[index] + ''
+                $A.modalInput({
+                    title: `编辑`,
+                    placeholder: `请输入名称`,
+                    okText: "确定",
+                    value: disSource[index] + '',
+                    onOk: (desc) => {
+                        if (!desc) {
+                            return `请输入名称`
+                        }
+                        this.editData.name = desc
+                        this.editData.disSource[this.editData.index] = desc
+                        this.$set(this.disSource,this.editData.index,desc)
+                        return false
+                    },
+                });
+            },
             focus(option) {
                 const $el = this.$refs.myTextarea;
                 $el.focus(option);
diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue
index 9cc208f0c..fee234de6 100644
--- a/resources/assets/js/pages/manage/components/TaskAdd.vue
+++ b/resources/assets/js/pages/manage/components/TaskAdd.vue
@@ -199,6 +199,28 @@
                 </ButtonGroup>
             </div>
         </div>
+
+        <Modal v-model="showTips" :title="$L('以下人员已存在任务')" >
+            <List :split="false" size="small">
+                <ListItem v-for="(items, userid) in tipsTask" :key="userid" >
+                    <div style="flex: 1;width: 100%;">
+                        <UserAvatar :userid="userid" :size="28" :show-icon="true" :show-name="true" tooltipDisabled/>
+                        <div style="margin-left: 35px;margin-top: 10px;width: calc(100% - 35px);"  v-for="(item, key) in items" :key="key" >
+                            <div style="min-width: 135px; flex: 1; white-space: nowrap; text-overflow: ellipsis;overflow: hidden;">
+                                <span style="color: #A7ABB5;">【{{item.project_name}}】</span>
+                                <span>{{item.name}}</span>
+                            </div>
+                            <div style="min-width: 135px;text-align: left;">{{getCutTime(item)}}</div>
+                        </div>
+                    </div>
+                </ListItem>
+            </List>
+            <div slot="footer">
+                <Button type="default" @click="showTips=false">{{$L('取消')}}</Button>
+                <Button type="primary" :loading="loadIng > 0" @click="onAdd(again,true)">{{$L('确认添加')}}</Button>
+            </div>
+        </Modal>
+
     </div>
 </template>
 
@@ -276,6 +298,10 @@ export default {
             isMounted: false,
 
             beforeClose: [],
+
+            again: false,
+            showTips: false,
+            tipsTask: [],
         }
     },
 
@@ -515,12 +541,67 @@ export default {
             this.addData = Object.assign({}, this.addData, data);
         },
 
-        onAdd(again) {
+        getCutTime(item) {
+            let start_at = $A.Date(item.start_at, true);
+            let end_at = $A.Date(item.end_at, true);
+            let string = "";
+            console.log(start_at)
+            if ($A.formatDate('Y/m/d', start_at) == $A.formatDate('Y/m/d', end_at)) {
+                string = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('H:i', end_at)
+            } else if ($A.formatDate('Y', start_at) == $A.formatDate('Y', end_at)) {
+                string = $A.formatDate('Y/m/d', start_at) + " ~ " + $A.formatDate('m/d', end_at)
+                string = string.replace(/( 00:00| 23:59)/g, "")
+            } else {
+                string = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('Y/m/d H:i', end_at)
+                string = string.replace(/( 00:00| 23:59)/g, "")
+            }
+            return string
+        },
+
+        async onAddBefore(){
+            let isExistTask = false;
+            await this.$store.dispatch("call", {
+                url: 'project/task/easylists',
+                data: {
+                    userid: this.addData.owner,
+                    timerange: this.addData.times
+                },
+                method: 'get',
+            }).then(({data}) => {
+                if(data.data.length > 0) {
+                    this.showTips = true;
+                    let taskObj = {}
+                    this.addData.owner.map(userid=>{
+                        data.data.map(h=>{
+                            if( (h.task_user || []).map(k=>k.owner ? k.userid : 0).indexOf(userid) !== -1 ){
+                                if( !taskObj[userid] ){
+                                    taskObj[userid] = [];
+                                }
+                                taskObj[userid].push(h);
+                            }
+                        });
+                    });
+                    this.tipsTask = taskObj
+                    isExistTask = true;
+                }
+            });
+            return isExistTask
+        },
+
+        async onAdd(again,affirm=false) {
             if (!this.addData.name) {
                 $A.messageError("任务描述不能为空");
                 return;
             }
-            this.loadIng++;
+            
+            // 存在任务提示
+            this.showTips = false;
+            this.again = false;
+            if(!affirm && this.addData.owner.length>0 && await this.onAddBefore()){
+               this.again = again;
+               return;
+            }
+
             this.$store.dispatch("taskAdd", this.addData).then(({msg}) => {
                 this.loadIng--;
                 $A.messageSuccess(msg);
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 994714b84..c9061c1ec 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -1,397 +1,413 @@
 <template>
-    <!--子任务-->
-    <li v-if="ready && taskDetail.parent_id > 0">
-        <div class="subtask-icon">
-            <TaskMenu
-                :ref="`taskMenu_${taskDetail.id}`"
-                :disabled="taskId === 0"
-                :task="taskDetail"
-                :load-status="taskDetail.loading === true"
-                @on-update="getLogLists"/>
-        </div>
-        <div v-if="taskDetail.flow_item_name" class="subtask-flow">
-            <span :class="taskDetail.flow_item_status" @click.stop="openMenu($event, taskDetail)">{{taskDetail.flow_item_name}}</span>
-        </div>
-        <div class="subtask-name">
-            <Input
-                v-model="taskDetail.name"
-                ref="name"
-                type="textarea"
-                :rows="1"
-                :autosize="{ minRows: 1, maxRows: 8 }"
-                :maxlength="255"
-                enterkeyhint="done"
-                @on-blur="updateBlur('name')"
-                @on-keydown="onNameKeydown"
-            />
-        </div>
-        <DatePicker
-            v-model="timeValue"
-            :open="timeOpen"
-            :options="timeOptions"
-            format="yyyy/MM/dd HH:mm"
-            type="datetimerange"
-            class="subtask-time"
-            placement="bottom-end"
-            @on-open-change="timeChange"
-            @on-clear="timeClear"
-            @on-ok="timeOk"
-            transfer>
-            <div v-if="!taskDetail.complete_at && taskDetail.end_at && taskDetail.end_at != mainEndAt" @click="openTime" :class="['time', taskDetail.today ? 'today' : '', taskDetail.overdue ? 'overdue' : '']">
-                {{expiresFormat(taskDetail.end_at)}}
-            </div>
-            <Icon v-else class="clock" type="ios-clock-outline" @click="openTime" />
-        </DatePicker>
-        <UserSelect
-            class="subtask-avatar"
-            v-model="ownerData.owner_userid"
-            :multiple-max="10"
-            :avatar-size="20"
-            :title="$L('修改负责人')"
-            :add-icon="false"
-            :project-id="taskDetail.project_id"
-            :before-submit="onOwner"/>
-    </li>
-    <!--主任务-->
-    <div
-        v-else-if="ready"
-        :class="{'task-detail':true, 'open-dialog': hasOpenDialog, 'completed': taskDetail.complete_at}"
-        :style="taskDetailStyle">
-        <div v-show="taskDetail.id > 0" class="task-info">
-            <div class="head">
+    <div>
+        <!--子任务-->
+        <li v-if="ready && taskDetail.parent_id > 0">
+            <div class="subtask-icon">
                 <TaskMenu
                     :ref="`taskMenu_${taskDetail.id}`"
                     :disabled="taskId === 0"
                     :task="taskDetail"
-                    class="icon"
-                    size="medium"
-                    :color-show="false"
+                    :load-status="taskDetail.loading === true"
                     @on-update="getLogLists"/>
-                <div v-if="taskDetail.flow_item_name" class="flow">
-                    <span :class="taskDetail.flow_item_status" @click.stop="openMenu($event, taskDetail)">{{taskDetail.flow_item_name}}</span>
+            </div>
+            <div v-if="taskDetail.flow_item_name" class="subtask-flow">
+                <span :class="taskDetail.flow_item_status" @click.stop="openMenu($event, taskDetail)">{{taskDetail.flow_item_name}}</span>
+            </div>
+            <div class="subtask-name">
+                <Input
+                    v-model="taskDetail.name"
+                    ref="name"
+                    type="textarea"
+                    :rows="1"
+                    :autosize="{ minRows: 1, maxRows: 8 }"
+                    :maxlength="255"
+                    enterkeyhint="done"
+                    @on-blur="updateBlur('name')"
+                    @on-keydown="onNameKeydown"
+                />
+            </div>
+            <DatePicker
+                v-model="timeValue"
+                :open="timeOpen"
+                :options="timeOptions"
+                format="yyyy/MM/dd HH:mm"
+                type="datetimerange"
+                class="subtask-time"
+                placement="bottom-end"
+                @on-open-change="timeChange"
+                @on-clear="timeClear"
+                @on-ok="timeOk"
+                transfer>
+                <div v-if="!taskDetail.complete_at && taskDetail.end_at && taskDetail.end_at != mainEndAt" @click="openTime" :class="['time', taskDetail.today ? 'today' : '', taskDetail.overdue ? 'overdue' : '']">
+                    {{expiresFormat(taskDetail.end_at)}}
                 </div>
-                <div v-if="taskDetail.archived_at" class="flow">
-                    <span class="archived" @click.stop="openMenu($event, taskDetail)">{{$L('已归档')}}</span>
-                </div>
-                <div class="nav">
-                    <p v-if="projectName"><span>{{projectName}}</span></p>
-                    <p v-if="columnName"><span>{{columnName}}</span></p>
-                    <p v-if="taskDetail.id"><span>{{taskDetail.id}}</span></p>
-                </div>
-                <div class="function">
-                    <EPopover
-                        v-if="getOwner.length === 0"
-                        v-model="receiveShow"
-                        placement="bottom">
-                        <div class="task-detail-receive">
-                            <div class="receive-title">
-                                <Icon type="ios-help-circle"/>
-                                {{$L('确认计划时间领取任务')}}
-                            </div>
-                            <div class="receive-time">
-                                <DatePicker
-                                    v-model="timeValue"
-                                    :options="timeOptions"
-                                    format="yyyy/MM/dd HH:mm"
-                                    type="datetimerange"
-                                    :placeholder="$L('请设置计划时间')"
-                                    :clearable="false"
-                                    :editable="false"/>
-                            </div>
-                            <div class="receive-bottom">
-                                <Button size="small" type="text" @click="receiveShow=false">取消</Button>
-                                <Button :loading="ownerLoad > 0" size="small" type="primary" @click="onOwner(true)">确定</Button>
+                <Icon v-else class="clock" type="ios-clock-outline" @click="openTime" />
+            </DatePicker>
+            <UserSelect
+                class="subtask-avatar"
+                v-model="ownerData.owner_userid"
+                :multiple-max="10"
+                :avatar-size="20"
+                :title="$L('修改负责人')"
+                :add-icon="false"
+                :project-id="taskDetail.project_id"
+                :before-submit="onOwner"/>
+        </li>
+        <!--主任务-->
+        <div
+            v-else-if="ready"
+            :class="{'task-detail':true, 'open-dialog': hasOpenDialog, 'completed': taskDetail.complete_at}"
+            :style="taskDetailStyle">
+            <div v-show="taskDetail.id > 0" class="task-info">
+                <div class="head">
+                    <TaskMenu
+                        :ref="`taskMenu_${taskDetail.id}`"
+                        :disabled="taskId === 0"
+                        :task="taskDetail"
+                        class="icon"
+                        size="medium"
+                        :color-show="false"
+                        @on-update="getLogLists"/>
+                    <div v-if="taskDetail.flow_item_name" class="flow">
+                        <span :class="taskDetail.flow_item_status" @click.stop="openMenu($event, taskDetail)">{{taskDetail.flow_item_name}}</span>
+                    </div>
+                    <div v-if="taskDetail.archived_at" class="flow">
+                        <span class="archived" @click.stop="openMenu($event, taskDetail)">{{$L('已归档')}}</span>
+                    </div>
+                    <div class="nav">
+                        <p v-if="projectName"><span>{{projectName}}</span></p>
+                        <p v-if="columnName"><span>{{columnName}}</span></p>
+                        <p v-if="taskDetail.id"><span>{{taskDetail.id}}</span></p>
+                    </div>
+                    <div class="function">
+                        <EPopover
+                            v-if="getOwner.length === 0"
+                            v-model="receiveShow"
+                            placement="bottom">
+                            <div class="task-detail-receive">
+                                <div class="receive-title">
+                                    <Icon type="ios-help-circle"/>
+                                    {{$L('确认计划时间领取任务')}}
+                                </div>
+                                <div class="receive-time">
+                                    <DatePicker
+                                        v-model="timeValue"
+                                        :options="timeOptions"
+                                        format="yyyy/MM/dd HH:mm"
+                                        type="datetimerange"
+                                        :placeholder="$L('请设置计划时间')"
+                                        :clearable="false"
+                                        :editable="false"/>
+                                </div>
+                                <div class="receive-bottom">
+                                    <Button size="small" type="text" @click="receiveShow=false">取消</Button>
+                                    <Button :loading="ownerLoad > 0" size="small" type="primary" @click="onOwner(true)">确定</Button>
+                                </div>
                             </div>
+                            <Button slot="reference" :loading="ownerLoad > 0" class="pick" type="primary">{{$L('我要领取任务')}}</Button>
+                        </EPopover>
+                        <ETooltip v-if="$Electron" :disabled="$isEEUiApp || windowTouch" :content="$L('新窗口打开')">
+                            <i class="taskfont open" @click="openNewWin">&#xe776;</i>
+                        </ETooltip>
+                        <div class="menu">
+                            <TaskMenu
+                                :disabled="taskId === 0"
+                                :task="taskDetail"
+                                icon="ios-more"
+                                completed-icon="ios-more"
+                                size="medium"
+                                :color-show="false"
+                                @on-update="getLogLists"/>
                         </div>
-                        <Button slot="reference" :loading="ownerLoad > 0" class="pick" type="primary">{{$L('我要领取任务')}}</Button>
-                    </EPopover>
-                    <ETooltip v-if="$Electron" :disabled="$isEEUiApp || windowTouch" :content="$L('新窗口打开')">
-                        <i class="taskfont open" @click="openNewWin">&#xe776;</i>
-                    </ETooltip>
-                    <div class="menu">
-                        <TaskMenu
-                            :disabled="taskId === 0"
-                            :task="taskDetail"
-                            icon="ios-more"
-                            completed-icon="ios-more"
-                            size="medium"
-                            :color-show="false"
-                            @on-update="getLogLists"/>
                     </div>
                 </div>
-            </div>
-            <Scrollbar class-name="scroller">
-                <div class="title">
-                    <Input
-                        v-model="taskDetail.name"
-                        ref="name"
-                        type="textarea"
-                        :rows="1"
-                        :autosize="{ minRows: 1, maxRows: 8 }"
-                        :maxlength="255"
-                        enterkeyhint="done"
-                        @on-blur="updateBlur('name')"
-                        @on-keydown="onNameKeydown"/>
-                </div>
-                <div class="desc">
-                    <TEditor
-                        ref="desc"
-                        :value="taskContent"
-                        :plugins="taskPlugins"
-                        :options="taskOptions"
-                        :option-full="taskOptionFull"
-                        :placeholder="$L('详细描述...')"
-                        scroll-hide-operate-class-name="task-modal"
-                        @on-blur="updateBlur('content')"
-                        inline/>
-                </div>
-                <Form class="items" label-position="left" label-width="auto" @submit.native.prevent>
-                    <FormItem v-if="taskDetail.p_name">
-                        <div class="item-label" slot="label">
-                            <i class="taskfont">&#xe6ec;</i>{{$L('优先级')}}
-                        </div>
-                        <ul class="item-content">
-                            <li>
-                                <EDropdown
-                                    ref="priority"
-                                    trigger="click"
-                                    placement="bottom"
-                                    @command="updateData('priority', $event)">
-                                    <TaskPriority :backgroundColor="taskDetail.p_color">{{taskDetail.p_name}}</TaskPriority>
-                                    <EDropdownMenu slot="dropdown">
-                                        <EDropdownItem v-for="(item, key) in taskPriority" :key="key" :command="item">
-                                            <i
-                                                class="taskfont"
-                                                :style="{color:item.color}"
-                                                v-html="taskDetail.p_name == item.name ? '&#xe61d;' : '&#xe61c;'"></i>
-                                            {{item.name}}
-                                        </EDropdownItem>
-                                    </EDropdownMenu>
-                                </EDropdown>
-                            </li>
-                        </ul>
-                    </FormItem>
-                    <FormItem v-if="getOwner.length > 0">
-                        <div class="item-label" slot="label">
-                            <i class="taskfont">&#xe6e4;</i>{{$L('负责人')}}
-                        </div>
-                        <UserSelect
-                            class="item-content user"
-                            v-model="ownerData.owner_userid"
-                            :multiple-max="10"
-                            :avatar-size="28"
-                            :title="$L('修改负责人')"
-                            :project-id="taskDetail.project_id"
-                            :add-icon="false"
-                            :before-submit="onOwner"/>
-                    </FormItem>
-                    <FormItem v-if="getAssist.length > 0 || assistForce">
-                        <div class="item-label" slot="label">
-                            <i class="taskfont">&#xe63f;</i>{{$L('协助人员')}}
-                        </div>
-                        <UserSelect
-                            ref="assist"
-                            class="item-content user"
-                            v-model="assistData.assist_userid"
-                            :multiple-max="10"
-                            :avatar-size="28"
-                            :title="$L(getAssist.length > 0 ? '修改协助人员' : '添加协助人员')"
-                            :project-id="taskDetail.project_id"
-                            :disabled-choice="assistData.disabled"
-                            :add-icon="false"
-                            :before-submit="onAssist"/>
-                    </FormItem>
-                    <FormItem>
-                        <div class="item-label" slot="label">
-                            <i class="taskfont">&#xe77b;</i>
-                            <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
-                                <span class="visibility-text color">{{$L('可见性')}}
-                                    <i class="taskfont">&#xe740;</i>
-                                </span>
-                                <EDropdownMenu slot="dropdown">
-                                    <EDropdownItem :command="1">
-                                        <div class="task-menu-icon" >
-                                            <Icon v-if="taskDetail.is_all_visible == 1" class="completed" :type="'md-checkmark-circle'"/>
-                                            <Icon v-else class="uncomplete" :type="'md-radio-button-off'"/>
-                                            {{$L('项目人员')}}
-                                        </div>
-                                    </EDropdownItem>
-                                    <EDropdownItem :command="2">
-                                        <div class="task-menu-icon" >
-                                            <Icon v-if="taskDetail.is_all_visible == 2" class="completed" :type="'md-checkmark-circle'"/>
-                                            <Icon v-else class="uncomplete" :type="'md-radio-button-off'"/>
-                                            {{$L('任务人员')}}
-                                        </div>
-                                    </EDropdownItem>
-                                    <EDropdownItem :command="3">
-                                        <div class="task-menu-icon" >
-                                            <Icon v-if="taskDetail.is_all_visible == 3" class="completed" :type="'md-checkmark-circle'"/>
-                                            <Icon v-else class="uncomplete" :type="'md-radio-button-off'"/>
-                                            {{$L('指定成员')}}
-                                        </div>
-                                    </EDropdownItem>
-                                </EDropdownMenu>
-                            </EDropdown>
-                        </div>
-                        <div class="item-content user">
-                            <span @click="showCisibleDropdown" v-if="taskDetail.is_all_visible == 1"  class="visibility-text">{{$L('项目人员可见')}}</span>
-                            <span @click="showCisibleDropdown" v-else-if="taskDetail.is_all_visible == 2"  class="visibility-text">{{$L('任务人员可见')}}</span>
+                <Scrollbar class-name="scroller">
+                    <div class="title">
+                        <Input
+                            v-model="taskDetail.name"
+                            ref="name"
+                            type="textarea"
+                            :rows="1"
+                            :autosize="{ minRows: 1, maxRows: 8 }"
+                            :maxlength="255"
+                            enterkeyhint="done"
+                            @on-blur="updateBlur('name')"
+                            @on-keydown="onNameKeydown"/>
+                    </div>
+                    <div class="desc">
+                        <TEditor
+                            ref="desc"
+                            :value="taskContent"
+                            :plugins="taskPlugins"
+                            :options="taskOptions"
+                            :option-full="taskOptionFull"
+                            :placeholder="$L('详细描述...')"
+                            scroll-hide-operate-class-name="task-modal"
+                            @on-blur="updateBlur('content')"
+                            inline/>
+                    </div>
+                    <Form class="items" label-position="left" label-width="auto" @submit.native.prevent>
+                        <FormItem v-if="taskDetail.p_name">
+                            <div class="item-label" slot="label">
+                                <i class="taskfont">&#xe6ec;</i>{{$L('优先级')}}
+                            </div>
+                            <ul class="item-content">
+                                <li>
+                                    <EDropdown
+                                        ref="priority"
+                                        trigger="click"
+                                        placement="bottom"
+                                        @command="updateData('priority', $event)">
+                                        <TaskPriority :backgroundColor="taskDetail.p_color">{{taskDetail.p_name}}</TaskPriority>
+                                        <EDropdownMenu slot="dropdown">
+                                            <EDropdownItem v-for="(item, key) in taskPriority" :key="key" :command="item">
+                                                <i
+                                                    class="taskfont"
+                                                    :style="{color:item.color}"
+                                                    v-html="taskDetail.p_name == item.name ? '&#xe61d;' : '&#xe61c;'"></i>
+                                                {{item.name}}
+                                            </EDropdownItem>
+                                        </EDropdownMenu>
+                                    </EDropdown>
+                                </li>
+                            </ul>
+                        </FormItem>
+                        <FormItem v-if="getOwner.length > 0">
+                            <div class="item-label" slot="label">
+                                <i class="taskfont">&#xe6e4;</i>{{$L('负责人')}}
+                            </div>
                             <UserSelect
-                                v-else
-                                ref="visibleUserSelectRef"
-                                v-model="taskDetail.visibility_appointor"
+                                class="item-content user"
+                                v-model="ownerData.owner_userid"
+                                :multiple-max="10"
                                 :avatar-size="28"
-                                :title="$L('选择指定人员')"
+                                :title="$L('修改负责人')"
                                 :project-id="taskDetail.project_id"
                                 :add-icon="false"
-                                @on-show-change="visibleUserSelectShowChange"/>
-                        </div>
-                    </FormItem>
-                    <FormItem v-if="taskDetail.end_at || timeForce">
-                        <div class="item-label" slot="label">
-                            <i class="taskfont">&#xe6e8;</i>{{$L('截止时间')}}
-                        </div>
-                        <ul class="item-content">
-                            <li>
-                                <DatePicker
-                                    v-model="timeValue"
-                                    :open="timeOpen"
-                                    :options="timeOptions"
-                                    format="yyyy/MM/dd HH:mm"
-                                    type="datetimerange"
-                                    @on-open-change="timeChange"
-                                    @on-clear="timeClear"
-                                    @on-ok="timeOk"
-                                    transfer>
-                                    <div class="picker-time">
-                                        <div @click="openTime" class="time">{{taskDetail.end_at ? cutTime : '--'}}</div>
-                                        <template v-if="!taskDetail.complete_at && taskDetail.end_at">
-                                            <Tag v-if="within24Hours(taskDetail.end_at)" color="blue"><i class="taskfont">&#xe71d;</i>{{expiresFormat(taskDetail.end_at)}}</Tag>
-                                            <Tag v-if="isOverdue(taskDetail)" color="red">{{$L('超期未完成')}}</Tag>
-                                        </template>
-                                    </div>
-                                </DatePicker>
-                            </li>
-                        </ul>
-                    </FormItem>
-                    <FormItem v-if="(taskDetail.loop && taskDetail.loop != 'never') || loopForce">
-                        <div class="item-label" slot="label">
-                            <i class="taskfont">&#xe93f;</i>{{$L('重复周期')}}
-                        </div>
-                        <ul class="item-content">
-                            <li>
-                                <EDropdown
-                                    ref="loop"
-                                    trigger="click"
-                                    placement="bottom"
-                                    @command="updateData('loop', $event)">
-                                    <ETooltip :disabled="$isEEUiApp || windowTouch || !taskDetail.loop_at" :content="`${$L('下个周期')}: ${taskDetail.loop_at}`" placement="right">
-                                        <span>{{$L(loopLabel(taskDetail.loop))}}</span>
-                                    </ETooltip>
-                                    <EDropdownMenu slot="dropdown" class="task-detail-loop">
-                                        <EDropdownItem v-for="item in loops" :key="item.key" :command="item.key">
-                                            {{$L(item.label)}}
+                                :before-submit="onOwner"/>
+                        </FormItem>
+                        <FormItem v-if="getAssist.length > 0 || assistForce">
+                            <div class="item-label" slot="label">
+                                <i class="taskfont">&#xe63f;</i>{{$L('协助人员')}}
+                            </div>
+                            <UserSelect
+                                ref="assist"
+                                class="item-content user"
+                                v-model="assistData.assist_userid"
+                                :multiple-max="10"
+                                :avatar-size="28"
+                                :title="$L(getAssist.length > 0 ? '修改协助人员' : '添加协助人员')"
+                                :project-id="taskDetail.project_id"
+                                :disabled-choice="assistData.disabled"
+                                :add-icon="false"
+                                :before-submit="onAssist"/>
+                        </FormItem>
+                        <FormItem>
+                            <div class="item-label" slot="label">
+                                <i class="taskfont">&#xe77b;</i>
+                                <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
+                                    <span class="visibility-text color">{{$L('可见性')}}
+                                        <i class="taskfont">&#xe740;</i>
+                                    </span>
+                                    <EDropdownMenu slot="dropdown">
+                                        <EDropdownItem :command="1">
+                                            <div class="task-menu-icon" >
+                                                <Icon v-if="taskDetail.is_all_visible == 1" class="completed" :type="'md-checkmark-circle'"/>
+                                                <Icon v-else class="uncomplete" :type="'md-radio-button-off'"/>
+                                                {{$L('项目人员')}}
+                                            </div>
+                                        </EDropdownItem>
+                                        <EDropdownItem :command="2">
+                                            <div class="task-menu-icon" >
+                                                <Icon v-if="taskDetail.is_all_visible == 2" class="completed" :type="'md-checkmark-circle'"/>
+                                                <Icon v-else class="uncomplete" :type="'md-radio-button-off'"/>
+                                                {{$L('任务人员')}}
+                                            </div>
+                                        </EDropdownItem>
+                                        <EDropdownItem :command="3">
+                                            <div class="task-menu-icon" >
+                                                <Icon v-if="taskDetail.is_all_visible == 3" class="completed" :type="'md-checkmark-circle'"/>
+                                                <Icon v-else class="uncomplete" :type="'md-radio-button-off'"/>
+                                                {{$L('指定成员')}}
+                                            </div>
                                         </EDropdownItem>
                                     </EDropdownMenu>
                                 </EDropdown>
-                            </li>
-                        </ul>
-                    </FormItem>
-                    <FormItem v-if="fileList.length > 0">
-                        <div class="item-label" slot="label">
-                            <i class="taskfont">&#xe6e6;</i>{{$L('附件')}}
-                        </div>
-                        <ul class="item-content file">
-                            <li v-if="taskDetail.file_num > 50" class="tip">{{$L(`共${taskDetail.file_num}个文件，仅显示最新50个`)}}</li>
-                            <li v-for="file in fileList">
-                                <img v-if="file.id" class="file-ext" :src="file.thumb"/>
-                                <Loading v-else class="file-load"/>
-                                <div class="file-name">{{file.name}}</div>
-                                <div class="file-size">{{$A.bytesToSize(file.size)}}</div>
-                                <div class="file-menu" :class="{show:file._show_menu}">
-                                    <Icon @click="viewFile(file)" type="md-eye" />
-                                    <Icon @click="downFile(file)" type="md-arrow-round-down" />
-                                    <EPopover v-model="file._show_menu" class="file-delete">
-                                        <div class="task-detail-delete-file-popover">
-                                            <p>{{$L('你确定要删除这个文件吗？')}}</p>
-                                            <div class="buttons">
-                                                <Button size="small" type="text" @click="file._show_menu=false">{{$L('取消')}}</Button>
-                                                <Button size="small" type="primary" @click="deleteFile(file)">{{$L('确定')}}</Button>
-                                            </div>
+                            </div>
+                            <div class="item-content user">
+                                <span @click="showCisibleDropdown" v-if="taskDetail.is_all_visible == 1"  class="visibility-text">{{$L('项目人员可见')}}</span>
+                                <span @click="showCisibleDropdown" v-else-if="taskDetail.is_all_visible == 2"  class="visibility-text">{{$L('任务人员可见')}}</span>
+                                <UserSelect
+                                    v-else
+                                    ref="visibleUserSelectRef"
+                                    v-model="taskDetail.visibility_appointor"
+                                    :avatar-size="28"
+                                    :title="$L('选择指定人员')"
+                                    :project-id="taskDetail.project_id"
+                                    :add-icon="false"
+                                    @on-show-change="visibleUserSelectShowChange"/>
+                            </div>
+                        </FormItem>
+                        <FormItem v-if="taskDetail.end_at || timeForce">
+                            <div class="item-label" slot="label">
+                                <i class="taskfont">&#xe6e8;</i>{{$L('截止时间')}}
+                            </div>
+                            <ul class="item-content">
+                                <li>
+                                    <DatePicker
+                                        v-model="timeValue"
+                                        :open="timeOpen"
+                                        :options="timeOptions"
+                                        format="yyyy/MM/dd HH:mm"
+                                        type="datetimerange"
+                                        @on-open-change="timeChange"
+                                        @on-clear="timeClear"
+                                        @on-ok="timeOk"
+                                        transfer>
+                                        <div class="picker-time">
+                                            <div @click="openTime" class="time">{{taskDetail.end_at ? cutTime : '--'}}</div>
+                                            <template v-if="!taskDetail.complete_at && taskDetail.end_at">
+                                                <Tag v-if="within24Hours(taskDetail.end_at)" color="blue"><i class="taskfont">&#xe71d;</i>{{expiresFormat(taskDetail.end_at)}}</Tag>
+                                                <Tag v-if="isOverdue(taskDetail)" color="red">{{$L('超期未完成')}}</Tag>
+                                            </template>
                                         </div>
-                                        <i slot="reference" class="taskfont del">&#xe6ea;</i>
-                                    </EPopover>
+                                    </DatePicker>
+                                </li>
+                            </ul>
+                        </FormItem>
+                        <FormItem v-if="(taskDetail.loop && taskDetail.loop != 'never') || loopForce">
+                            <div class="item-label" slot="label">
+                                <i class="taskfont">&#xe93f;</i>{{$L('重复周期')}}
+                            </div>
+                            <ul class="item-content">
+                                <li>
+                                    <EDropdown
+                                        ref="loop"
+                                        trigger="click"
+                                        placement="bottom"
+                                        @command="updateData('loop', $event)">
+                                        <ETooltip :disabled="$isEEUiApp || windowTouch || !taskDetail.loop_at" :content="`${$L('下个周期')}: ${taskDetail.loop_at}`" placement="right">
+                                            <span>{{$L(loopLabel(taskDetail.loop))}}</span>
+                                        </ETooltip>
+                                        <EDropdownMenu slot="dropdown" class="task-detail-loop">
+                                            <EDropdownItem v-for="item in loops" :key="item.key" :command="item.key">
+                                                {{$L(item.label)}}
+                                            </EDropdownItem>
+                                        </EDropdownMenu>
+                                    </EDropdown>
+                                </li>
+                            </ul>
+                        </FormItem>
+                        <FormItem v-if="fileList.length > 0">
+                            <div class="item-label" slot="label">
+                                <i class="taskfont">&#xe6e6;</i>{{$L('附件')}}
+                            </div>
+                            <ul class="item-content file">
+                                <li v-if="taskDetail.file_num > 50" class="tip">{{$L(`共${taskDetail.file_num}个文件，仅显示最新50个`)}}</li>
+                                <li v-for="file in fileList">
+                                    <img v-if="file.id" class="file-ext" :src="file.thumb"/>
+                                    <Loading v-else class="file-load"/>
+                                    <div class="file-name">{{file.name}}</div>
+                                    <div class="file-size">{{$A.bytesToSize(file.size)}}</div>
+                                    <div class="file-menu" :class="{show:file._show_menu}">
+                                        <Icon @click="viewFile(file)" type="md-eye" />
+                                        <Icon @click="downFile(file)" type="md-arrow-round-down" />
+                                        <EPopover v-model="file._show_menu" class="file-delete">
+                                            <div class="task-detail-delete-file-popover">
+                                                <p>{{$L('你确定要删除这个文件吗？')}}</p>
+                                                <div class="buttons">
+                                                    <Button size="small" type="text" @click="file._show_menu=false">{{$L('取消')}}</Button>
+                                                    <Button size="small" type="primary" @click="deleteFile(file)">{{$L('确定')}}</Button>
+                                                </div>
+                                            </div>
+                                            <i slot="reference" class="taskfont del">&#xe6ea;</i>
+                                        </EPopover>
+                                    </div>
+                                </li>
+                            </ul>
+                            <ul class="item-content">
+                                <li>
+                                    <div class="add-button" @click="onUploadClick(true)">
+                                        <i class="taskfont">&#xe6f2;</i>{{$L('添加附件')}}
+                                    </div>
+                                </li>
+                            </ul>
+                        </FormItem>
+                        <FormItem v-if="subList.length > 0 || addsubForce">
+                            <div class="item-label" slot="label">
+                                <i class="taskfont">&#xe6f0;</i>{{$L('子任务')}}
+                            </div>
+                            <ul class="item-content subtask">
+                                <TaskDetail
+                                    v-for="(task, key) in subList"
+                                    :ref="`subTask_${task.id}`"
+                                    :key="key"
+                                    :task-id="task.id"
+                                    :open-task="task"
+                                    :main-end-at="taskDetail.end_at"
+                                    :can-update-blur="canUpdateBlur"/>
+                            </ul>
+                            <ul :class="['item-content', subList.length === 0 ? 'nosub' : '']">
+                                <li>
+                                    <Input
+                                        v-if="addsubShow"
+                                        v-model="addsubName"
+                                        ref="addsub"
+                                        class="add-input"
+                                        :placeholder="$L('+ 输入子任务，回车添加子任务')"
+                                        :icon="addsubLoad > 0 ? 'ios-loading' : ''"
+                                        :class="{loading: addsubLoad > 0}"
+                                        enterkeyhint="done"
+                                        @on-blur="addsubChackClose"
+                                        @on-keydown="addsubKeydown"/>
+                                    <div v-else class="add-button" @click="addsubOpen">
+                                        <i class="taskfont">&#xe6f2;</i>{{$L('添加子任务')}}
+                                    </div>
+                                </li>
+                            </ul>
+                        </FormItem>
+                    </Form>
+                    <div v-if="menuList.length > 0" class="add">
+                        <EDropdown
+                            trigger="click"
+                            placement="bottom"
+                            @command="dropAdd">
+                            <div class="add-button">
+                                <i class="taskfont">&#xe6f2;</i>
+                                {{$L('添加')}}
+                                <em>{{menuText}}</em>
+                            </div>
+                            <EDropdownMenu slot="dropdown">
+                                <EDropdownItem v-for="(item, key) in menuList" :key="key" :command="item.command">
+                                    <div class="item">
+                                        <i class="taskfont" v-html="item.icon"></i>{{$L(item.name)}}
+                                    </div>
+                                </EDropdownItem>
+                            </EDropdownMenu>
+                        </EDropdown>
+                    </div>
+                </Scrollbar>
+                <TaskUpload ref="upload" class="upload" @on-select-file="onSelectFile"/>
+            </div>
+            <div v-show="taskDetail.id > 0" class="task-dialog" :style="dialogStyle">
+                <template v-if="hasOpenDialog">
+                    <DialogWrapper v-if="taskId > 0" ref="dialog" :dialog-id="taskDetail.dialog_id">
+                        <div slot="head" class="head">
+                            <Icon class="icon" type="ios-chatbubbles-outline" />
+                            <div class="nav">
+                                <p :class="{active:navActive=='dialog'}" @click="navActive='dialog'">{{$L('聊天')}}</p>
+                                <p :class="{active:navActive=='log'}" @click="navActive='log'">{{$L('动态')}}</p>
+                                <div v-if="navActive=='log'" class="refresh">
+                                    <Loading v-if="logLoadIng"/>
+                                    <Icon v-else type="ios-refresh" @click="getLogLists"></Icon>
                                 </div>
-                            </li>
-                        </ul>
-                        <ul class="item-content">
-                            <li>
-                                <div class="add-button" @click="onUploadClick(true)">
-                                    <i class="taskfont">&#xe6f2;</i>{{$L('添加附件')}}
-                                </div>
-                            </li>
-                        </ul>
-                    </FormItem>
-                    <FormItem v-if="subList.length > 0 || addsubForce">
-                        <div class="item-label" slot="label">
-                            <i class="taskfont">&#xe6f0;</i>{{$L('子任务')}}
+                            </div>
                         </div>
-                        <ul class="item-content subtask">
-                            <TaskDetail
-                                v-for="(task, key) in subList"
-                                :ref="`subTask_${task.id}`"
-                                :key="key"
-                                :task-id="task.id"
-                                :open-task="task"
-                                :main-end-at="taskDetail.end_at"
-                                :can-update-blur="canUpdateBlur"/>
-                        </ul>
-                        <ul :class="['item-content', subList.length === 0 ? 'nosub' : '']">
-                            <li>
-                                <Input
-                                    v-if="addsubShow"
-                                    v-model="addsubName"
-                                    ref="addsub"
-                                    class="add-input"
-                                    :placeholder="$L('+ 输入子任务，回车添加子任务')"
-                                    :icon="addsubLoad > 0 ? 'ios-loading' : ''"
-                                    :class="{loading: addsubLoad > 0}"
-                                    enterkeyhint="done"
-                                    @on-blur="addsubChackClose"
-                                    @on-keydown="addsubKeydown"/>
-                                <div v-else class="add-button" @click="addsubOpen">
-                                    <i class="taskfont">&#xe6f2;</i>{{$L('添加子任务')}}
-                                </div>
-                            </li>
-                        </ul>
-                    </FormItem>
-                </Form>
-                <div v-if="menuList.length > 0" class="add">
-                    <EDropdown
-                        trigger="click"
-                        placement="bottom"
-                        @command="dropAdd">
-                        <div class="add-button">
-                            <i class="taskfont">&#xe6f2;</i>
-                            {{$L('添加')}}
-                            <em>{{menuText}}</em>
-                        </div>
-                        <EDropdownMenu slot="dropdown">
-                            <EDropdownItem v-for="(item, key) in menuList" :key="key" :command="item.command">
-                                <div class="item">
-                                    <i class="taskfont" v-html="item.icon"></i>{{$L(item.name)}}
-                                </div>
-                            </EDropdownItem>
-                        </EDropdownMenu>
-                    </EDropdown>
-                </div>
-            </Scrollbar>
-            <TaskUpload ref="upload" class="upload" @on-select-file="onSelectFile"/>
-        </div>
-        <div v-show="taskDetail.id > 0" class="task-dialog" :style="dialogStyle">
-            <template v-if="hasOpenDialog">
-                <DialogWrapper v-if="taskId > 0" ref="dialog" :dialog-id="taskDetail.dialog_id">
-                    <div slot="head" class="head">
+                    </DialogWrapper>
+                    <ProjectLog v-if="navActive=='log' && taskId > 0" ref="log" :task-id="taskDetail.id" @on-load-change="logLoadChange"/>
+                </template>
+                <div v-else>
+                    <div class="head">
                         <Icon class="icon" type="ios-chatbubbles-outline" />
                         <div class="nav">
                             <p :class="{active:navActive=='dialog'}" @click="navActive='dialog'">{{$L('聊天')}}</p>
@@ -401,56 +417,63 @@
                                 <Icon v-else type="ios-refresh" @click="getLogLists"></Icon>
                             </div>
                         </div>
-                    </div>
-                </DialogWrapper>
-                <ProjectLog v-if="navActive=='log' && taskId > 0" ref="log" :task-id="taskDetail.id" @on-load-change="logLoadChange"/>
-            </template>
-            <div v-else>
-                <div class="head">
-                    <Icon class="icon" type="ios-chatbubbles-outline" />
-                    <div class="nav">
-                        <p :class="{active:navActive=='dialog'}" @click="navActive='dialog'">{{$L('聊天')}}</p>
-                        <p :class="{active:navActive=='log'}" @click="navActive='log'">{{$L('动态')}}</p>
-                        <div v-if="navActive=='log'" class="refresh">
-                            <Loading v-if="logLoadIng"/>
-                            <Icon v-else type="ios-refresh" @click="getLogLists"></Icon>
+                        <div class="menu">
+                            <div v-if="navActive=='dialog' && taskDetail.msg_num > 0" class="menu-item" @click.stop="onSend('open')">
+                                <div v-if="openLoad > 0" class="menu-load"><Loading/></div>
+                                {{$L('任务聊天')}}
+                                <em>({{taskDetail.msg_num > 999 ? '999+' : taskDetail.msg_num}})</em>
+                                <i class="taskfont">&#xe703;</i>
+                            </div>
                         </div>
                     </div>
-                    <div class="menu">
-                        <div v-if="navActive=='dialog' && taskDetail.msg_num > 0" class="menu-item" @click.stop="onSend('open')">
-                            <div v-if="openLoad > 0" class="menu-load"><Loading/></div>
-                            {{$L('任务聊天')}}
-                            <em>({{taskDetail.msg_num > 999 ? '999+' : taskDetail.msg_num}})</em>
-                            <i class="taskfont">&#xe703;</i>
+                    <ProjectLog v-if="navActive=='log' && taskId > 0" ref="log" :task-id="taskDetail.id" :show-load="false" @on-load-change="logLoadChange"/>
+                    <div v-else class="no-dialog"
+                        @drop.prevent="taskPasteDrag($event, 'drag')"
+                        @dragover.prevent="taskDragOver(true, $event)"
+                        @dragleave.prevent="taskDragOver(false, $event)">
+                        <div class="no-tip">{{$L('暂无消息')}}</div>
+                        <div class="no-input">
+                            <ChatInput
+                                ref="chatInput"
+                                :task-id="taskId"
+                                v-model="msgText"
+                                :loading="sendLoad > 0"
+                                :maxlength="200000"
+                                :placeholder="$L('输入消息...')"
+                                @on-more="onEventMore"
+                                @on-file="onSelectFile"
+                                @on-record="onRecord"
+                                @on-send="onSend"/>
+                        </div>
+                        <div v-if="dialogDrag" class="drag-over" @click="dialogDrag=false">
+                            <div class="drag-text">{{$L('拖动到这里发送')}}</div>
                         </div>
-                    </div>
-                </div>
-                <ProjectLog v-if="navActive=='log' && taskId > 0" ref="log" :task-id="taskDetail.id" :show-load="false" @on-load-change="logLoadChange"/>
-                <div v-else class="no-dialog"
-                     @drop.prevent="taskPasteDrag($event, 'drag')"
-                     @dragover.prevent="taskDragOver(true, $event)"
-                     @dragleave.prevent="taskDragOver(false, $event)">
-                    <div class="no-tip">{{$L('暂无消息')}}</div>
-                    <div class="no-input">
-                        <ChatInput
-                            ref="chatInput"
-                            :task-id="taskId"
-                            v-model="msgText"
-                            :loading="sendLoad > 0"
-                            :maxlength="200000"
-                            :placeholder="$L('输入消息...')"
-                            @on-more="onEventMore"
-                            @on-file="onSelectFile"
-                            @on-record="onRecord"
-                            @on-send="onSend"/>
-                    </div>
-                    <div v-if="dialogDrag" class="drag-over" @click="dialogDrag=false">
-                        <div class="drag-text">{{$L('拖动到这里发送')}}</div>
                     </div>
                 </div>
             </div>
+            <div v-if="!taskDetail.id" class="task-load"><Loading/></div>
         </div>
-        <div v-if="!taskDetail.id" class="task-load"><Loading/></div>
+        <!-- 提示  -->
+        <Modal v-model="showTips" title="提示" >
+            <p>以下人员时间段【】中已存在任务</p>
+            <List :split="false" size="small">
+                <ListItem v-for="(item, key) in tipsTaskList" :key="key">
+                    <UserAvatar v-for="(user, index) in item.task_user" 
+                        v-if="(taskDetail.owner_userid || []).indexOf(user.userid) !== -1"
+                        :userid="user.userid" 
+                        :size="28" 
+                        :show-icon="true" 
+                        :show-name="false" 
+                        :key="index" 
+                    />
+                    <p style="margin-left: 10px;"> 项目：{{item.project_name}} ｜ 任务：{{item.name}}</p>
+                </ListItem>
+            </List>
+            <div slot="footer">
+                <Button type="default" @click="showTips=false">{{$L('取消')}}</Button>
+                <Button type="primary" :loading="loadIng > 0" @click="onAdd()">{{$L('确认添加')}}</Button>
+            </div>
+        </Modal>
     </div>
 </template>
 
@@ -574,6 +597,10 @@ export default {
                 {key: 'year', label: '每年'},
                 {key: 'custom', label: '自定义'},
             ],
+
+            showTips: false,
+            tipsTaskList: [],
+            loadIng: 0,
         }
     },
 
@@ -702,6 +729,8 @@ export default {
             let start_at = $A.Date(taskDetail.start_at, true);
             let end_at = $A.Date(taskDetail.end_at, true);
             let string = "";
+            console.log(start_at)
+            console.log(end_at)
             if ($A.formatDate('Y/m/d', start_at) == $A.formatDate('Y/m/d', end_at)) {
                 string = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('H:i', end_at)
             } else if ($A.formatDate('Y', start_at) == $A.formatDate('Y', end_at)) {
@@ -935,6 +964,26 @@ export default {
             }
         },
 
+        async onUpdateDataBefore(params){
+            let isExistTask = false;
+            this.$store.dispatch("call", {
+                url: 'project/task/easylists',
+                data: {
+                    taskid: this.taskDetail.id,
+                    userid: this.taskDetail.owner_userid,
+                    timerange: [params.start_at,params.end_at]
+                },
+                method: 'get',
+            }).then(({data}) => {
+                if(data.data.length > 0) {
+                    this.showTips = true;
+                    this.tipsTaskList = data.data
+                    isExistTask = true;
+                }
+            });
+            return isExistTask
+        },
+
         updateData(action, params) {
             let successCallback = null;
             switch (action) {
@@ -957,7 +1006,16 @@ export default {
                                 if (!desc) {
                                     return `请输入修改备注`
                                 }
-                                this.updateData("times", Object.assign(params, {desc}))
+                                
+                                console.log( this.onUpdateDataBefore(params) )
+
+                                if(this.taskDetail.owner_userid.length>0 && this.onUpdateDataBefore(params)){
+                                    this.again = again;
+                                    console.log(11111)
+                                    return false;
+                                }
+                                console.log(22222)
+                                // this.updateData("times", Object.assign(params, {desc}))
                                 return false
                             },
                         });