From 5801d0fc1422e3bc5f42be53cfcfff8e9482d36d Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Fri, 8 Sep 2023 19:57:21 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A1.=E5=BA=94=E7=94=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=20=202.=E5=AE=A1=E6=89=B9=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml                            |  4 +--
 .../assets/js/pages/manage/approve/index.vue  | 12 +++++---
 .../pages/manage/components/DialogWrapper.vue |  6 +++-
 resources/assets/sass/pages/page-apply.scss   | 29 ++++++++++++++-----
 resources/assets/sass/pages/page-approve.scss |  8 +++++
 5 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d69ab4357..0403635b9 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -150,7 +150,7 @@ services:
 
   approve:
     container_name: "dootask-approve-${APP_ID}"
-    image: "kuaifan/dooapprove:0.0.3"
+    image: "kuaifan/dooapprove:0.0.4"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       MYSQL_HOST: "${DB_HOST}"
@@ -176,7 +176,7 @@ services:
 
   okr:
     container_name: "dootask-okr-${APP_ID}"
-    image: "kuaifan/doookr:0.0.8"
+    image: "kuaifan/doookr:0.0.10"
     environment:
       TZ: "${TIMEZONE:-PRC}"
       DOO_TASK_URL: "http://${APP_IPPR}.3"
diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue
index c497fcd32..d72e74d0d 100644
--- a/resources/assets/js/pages/manage/approve/index.vue
+++ b/resources/assets/js/pages/manage/approve/index.vue
@@ -37,7 +37,8 @@
                                 <Option v-for="item in approvalList" :value="item.value" :key="item.value">{{ item.label }}</Option>
                             </Select>
                             <Input v-model="approvalName" :placeholder="$L('请输入用户名')" ></Input>
-                            <Button type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)">{{ $L('搜索') }}</Button>
+                            <Button v-show="!isShowIcon" type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)">{{ $L('搜索') }}</Button>
+                            <Button v-show="isShowIcon" type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)" />
                         </div>
                     </div>
                     <div>
@@ -66,7 +67,8 @@
                                 <Option v-for="item in approvalList" :value="item.value" :key="item.value">{{ item.label }}</Option>
                             </Select>
                             <Input v-model="approvalName" :placeholder="$L('请输入用户名')"></Input>
-                            <Button type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)">{{ $L('搜索') }}</Button>
+                            <Button v-show="!isShowIcon" type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)">{{ $L('搜索') }}</Button>
+                            <Button v-show="isShowIcon" type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)"/>
                         </div>
                     </div>
                     <div v-if="doneList.length==0" class="noData">{{$L('暂无数据')}}</div>
@@ -94,7 +96,8 @@
                                     <Option v-for="item in approvalList" :value="item.value" :key="item.value">{{ item.label }}</Option>
                                 </Select>
                                 <Input v-model="approvalName" :placeholder="$L('请输入用户名')"></Input>
-                                <Button type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)">{{ $L('搜索') }}</Button>
+                                <Button v-show="!isShowIcon" type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)">{{ $L('搜索') }}</Button>
+                                <Button v-show="isShowIcon" type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)"/>
                             </div>
                         </div>
                     </div>
@@ -125,7 +128,8 @@
                                 <Option v-for="item in searchStateList" :value="item.value" :key="item.value">{{ item.label }}</Option>
                             </Select>
                             <Input v-model="approvalName" :placeholder="$L('请输入用户名')"></Input>
-                            <Button type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)">{{ $L('搜索') }}</Button>
+                            <Button v-show="!isShowIcon" type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)">{{ $L('搜索') }}</Button>
+                            <Button v-show="isShowIcon" type="primary" :loading="loadIng" icon="ios-search" @click="tabsClick(false,0)"/>
                         </div>
                     </div>
                     <div v-if="initiatedList.length==0" class="noData">{{$L('暂无数据')}}</div>
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 9a36a6aa0..568c67573 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -44,7 +44,7 @@
                                 <h2>{{dialogData.name}}</h2>
                                 <em v-if="peopleNum > 0" @click="onDialogMenu('groupInfo')">({{peopleNum}})</em>
                                 <Tag v-if="dialogData.bot" class="after" :fade="false">{{$L('机器人')}}</Tag>
-                                <Tag v-if="dialogData.type === 'user' && cacheUserBasic.find(item => item.userid === dialogData.dialog_user.userid)?.approval_status" class="after" color="red" :fade="false">{{$L(cacheUserBasic.find(item => item.userid === dialogData.dialog_user.userid)?.approval_status)}}</Tag>
+                                <Tag v-if="dialogData.type === 'user' && approvalStatus" class="after" color="red" :fade="false">{{$L(approvalStatus)}}</Tag>
                                 <Tag v-if="dialogData.group_type=='all'" class="after pointer" :fade="false" @on-click="onDialogMenu('groupInfo')">{{$L('全员')}}</Tag>
                                 <Tag v-else-if="dialogData.group_type=='department'" class="after pointer" :fade="false" @on-click="onDialogMenu('groupInfo')">{{$L('部门')}}</Tag>
                                 <div v-if="msgLoadIng > 0" class="load"><Loading/></div>
@@ -979,6 +979,10 @@ export default {
                 }
             })
             return list
+        },
+
+        approvalStatus(){
+            return this.cacheUserBasic.find(item => item.userid === this.dialogData.dialog_user.userid)?.approval_status
         }
     },
 
diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss
index dddc603e5..bb46822fe 100644
--- a/resources/assets/sass/pages/page-apply.scss
+++ b/resources/assets/sass/pages/page-apply.scss
@@ -10,7 +10,7 @@
         display: flex;
         flex-direction: column;
         position: relative;
-        background-color: #FFFFFF;
+        background-color: #fafafa;
 
         .apply-head {
             display: flex;
@@ -39,6 +39,11 @@
 
             .apply-row-title{
                 margin-bottom: 16px;
+                
+            }
+
+            >div.apply-row-title:nth-last-child(2){
+                margin-top: 22px !important;
             }
 
             .apply-col {
@@ -47,7 +52,7 @@
                 >div {
                     font-size: 14px;
                     font-weight: normal;
-                    background: #fcfcfc;
+                    background: #FFFFFF;
                     color: #333333;
                     border-radius: 8px;
                     padding: 12px;
@@ -56,7 +61,7 @@
                     gap: 10px;
                     cursor: pointer;
                     position: relative;
-                    border: 1px solid #fcfcfc;
+                    border: 1px solid #f1f1f1;
 
                     >img {
                         width: 40px;
@@ -78,25 +83,37 @@
                         padding: 8px;
                     }
                 }
+            }
+        }
 
+        @media (max-width: 510px) {
+            background-color: #FFFFFF;
+
+            .apply-row-title{
+                margin-bottom: 8px !important;
             }
 
-            @media (max-width: 510px) {
+            .apply-content{
+                
                 .ivu-row{
                     margin-left: -12px !important;
                     margin-right: -12px !important;
                 }
+
                 .apply-col {
                     margin-bottom: 6px;
+
                     >div {
                         display: block;
                         text-align: center;
                         padding:12px 0;
                         background: none;
                         border-color: #ffffff;
+
                         >img {
                             margin-bottom: 5px;
                         }
+
                         >p{
                             -webkit-line-clamp: 1;
                         }
@@ -104,6 +121,7 @@
                 }
             }
         }
+
     }
 }
 
@@ -363,9 +381,6 @@ body.window-portrait {
         }
         .apply-content{
             padding: 16px 20px;
-            .apply-row-title{
-                margin: 8px 0;
-            }
             .apply-col {
                 >div {
                     font-size: 12px;
diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss
index 9ecda8b6d..c6aae5bb9 100644
--- a/resources/assets/sass/pages/page-approve.scss
+++ b/resources/assets/sass/pages/page-approve.scss
@@ -56,6 +56,14 @@
                     overflow: hidden;
                 }
             }
+
+            .ivu-input-wrapper{
+                max-width: 200px;
+            }
+            
+            .ivu-btn{
+                min-width: 45px;
+            }
         }
 
         .noData {