Merge branch 'master' of ssh://1582597470426922.onaliyun.com@s1.nsloop.com:29418/web_TracerMethodology

pages/planList/components/modal.vue

@@ -0,0 +1,83 @@
+<template>
+	<view class="modal-page" v-show="showModal">
+		<view class="modal-box">
+			<image class="pic" src="../../../static/hint.png"></image>
+			<text class="text">您的分配工作量较大，建议使用批量分配功能</text>
+			<view class="btn" @click="hide">
+				<text class="btn-text">确定</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	//提示弹框
+	export default {
+		data() {
+			return {
+				showModal:false,//是否显示弹框
+			}
+		},
+		methods: {
+			show(){
+				this.showModal=true;
+			},	
+			hide(){
+				this.showModal=false;
+			},
+			
+		},
+	}
+</script>
+
+<style lang="less">
+	.modal-page{
+		height: 100%;
+		width: 100%;
+		position: fixed;
+		top: 0rpx;
+		left: 0rpx;
+		background: rgba(0,0,0,0.5);
+		.modal-box{
+			height: 317.5rpx;
+			width: 562.5rpx;
+			background: #FFFFFF;
+			border-radius: 24px;
+			position: fixed;
+			top: 441.25rpx;
+			left: 93.75rpx;
+			
+			.pic{
+				height: 80rpx;
+				width: 80rpx;
+				position: absolute;
+				top: 50rpx;
+				left: 241.25rpx;
+			}
+			.text{
+				font-size: 22.5rpx;
+				font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+				font-weight: 400;
+				color: #292C33;
+				position: absolute;
+				top: 170rpx;
+				left: 56.25rpx;
+			}
+			.btn{
+				height: 75rpx;
+				width: 562.5rpx;
+				background: #3377FF;
+				position: absolute;
+				bottom: 0rpx;
+				text-align: center;
+				.btn-text{
+					font-size: 22.5rpx;
+					font-family: SourceHanSansCN-Normal, SourceHanSansCN;
+					font-weight: 400;
+					color: #FFFFFF;
+					line-height: 75rpx;
+				}
+			}
+		}
+	}
+</style>

pages/planList/planList.vue

@@ -13,17 +13,19 @@
 				</view>
 				<view class="row2">
 					<text class="TobeDistributed">剩余1个单位待分配</text>
-					<text class="startEndTime">起止时间：2020-12-26 ~ 2020-12-18</text>
+					<text class="startEndTime">起止时间：{{item.startDate}} ~ {{item.endDate}}</text>
 				</view>
 			</view>
 		</scroll-view>
 		<view class="btn-distribution" @click="gotoCheckList(true, planList[0])" v-if="isShowDistribution">
 			<text class="btn-text">批量分配</text>
 		</view>
+		<modal ref="modal" ></modal>
 	</view>
 </template>
 
 <script>
+	import modal from './components/modal.vue'
 	export default {
 		data() {
 			return {
@@ -65,12 +67,9 @@
 							toDistribute:item.toDistribute,
 						}
 					});
+					console.log(this.firstFlag,'1111111')
 					if(this.firstFlag==1){
-						uni.showModal({
-							title:'提示',
-							content:'您的分配工作量较大，建议使用批量分配功能',
-						  showCancel:false
-						})
+						this.$refs.modal.show();
 					}
 				}
 			});
@@ -98,6 +97,9 @@
 					url: `/pages/editCheckList/editCheckList?situationId=${type ? this.situationID : 0}&checkId=${id}&checkGroupId=${this.checkGroupId}&startDate=${startDate}&endDate=${endDate}`
 				});
 			}
+		},
+		components: {
+			modal,
 		}
 	}
 </script>