1222

pages/handlingList/index.vue

@@ -5,10 +5,9 @@
 			<text :class='turnoverClass' @click='selectTurnover'>{{turnoverTitle}}</text>
 			<image class='img' src="../../static/screen.png"></image>
 		</view>
-
 		<!-- 待周转页面 -->
 		<view class="padding-container" v-if='pendingShow'>
-			<scroll-view class="scroll-container" scroll-y>
+			<view class="scroll-container" scroll-y>
 				<view v-for="(item, index) in listData" :key="index"
 					:class="{'list-item':true,'selected':isSelected(item)}">
 					<!-- @click="handleSelection(item)" -->
@@ -48,14 +47,14 @@
 						<text class="label right">{{ item['nickName']}}</text>
 					</view>
 				</view>
-			</scroll-view>
+			</view> 
 			<view class="bottom-btn-container uni-row">
 				<button class="bottom-btn" @click="handleStartTurn">开始周转</button>
 			</view>
 		</view>
 		<!-- 周转中页面 -->
 		<view class='turnover-container' v-if='turnoverShow'>
-			<scroll-view class="scroll-container" scroll-y>
+			<view class="scroll-container" scroll-y>
 				<!-- 循环周转中的数据 -->
 				<view class='item-container'>
 					<view v-if="products.length > 0" class="turnover-title uni-row">
@@ -86,7 +85,7 @@
 						</view>
 					</view>
 				</view>
-			</scroll-view>
+			</view>
 			<view class='bottom-btn-container uni-row'>
 				<button type='primary' class='bottom-btn' @click="handleConfirmDelivery">确认送达</button>
 			</view>
@@ -259,7 +258,9 @@
 
 	/* 导航栏样式 */
 	.container {
-		height: 1600rpx;
+		height: calc(100% - $navHeight);
+		position: relative;
+		top: $navHeight;
 		background-color: #f5f5f5;
 	}
 
@@ -269,6 +270,8 @@
 
 	.nav {
 		justify-content: space-around;
+		position: fixed;
+		top:0;
 		width: 100%;
 		height: $navHeight;
 		border-bottom: 3rpx solid rgba(228, 231, 237, 1);

pages/productionPlan/index.vue

@@ -205,6 +205,7 @@
 		position: relative;
 		padding: 16rpx;
 		padding-bottom: 24rpx;
+		border-radius: 24rpx;
 		margin-bottom: 24rpx;
 
 		.title-container {

pages/reportingForWork/index.vue

@@ -143,10 +143,23 @@
 	}
 	
 	function handleStartFirstItem(item){
-		item.status = 1;
-		updateDayWorkItem(item).then(res => {
+		let reqParam = item;
+		reqParam.status = 1;
+		reqParam.startTime = timestampToTime(new Date());
+		updateDayWorkItem(reqParam).then(res => {
 			if (res.code === 200) {
+				uni.showToast({
+					icon: "success",
+					title: "报工成功",
+					duration:2000
+				})
 				init();
+			}else{
+				uni.showToast({
+					icon: "fail",
+					title: "报工失败,请联系管理员",
+					duration: 2000
+				})
 			}
 		})
 	}