From 5c00a2892020d1b48f4c4c17c4e2ba818bef8d70 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 30 Jun 2023 15:46:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?style=EF=BC=9A=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C=E6=9C=AA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/TaskAdd.vue    |  2 +-
 .../js/pages/manage/components/TaskDetail.vue | 22 +++----------------
 .../sass/pages/components/task-detail.scss    | 12 ++++++++++
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue
index ca979d144..e76afafaa 100644
--- a/resources/assets/js/pages/manage/components/TaskAdd.vue
+++ b/resources/assets/js/pages/manage/components/TaskAdd.vue
@@ -97,7 +97,7 @@
                 <div class="item-label" slot="label">
                     <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
                         <span cclass="dashed-text">{{$L('可见性')}}
-                            <i class="taskfont" style="font-size: 10px;margin-right: 0;">&#xe740;</i>
+                            <i class="taskfont">&#xe740;</i>
                         </span>
                         <EDropdownMenu slot="dropdown">
                             <EDropdownItem :command="1">
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 2e987e373..16cf0c7f9 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -13,7 +13,7 @@
             <span :class="taskDetail.flow_item_status" @click.stop="openMenu($event, taskDetail)">{{taskDetail.flow_item_name}}</span>
         </div>
         <div class="subtask-name">
-            <Input style="min-width: 80px;"
+            <Input
                 v-model="taskDetail.name"
                 ref="name"
                 type="textarea"
@@ -205,8 +205,8 @@
                         <div class="item-label" slot="label">
                             <i class="taskfont">&#xe77b;</i>
                             <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
-                                <span class="dashed-text" style="color: #bbbbbb; ">{{$L('可见性')}}
-                                    <i class="taskfont" style="font-size: 10px;margin-right: 0;">&#xe740;</i>
+                                <span class="dashed-text color">{{$L('可见性')}}
+                                    <i class="taskfont">&#xe740;</i>
                                 </span>
                                 <EDropdownMenu slot="dropdown">
                                     <EDropdownItem :command="1">
@@ -1583,19 +1583,3 @@ export default {
     }
 }
 </script>
-<style scoped>
-::v-deep .ivu-poptip-rel {
-    display: flex;
-}
-::v-deep .sub-time {
-    color: #BBBBBB;
-}
-.dashed-text{
-    cursor: pointer; 
-    border-bottom: 1px dashed #acacac;
-}
-.dashed-text .taskfont{
-    font-size: 10px;
-    margin-right: 0;
-}
-</style>
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index 9a1c277d6..9cd1ae980 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -376,6 +376,7 @@
                                 margin-right: 8px;
                                 display: flex;
                                 .ivu-input {
+                                    min-width: 80px;
                                     margin: -2px 0;
                                     padding: 4px 0;
                                     resize: none;
@@ -428,6 +429,17 @@
                         }
                     }
                 }
+                .dashed-text{
+                    cursor: pointer; 
+                    border-bottom: 1px dashed #acacac;
+                    &.color{
+                        color: #bbbbbb;
+                    }
+                }
+                .dashed-text .taskfont{
+                    font-size: 10px;
+                    margin-right: 0;
+                }
             }
             .add {
                 margin-top: 12px;

From 41c2dabe267fcbbdf27a40e14b9c8d3537b40b31 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 30 Jun 2023 15:47:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style=EF=BC=9A=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C=E6=9C=AA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/components/TaskDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 16cf0c7f9..c576fb7da 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -346,7 +346,7 @@
                                 :can-update-blur="canUpdateBlur"/>
                         </ul>
                         <ul :class="['item-content', subList.length === 0 ? 'nosub' : '']">
-                            <li style="margin-left: 8px;">
+                            <li>
                                 <Input
                                     v-if="addsubShow"
                                     v-model="addsubName"

From 287e3e378db3e6471875ef9c3c91f28741c333dc Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 30 Jun 2023 16:15:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?style=EF=BC=9A=E8=B0=83=E6=95=B4=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C=E6=9C=AA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/ProjectTask.php                    |  8 +++-----
 .../js/pages/manage/components/TaskAdd.vue    |  6 +++---
 .../js/pages/manage/components/TaskDetail.vue |  6 +++---
 .../sass/pages/components/task-add.scss       | 20 +++++++++++++++++++
 .../sass/pages/components/task-detail.scss    | 11 +++++-----
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index 0ce8de294..9b9d77235 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -1413,11 +1413,9 @@ class ProjectTask extends AbstractModel
         $userids = [];
         if ($userid === null) {
             $userids = $this->project->relationUserids();
-        } elseif (!is_array($userid)) {
-            $userids = [$userid];
-        } elseif (is_array($userid)) {
-            $userids = $userid;
-        }
+        } else {
+            $userids = is_array($userid) ? $userid : [$userid];
+        } 
         //
         $array = [];
         if (empty($data['parent_id'])) {
diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue
index e76afafaa..3b784c7d7 100644
--- a/resources/assets/js/pages/manage/components/TaskAdd.vue
+++ b/resources/assets/js/pages/manage/components/TaskAdd.vue
@@ -96,7 +96,7 @@
             <FormItem>
                 <div class="item-label" slot="label">
                     <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
-                        <span cclass="dashed-text">{{$L('可见性')}}
+                        <span class="visibility-text">{{$L('可见性')}}
                             <i class="taskfont">&#xe740;</i>
                         </span>
                         <EDropdownMenu slot="dropdown">
@@ -125,8 +125,8 @@
                     </EDropdown>
                 </div>
                 <div class="item-content user ivu-input ivu-input-default ivu-input-with-suffix" v-if="addData.visibility_appoint < 3" @click="showCisibleDropdown">
-                    <span v-if="addData.visibility_appoint == 1"  class="dashed-text">{{$L('项目人员可见')}}</span>
-                    <span v-else-if="addData.visibility_appoint == 2"  class="dashed-text">{{$L('任务人员可见')}}</span>
+                    <span v-if="addData.visibility_appoint == 1">{{$L('项目人员可见')}}</span>
+                    <span v-else-if="addData.visibility_appoint == 2">{{$L('任务人员可见')}}</span>
                 </div>
                 <UserSelect v-else
                     ref="visibleUserSelectRef"
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index c576fb7da..bb33d20e2 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -205,7 +205,7 @@
                         <div class="item-label" slot="label">
                             <i class="taskfont">&#xe77b;</i>
                             <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
-                                <span class="dashed-text color">{{$L('可见性')}}
+                                <span class="visibility-text color">{{$L('可见性')}}
                                     <i class="taskfont">&#xe740;</i>
                                 </span>
                                 <EDropdownMenu slot="dropdown">
@@ -234,8 +234,8 @@
                             </EDropdown>
                         </div>
                         <div class="item-content user">
-                            <span @click="showCisibleDropdown" v-if="taskDetail.is_all_visible == 1"  class="dashed-text">{{$L('项目人员可见')}}</span>
-                            <span @click="showCisibleDropdown" v-else-if="taskDetail.is_all_visible == 2"  class="dashed-text">{{$L('任务人员可见')}}</span>
+                            <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"
diff --git a/resources/assets/sass/pages/components/task-add.scss b/resources/assets/sass/pages/components/task-add.scss
index 85f6f707c..207ab2da7 100644
--- a/resources/assets/sass/pages/components/task-add.scss
+++ b/resources/assets/sass/pages/components/task-add.scss
@@ -152,6 +152,16 @@
                 }
             }
         }
+        .visibility-text{
+            cursor: pointer; 
+            &.color{
+                color: #bbbbbb;
+            }
+            .taskfont{
+                font-size: 10px;
+                margin-right: 0;
+            }
+        }
     }
     .task-add-advanced {
         margin: -16px 0 0;
@@ -226,6 +236,16 @@ body.window-portrait {
                     margin-left: 4px;
                 }
             }
+            .visibility-text{
+                cursor: pointer; 
+                &.color{
+                    color: #bbbbbb;
+                }
+                .taskfont{
+                    font-size: 10px;
+                    margin-right: 0;
+                }
+            }
         }
     }
 }
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
index 9cd1ae980..2f3331a99 100644
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -429,16 +429,15 @@
                         }
                     }
                 }
-                .dashed-text{
+                .visibility-text{
                     cursor: pointer; 
-                    border-bottom: 1px dashed #acacac;
                     &.color{
                         color: #bbbbbb;
                     }
-                }
-                .dashed-text .taskfont{
-                    font-size: 10px;
-                    margin-right: 0;
+                    .taskfont{
+                        font-size: 10px;
+                        margin-right: 0;
+                    }
                 }
             }
             .add {