github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 03:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat：1.应用页面优化 2.审批中心优化

Browse Source
This commit is contained in:
weifashi 2023-09-08 19:57:21 +08:00
parent 525ac41258
commit 5801d0fc14
5 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -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"

12
resources/assets/js/pages/manage/approve/index.vue
View File

@ -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>

6
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -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
}
},

29
resources/assets/sass/pages/page-apply.scss vendored
View File

@ -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;

8
resources/assets/sass/pages/page-approve.scss vendored
View File

@ -56,6 +56,14 @@
overflow: hidden;
}
}
.ivu-input-wrapper{
max-width: 200px;
}
.ivu-btn{
min-width: 45px;
}
}
.noData {