Merge pull request 'feat:终审的按钮效果' (#286) from fix/change_task into test

Reviewed-on: #286
pull/287/head
赵辉 1 year ago
commit ab0a49d719

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

@ -888,8 +888,8 @@ defineExpose({
<div v-show="!showActions" style="display: flex; align-items: center"> <div v-show="!showActions" style="display: flex; align-items: center">
<div class="btn"> <div class="btn">
<SvgIcon style="margin-right: 6px" size="22" name="batch" /> <!-- <SvgIcon style="margin-right: 6px" size="22" name="batch" />
批量审批 批量审批-->
</div> </div>
</div> </div>
<div v-show="showActions" class="batch"> <div v-show="showActions" class="batch">
@ -908,6 +908,7 @@ defineExpose({
> >
<SvgIcon size="24" name="vs" /> <SvgIcon size="24" name="vs" />
<img <img
style="margin-right: 5px;"
class="btn-approval" class="btn-approval"
src="@/assets/images/task/btn-pass.png" src="@/assets/images/task/btn-pass.png"
alt="" alt=""
@ -1074,16 +1075,17 @@ defineExpose({
} }
.btn { .btn {
width: 118px; width: 160px;
height: 36px; height: 27px;
background: linear-gradient(135deg, #5b85f8, #3c6cf0); background: url(/src/assets/images/pocitypass.png) no-repeat;
background-size: 100% 100%;
border-radius: 17px; border-radius: 17px;
box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3); box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: #fff; color: #fff;
margin-right: 6px; margin-right: 16px;
cursor: pointer; cursor: pointer;
} }

@ -534,8 +534,8 @@ defineExpose({
<div v-show="!showActions" style="display: flex; align-items: center"> <div v-show="!showActions" style="display: flex; align-items: center">
<div class="btn"> <div class="btn">
<SvgIcon style="margin-right: 6px" size="22" name="batch" /> <!-- <SvgIcon style="margin-right: 6px" size="22" name="batch" />
批量审批 批量审批-->
</div> </div>
</div> </div>
<div v-show="showActions" class="batch"> <div v-show="showActions" class="batch">
@ -554,6 +554,7 @@ defineExpose({
> >
<SvgIcon size="24" name="vs" /> <SvgIcon size="24" name="vs" />
<img <img
style="margin-right:16px"
class="btn-approval" class="btn-approval"
src="@/assets/images/task/btn-pass.png" src="@/assets/images/task/btn-pass.png"
alt="" alt=""
@ -820,16 +821,17 @@ defineExpose({
} }
.btn { .btn {
width: 118px; width: 163px;
height: 36px; height: 27px;
background: linear-gradient(135deg, #5b85f8, #3c6cf0); background: url(/src/assets/images/pocitypass.png) no-repeat;
background-size: 100% 100%;
border-radius: 17px; border-radius: 17px;
box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3); box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
color: #fff; color: #fff;
margin-right: 6px; margin-right: 16px;
cursor: pointer; cursor: pointer;
} }

Loading…
Cancel
Save