首页，质控作业，选择处方，代煎详情等页面接口实现

pages.json

@@ -80,7 +80,7 @@
 			}
 		},
 		{
-		    "path" : "pages/ypczk/zkTask/zkTaskDP",
+		    "path" : "pages/ypczk/zkTask/dpTask",
 		    "style" :
 		    {
 		        "navigationBarTitleText": "代配处方质控作业",

pages/ypczk/index/index.scss

@@ -8,6 +8,7 @@
 		height: 450rpx;
 		.info{
 			display: flex;
+			align-items: center;
 			padding: 10rpx 10rpx 20rpx 10rpx;
 			.info_img{
 				width:100rpx;
@@ -17,11 +18,12 @@
 				.headImg{
 					margin-left: auto;
 					margin-right: auto;
-					width: 80rpx;
-					height: 80rpx;
+					width: 100rpx;
+					height: 100rpx;
 				}
 			}
 			.userName{
+				line-height: 100rpx;
 				font-size: 20px;
 				font-weight: 500;
 				color: rgba(255, 255, 255, 1);
@@ -30,6 +32,7 @@
 				padding-right: 40rpx;
 			}
 			.eyeIcon{
+				line-height: 100rpx;
 				width: 60rpx;
 				height: 60rpx;
 			}

pages/ypczk/index/leaderIndex.vue

@@ -42,8 +42,8 @@
 				</view>
 				<view class="list_button">
 					<view class="button_group">
-						<view class="button_item" @click="signTask">签收</view>
-						<view class="button_item" @click="startTask">开始质控</view>
+						<view class="button_item" @click="signTask(item)">签收</view>
+						<view class="button_item" @click="startTask(item)">开始质控</view>
 					</view>
 				</view>
 			</uni-card>
@@ -61,6 +61,8 @@ import { ref,reactive } from "vue";
 import {onLoad,onShow,onUnload,onPullDownRefresh} from "@dcloudio/uni-app";
 
 const pageData=reactive({
+	// 任务编号
+	taskId:'',
 	headImg:'/static/logo.png',
 	userName:'王军',
 	taskNum:2,
@@ -92,6 +94,12 @@ const statusIcon=reactive({
 	zhiIcon:'/static/zhi_icon.png'
 })
 
+// 签收接口输入参数
+const signFormData=reactive({
+	// 任务id
+	id:''
+})
+
 // 开始质控接口输入参数
 const startFormData=reactive({
 	// 任务id
@@ -106,7 +114,13 @@ const remindDialog=ref()
 
 // 签收任务/开始质控对话框确定事件
 const operatorDialogConfirm=()=>{
-	getStartTask()
+	if(pageData.popupMessage.title=='开始质控'){
+		startFormData.id = pageData.taskId
+		getStartTask()
+	}else{
+		signFormData.id=pageData.taskId
+		getSignTask()
+	}
 	operatorDialog._value.close()
 }
 
@@ -115,29 +129,44 @@ const operatorDialogClose=()=>{
 	operatorDialog._value.close()
 }
 
+// 签收接口
+const getSignTask=()=>{
+	http.get("app-api/index/qs",signFormData).then(res=>{
+		console.log(res)
+		if(res==true){
+			uni.showToast({
+				title:'签收成功',
+				icon:'success'
+			})
+		}else{
+			uni.showToast({
+				title:'签收失败',
+				icon:'error'
+			})
+		}
+	})
+}
+
 // 开始质控接口
 const getStartTask=()=>{
-	startFormData.id='1111111'
 	http.get("app-api/index/kszkByid",startFormData).then(res=>{
 		console.log(res)
-		if(pageData.popupMessage.title=='开始质控'){
-			if(res==true){
-				uni.navigateTo({
-					url:'/pages/ypczk/zkTask/zkTask'
-				})
-			}else{
-				// 提示-只有组长能够开始质控
-				uni.showModal({
-					title: '提示',
-					content: '只有组长能够开始质控',
-					confirmColor: 'rgba(190, 163, 117, 1)', //确定字体颜色
-					showCancel: false,//没有取消按钮的弹框
-					buttonText: '确定',
-					success: function (res) {
-						console.log(res)
-					}
-				})
-			}
+		if(res==true){
+			uni.navigateTo({
+				url:'/pages/ypczk/zkTask/zkTask?taskId='+pageData.taskId
+			})
+		}else{
+			// 提示-只有组长能够开始质控
+			uni.showModal({
+				title: '提示',
+				content: '只有组长能够开始质控',
+				confirmColor: 'rgba(190, 163, 117, 1)', //确定字体颜色
+				showCancel: false,//没有取消按钮的弹框
+				buttonText: '确定',
+				success: function (res) {
+					console.log(res)
+				}
+			})
 		}
 	})
 }
@@ -170,16 +199,18 @@ const toDetail=()=>{
 }
 
 // 签收
-const signTask=()=>{
+const signTask=(e)=>{
 	console.log("签收")
+	pageData.taskId=e.id
 	operatorDialog._value.open()
 	pageData.popupMessage.title='签收'
 	pageData.popupMessage.showMessage='是否确认签收任务？'
 }
 
 // 开始质控
-const startTask=()=>{
+const startTask=(e)=>{
 	console.log("开始质控")
+	pageData.taskId=e.id
 	operatorDialog._value.open()
 	pageData.popupMessage.title='开始质控'
 	pageData.popupMessage.showMessage='是否确认开始质控任务？'

pages/ypczk/zkTask/choosePrescription.vue

@@ -17,7 +17,7 @@
 		<uni-card v-for="(item,index) in pageData.cfInfo" class="cfInfo" @click="chooseCf(item)">
 			<view class="cfInfo_title">
 				<view class="cfInfo_text">处方编号</view>
-				<view class="cfInfo_text">{{item.cfbm}}</view>
+				<view class="cfInfo_text">{{item.yncfbh}}</view>
 			</view>
 			<view class="cfInfo_title">
 				<view class="cfInfo_text">患者姓名</view>
@@ -29,11 +29,11 @@
 			</view>
 			<view class="cfInfo_title">
 				<view class="cfInfo_text">开方日期</view>
-				<view class="cfInfo_text">{{item.kfrq}}</view>
+				<view class="cfInfo_text">{{item.cfrqtime}}</view>
 			</view>
 			<view class="cfInfo_title">
 				<view class="cfInfo_text">贴数</view>
-				<view class="cfInfo_text">{{item.ts}}</view>
+				<view class="cfInfo_text">{{item.cfts}}</view>
 			</view>
 			<view class="cfInfo_title">
 				<view class="cfInfo_text">处方内容</view>
@@ -49,40 +49,22 @@
 
 <script setup>
 import { reactive,ref } from "vue";
-import http from "../../../utils/request";	
+import {onLoad,onShow,onUnload,onPullDownRefresh} from "@dcloudio/uni-app";
+import http from "../../../utils/request";
 
 const pageData=reactive({
 	// 处方编号
 	cfbh:'',
+	// 平台唯一编号
+	ptwybh:'',
 	// 患者姓名
 	hzxm:'',
 	// 处方信息列表
-	cfInfo:[
-		{
-			cfbm:'11111111',
-			hzxm:'患者1',
-			yljg:'机构1',
-			kfrq:'11111',
-			ts:'1',
-			cfnr:'熟附片 3g、丹参 10g、大枣9g、海藻 6g、蜜炙甘草9...'
-		},
-		{
-			cfbm:'22222222',
-			hzxm:'患者2',
-			yljg:'机构2',
-			kfrq:'22222',
-			ts:'2',
-			cfnr:'熟附片 3g、丹参 10g、大枣9g、海藻 6g、蜜炙甘草9...'
-		},
-		{
-			cfbm:'333333333',
-			hzxm:'患者3',
-			yljg:'机构3',
-			kfrq:'3333333',
-			ts:'3',
-			cfnr:'12，13'
-		}
-	],
+	cfInfo:[],
+	// 质控状态
+	taskStatus:'',
+	// 发药方式类型
+	fyfslx:'',
 	chooseDialog:'',
 	// 弹出框内容
 	popupMessage:{
@@ -96,8 +78,16 @@ const chooseDialog = ref()
 
 // 弹出框确定事件
 const dialogConfirm=()=>{
+	let url=''
 	// 跳转到下一个页面
-	
+	if(pageData.fyfslx=='2' || pageData.fyfslx=='3'){
+		url='/pages/ypczk/zkTask/djTask?cfbh='+pageData.cfbh+'&fyfslx='+pageData.fyfslx+'&ptwybh='+pageData.ptwybh
+	}else if(pageData.fyfslx=='4' || pageData.fyfslx=='5'){
+		url='/pages/ypczk/zkTask/dpTask?cfbh='+pageData.cfbh+'&fyfslx='+pageData.fyfslx+'&ptwybh='+pageData.ptwybh
+	}
+	uni.navigateTo({
+		url:url,
+	})
 }
 
 // 弹出框取消事件
@@ -106,7 +96,10 @@ const dialogClose=()=>{
 }
 
 const formData=reactive({
-	
+	cfbm:'',
+	hzxm:'',
+	pageNum:1,
+	pageSize:10
 })
 
 // 重置
@@ -117,15 +110,37 @@ const reset=()=>{
 
 // 搜索
 const search=()=>{
-	
+	formData.cfbm=pageData.cfbh
+	formData.hzxm=pageData.hzxm
+	getCfData()
 }
 
 // 选择处方
 const chooseCf=(e)=>{
 	// 点击处方，弹出对话框
 	chooseDialog._value.open()
-	pageData.popupMessage.showMessage="处方编号："+e.cfbm+"\n"+"患者姓名："+e.hzxm+"\n"+"是否确认选择该处方？"
+	pageData.popupMessage.showMessage="处方编号："+e.yncfbh+"\n"+"患者姓名："+e.hzxm+"\n"+"是否确认选择该处方？"
+	pageData.cfbh=e.yncfbh
+	pageData.fyfslx=e.fyfslx
+	pageData.ptwybh=e.ptwybh
+}
+
+const getCfData=()=>{
+	http.get("app-api/cf/findList",formData).then(res=>{
+		console.log(res)
+		pageData.cfInfo=res.data
+	})
 }
+
+onShow(()=>{
+	getCfData()
+})
+
+onLoad((type)=>{
+	if(type.status!=null){
+		pageData.taskStatus=type.status
+	}
+})
 </script>
 
 <style lang="scss" scoped>

pages/ypczk/zkTask/djTask.vue

@@ -4,7 +4,7 @@
 		<view class="progress_title">
 			<view class="progress">
 				<image src="../../../static/progress_icon.png" class="progress_image"></image>
-				<text>任务进度</text>
+				<text class="progress_text">任务进度</text>
 			</view>
 			<view class="dj_num">
 				<text class="dj_num_title">代煎7贴：<text class="dj_num_text">3/5</text></text>
@@ -14,7 +14,7 @@
 		<!-- 处方编号 -->
 		<view class="sub_title">
 			<view class="cfbh">
-				<text class="cfbh_title">处方编号<text class="cfbh_text">2164832615815</text></text>
+				<text class="cfbh_title">处方编号<text class="cfbh_text">{{pageData.cfbh}}</text></text>
 			</view>
 			<view class="bhgs">
 				<text class="bhgs_title">不合格数<text class="bhgs_text">1</text></text>
@@ -24,7 +24,7 @@
 		<uni-card padding="0" spacing="0" v-for="(item,index) in pageData.djList" class="djList">
 			<view class="djList_title">
 				<view class="djList_text">检查项目</view>
-				<view class="djList_righttext">{{item.item}}</view>
+				<view class="djList_righttext">{{item.bhgx}}</view>
 			</view>
 			<view class="djList_title">
 				<view class="djList_text">检查内容</view>
@@ -72,8 +72,11 @@
 <script setup>
 import { ref,reactive } from "vue";
 import {onLoad,onShow,onUnload,onPullDownRefresh} from "@dcloudio/uni-app";
+import http from "../../../utils/request";
 	
 const pageData=reactive({
+	// 处方编号
+	cfbh:'',
 	// 操作状态，是编辑/查看
 	operatorStatus:'',
 	djList:[
@@ -96,7 +99,17 @@ const pageData=reactive({
 	],
 	// 图片列表
 	imageList:[]
-})	
+})
+
+const formData=reactive({
+	id:''
+})
+
+const createData=reactive({
+	taskId:'',
+	pId:'',
+	providerType:''
+})
 
 // 定义不合格弹出输入框
 const bhgDialog=ref()
@@ -155,10 +168,53 @@ const finish=()=>{
 	console.log("完成")
 }
 
+// 临时创建代煎代配企业评估任务内容
+const createTask=()=>{
+	getTaskId()
+	http.get("app-api/zkzy/create",createData).then(res=>{
+		console.log(res)
+		getDjTask(res)
+	})
+}
+
+// 获取代煎质控作业
+const getDjTask=(data)=>{
+	formData.id=data
+	http.get("app-api/taskDetail/getTaskDjDetailById",formData).then(res=>{
+		console.log(res)
+		pageData.djList = res.djCfDetail
+	})
+}
+
+// 获取taskId
+const getTaskId=()=>{
+	uni.getStorage({
+		key:'taskId',
+		success: (res) => {
+			console.log(res)
+			createData.taskId = res.data.taskId
+		}
+	})
+}
+
+onShow(()=>{
+	createTask()
+})
+
 onLoad((type)=>{
+	console.log(type)
 	if(type.status!=null){
 		pageData.operatorStatus=type.status
 	}
+	if(type.cfbh!=null){
+		pageData.cfbh=type.cfbh
+	}
+	if(type.ptwybh!=null){
+		createData.pId=type.ptwybh
+	}
+	if(type.fyfslx!=null){
+		createData.providerType=type.fyfslx
+	}
 })
 </script>
 

pages/ypczk/zkTask/index.scss

@@ -14,6 +14,32 @@
 				}
 			}
 		}
+		.flightTask_list{
+			.flightTask_title{
+				display: flex;
+				padding: 10rpx 0;
+				.flightTask_text{
+					padding-left: 20rpx;
+					font-size: 14px;
+					font-weight: 400;
+					letter-spacing: 0.5px;
+					line-height: 22px;
+					color: rgba(53, 53, 53, 1);
+					vertical-align: top;
+				}
+				.flightTask_righttext{
+					padding-right: 20rpx;
+					padding-left: 30rpx;
+					flex: 1;
+					text-align: right;
+					font-size: 14px;
+					font-weight: 400;
+					letter-spacing: 0.5px;
+					line-height: 22px;
+					color: rgba(53, 53, 53, 1);
+				}
+			}
+		}
 	}
 	.dp_or_dj_Task{
 		.sub_title{
@@ -171,6 +197,7 @@
 		padding: 20rpx 20rpx 10rpx 20rpx;
 		display: flex;
 		justify-content: center;
+		align-items: center;
 		.progress{
 			flex: 1;
 			.progress_image{
@@ -179,6 +206,9 @@
 				font-size: 18px;
 				padding-right: 10rpx;
 			}
+			.progress_text{
+				line-height: 40rpx;
+			}
 		}
 		.dj_num{
 			.dj_num_title{

pages/ypczk/zkTask/indexList.scss

@@ -1,39 +1,19 @@
-.view_container{
-	// overflow: auto;
-}
 ::v-deep.yui-tabs{
 	
 	
 	position: sticky;
-	// margin-top: 2.8125rem;
-	// .tab-pane{
-	// 	$height1: calc(60px + 0.625rem + 2.8125rem);
-	// 	height: calc(100vh - #{$height1});
-	// 	width: 100%;
-	// }
-	// display: flex;
-	// flex-direction: column;
-	// height: 100vh;
+
 	.yui-tabs__wrap{
 	}
 	.yui-tabs__content{
-		// $height1: var(--status-bar-height);
-		// height: calc(100vh - 2.5rem);
-		// height: 100dvh;
-		// background-color: yellow;
-		
 		.content-wrap{
 			display: flex;
 			flex-direction: column;
 			padding-bottom: 100rpx;
 			$height1: var(--status-bar-height);
 			height:calc(100% - 235rpx);
-			// overflow: auto;
-			// height: calc(100vh - 2.5rem - #{$height1});
-			// height: calc(100vh - 2.5rem - #{$height1});
 			.order_list{
-				// flex: 1;
-				// overflow: auto;
+				
 				height: calc(100% - 235rpx);
 				.loading_more{
 					display: flex;
@@ -60,9 +40,6 @@
 		align-items: flex-end;
 		height: 30rpx;
 		padding-top: 50rpx;
-		// &.yellow{
-		// 	background-color: #fefdf2;
-		// }
 	}
 	.data_empty{
 		flex: 1;

pages/ypczk/zkTask/zkTask.vue

@@ -9,10 +9,42 @@
 					</template>
 				</uni-section>
 				<view class="flightTask_list">
-					<text class="flightTask_list_item">被质控代煎企业<text class="flightTask_list_item_text">{{pageData.detailList.taskId}}</text></text>
-					<text class="flightTask_list_item">组长<text class="flightTask_list_item_text">{{pageData.detailList.taskId}}</text></text>
-					<text class="flightTask_list_item">组员<text class="flightTask_list_item_text">{{pageData.detailList.taskId}}</text></text>
-					<text class="flightTask_list_item">地址<text class="flightTask_list_item_text">{{pageData.detailList.taskId}}</text></text>
+					<view class="flightTask_title">
+						<view class="flightTask_text">被质控代煎企业</view>
+						<view class="flightTask_righttext">{{pageData.taskList.bzkOrgName}}</view>
+					</view>
+					<view class="flightTask_title">
+						<view class="flightTask_text">组长</view>
+						<view class="flightTask_righttext">{{pageData.taskList.zzName}}</view>
+					</view>
+					<view class="flightTask_title">
+						<view class="flightTask_text">组员</view>
+						<view class="flightTask_righttext">{{pageData.taskList.zyNames}}</view>
+					</view>
+					<view class="flightTask_title">
+						<view class="flightTask_text">地址</view>
+						<view class="flightTask_righttext">{{pageData.taskList.address}}</view>
+					</view>
+					<view class="flightTask_title">
+						<view class="flightTask_text">总数量:</view>
+						<view class="flightTask_righttext">{{pageData.taskList.totalCyCount+'/'+pageData.taskList.totalWcCount}}</view>
+					</view>
+					<view class="flightTask_title">
+						<view class="flightTask_text">代煎完成数量:</view>
+						<view class="flightTask_righttext">{{pageData.taskList.djCyCount+'/'+pageData.taskList.djWcCount}}</view>
+					</view>
+					<view class="flightTask_title">
+						<view class="flightTask_text">代配完成数量:</view>
+						<view class="flightTask_righttext">{{pageData.taskList.dpCyCount+'/'+pageData.taskList.dpWcCount}}</view>
+					</view>
+					<view class="flightTask_title">
+						<view class="flightTask_text">7贴完成数量:</view>
+						<view class="flightTask_righttext">{{pageData.taskList.t7CyCount+'/'+pageData.taskList.t7WcCount}}</view>
+					</view>
+					<view class="flightTask_title">
+						<view class="flightTask_text">14贴完成数量:</view>
+						<view class="flightTask_righttext">{{pageData.taskList.t14CyCount+'/'+pageData.taskList.t14WcCount}}</view>
+					</view>
 				</view>
 			</uni-card>
 		</view>
@@ -40,11 +72,11 @@
 						<uni-th align="center" width="150rpx">创建人</uni-th>
 					</uni-tr>
 					<!-- 表格数据行 -->
-					<uni-tr v-for="(item, index) in pageData.detailList.dpCfDetail" :key="index">
-						<uni-td>{{item.cfbh}}</uni-td>
-						<uni-td>{{item.ts}}</uni-td>
-						<uni-td>{{item.bhgx}}</uni-td>
-						<uni-td>{{item.creatorName}}</uni-td>
+					<uni-tr v-for="(item, index) in pageData.dpList" :key="index">
+						<uni-td align="center">{{item.cfbh}}</uni-td>
+						<uni-td align="center">{{item.ts}}</uni-td>
+						<uni-td align="center">{{item.bhgx}}</uni-td>
+						<uni-td align="center">{{item.creatorName}}</uni-td>
 					</uni-tr>
 				</uni-table>
 				<view class="see_more" @click="seeMore('dp')">
@@ -77,11 +109,11 @@
 						<uni-th align="center" width="150rpx">创建人</uni-th>
 					</uni-tr>
 					<!-- 表格数据行 -->
-					<uni-tr v-for="(item, index) in pageData.detailList.djCfDetail" :key="index">
-						<uni-td>{{item.cfbh}}</uni-td>
-						<uni-td>{{item.ts}}</uni-td>
-						<uni-td>{{item.bhgx}}</uni-td>
-						<uni-td>{{item.creatorName}}</uni-td>
+					<uni-tr v-for="(item, index) in pageData.djList" :key="index">
+						<uni-td align="center">{{item.cfbh}}</uni-td>
+						<uni-td align="center">{{item.ts}}</uni-td>
+						<uni-td align="center">{{item.bhgx}}</uni-td>
+						<uni-td align="center">{{item.creatorName}}</uni-td>
 					</uni-tr>
 				</uni-table>
 				<view class="see_more" @click="seeMore('dj')">
@@ -117,8 +149,16 @@ import http from "../../../utils/request";
 
 const pageData=reactive({
 	detailList:{},
+	// 质控任务
+	taskList:{},
+	// 代配
+	dpList:{},
+	// 代煎
+	djList:{},
 	// 图片列表
-	imageList:[]
+	imageList:[],
+	// 质控状态
+	taskStatus:''
 })
 
 const showIcon=reactive({
@@ -127,8 +167,8 @@ const showIcon=reactive({
 	hideIcon:'/static/blackHide.png'
 })
 
-const formData=reactive({
-	id:'1221231'
+const findZkzyData=reactive({
+	id:'1661969828969525249'
 })
 
 // 切换显示状态
@@ -145,13 +185,15 @@ const addTask=(type)=>{
 	if(type=='dp'){
 		// 新增代配
 		console.log("新增代配")
+		pageData.taskStatus='dp'
 	}else if(type=='dj'){
 		// 新增代煎
 		console.log("新增代煎")
-		uni.navigateTo({
-			url:"/pages/ypczk/zkTask/djTask?status=add"
-		})
+		pageData.taskStatus='dj'
 	}
+	uni.navigateTo({
+		url:'/pages/ypczk/zkTask/choosePrescription?taskStatus='+pageData.taskStatus
+	})
 }
 
 // 查看更多
@@ -159,16 +201,13 @@ const seeMore =(type)=>{
 	if(type=='dp'){
 		// 代配跳转
 		console.log("代配跳转")
-		// uni.navigateTo({
-		// 	url:''
-		// })
 	}else if(type=='dj'){
 		// 代煎跳转
 		console.log("代煎跳转")
-		uni.navigateTo({
-			url:'/pages/ypczk/zkTask/zkTaskDetail/djTaskDetail'
-		})
 	}
+	uni.navigateTo({
+		url:'/pages/ypczk/zkTask/zkTaskDetail/detailsList'
+	})
 }
 
 // 选中图片，将选中的图片添加列表
@@ -194,16 +233,31 @@ const finishTask=()=>{
 
 // 查询质控作业--根据Id
 const getZkData=()=>{
-	http.get("app-api/findZkzy",formData).then(res=>{
+	http.get("app-api/zkzy/findZkzyById",findZkzyData).then(res=>{
 		console.log(res)
 		pageData.detailList=res
+		pageData.taskList=res.task
+		pageData.djList=res.djCfDetail
+		pageData.dpList=res.dpCfDetail
 		// 获取图片
-		if(pageData.detailList.imgUrl.length!=0){
+		if(pageData.detailList.imgUrl!=null){
 			pageData.imageList=pageData.detailList.imgUrl
 		}
 	})
 }
 
+// 存入taskData(taskId)
+const setTaskId=()=>{
+	uni.setStorageSync("taskId",{taskId:findZkzyData.id})
+}
+
+onLoad((data)=>{
+	if(data!=null){
+		findZkzyData.id=data.taskId
+	}
+	setTaskId()
+})
+
 onShow(()=>{
 	showIcon.nowIcon=showIcon.hideIcon
 	getZkData()

pages/ypczk/zkTask/zkTaskDetail/djTaskDetail.vue

@@ -39,6 +39,7 @@
 
 <script setup>
 import { reactive } from "vue";
+import {onLoad,onShow,onUnload,onPullDownRefresh} from "@dcloudio/uni-app";
 const pageData=reactive({
 	djTaskList:[
 		{
@@ -63,6 +64,15 @@ const toDetail=(e)=>{
 		url:"/pages/ypczk/zkTask/djTask?status=get"
 	})
 }
+
+// 获取代煎质控任务详情
+const getDjData=()=>{
+	// http.get("getTaskDjDetailById")
+}
+
+onShow(()=>{
+	getDjData()
+})
 </script>
 
 <style lang="scss" scoped>

pages/ypczk/zkTask/zkTaskList.vue

@@ -1,4 +1,3 @@
-<!-- 首页-组长 -->
 <template>
 	<view>
 		<yui-tabs :tabs="pageInfo.tabs" :offsetTop="22" v-model="pageInfo.activeIndex" @change="tabChange" color="rgba(190, 163, 117, 1)"

pages/ypczk/zkTask/zkTaskListView.vue

@@ -125,31 +125,6 @@
 		}
 	}
 
-	// 上拉加载
-	onReachBottom(() => {
-		if (loadingData.reload) {
-			formData.pageIndex++;
-			loadingData.status = 'loading'
-			getTaskData();
-		}
-	})
-
-	//下拉刷新
-	onPullDownRefresh(() => {
-		formData.pageIndex = 1;
-		loadingData.reload = true
-		getTaskData();
-		pageData.taskList = []
-	})
-
-	// 页面滚动触发事件
-	onPageScroll((detail) => {
-		//页面滚动事件
-		uni.pageScrollTo({
-			scrollTop: detail.scrollTop,
-			duration: 0
-		})
-	})
 
 	const getTaskData = () => {
 		if(props.state=='wait'){
@@ -204,6 +179,32 @@
 		getTaskData();
 		pageData.taskList = []
 	})
+	
+	// 上拉加载
+	onReachBottom(() => {
+		if (loadingData.reload) {
+			formData.pageIndex++;
+			loadingData.status = 'loading'
+			getTaskData();
+		}
+	})
+	
+	//下拉刷新
+	onPullDownRefresh(() => {
+		formData.pageIndex = 1;
+		loadingData.reload = true
+		getTaskData();
+		pageData.taskList = []
+	})
+	
+	// 页面滚动触发事件
+	onPageScroll((detail) => {
+		//页面滚动事件
+		uni.pageScrollTo({
+			scrollTop: detail.scrollTop,
+			duration: 0
+		})
+	})
 </script>
 
 <style lang="scss" scoped>