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

feat：样式调优

Browse Source
This commit is contained in:
weifashi 2023-08-16 18:35:20 +08:00
parent c4743d3b26
commit 632e113d63
8 changed files with 47 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/assets/js/pages/manage/apply.vue
View File

@ -22,14 +22,16 @@
<div @click="applyClick(item)"> <div @click="applyClick(item)">
<img :src="item.src"> <img :src="item.src">
<p>{{ item.label }}</p> <p>{{ item.label }}</p>
<div @click.stop="applyClick(item,'badge')" class="apply-box-top-report">
<!-- 审批中心 --> <!-- 审批中心 -->
<Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" class="manage-box-top-report" <Badge v-if="item.value == 'approve' && approveUnreadNumber > 0"
:overflow-count="999" :count="approveUnreadNumber"/> :overflow-count="999" :count="approveUnreadNumber"/>
<!-- 工作报告 --> <!-- 工作报告 -->
<Badge v-if="item.value == 'report' && reportUnreadNumber > 0" class="manage-box-top-report" <Badge v-if="item.value == 'report' && reportUnreadNumber > 0"
:overflow-count="999" :count="reportUnreadNumber"/> :overflow-count="999" :count="reportUnreadNumber"/>
</div> </div>
</div> </div>
</div>
</Col> </Col>
</Row> </Row>
</div> </div>
@ -298,7 +300,7 @@ export default {
} }
}, },
// 点击应用 // 点击应用
applyClick(item) { applyClick(item,area='') {
this.$emit("on-click", item.value) this.$emit("on-click", item.value)
switch (item.value) { switch (item.value) {
case 'approve': case 'approve':
@ -308,6 +310,10 @@ export default {
this.goForward({ name: 'manage-' + item.value }); this.goForward({ name: 'manage-' + item.value });
break; break;
case 'report': case 'report':
this.workReportTabs = 'my';
if(area=='badge'){
this.workReportTabs = 'receive';
}
this.workReportShow = true; this.workReportShow = true;
break; break;
case 'ai': case 'ai':

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

@ -8,24 +8,31 @@
<div class="common-nav-back" @click="goBack()"><i class="taskfont">&#xe676;</i></div> <div class="common-nav-back" @click="goBack()"><i class="taskfont">&#xe676;</i></div>
<h1>{{$L('审批中心')}}</h1> <h1>{{$L('审批中心')}}</h1>
</div> </div>
<Button v-if="showType == 1" :loading="addLoadIng" type="primary" @click="addApply">
<span v-if="!isShowIcon"> {{$L("添加申请")}} </span> <Button v-if="showType == 1 && !isShowIcon" :loading="addLoadIng" type="primary" @click="addApply">
<i v-else class="taskfont">&#xe6f2;</i> <span> {{$L("添加申请")}} </span>
</Button> </Button>
<Button v-if="showType == 1 && userIsAdmin" @click="exportApproveShow = true"> <Button v-if="showType == 1 && isShowIcon" :loading="addLoadIng" type="primary" @click="addApply" shape="circle">
<span v-if="!isShowIcon"> {{$L("导出审批数据")}} </span> <i class="taskfont">&#xe6f2;</i>
<i v-else class="taskfont">&#xe7a8;</i>
</Button> </Button>
<Button v-if="userIsAdmin" @click="showType = showType == 1 ? 2 : 1">
<span v-if="!isShowIcon"> {{ showType == 1 ? $L("流程设置") : $L("返回") }} </span> <Button v-if="showType == 1 && userIsAdmin && !isShowIcon" @click="exportApproveShow = true">
<template v-else> <span> {{$L("导出审批数据")}} </span>
</Button>
<Button v-if="showType == 1 && userIsAdmin && isShowIcon" @click="exportApproveShow = true" shape="circle">
<i class="taskfont">&#xe7a8;</i>
</Button>
<Button v-if="userIsAdmin && !isShowIcon" @click="showType = showType == 1 ? 2 : 1">
<span> {{ showType == 1 ? $L("流程设置") : $L("返回") }} </span>
</Button>
<Button v-if="userIsAdmin && isShowIcon" @click="showType = showType == 1 ? 2 : 1" shape="circle">
<i v-if="showType == 1" class="taskfont">&#xe67b;</i> <i v-if="showType == 1" class="taskfont">&#xe67b;</i>
<i v-else class="taskfont">&#xe637;</i> <i v-else class="taskfont">&#xe637;</i>
</template>
</Button> </Button>
</div> </div>
<Tabs v-if="showType==1" :value="tabsValue" @on-click="tabsClick" style="margin: 0 20px;height: 100%;" size="small"> <Tabs class="page-approve-tabs" v-if="showType==1" :value="tabsValue" @on-click="tabsClick" size="small">
<TabPane :label="$L('待办') + (unreadTotal > 0 ? ('('+unreadTotal+')') : '')" name="unread" style="height: 100%;"> <TabPane :label="$L('待办') + (unreadTotal > 0 ? ('('+unreadTotal+')') : '')" name="unread" style="height: 100%;">
<div class="approve-main-search"> <div class="approve-main-search">
<div> <div>

2
resources/assets/sass/pages/common.scss vendored
View File

@ -780,7 +780,7 @@ body {
// 全局返回按钮 // 全局返回按钮
.common-nav-back{ .common-nav-back{
cursor: pointer; cursor: pointer;
padding-right: 5px; padding-right: 10px;
&.portrait{ &.portrait{
display: none; display: none;
} }

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

@ -67,10 +67,11 @@
} }
} }
.manage-box-top-report { .apply-box-top-report {
position: absolute; position: absolute;
right: -6px; right: -16px;
top: -6px; top: -16px;
padding: 8px;
} }
} }
} }

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

@ -63,6 +63,11 @@
line-height: 150px; line-height: 150px;
} }
.page-approve-tabs{
margin: 0 20px;
height: 100%;
}
.approve-mains { .approve-mains {
display: flex; display: flex;
flex: 1 1 auto; flex: 1 1 auto;
@ -477,7 +482,7 @@
body.window-portrait { body.window-portrait {
.page-approve{ .page-approve{
.approve-head { .approve-head {
margin: 20px 14px 16px; margin: 24px 16px 6px 16px;
} }
.approve-mains { .approve-mains {
height: calc(100vh - 250px); height: calc(100vh - 250px);

2
resources/assets/sass/pages/page-calendar.scss vendored
View File

@ -194,7 +194,7 @@
body.window-portrait { body.window-portrait {
.page-calendar { .page-calendar {
.calendar-head { .calendar-head {
margin: 24px 24px 16px; margin: 24px 16px 16px;
.calendar-titbox { .calendar-titbox {
.calendar-title { .calendar-title {
flex: 1; flex: 1;

2
resources/assets/sass/pages/page-file.scss vendored
View File

@ -709,7 +709,7 @@ body.window-portrait {
.page-file { .page-file {
.file-wrapper { .file-wrapper {
.file-head { .file-head {
margin: 24px 24px 16px; margin: 24px 16px 16px;
} }
.file-navigator { .file-navigator {
margin: 0 24px 0; margin: 0 24px 0;

2
resources/assets/sass/pages/page-setting.scss vendored
View File

@ -375,7 +375,7 @@
body.window-portrait { body.window-portrait {
.page-setting { .page-setting {
.setting-head { .setting-head {
margin: 24px 24px 16px; margin: 24px 16px 16px;
.setting-titbox { .setting-titbox {
.setting-title { .setting-title {
.setting-more { .setting-more {