fix: 【工作报告】填写'提交'按钮位置被挤压修改

This commit is contained in:
韦荣超 2022-01-14 16:43:13 +08:00
parent d48ed18102
commit 0d0b5dd552
16 changed files with 5 additions and 1179 deletions

View File

@ -38,7 +38,7 @@
v-model="reportData.receive"
:placeholder="$L('选择接收人')" />
</Col>
<Col span="6"><a class="report-row-a" href="javascript:void(0);" @click="getLastSubmitter"><Icon class="report-row-a-icon" type="ios-share-outline" />{{ $L("使用上一次提交的接收人") }}</a></Col>
<Col span="6"><a class="report-row-a" href="javascript:void(0);" @click="getLastSubmitter"><Icon class="report-row-a-icon" type="ios-share-outline" />{{ $L("使用我上次的汇报对象") }}</a></Col>
</Row>
<Row class="report-row report-row-content">
<Col span="2"><p class="report-titles">{{ $L("汇报内容") }}</p></Col>
@ -57,13 +57,6 @@
<!-- <Button type="primary" @click="nextCycle" :disabled="reportData.offset >= 0">{{ nextCycleText }}</Button>-->
</FormItem>
</Col>
<Col span="4">
<FormItem>
<Button type="primary" class="report-bottom-save">保存</Button>
<!-- <Button type="primary" @click="prevCycle">{{ prevCycleText }}</Button>-->
<!-- <Button type="primary" @click="nextCycle" :disabled="reportData.offset >= 0">{{ nextCycleText }}</Button>-->
</FormItem>
</Col>
</Row>
</Form>
</template>
@ -118,8 +111,7 @@ export default {
method: 'post',
}).then(({data, msg}) => {
// data
this.reportData.content = "";
this.reportData.receive = [];
this.getTemplate();
this.disabledType = false;
// msg
$A.messageSuccess(msg);

View File

@ -1,14 +0,0 @@
@import "app-down";
@import "auto-tip";
@import "circle";
@import "drawer-overlay";
@import "img-update";
@import "loading";
@import "scroller-y";
@import "spinner";
@import "t-editor";
@import "quick-edit";
@import "tag-input";
@import "user-avatar";
@import "user-input";
@import "report";

View File

@ -1,74 +0,0 @@
.common-app-down {
position: absolute;
bottom: 26px;
right: 26px;
z-index: 1;
display: flex;
align-items: center;
transition: bottom 0.3s;
&.on-client {
&[data-route=login] {
bottom: 75px;
}
}
}
.common-app-down-notification {
.notification-head {
display: flex;
align-items: center;
.notification-title {
display: inline-block;
vertical-align: middle;
font-size: 18px;
color: #17233d;
font-weight: 500;
margin-right: 6px;
}
}
.notification-body {
max-height: 210px;
overflow: auto;
margin: 18px 0;
.markdown-preview {
margin: -20px -12px;
h2 {
font-size: 18px !important;
padding-top: 2px !important;
}
ul {
li {
padding: 2px 0 2px 2px !important;
&:after {
top: 10px !important;
width: 6px !important;
height: 6px !important;
}
}
}
}
}
.notification-link {
margin-top: 20px;
text-align: right;
> button + button {
margin-left: 6px;
}
}
}
.common-app-down-link {
display: inline-block;
cursor: pointer;
line-height: 32px;
height: 32px;
padding: 0 15px;
font-size: 14px;
border-radius: 4px;
color: #fff;
background-color: #8bcf70;
border-color: #8bcf70;
&:hover {
color: #fff;
opacity: 0.9;
}
}

View File

@ -1,6 +0,0 @@
.common-auto-tip {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap
}

View File

@ -1,14 +0,0 @@
.common-circle {
border-radius: 50%;
.common-circle-path {
fill: transparent;
}
.common-circle-g-path-ring {
stroke: $primary-color;
}
.common-circle-g-path-core {
fill: $primary-color;
transform: scale(0.56);
transform-origin: 50%;
}
}

View File

@ -14,6 +14,7 @@
}
.report-row-content{
flex:1 1 auto;
overflow-y: auto;
.ivu-table{
.ivu-table-body{
height: 100%;
@ -43,7 +44,7 @@
padding-top: 53px;
}
.ivu-tabs-tabpane{
overflow-y: auto;
}
}
}
@ -115,6 +116,7 @@
}
.report-row-content{
flex:1 1 auto;
overflow-y:auto;
}
.report-row-foot{
margin-bottom: 0;

View File

@ -1,136 +0,0 @@
.drawer-overlay {
position: fixed;
top: 0;
left: 0;
width: 0;
height: 0;
z-index: 1000;
box-sizing: border-box;
pointer-events: none;
background: rgba(0, 0, 0, 0.76);
outline: none;
opacity: 0;
display: flex;
flex-direction: column;
justify-content: flex-end;
.overlay-mask {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 1;
}
.overlay-body {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
max-width: 100%;
max-height: 100%;
z-index: 2;
.overlay-close {
flex-shrink: 0;
display: flex;
align-items: flex-end;
justify-content: flex-end;
> a {
display: flex;
align-items: center;
justify-content: center;
width: 40px;
height: 40px;
color: #dbdbde;
&:hover {
color: #fff
}
.icon {
width: 24px;
height: 24px
}
}
}
.overlay-resize {
width: 100%;
height: 5px;
margin-bottom: -5px;
z-index: 1;
}
.overlay-content {
flex: 1;
position: relative;
background: #fff;
border-radius: 18px 18px 0 0;
transform: translate(0, 15%) scale(0.98);
cursor: default;
opacity: 0;
}
}
&.overlay-visible {
pointer-events: auto;
opacity: 1;
width: 100%;
height: 100%;
transition: opacity 0.2s ease;
.overlay-body {
.overlay-content {
opacity: 1;
transform: translate(0, 0) scale(1);
transition: opacity 0.2s ease, transform 0.3s ease;
}
}
}
&.overlay-hide {
width: 100%;
height: 100%;
transition: opacity 0.2s ease;
.overlay-body {
.overlay-content {
transform: translate(0, 15%) scale(0.98);
transition: opacity 0.2s ease, transform 0.2s ease
}
}
}
&.right {
flex-direction: row;
justify-content: flex-end;
.overlay-body {
flex-direction: row;
.overlay-close {
align-items: flex-start;
}
.overlay-resize {
width: 5px;
height: 100%;
margin-right: -5px;
z-index: 1;
}
.overlay-content {
transform: translate(15%, 0) scale(0.98);
border-radius: 18px 0 0 18px;
}
}
&.overlay-visible {
.overlay-body {
.overlay-content {
transform: translate(0, 0) scale(1);
}
}
}
&.overlay-hide {
.overlay-body {
.overlay-content {
transform: translate(15%, 0) scale(0.98);
}
}
}
}
}

View File

@ -1,255 +0,0 @@
.img-upload-modal {
.ivu-modal-mask {
z-index: 1001;
}
.ivu-modal-no-mask {
background-color: rgba(55, 55, 55, .2);
}
.ivu-modal-wrap {
z-index: 1001;
}
}
.imgcomp-upload-list {
display: inline-block;
width: 60px;
height: 60px;
text-align: center;
line-height: 60px;
border: 1px solid transparent;
border-radius: 4px;
overflow: hidden;
background: #fff;
position: relative;
box-shadow: 0 1px 1px rgba(0, 0, 0, .2);
margin-right: 4px;
vertical-align: top;
.imgcomp-upload-img {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-position: center;
background-size: cover;
}
.imgcomp-upload-list-cover {
display: none;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
background: rgba(0, 0, 0, .6);
}
.imgcomp-upload-list-cover i {
color: #fff;
font-size: 24px;
cursor: pointer;
vertical-align: middle;
margin: 0;
transition: all .2s;
}
.imgcomp-upload-list-cover i:hover {
font-size: 28px;
}
.ivu-progress {
height: 100%;
.ivu-progress-outer {
background-color: rgba(0, 0, 0, 0.68);
height: 100%;
.ivu-progress-inner {
width: 88%;
margin: 0 auto;
}
}
}
}
.imgcomp-upload-list:hover .imgcomp-upload-list-cover {
display: block;
}
.img-upload-foot {
display: flex;
align-items: center;
justify-content: flex-end;
.img-upload-foot-input {
flex: 1;
text-align: left;
display: flex;
align-items: center;
justify-content: flex-end;
.img-upload-foot-httptitle {
cursor: pointer;
padding-left: 3px;
margin-right: 22px;
}
}
}
.add-box {
width: 60px;
height: 60px;
line-height: 60px;
display: inline-block;
background: #fff;
border: 1px dashed #dddee1;
border-radius: 4px;
text-align: center;
position: relative;
overflow: hidden;
vertical-align: top;
.add-box-icon {
i {
vertical-align: middle;
padding-bottom: 2px;
}
}
.add-box-upload {
display: none;
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
color: #ffffff;
padding-top: 9px;
background: rgba(0, 0, 0, 0.6);
.add-box-item {
height: 22px;
line-height: 22px;
cursor: pointer;
.ivu-upload-drag, .ivu-upload-drag:hover {
background: transparent;
border: 0;
border-radius: 0;
}
span {
transition: all .2s;
font-size: 12px;
}
}
.add-box-item:hover {
span {
font-size: 14px;
}
}
}
em {
font-style: normal;
}
}
.add-box:hover {
border-color: rgba(0, 0, 0, .6);
.add-box-upload {
display: block;
}
}
.callback-add-box {
display: block;
width: auto;
height: 25px;
line-height: 25px;
border: 0;
background: transparent;
.add-box-icon {
display: none;
}
.add-box-upload {
display: block;
width: auto;
background: transparent;
color: #333;
padding: 0;
> div {
display: inline-block;
padding-right: 10px;
}
}
}
.browse-load {
margin: 20px;
text-align: center;
}
.browse-list {
max-height: 540px;
overflow: auto;
.browse-item {
margin: 10px 15px;
display: inline-block;
text-align: center;
cursor: pointer;
position: relative;
.browse-img {
width: 64px;
height: 64px;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKoAAABxCAAAAABg5GeyAAACW0lEQVR4Ae3XVRLjMBAE0L3/rSwKM3OcSNPyLVYOLvM6UD0Bd03LVe9XH+RlhlRSSSWVVFJJJZVUUkkllVRSSSWVVFJJJZVUUkl9WyqppJJKKqmkkgpURP17xngOAR5NxW5wlJ9MaLQh83F4NHWmd/gZtdVBaOldfDB1bq5UpJFbFOC6LKnYrkRO209PAw+hIuzWB8Ep5es8HvYo4z4tE1X8UeRwlMM2D5Bzkc7kj6Bi3VTKDDwEeUcrMxrUvGDXTnHa6kK69SDN9sgq1clxKSbNHqqnYmdri81Q9QHf1JPt1Frncaib2XbiTKL2GkHaurnY9LOulMV0O7G6Kw+g9sw2ohhm62KezVJaaufjWC1TnOkr1exilJ7Ji0vxCCqO9V4UwV4PYr9+apouhGYLKfnahdpqegjmeoXOpXgANe70pKT6Zhu19qkY2nC0PZS527lQOyInqr8Uvc5jqfUb1X+PGh5IhW90S2quh3FQC2XRcF66TUkTXPcLKm5FtdR9RJq+2hWII7UpFtmsQLEyzsdJtkxxpr6gLotbUSlV9yeT0Trmzk2XPdUThLYarUbWOY9j04xXQ2u+pMZLYSumGmNUH3HbM9qOAwSHodN2Pks25F2j3aI7+IxqNsB+YLWb16ukSjiW4xNB0gMoMfApBS/XZQgi3p9/5RsiKNKZEOwYFVIF5VyTyD19sbyjIJiNJRZxpNbx2S8sGKvGZNHJBniBu9Wy5WxjGuQFqIAcBHiRGyt4ua5gSCWVVFJJJZVUUkkllVRSSSWVVFJJJZVUUkkllVRSSSWVVFI/AgO0SXIVYHeGAAAAAElFTkSuQmCC);
background-position: center;
background-repeat: no-repeat;
background-size: cover;
}
.browse-title {
display: block;
width: 64px;
margin-top: 5px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.browse-icon {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 64px;
font-size: 36px;
padding-top: 15px;
color: #ffffff;
background-color: rgba(0, 0, 0, 0.5);
}
}
}
.browse-list-disabled {
position: relative;
}
.browse-list-disabled:after {
position: absolute;
content: '';
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(255, 255, 255, 0.9);
z-index: 1;
}

View File

@ -1,58 +0,0 @@
.quick-edit {
display: flex;
align-items: center;
max-width: 100%;
.quick-input {
flex: 1;
max-width: 100%;
position: relative;
.quick-loading {
position: absolute;
top: 0;
right: 8px;
bottom: 0;
display: flex;
align-items: center;
.common-loading {
margin: 0;
width: 14px;
height: 14px;
}
}
}
.quick-text {
overflow: hidden;
text-overflow: ellipsis;
align-items: center;
white-space: nowrap;
height: 20px;
line-height: 20px;
margin-right: 6px;
}
.quick-icon {
display: none;
font-size: 16px;
cursor: pointer;
}
&.quick-always {
.quick-icon {
display: inline-block;
opacity: 0.3;
transition: opacity 0.2s;
}
}
&:hover {
.quick-icon {
display: inline-block;
opacity: 1;
}
}
}
.ivu-table-row-hover {
.quick-edit {
.quick-icon {
display: inline-block;
opacity: 1;
}
}
}

View File

@ -1,218 +0,0 @@
.report {
height: 100%;
padding: 10px 20px;
.report-list-wrap {
width: 100%;
height: 100%;
display: flex;
top: 0;
padding-top: 53px;
flex-direction: column;
position: absolute;
.report-row-header,.report-row-foot{
flex: 0 0 auto;
}
.report-row-content{
flex:1 1 auto;
.ivu-table{
.ivu-table-body{
height: 100%;
overflow-y: auto;
padding-bottom: 50px;
}
}
}
}
.page-box {
text-align: center;
margin-top: 15px;
}
.ivu-tabs{
height: 100%;
position: relative;
.ivu-tabs-bar{
position: relative;
z-index: 2;
background: #fff;
}
.ivu-tabs-content{
height: 100%;
width: 100%;
margin-top: -53px;
padding-top: 53px;
}
.ivu-tabs-tabpane{
overflow-y: auto;
}
}
}
.report-detail {
.report-title {
font-size: 16px;
font-weight: bold;
margin-bottom: 12px;
padding-top: 20px;
.report-title-icon{
font-size: 22px;
cursor: pointer;
margin-right: 20px;
}
}
.report-profile {
font-size: 14px;
}
.report-submitter {
display: flex;
flex-wrap: wrap;
height: 28px;
line-height: 28px;
p{
display: block;
width: 100%;
text-align: justify;
padding-right: 12px;
&:after{
content: '';
display: inline-block;
width: 100%;
}
}
& > div {
margin-right: 8px;
}
}
.ivu-col{
margin-bottom: 12px;
}
.report-content {
margin-top: 12px;
width: 100%;
h2{
margin-bottom: 10px;
}
ol{
margin-bottom: 20px;
padding-left: 18px;
li{
font-size: 14px;
line-height: 24px;
}
}
}
}
.report-box{
display: flex;
flex-direction: column;
height: 100%;
.report-row-header,.report-row-foot{
flex: 0 0 auto;
}
.report-row-content{
flex:1 1 auto;
}
.report-row-foot{
margin-bottom: 0;
}
}
.report-row{
margin-bottom: 20px;
.report-row-a{
float: right;
line-height: 32px;
.report-row-a-icon{
transform: rotate(-90deg);
font-size: 16px;
margin-right: 2px;
}
}
.report-bottom{
width: 120px;
}
.report-bottom-save{
width: 120px;
background: #F4F5F7 ;
color: #515A6E;
border-color: #F4F5F7 ;
}
}
.report-titles{
line-height: 32px;
}
.report-radiogroup{
background: #F4F5F7 !important;
padding: 2px !important;
border-radius: 4px!important;
.ivu-radio-wrapper{
padding: 0 30px !important;
background: #F4F5F7 !important;
color: #515A6E !important;
box-shadow: none !important;
border: none!important;
&:before{
width: 0!important;
}
&:after{
width: 0!important;
}
}
.ivu-radio-focus{
box-shadow: none !important;
border: none!important;
&:after{
background: none!important;
}
}
.ivu-radio-wrapper-checked:not(.ivu-radio-wrapper-disabled){
background: #fff !important;
color: #8BCF70 !important;
box-shadow: none !important;
border: none!important;
border-radius: 4px!important;
}
}
.report-buttongroup{
margin-top: 2px;
background: #F4F5F7!important;
border-radius: 4px;
.report-buttongroup-shu{
position: absolute;
left: 47px;
width: 1px;
height: 23px;
background-color: #E5E5E5;
top: 5px;
}
.ivu-btn-primary{
background: #F4F5F7!important;
box-shadow: none !important;
border: none!important;
color: #8BCF70 !important;
&[disabled]{
color: #515A6E !important;
}
}
}
.report-poptip{
.ivu-tooltip-inner{
min-width: 60px !important;
font-size: 12px !important;
}
}
.reportmy-row{
margin-bottom: 20px;
.reportmy-titles{
line-height: 32px;
}
}
.report-main{
.report-submitter{
padding-top: 13px;
}
}

View File

@ -1,19 +0,0 @@
.app-scroller-y {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
overflow-x: hidden;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
.app-scroller-bottom {
height: 0;
margin: 0;
padding: 0;
}
&.static {
position: static;
flex: 1;
}
}

View File

@ -1,20 +0,0 @@
.common-spinner {
display: none;
position: fixed;
z-index: 9999;
bottom: 20px;
right: 20px;
margin: 0 auto;
width: 30px;
height: 30px;
.common-circular {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
width: 100%;
height: 100%;
}
}

View File

@ -1,118 +0,0 @@
.teditor-box,
.teditor-transfer {
.tox {
&.tox-silver-sink {
z-index: 13000;
}
}
}
.teditor-box {
position: relative;
min-height: 22px;
.icon-inline {
color: #bbbbbb;
position: absolute;
left: 0;
top: 0;
}
textarea {
opacity: 0;
}
.tox-tinymce {
box-shadow: none;
box-sizing: border-box;
border-color: #dddee1;
border-radius: 4px;
overflow: hidden;
.tox-statusbar {
span.tox-statusbar__branding {
a {
display: none;
}
}
}
.tox-tbtn--bespoke {
.tox-tbtn__select-label {
width: auto;
}
}
}
}
.teditor-transfer {
background-color: #ffffff;
.tox-toolbar {
> div:last-child {
> button:last-child {
margin-right: 64px;
}
}
}
.ivu-modal-header {
display: none;
}
.ivu-modal-close {
top: 7px;
z-index: 2;
}
.teditor-transfer-body {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding: 0;
margin: 0;
textarea {
opacity: 0;
}
.tox-tinymce {
border: 0;
.tox-statusbar {
span.tox-statusbar__branding {
a {
display: none;
}
}
}
}
}
}
.teditor-loadstyle {
width: 100%;
height: 180px;
overflow: hidden;
position: relative;
}
.teditor-loadedstyle {
width: 100%;
max-height: inherit;
overflow: inherit;
position: relative;
}
.upload-control {
display: none;
width: 0;
height: 0;
overflow: hidden;
}
.tox-tinymce-inline {
z-index: 100000;
}

View File

@ -1,93 +0,0 @@
.common-tag-input {
display: inline-block;
width: 100%;
min-height: 32px;
padding: 2px 7px;
border: 1px solid #dddee1;
border-radius: 4px;
color: #495060;
background: #fff;
position: relative;
cursor: text;
vertical-align: middle;
line-height: normal;
transition: all .2s;
&:hover {
border-color: #a2d98d;
}
&.focus {
border-color: #a2d98d;
box-shadow: 0 0 0 2px rgba(139,207,112,.2)
}
.tags-item, .tags-input {
position: relative;
float: left;
color: #495060;
background-color: #f1f8ff;
border-radius: 3px;
line-height: 22px;
margin: 2px 6px 2px 0;
padding: 0 20px 0 6px;
.tags-content {
line-height: 22px;
}
.tags-del {
width: 20px;
height: 22px;
text-align: center;
cursor: pointer;
position: absolute;
top: -1px;
right: 0;
}
}
.tags-input {
max-width: 80%;
padding: 0;
background-color: inherit;
border: none;
color: inherit;
height: 22px;
line-height: 22px;
-webkit-appearance: none;
outline: none;
resize: none;
overflow: hidden;
}
.tags-input::placeholder {
color: #bbbbbb;
}
.tags-placeholder {
position: absolute;
left: 0;
top: 0;
z-index: -1;
color: rgba(255, 255, 255, 0);
}
}
.common-tag-input::after {
content: "";
display: block;
height: 0;
clear: both;
}
.ivu-form-item-error {
.common-tag-input {
border-color: #ed4014;
&:hover {
border-color: #ed4014;
}
&.focus {
border-color: #ed4014;
box-shadow: 0 0 0 2px rgba(237,64,20,.2)
}
}
}

View File

@ -1,73 +0,0 @@
.common-avatar {
position: relative;
&.avatar-wrapper {
display: flex;
align-items: center;
.avatar-box {
position: relative;
border-radius: 50%;
display: flex;
align-items: center;
.avatar-default {
background-color: transparent;
}
.avatar-text {
background-color: $primary-color;
> span {
display: inline-block;
font-size: 15px;
line-height: 1;
}
}
> em {
position: absolute;
right: 0;
bottom: 0;
width: 8px;
height: 8px;
border-radius: 50%;
background-color: #ff9900;
border: 1px solid #ffffff;
transform-origin: right bottom;
z-index: 1;
}
&.online {
> em {
background-color: $primary-color;
}
}
}
.avatar-name {
padding-left: 6px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
.common-avatar-transfer {
padding: 4px 2px;
line-height: 1.5;
> p {
padding: 1px 2px;
}
.avatar-icons {
margin-top: 12px;
border-top: 1px solid rgba(244, 244, 245, 0.5);
padding: 8px 0 2px;
display: flex;
align-items: center;
> i {
cursor: pointer;
font-size: 22px;
margin-right: 12px;
color: #F4F4F5;
&:last-child {
margin-right: 0;
}
&:hover {
color: #ffffff;
}
}
}
}

View File

@ -1,70 +0,0 @@
.common-user {
position: relative;
white-space: normal;
.common-user-loading {
position: absolute;
top: 2px;
bottom: 0;
right: 10px;
display: flex;
align-items: center;
.common-loading {
width: 14px;
height: 14px;
}
}
&.hidden-input {
.ivu-select-selection {
padding: 0 4px;
.ivu-select-input {
display: none;
}
}
}
}
.common-user-transfer {
.user-input-option {
display: flex;
align-items: center;
.user-input-avatar {
display: flex;
align-items: center;
.avatar {
width: 26px;
height: 26px;
line-height: 26px;
}
}
.user-input-nickname {
margin-left: 10px;
flex: 1;
}
.user-input-userid {
margin-left: 10px;
font-size: 12px;
color: #cccccc;
transition: margin 0.1s;
}
}
.ivu-select-item {
&.ivu-select-item-selected {
&:after {
top: 8px;
}
.user-input-option {
.user-input-userid {
margin-right: 16px;
}
}
}
}
.user-drop-prepend {
text-align: center;
color: #c5c8ce;
line-height: 20px;
padding-bottom: 5px;
font-size: 12px;
border-bottom: 1px solid #f1f1f1;
margin-bottom: 5px;
}
}