From 2e92682df233a384f8aff35b3bb3c55247ca4e4e Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 29 Jun 2023 01:08:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A1.=E5=AE=A1=E6=89=B9=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E6=97=B6=E9=95=BF=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C2.=E5=AE=A1=E6=89=B9=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E7=82=B9=E5=87=BB=E5=88=97=E8=A1=A8=E6=97=B6=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E4=B8=8D=E5=8F=98=20,=20=203=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8F=AF=E8=A7=81=E6=80=A7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/components/UserSelect.vue |  2 +-
 .../js/pages/manage/approve/details.vue       | 12 +++--
 .../assets/js/pages/manage/approve/index.vue  | 46 ++++++++++++++-----
 .../js/pages/manage/components/TaskAdd.vue    | 15 +++---
 .../js/pages/manage/components/TaskDetail.vue | 38 ++++++++-------
 5 files changed, 74 insertions(+), 39 deletions(-)

diff --git a/resources/assets/js/components/UserSelect.vue b/resources/assets/js/components/UserSelect.vue
index b39d2cf4b..9df819825 100755
--- a/resources/assets/js/components/UserSelect.vue
+++ b/resources/assets/js/components/UserSelect.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="common-user-select" :class="warpClass">
         <ul v-if="!module" @click="onSelection">
-            <li v-for="userid in values">
+            <li v-for="userid in values"  v-if="userid" >
                 <UserAvatar :userid="userid" :size="avatarSize" :show-icon="avatarIcon" :show-name="avatarName" tooltip-disabled/>
             </li>
             <li v-if="addIcon || values.length === 0" class="add-icon" :style="addStyle" @click.stop="onSelection"></li>
diff --git a/resources/assets/js/pages/manage/approve/details.vue b/resources/assets/js/pages/manage/approve/details.vue
index f0b3e08c1..45ce254c1 100644
--- a/resources/assets/js/pages/manage/approve/details.vue
+++ b/resources/assets/js/pages/manage/approve/details.vue
@@ -276,14 +276,15 @@ export default {
         // 获取时间差
         getTimeDifference(startTime,endTime) {
             const currentTime = new Date((endTime + '').replace(/-/g,"/"));
-            const timeDiff = (currentTime - new Date((startTime + '').replace(/-/g,"/"))) / 1000; // convert to seconds
+            const endTimes = new Date((startTime + '').replace(/-/g,"/"));
+            const timeDiff = (currentTime - endTimes) / 1000; // convert to seconds
             if (timeDiff < 60) {
                 return {time:timeDiff,unit:this.$L('秒')};
             } else if (timeDiff < 3600) {
                 const minutes = Math.floor(timeDiff / 60);
                 return {time:minutes,unit:this.$L('分钟')};
             } else if(timeDiff < 3600 * 24) {
-                const hours = Math.floor(timeDiff / 3600);
+                const hours = (currentTime - endTimes) / (1000 * 60 * 60);
                 return {time:hours,unit:this.$L('小时')};
             } else {
                 const days = Math.floor(timeDiff / 3600 / 24);
@@ -292,7 +293,6 @@ export default {
         },
         // 获取详情
         getInfo(){
-            this.datas = this.data
             this.$store.dispatch("call", {
                 method: 'get',
                 url: 'approve/process/detail',
@@ -308,7 +308,9 @@ export default {
                     }
                     return item;
                 })
-                this.datas = data
+                this.$nextTick(()=>{
+                    this.datas = data
+                })
             }).catch(({msg}) => {
                 $A.modalError(msg);
             }).finally(_ => {
@@ -379,6 +381,8 @@ export default {
         },
         // 评论
         comment(){
+            this.commentData.content = ""
+            this.commentData.pictures = []
             this.commentShow = true;
         },
         // 提交评论
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index e8ad0b348..f020d6c90 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -372,8 +372,14 @@ export default {
                     proc_def_name: this.approvalType == 'all' ? '' : this.approvalType,
                 }
             }).then(({data}) => {
-                this.unreadList =  data.rows.map((h,index)=>{
-                    h._active = index == 0; 
+                let activeId = 0;
+                let activeIndex = 0;
+                if( this.unreadList.length == 0 || this.unreadList.length == data.rows.length){
+                    this.unreadList?.map((res)=>{ if(res._active)  activeId = res.id  })
+                }
+                this.unreadList = data.rows.map((h,index)=>{
+                    h._active = activeId > 0 ? h.id == activeId : index == 0; 
+                    if(h._active) activeIndex = index
                     return h;
                 })
                 if(this.approvalType == 'all'){
@@ -381,7 +387,7 @@ export default {
                 }
                 if(this.tabsValue == 'unread'){
                     this.$nextTick(()=>{
-                        this.details = this.unreadList[0] || {}
+                        this.details = this.unreadList[activeIndex] || {}
                     })
                 }
             }).catch(({msg}) => {
@@ -402,13 +408,19 @@ export default {
                     proc_def_name: this.approvalType == 'all' ? '' : this.approvalType,
                 }
             }).then(({data}) => {
-                this.doneList =  data.rows.map((h,index)=>{
-                    h._active = index == 0; 
+                let activeId = 0;
+                let activeIndex = 0;
+                if( this.doneList.length == 0 || this.doneList.length == data.rows.length){
+                    this.doneList?.map((res)=>{ if(res._active)  activeId = res.id  })
+                }
+                this.doneList = data.rows.map((h,index)=>{
+                    h._active = activeId > 0 ? h.id == activeId : index == 0; 
+                    if(h._active) activeIndex = index
                     return h;
                 })
                 if(this.tabsValue == 'done'){
                     this.$nextTick(()=>{
-                        this.details = this.doneList[0] || {}
+                        this.details = this.doneList[activeIndex] || {}
                     })
                 }
             }).catch(({msg}) => {
@@ -429,13 +441,19 @@ export default {
                     proc_def_name: this.approvalType == 'all' ? '' : this.approvalType,
                 }
             }).then(({data}) => {
-                this.notifyList =  data.rows.map((h,index)=>{
-                    h._active = index == 0; 
+                let activeId = 0;
+                let activeIndex = 0;
+                if( this.notifyList.length == 0 || this.notifyList.length == data.rows.length){
+                    this.notifyList?.map((res)=>{ if(res._active)  activeId = res.id  })
+                }
+                this.notifyList = data.rows.map((h,index)=>{
+                    h._active = activeId > 0 ? h.id == activeId : index == 0; 
+                    if(h._active) activeIndex = index
                     return h;
                 })
                 if(this.tabsValue == 'notify'){
                     this.$nextTick(()=>{
-                        this.details = this.notifyList[0] || {}
+                        this.details = this.notifyList[activeIndex] || {}
                     })
                 }
             }).catch(({msg}) => {
@@ -457,13 +475,19 @@ export default {
                     state: this.searchState == 'all' ? '' : this.searchState
                 }
             }).then(({data}) => {
+                let activeId = 0;
+                let activeIndex = 0;
+                if( this.initiatedList.length == 0 || this.initiatedList.length == data.rows.length){
+                    this.initiatedList?.map((res)=>{ if(res._active)  activeId = res.id  })
+                }
                 this.initiatedList = data.rows.map((h,index)=>{
-                    h._active = index == 0; 
+                    h._active = activeId > 0 ? h.id == activeId : index == 0; 
+                    if(h._active) activeIndex = index
                     return h;
                 })
                 if(this.tabsValue == 'initiated'){
                     this.$nextTick(()=>{
-                        this.details = this.initiatedList[0] || {}
+                        this.details = this.initiatedList[activeIndex] || {}
                     })
                 }
             }).catch(({msg}) => {
diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue
index e0d6dd059..55d57e470 100644
--- a/resources/assets/js/pages/manage/components/TaskAdd.vue
+++ b/resources/assets/js/pages/manage/components/TaskAdd.vue
@@ -78,7 +78,7 @@
                     type="datetimerange"
                     @on-change="taskTimeChange(addData.times)"/>
             </FormItem>
-            <FormItem :label="$L('任务负责人')">
+            <FormItem :label="$L('任务负责人')" >
                 <UserSelect
                     v-model="addData.owner"
                     :multiple-max="10"
@@ -94,8 +94,10 @@
                 </div>
             </FormItem>
             <FormItem :label="$L('可见性')">
-                <Checkbox disabled v-model="addData.visibility_principal" :true-value="1" :false-value="0">{{$L('任务负责人')}}</Checkbox>
-                <Checkbox disabled v-model="addData.visibility_assist" :true-value="1" :false-value="0">{{$L('任务协助人')}}</Checkbox>
+                <RadioGroup>
+                    <Checkbox disabled v-model="addData.visibility_principal" :true-value="1" :false-value="0">{{$L('任务负责人')}}</Checkbox>
+                    <Checkbox disabled v-model="addData.visibility_assist" :true-value="1" :false-value="0">{{$L('任务协助人')}}</Checkbox>
+                </RadioGroup>
                 <RadioGroup v-model="addData.is_all_visible">
                     <Radio :label=1>{{$L('所有人员')}}</Radio>
                     <Radio :label=0>{{$L('指定成员')}}</Radio>
@@ -104,10 +106,11 @@
                     class="item-content user"
                     v-show="!addData.is_all_visible"
                     v-model="addData.visibility_appointor"
-                    :avatar-size="28"
+                    :avatar-size="24"
                     :title="$L('选择指定人员')"
-                    :project-id="addData.project_id"/>
-<!--                <Button size="small" type="primary" @click="updateVisible">{{$L('提交修改')}}</Button>-->
+                    :project-id="addData.project_id"
+                    border
+                    />
             </FormItem>
             <div class="subtasks">
                 <div v-if="addData.subtasks.length > 0" class="sublist">
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index a9628e401..fd83e7584 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -10,9 +10,9 @@
                     :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 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"
@@ -220,20 +220,24 @@
                         <div class="item-label" slot="label">
                             <i class="taskfont">&#xe63f;</i>{{$L('可见性')}}
                         </div>
-                        <Checkbox disabled v-model="visibility_principal" :true-value="1" :false-value="0">{{$L('任务负责人')}}</Checkbox>
-                        <Checkbox disabled v-model="visibility_assist" :true-value="1" :false-value="0">{{$L('任务协助人')}}</Checkbox>
-                        <RadioGroup v-model="taskDetail.is_all_visible">
-                            <Radio :label=1>{{$L('所有人员')}}</Radio>
-                            <Radio :label=0>{{$L('指定成员')}}</Radio>
-                        </RadioGroup>
-                        <UserSelect
-                            class="item-content user"
-                            v-show="!taskDetail.is_all_visible"
-                            v-model="taskDetail.visibility_appointor"
-                            :avatar-size="28"
-                            :title="$L('选择指定人员')"
-                            :project-id="taskDetail.project_id"/>
-                        <Button size="small" type="primary" @click="updateVisible">{{$L('提交修改')}}</Button>
+                        <div class="item-content user">
+                            <RadioGroup >
+                                <Checkbox disabled v-model="visibility_principal" :true-value="1" :false-value="0">{{$L('任务负责人')}}</Checkbox>
+                                <Checkbox disabled v-model="visibility_assist" :true-value="1" :false-value="0">{{$L('任务协助人')}}</Checkbox>
+                            </RadioGroup>
+                            <RadioGroup v-model="taskDetail.is_all_visible">
+                                <Radio :label=1>{{$L('所有人员')}}</Radio>
+                                <Radio :label=0>{{$L('指定成员')}}</Radio>
+                            </RadioGroup>
+                            <UserSelect 
+                                v-show="!taskDetail.is_all_visible"
+                                v-model="taskDetail.visibility_appointor"
+                                :avatar-size="28"
+                                :title="$L('选择指定人员')"
+                                :project-id="taskDetail.project_id"
+                                />
+                            <Button size="small" type="primary" @click="updateVisible">{{$L('提交修改')}}</Button>
+                        </div>
                     </FormItem>
                     <FormItem v-if="taskDetail.end_at || timeForce">
                         <div class="item-label" slot="label">