Skip to content

W
wechatapp.shangjiadao.com
Commit bcc80c4a authored by lvtz's avatar lvtz
Browse files
Options

fix

parent 1f211d9e
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 25 deletions
src/pages/myschedule/index.js
View file @ bcc80c4a
......@@ -380,6 +380,14 @@ Page({
modalLeaveShow: true
})
},
// 驳回重新申请
bindShowModalLeaveAgain(e){
let that = this;
that.setData({
modalLeaveDetailShow: false,
modalLeaveShow: true
})
},
contentInput(e) {
const {
value
......@@ -401,7 +409,6 @@ Page({
})
return
}
wx.showLoading({
title: '正在提交..'
})
......@@ -454,7 +461,13 @@ Page({
bindShowModalLeaveDetail(e){
let that = this;
let leaveOptid = that.data.leaveOptid;
const {leaveid} = e.currentTarget.dataset;
const {scheid,leaveid,bigindex,index} = e.currentTarget.dataset;
// scheid在状态为4时会用到 leaveid在状态为3时会用到
that.data.optBigindex = bigindex;
that.data.optIndex = index;
that.data.optScheid = scheid;
if(leaveid && leaveid!=leaveOptid){
that.getErpLeaveDetail(leaveid)
}
......
src/pages/myschedule/index.wxml
View file @ bcc80c4a
......@@ -32,7 +32,6 @@
<view wx:if="{{item.leave && item.leave.status==1}}"
class="itme-state state-leave state-leave-cancel"
catchtap="bindBackLeave"
data-scheid="{{item.id}}"
data-leaveid="{{item.leave.id}}"
data-bigindex="{{bigindex}}"
data-index="{{index}}">
......@@ -41,12 +40,26 @@
<button form-type="submit" class="createidbutton">生成form</button>
</form>
</view>
<view wx:if="{{item.leave && (item.leave.status==3 || item.leave.status==4)}}"
class="itme-state state-leave state-leave-cancel"
<view wx:if="{{item.leave && item.leave.status==3}}"
class="itme-state state-leave state-leave-success"
catchtap="bindShowModalLeaveDetail"
data-scheid="{{item.id}}"
data-leaveid="{{item.leave.id}}">
已请假
data-leaveid="{{item.leave.id}}"
data-bigindex="{{bigindex}}"
data-index="{{index}}">
请假成功
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
</view>
<view wx:if="{{item.leave && item.leave.status==4}}"
class="itme-state state-leave state-leave-reject"
catchtap="bindShowModalLeaveDetail"
data-scheid="{{item.id}}"
data-leaveid="{{item.leave.id}}"
data-bigindex="{{bigindex}}"
data-index="{{index}}">
已驳回
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
......@@ -55,7 +68,7 @@
</view>
<view class="item-contentbox">
<view class="content-item">
<view class="item-label"><view class="text">授课时间</view>：</view>
<view class="item-label"><view class="text">授课时间{{item.leave.status}}</view>：</view>
<view class="item-text">{{filter.matchTime(item.start_time,'month')}} {{filter.matchTime(item.start_time,'hour')}}-{{filter.matchTime(item.end_time,'hour')}}</view>
</view>
<view class="content-item">
......@@ -84,9 +97,9 @@
<guidecollection/>
<view class="modal-dialog modal-leaveopt" hidden="{{!modalLeaveShow}}">
<view class="modal-dialog modal-leaveopt" hidden="{{!modalLeaveShow}}" style="z-index: 100;">
<view class="modal-mask"></view>
<view class="modal-box">
<view class="modal-box" style="z-index: 101;">
<view class="modal-title">请假</view>
<view class="modal-content">
<view class="textarea-box">
......@@ -116,9 +129,9 @@
</view>
</view>
<view class="modal-dialog modal-record" hidden="{{!modalLeaveRecordShow}}">
<view class="modal-dialog modal-record" hidden="{{!modalLeaveRecordShow}}" style="z-index: 102;">
<view class="modal-mask"></view>
<view class="modal-box">
<view class="modal-box" style="z-index: 103;">
<view class="modal-title">请假记录</view>
<view class="modal-content">
<view class="record-list">
......@@ -175,9 +188,11 @@
</view>
<view class="detail-box">
<view class="detail-item">申请时间：{{leaveDetail.created_at}}</view>
<view class="detail-item">额外扣除课时：{{leaveDetail.expend}}</view>
<!-- <view class="detail-item">审批时间：{{leaveDetail.handled_at}}</view> -->
<view class="detail-item" wx:if="{{leaveDetail.status==3}}">额外扣除课时：{{leaveDetail.expend}}</view>
<view class="detail-item">审批人：{{leaveDetail.operator.nickname}}</view>
<view class="detail-item">审批时间：{{leaveDetail.handled_at}}</view>
</view>
<view class="btn-leaveagain" bindtap="bindShowModalLeaveAgain" wx:if="{{leaveDetail.status==4}}">重新申请</view>
<view class="status" wx:if="{{leaveDetail.status==3}}">已通过</view>
<view class="status status-reject" wx:if="{{leaveDetail.status==4}}">已驳回</view>
</view>
......
src/pages/myschedule/index.wxss
View file @ bcc80c4a
......@@ -176,20 +176,20 @@ page{
justify-content: center;
}
.modal-record .record-list .record-item .item-status.status-refuse{
background: rgba(233,233,233,.99);
color: #696969;
background: rgba(255,77,77,.15);
color: #FF4D4D;
}
.modal-record .record-list .record-item .item-status.status-pass{
background: rgba(101,184,244,.15);
color: #65B8F4;
background: rgba(45,189,91,.15);
color: #2DBD5B;
}
.modal-record .record-list .record-item .item-status.status-back{
background: rgba(255,192,0,.1);
color: #FFC000;
background: rgba(233,233,233,.99);
color: #696969;
}
.modal-record .record-list .record-item .item-status.status-wait{
background: rgba(255,77,77,.15);
color: #FF4D4D;
background: rgba(101,184,244,.15);
color: #65B8F4;
}
.modal-record .record-list .record-item .line-item{
......@@ -336,6 +336,12 @@ page{
.modal-leavedetail .reason-box .title{
font-size: 26rpx;
color: #000;
overflow : hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
word-break: break-all;
}
.modal-leavedetail .detail-box{
padding: 15rpx 30rpx;
......@@ -360,7 +366,7 @@ page{
.modal-leavedetail .status{
width: 212rpx;
height: 140rpx;
background: #35BAFD;
background: #2DBD5B;
color: #fff;
position: absolute;
bottom: -45rpx;
......@@ -374,8 +380,19 @@ page{
text-align: center;
}
.modal-leavedetail .status-reject{
background: #E9E9E9;
color: #696969;
background: #FF4D4D;
}
.modal-leavedetail .btn-leaveagain{
width: 380rpx;
height: 70rpx;
background:#FFD146;
border-radius: 6rpx;
font-size: 24rpx;
color: #000;
display: flex;
align-items: center;
justify-content: center;
margin: 0 auto;
}
.modal-backLeave .tip-content{
text-align: center;
......
style/commonlist.wxss
View file @ bcc80c4a
......@@ -101,6 +101,14 @@ commonlist-bigwrap commonlist-bigwrap-round(圆角，左右留白)
background: #E9E9E9;
color: #696969;
}
.commonlist-item .item-titlebox .state-box .state-leave.state-leave-success{
background: #2DBD5B;
color: #fff;
}
.commonlist-item .item-titlebox .state-box .state-leave.state-leave-reject{
background: rgba(255,77,77,.92);
color: #fff;
}
.c-red{
background: rgba(255,107,107,.15);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment