mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 11:19:56 +00:00
feat：样式调优
This commit is contained in:
weifashi
parent
c4743d3b26
commit
632e113d63
@ -22,12 +22,14 @@
|
||||
<div @click="applyClick(item)">
|
||||
<img :src="item.src">
|
||||
<p>{{ item.label }}</p>
|
||||
<!-- 审批中心 -->
|
||||
<Badge v-if="item.value == 'approve' && approveUnreadNumber > 0" class="manage-box-top-report"
|
||||
:overflow-count="999" :count="approveUnreadNumber" />
|
||||
<!-- 工作报告 -->
|
||||
<Badge v-if="item.value == 'report' && reportUnreadNumber > 0" class="manage-box-top-report"
|
||||
:overflow-count="999" :count="reportUnreadNumber" />
|
||||
<div @click.stop="applyClick(item,'badge')" class="apply-box-top-report">
|
||||
<!-- 审批中心 -->
|
||||
<Badge v-if="item.value == 'approve' && approveUnreadNumber > 0"
|
||||
:overflow-count="999" :count="approveUnreadNumber"/>
|
||||
<!-- 工作报告 -->
|
||||
<Badge v-if="item.value == 'report' && reportUnreadNumber > 0"
|
||||
:overflow-count="999" :count="reportUnreadNumber"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Col>
|
||||
@ -298,7 +300,7 @@ export default {
|
||||
}
|
||||
},
|
||||
// 点击应用
|
||||
applyClick(item) {
|
||||
applyClick(item,area='') {
|
||||
this.$emit("on-click", item.value)
|
||||
switch (item.value) {
|
||||
case 'approve':
|
||||
@ -308,6 +310,10 @@ export default {
|
||||
this.goForward({ name: 'manage-' + item.value });
|
||||
break;
|
||||
case 'report':
|
||||
this.workReportTabs = 'my';
|
||||
if(area=='badge'){
|
||||
this.workReportTabs = 'receive';
|
||||
}
|
||||
this.workReportShow = true;
|
||||
break;
|
||||
case 'ai':
|
||||
|
||||
@ -8,24 +8,31 @@
|
||||
<div class="common-nav-back" @click="goBack()"><i class="taskfont"></i></div>
|
||||
<h1>{{$L('审批中心')}}</h1>
|
||||
</div>
|
||||
<Button v-if="showType == 1" :loading="addLoadIng" type="primary" @click="addApply">
|
||||
<span v-if="!isShowIcon"> {{$L("添加申请")}} </span>
|
||||
<i v-else class="taskfont"></i>
|
||||
|
||||
<Button v-if="showType == 1 && !isShowIcon" :loading="addLoadIng" type="primary" @click="addApply">
|
||||
<span> {{$L("添加申请")}} </span>
|
||||
</Button>
|
||||
<Button v-if="showType == 1 && userIsAdmin" @click="exportApproveShow = true">
|
||||
<span v-if="!isShowIcon"> {{$L("导出审批数据")}} </span>
|
||||
<i v-else class="taskfont"></i>
|
||||
<Button v-if="showType == 1 && isShowIcon" :loading="addLoadIng" type="primary" @click="addApply" shape="circle">
|
||||
<i class="taskfont"></i>
|
||||
</Button>
|
||||
<Button v-if="userIsAdmin" @click="showType = showType == 1 ? 2 : 1">
|
||||
<span v-if="!isShowIcon"> {{ showType == 1 ? $L("流程设置") : $L("返回") }} </span>
|
||||
<template v-else>
|
||||
<i v-if="showType == 1" class="taskfont"></i>
|
||||
<i v-else class="taskfont"></i>
|
||||
</template>
|
||||
|
||||
<Button v-if="showType == 1 && userIsAdmin && !isShowIcon" @click="exportApproveShow = true">
|
||||
<span> {{$L("导出审批数据")}} </span>
|
||||
</Button>
|
||||
<Button v-if="showType == 1 && userIsAdmin && isShowIcon" @click="exportApproveShow = true" shape="circle">
|
||||
<i class="taskfont"></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"></i>
|
||||
<i v-else class="taskfont"></i>
|
||||
</Button>
|
||||
</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%;">
|
||||
<div class="approve-main-search">
|
||||
<div>
|
||||
|
||||
2
resources/assets/sass/pages/common.scss
vendored
2
resources/assets/sass/pages/common.scss
vendored
@ -780,7 +780,7 @@ body {
|
||||
// 全局返回按钮
|
||||
.common-nav-back{
|
||||
cursor: pointer;
|
||||
padding-right: 5px;
|
||||
padding-right: 10px;
|
||||
&.portrait{
|
||||
display: none;
|
||||
}
|
||||
|
||||
7
resources/assets/sass/pages/page-apply.scss
vendored
7
resources/assets/sass/pages/page-apply.scss
vendored
@ -67,10 +67,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
.manage-box-top-report {
|
||||
.apply-box-top-report {
|
||||
position: absolute;
|
||||
right: -6px;
|
||||
top: -6px;
|
||||
right: -16px;
|
||||
top: -16px;
|
||||
padding: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,6 +63,11 @@
|
||||
line-height: 150px;
|
||||
}
|
||||
|
||||
.page-approve-tabs{
|
||||
margin: 0 20px;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.approve-mains {
|
||||
display: flex;
|
||||
flex: 1 1 auto;
|
||||
@ -477,7 +482,7 @@
|
||||
body.window-portrait {
|
||||
.page-approve{
|
||||
.approve-head {
|
||||
margin: 20px 14px 16px;
|
||||
margin: 24px 16px 6px 16px;
|
||||
}
|
||||
.approve-mains {
|
||||
height: calc(100vh - 250px);
|
||||
|
||||
@ -194,7 +194,7 @@
|
||||
body.window-portrait {
|
||||
.page-calendar {
|
||||
.calendar-head {
|
||||
margin: 24px 24px 16px;
|
||||
margin: 24px 16px 16px;
|
||||
.calendar-titbox {
|
||||
.calendar-title {
|
||||
flex: 1;
|
||||
|
||||
2
resources/assets/sass/pages/page-file.scss
vendored
2
resources/assets/sass/pages/page-file.scss
vendored
@ -709,7 +709,7 @@ body.window-portrait {
|
||||
.page-file {
|
||||
.file-wrapper {
|
||||
.file-head {
|
||||
margin: 24px 24px 16px;
|
||||
margin: 24px 16px 16px;
|
||||
}
|
||||
.file-navigator {
|
||||
margin: 0 24px 0;
|
||||
|
||||
@ -375,7 +375,7 @@
|
||||
body.window-portrait {
|
||||
.page-setting {
|
||||
.setting-head {
|
||||
margin: 24px 24px 16px;
|
||||
margin: 24px 16px 16px;
|
||||
.setting-titbox {
|
||||
.setting-title {
|
||||
.setting-more {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user