From 5b079018e872c9c62798a3fe49b7349e8c79d1ff Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 21 Jul 2023 12:15:07 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=B2=E7=AA=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 language/original-web.txt                     |  4 ++--
 .../pages/manage/components/TaskExistTips.vue | 12 ++++------
 .../pages/components/task-exist-tips.scss     | 22 +++++--------------
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/language/original-web.txt b/language/original-web.txt
index feec9bf97..95dcdb971 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -1250,5 +1250,5 @@ Markdown 格式发送
 退出
 会议组件加载失败！
 
-以下人员已存在任务
-确定
\ No newline at end of file
+计划时间冲突提示
+忽略并继续
diff --git a/resources/assets/js/pages/manage/components/TaskExistTips.vue b/resources/assets/js/pages/manage/components/TaskExistTips.vue
index 408235e93..2a30dec16 100644
--- a/resources/assets/js/pages/manage/components/TaskExistTips.vue
+++ b/resources/assets/js/pages/manage/components/TaskExistTips.vue
@@ -1,10 +1,10 @@
 <template>
-    <Modal v-model="show" :title="$L('以下人员已存在任务')" class="task-exist-tips" width="640">
+    <Modal v-model="show" :title="$L('计划时间冲突提示')" class="task-exist-tips">
         <List :split="false" size="small">
             <ListItem v-for="(items, userid) in tipsTask" :key="userid">
                 <div class="list-content">
                     <UserAvatar :userid="userid" :size="28" :show-icon="true" :show-name="true" tooltipDisabled />
-                    <div class="list-task" v-for="(item, key) in items" :key="key">
+                    <div class="list-task clearfix" v-for="(item, key) in items" :key="key">
                         <div class="list-task-info">
                             <span>[{{ item.project_name }}] </span>
                             <span>{{ item.name }}</span>
@@ -16,18 +16,14 @@
         </List>
         <div slot="footer">
             <Button type="default" @click="show = false">{{ $L('取消') }}</Button>
-            <Button type="primary" @click="onAdd()">{{ $L('确定') }}</Button>
+            <Button type="primary" @click="onAdd">{{ $L('忽略并继续') }}</Button>
         </div>
     </Modal>
 </template>
 
 <script>
-import TEditor from "../../../components/TEditor";
-import UserSelect from "../../../components/UserSelect.vue";
-
 export default {
     name: "TaskExistTips",
-    components: { UserSelect, TEditor },
     props: {
         value: {
             type: Boolean,
@@ -57,7 +53,7 @@ export default {
             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 = $A.formatDate('Y/m/d H:i', start_at) + " ~ " + $A.formatDate('m/d H:i', 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)
diff --git a/resources/assets/sass/pages/components/task-exist-tips.scss b/resources/assets/sass/pages/components/task-exist-tips.scss
index 97d268668..6f4bf7001 100644
--- a/resources/assets/sass/pages/components/task-exist-tips.scss
+++ b/resources/assets/sass/pages/components/task-exist-tips.scss
@@ -1,7 +1,7 @@
 .task-exist-tips {
 
     .ivu-modal-body {
-        padding: 0px 26px 16px 26px !important;
+        padding: 0 26px 16px 26px !important;
         max-height: 500px;
         overflow: auto;
     }
@@ -12,29 +12,19 @@
     }
 
     .list-task {
-        @media (min-width: 450px) {
-            display: flex;
-        }
-
-        margin-left: 34px;
+        margin-left: 22px;
         margin-top: 10px;
-        width: calc(100% - 34px);
     }
 
     .list-task-info {
-        min-width: 135px;
-        flex: 1;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        overflow: hidden;
-
+        float: left;
+        padding: 0 12px;
         span:first-child {
             color: #A7ABB5;
         }
     }
 
     .list-task-date {
-        min-width: 135px;
-        text-align: left;
+        float: right;
     }
-}
\ No newline at end of file
+}