请假

pages/clock/supp_clock.vue

@@ -5,7 +5,7 @@
 				<view class="c-row">
 					<view class="title">补卡原因</view>
 					<view class="con-list">
-						<u-radio-group  activeColor="#22C572" v-model="typevalue">
+						<u-radio-group activeColor="#22C572" v-model="typevalue">
 							<u-radio key="1" label="上班" name="1">上班</u-radio>
 							<u-radio key="3" label="下班" name="3">下班</u-radio>
 						</u-radio-group>
@@ -149,6 +149,10 @@
 					confirmText: '提交',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								mask: true,
+								title: '加载中'
+							})
 							that.detailData.id = that.id
 							that.detailData.compId = uni.getStorageSync('pcUserInfo').compId
 							that.detailData.commonId = uni.getStorageSync('pcUserInfo').userId
@@ -157,8 +161,9 @@
 								.then(res => {
 									if (res.data.code == 200) {
 										that.$api.msg('提交成功')
+										uni.hideLoading()
 										uni.navigateTo({
-											url: '/pages/clock/the_clock_record'
+											url: '/pages/clock/the_clock?value=1'
 										})
 									} else {
 										that.$api.msg('提交失败')

pages/clock/the_clock.vue

@@ -52,11 +52,12 @@
 							<view class="toClockDate" v-if="item.toClockDate">{{ item.toClockDate.split(" ")[1] }}
 							</view>
 							<view class="toClockDate" v-else-if="!item.toClockDate">
-								<button v-if='item.approveStatus ==null && item.status == null' @click='supp(item)'
-									class="uni-button" size="mini" type="primary" align="center"
-									style="height: 30px;">补卡</button>
-								<button v-if='item.approveStatus=="待人事审核"' class='listitemStatus audit Regular'
-									size="mini" type="primary" align="center" style="height: 30px;">审核中</button>
+								<view v-if='item.approveStatus ==null && item.status == null' @click='supp(item)'
+									class="bk-button">补卡</view>
+								<view v-if='item.approveStatus=="待人事审核"' class='listitemStatus audit Regular'>待人事审核
+								</view>
+								<view v-if='item.approveStatus=="待主管审核"' class='listitemStatus audit Regular'>待主管审核
+								</view>
 								<button v-if='item.status=="补卡失败"' class='listitemStatus notPass Regular' size="mini"
 									type="primary" align="center" style="height: 30px;">补卡失败</button>
 								<button v-if='item.status=="补卡成功"' class='listitemStatus pass Regular' size="mini"
@@ -67,9 +68,8 @@
 							<view class="offClockDate" v-if="item.offClockDate">{{ item.offClockDate.split(" ")[1] }}
 							</view>
 							<view class="offClockDate" v-else-if="!item.offClockDate">
-								<button v-if='item.approveStatus ==null && item.status == null' @click='supp(item)'
-									class="uni-button" size="mini" type="primary" align="center"
-									style="height: 30px;">补卡</button>
+								<view v-if='item.approveStatus ==null && item.status == null' @click='supp(item)'
+									class="bk-button">补卡</view>
 								<button v-if='item.approveStatus=="待人事审核"' class='listitemStatus audit Regular'
 									size="mini" type="primary" align="center" style="height: 30px;">审核中</button>
 								<button v-if='item.status=="补卡失败"' class='listitemStatus notPass Regular' size="mini"
@@ -132,7 +132,10 @@
 		onShow() {
 			this.getList()
 		},
-		onLoad() {
+		onLoad(options) {
+			if (options.value) {
+				this.value = 1
+			}
 			console.log(uni.getStorageSync("clockwerehouse"))
 			if (!uni.getStorageSync("clockwerehouse")) {
 				uni.showLoading({
@@ -432,4 +435,22 @@
 		}
 
 	}
+
+	.listitemStatus {
+		color: red;
+	}
+
+	.bk-button {
+		background: #22C572;
+		color: white;
+		width: 100rpx;
+		padding: 10rpx;
+		box-sizing: border-box;
+		border-radius: 50rpx;
+	}
+
+	.offClockDate {
+		display: flex;
+		justify-content: center;
+	}
 </style>