Merge remote-tracking branch 'origin/master' into master

pages.json

@@ -174,6 +174,50 @@
             }
 
         }
+        ,{
+            "path" : "pages/ypczk/djfk/index/djfkIndex",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "代煎反馈首页",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/ypczk/djfk/djfkTask/allTask",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "全部任务",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/ypczk/djfk/djfkTask/daiZgTask",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "待质控任务",
+                "enablePullDownRefresh": false
+            }
+            
+        },{
+            "path" : "pages/ypczk/djfk/djfkTask/shenheTask",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "审核中任务",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/ypczk/djfk/djfkTask/wanchenTask",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "完成任务",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/my/index.scss

@@ -0,0 +1,33 @@
+.myIndex{
+	.myIndex_header{
+		height: 300rpx;
+		background: linear-gradient(180deg, rgba(190, 163, 117, 1) 0%, rgba(255, 255, 255, 1) 100%);
+		display: flex;
+		padding-top: 100rpx;
+		.myIndex_header_icon{
+			.header_icon{
+				height: 140rpx;
+				width: 140rpx;
+			}
+		}
+		.myIndex_header_info{
+			.myIndex_header_name{
+				display: flex;
+				.myIndex_header_name_text{
+					color: rgba(255, 255, 255, 1);
+					font-size: 20px;
+					text-align: left;
+				}
+				.myIndex_header_eyeIcon{
+					height: 60rpx;
+					width: 60rpx;
+				}
+			}
+			.myIndex_header_address{
+				color: rgba(255, 255, 255, 1);
+				font-size: 12px;
+				text-align: left;
+			}
+		}
+	}
+}

pages/ypczk/djfk/djfkTask/allTask.vue

@@ -0,0 +1,37 @@
+<template>
+	<view class="allTaskList" ref="allTaskList">
+		<custom-tabs type="allTaskListViewRef" :value="pageInfo.current" fixed="true" :activeTextStyle="{color:'rgba(190, 163, 117, 1)'}" :activeLineStyle="{'background-color':'rgba(190, 163, 117, 1)',height:'6rpx'}" @change="changeIndex">
+			<!-- 全部 -->
+			<custom-tab-pane label="全部" name="allTaskListViewRef_1">
+				
+			</custom-tab-pane>
+			<!-- 待整改 -->
+			<custom-tab-pane label="待整改" name="allTaskListViewRef_2">
+		
+			</custom-tab-pane>
+			<!-- 审核中 -->
+			<custom-tab-pane label="审核中" name="allTaskListViewRef_3">
+				
+			</custom-tab-pane>
+			<!-- 完成 -->
+			<custom-tab-pane label="完成" name="allTaskListViewRef_4">
+				
+			</custom-tab-pane>
+		</custom-tabs>
+		
+	</view>
+</template>
+
+<script setup>
+import http from '@/utils/request';
+import {ref,reactive,getCurrentInstance, computed, nextTick,watch} from "vue";
+import {onLoad,onShow,onUnload,onPageScroll,onReachBottom,onPullDownRefresh} from "@dcloudio/uni-app";
+
+const pageData=reactive({
+	current:-1,
+})
+</script>
+
+<style lang="scss" scoped>
+@import 'index.scss';
+</style>

pages/ypczk/djfk/djfkTask/daiZgTask.vue

@@ -0,0 +1,56 @@
+<template>
+	<view class="allTask">
+		<uni-card v-for="(item,index) in pageData.taskList" class="allTask_list">
+			<view class="list_content">
+				<view class="list_content_img">
+					<image :src="pageData.statusIcon" class="statusIcon"></image>
+				</view>
+				<view class="list_item">质控名称</view>
+				<view class="list_item_text">{{item.taskName}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">质控日期</view>
+				<view class="list_item_text">{{item.taskTime}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改截止日期</view>
+				<view class="list_item_text">{{item.taskDeadline}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改项数</view>
+				<view class="list_item_text">{{item.taskNum}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改情况</view>
+				<view class="list_item_text">{{item.taskSituation}}</view>
+			</view>
+			<view class="button">
+				<view class="button_upload" @click="uploadZg(item)">上传整改</view>
+			</view>
+		</uni-card>
+	</view>
+</template>
+
+<script setup>
+import http from '@/utils/request';
+import {ref,reactive,getCurrentInstance, computed, nextTick,watch} from "vue";
+import {onLoad,onShow,onUnload,onPageScroll,onReachBottom,onPullDownRefresh} from "@dcloudio/uni-app";
+	
+const pageData=reactive({
+	// 状态icon
+	statusIcon:'/static/gai_icon.png',
+	taskList:[
+		{
+			taskName:'20230405质控任务',
+			taskTime:'2023.04.28',
+			taskDeadline:'2023.05.23',
+			taskNum:'10',
+			taskSituation:'第一次'
+		}
+	]
+})	
+</script>
+
+<style lang="scss" scoped>
+@import 'index.scss';
+</style>

pages/ypczk/djfk/djfkTask/index.scss

@@ -0,0 +1,40 @@
+.allTask{
+	.allTask_list{
+		.list_content{
+			display: flex;
+			padding: 15rpx 20rpx 15rpx;
+			.list_content_img{
+				align-self: center;
+				display: flex;
+				.statusIcon{
+						height: 50rpx;
+						width: 50rpx;
+					}
+				}
+				.list_item{
+					padding-left:80rpx;
+					font-size: 15px;
+					font-weight: 400;
+					letter-spacing: 0px;
+					line-height: 21.72px;
+					color: rgba(102, 102, 102, 1);
+					vertical-align: top;
+				}
+				.list_item_text{
+					padding-right: 20rpx;
+					padding-left: 30rpx;
+					flex: 1;
+					text-align: right;
+					font-size: 15px;
+					font-weight: 400;
+					letter-spacing: 0.5px;
+					line-height: 22px;
+					color: rgba(51, 51, 51, 1);
+				}
+			}
+			.list_content :nth-child(2){
+				padding-left: 35rpx;
+			}
+		}
+	}
+}

pages/ypczk/djfk/djfkTask/shenheTask.vue

@@ -0,0 +1,57 @@
+<template>
+	<view class="allTask">
+		<uni-card v-for="(item,index) in pageData.taskList" class="allTask_list">
+			<view class="list_content">
+				<view class="list_content_img">
+					<image :src="pageData.statusIcon" class="statusIcon"></image>
+				</view>
+				<view class="list_item">质控名称</view>
+				<view class="list_item_text">{{item.taskName}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">质控日期</view>
+				<view class="list_item_text">{{item.taskTime}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改截止日期</view>
+				<view class="list_item_text">{{item.taskDeadline}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改项数</view>
+				<view class="list_item_text">{{item.taskNum}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改情况</view>
+				<view class="list_item_text">{{item.taskSituation}}</view>
+			</view>
+			<view class="button">
+				<view class="button_upload" @click="uploadZg(item)">上传整改</view>
+			</view>
+		</uni-card>
+	</view>
+</template>
+
+<script setup>
+import http from '@/utils/request';
+import {ref,reactive,getCurrentInstance, computed, nextTick,watch} from "vue";
+import {onLoad,onShow,onUnload,onPageScroll,onReachBottom,onPullDownRefresh} from "@dcloudio/uni-app";
+
+const pageData=reactive({
+	// 状态icon
+	statusIcon:'/static/shen_icon.png',
+	taskList:[
+		{
+			taskName:'20230405质控任务',
+			taskTime:'2023.04.28',
+			taskDeadline:'2023.05.23',
+			taskNum:'10',
+			taskSituation:'第一次'
+		}
+	]
+})
+
+</script>
+
+<style lang="scss" scoped>
+@import 'index.scss';
+</style>

pages/ypczk/djfk/djfkTask/wanchenTask.vue

@@ -0,0 +1,57 @@
+<template>
+	<view class="allTask">
+		<uni-card v-for="(item,index) in pageData.taskList" class="allTask_list">
+			<view class="list_content">
+				<view class="list_content_img">
+					<image :src="pageData.statusIcon" class="statusIcon"></image>
+				</view>
+				<view class="list_item">质控名称</view>
+				<view class="list_item_text">{{item.taskName}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">质控日期</view>
+				<view class="list_item_text">{{item.taskTime}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改截止日期</view>
+				<view class="list_item_text">{{item.taskDeadline}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改项数</view>
+				<view class="list_item_text">{{item.taskNum}}</view>
+			</view>
+			<view class="list_content">
+				<view class="list_item">整改情况</view>
+				<view class="list_item_text">{{item.taskSituation}}</view>
+			</view>
+			<view class="button">
+				<view class="button_upload" @click="uploadZg(item)">上传整改</view>
+			</view>
+		</uni-card>
+	</view>
+</template>
+
+<script setup>
+import http from '@/utils/request';
+import {ref,reactive,getCurrentInstance, computed, nextTick,watch} from "vue";
+import {onLoad,onShow,onUnload,onPageScroll,onReachBottom,onPullDownRefresh} from "@dcloudio/uni-app";
+
+const pageData=reactive({
+	// 状态icon
+	statusIcon:'/static/wan_icon.png',
+	taskList:[
+		{
+			taskName:'20230405质控任务',
+			taskTime:'2023.04.28',
+			taskDeadline:'2023.05.23',
+			taskNum:'10',
+			taskSituation:'第一次'
+		}
+	]
+})
+
+</script>
+
+<style lang="scss" scoped>
+@import 'index.scss';
+</style>

pages/ypczk/djfk/index/djfkIndex.vue

@@ -0,0 +1,143 @@
+<!-- 代煎反馈首页 -->
+<template>
+	<view class="djfkIndex">
+		<!-- 头部 -->
+		<view class="djfkIndex_header">
+			<view class="info">
+				<view class="info_img">
+					<image :src="pageData.headImg" class="headImg"></image>
+				</view>
+				<text class="userName">{{pageData.userName}}</text>
+				<image :src="eyeIcon.nowIcon" class="eyeIcon" @click="changeState('header')"></image>
+			</view>
+			<view class="slogan">
+				<image src="/static/slogan_header_img.png" class="slogan_img"></image>
+			</view>
+		</view>
+		<!-- 标题 -->
+		<view class="djfkIndex_title">
+			<view class="title_left">
+				<text>任务列表</text>
+				<!-- <uni-badge class="uni-badge-left-margin" :text="pageData.taskNum" /> -->
+			</view>
+			<view class="title_right" @click="toDetail">
+				<text class="right_text">查看全部</text>
+				<uni-icons type="right"></uni-icons>
+			</view>
+		</view>
+		<!-- 任务列表 -->
+		<view>
+			<uni-card v-for="(item,index) in pageData.taskList" padding="0" spacing="0" class="djfkIndex_list">
+				<view class="list_content">
+					<view class="list_content_img">
+						<image :src="pageData.statusIcon" class="statusIcon"></image>
+					</view>
+					<view class="list_item">质控名称</view>
+					<view class="list_item_text">{{item.taskName}}</view>
+				</view>
+				<view class="list_content">
+					<view class="list_item">质控日期</view>
+					<view class="list_item_text">{{item.taskTime}}</view>
+				</view>
+				<view class="list_content">
+					<view class="list_item">整改截止日期</view>
+					<view class="list_item_text">{{item.taskDeadline}}</view>
+				</view>
+				<view class="list_content">
+					<view class="list_item">整改项数</view>
+					<view class="list_item_text">{{item.taskNum}}</view>
+				</view>
+				<view class="list_content">
+					<view class="list_item">整改情况</view>
+					<view class="list_item_text">{{item.taskSituation}}</view>
+				</view>
+				<view class="button">
+					<view class="button_upload" @click="uploadZg(item)">上传整改</view>
+				</view>
+			</uni-card>
+		</view>
+		<!-- 整改通知 -->
+		<uni-popup ref="zgDialog" type="dialog">
+			<view class="rectification_notice">
+				<uni-title type="h1" title="整改通知" align="center" class="rectification_notice_title"></uni-title>
+				<view class="rectification_notice_content">
+					1.墙壁有霉污2.浸泡时间未满40分钟3.未采取防尘措施
+				</view>
+				<view class="rectification_notice_deadline">
+					整改截止日期: 2023.06.30
+				</view>
+				<view class="rectification_notice_date">
+					5月30日
+				</view>
+				<view class="rectification_notice_button">
+					<button class="button">我知道了</button>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script setup>
+import http from '@/utils/request';
+import { ref,reactive } from "vue";
+import {onLoad,onShow,onUnload,onPullDownRefresh} from "@dcloudio/uni-app";
+
+const pageData=reactive({
+	headImg:'/static/header.png',
+	userName:'王军',
+	// 状态icon
+	statusIcon:'/static/gai_icon.png',
+	// 整改任务列表
+	taskList:[
+		{
+			taskName:'20230405质控任务',
+			taskTime:'2023.04.28',
+			taskDeadline:'2023.05.23',
+			taskNum:'10',
+			taskSituation:'第一次'
+		}
+	]
+})
+
+// 整改通知对话框
+const zgDialog=ref()
+
+const eyeIcon=reactive({
+	nowIcon:'',
+	showIcon:'/static/whiteDisplay.png',
+	hideIcon:'/static/whiteHide.png'
+})
+
+// 切换显示与隐藏
+const changeState=(type)=>{
+	if(type=='header'){
+		console.log("头部切换")
+		if(eyeIcon.nowIcon==eyeIcon.hideIcon){
+			eyeIcon.nowIcon=eyeIcon.showIcon
+		}else{
+			eyeIcon.nowIcon=eyeIcon.hideIcon
+		}
+	}else if(type=='list'){
+		console.log("列表切换")
+		if(showIcon.nowIcon==showIcon.hideIcon){
+			showIcon.nowIcon=showIcon.showIcon
+		}else{
+			showIcon.nowIcon=showIcon.hideIcon
+		}
+	}
+}
+
+// 上传整改
+const uploadZg=(e)=>{
+	zgDialog._value.open()
+}
+
+onShow(()=>{
+	eyeIcon.nowIcon=eyeIcon.hideIcon
+})
+
+</script>
+
+<style lang="scss" scoped>
+@import 'index.scss';
+</style>

pages/ypczk/djfk/index/index.scss

@@ -0,0 +1,156 @@
+.djfkIndex{
+	.djfkIndex_header{
+		background: linear-gradient(180deg, rgba(189, 162, 115, 1) 0%, rgba(255, 255, 255, 1) 100%);
+		height: 450rpx;
+		.info{
+			display: flex;
+			align-items: center;
+			padding: 10rpx 10rpx 20rpx 10rpx;
+			.info_img{
+				width:100rpx;
+				height:100rpx;
+				border-radius:50%;
+				background-color:white;
+				.headImg{
+					margin-left: auto;
+					margin-right: auto;
+					width: 100rpx;
+					height: 100rpx;
+				}
+			}
+			.userName{
+				line-height: 100rpx;
+				font-size: 20px;
+				font-weight: 500;
+				color: rgba(255, 255, 255, 1);
+				text-align: center;
+				padding-left: 40rpx;
+				padding-right: 20rpx;
+			}
+			.eyeIcon{
+				line-height: 100rpx;
+				width: 60rpx;
+				height: 60rpx;
+			}
+		}
+		.slogan{
+			display:flex;
+			align-items: center;
+			justify-content: center;
+			.slogan_img{
+				width: 670rpx;
+				height: 290rpx;
+			}
+		}
+	}
+	.djfkIndex_title{
+		display: flex;
+		padding-left: 30rpx;
+		.title_left{
+			display:flex;
+			align-items: center;
+			justify-content: center;
+			.uni-badge--x{
+				padding-left: 5rpx;
+			}
+		}
+		.title_right{
+			padding-left: 400rpx;
+			right: 20rpx;
+			.right_text{
+				font-size: 17px;
+				font-weight: 400;
+				color: rgba(153, 153, 153, 1);
+				padding-right: 5rpx;
+			}
+		}
+	}
+	.djfkIndex_list{
+		.list_content{
+			display: flex;
+			padding: 15rpx 20rpx 15rpx;
+			.list_content_img{
+				align-self: center;
+				display: flex;
+				.statusIcon{
+					height: 50rpx;
+					width: 50rpx;
+				}
+			}
+			.list_item{
+				padding-left:80rpx;
+				font-size: 15px;
+				font-weight: 400;
+				letter-spacing: 0px;
+				line-height: 21.72px;
+				color: rgba(102, 102, 102, 1);
+				vertical-align: top;
+			}
+			.list_item_text{
+				padding-right: 20rpx;
+				padding-left: 30rpx;
+				flex: 1;
+				text-align: right;
+				font-size: 15px;
+				font-weight: 400;
+				letter-spacing: 0.5px;
+				line-height: 22px;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+		.list_content :nth-child(2){
+			padding-left: 35rpx;
+		}
+		.button{
+			display: flex;
+			justify-content: flex-start;
+			border-top: 0.5px solid rgba(221, 221, 221, 1);
+			height: 80rpx;
+			.button_upload{
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: rgba(190, 163, 117, 1);
+				font-size: 17px;
+			}
+		}
+	}
+	.rectification_notice{
+		height: 800rpx;
+		width: 600rpx;
+		background-image: url('../../../../static/rectification_notice.png');
+		background-size: cover;
+		background-repeat: no-repeat;
+		background-attachment: fixed;
+		border-radius: 10rpx;
+		.rectification_notice_title{
+			padding-top: 110rpx;
+		}
+		.rectification_notice_content{
+			padding: 50rpx 50rpx 30rpx;
+			font-size: 16px;
+			font-weight: 400;
+			text-align: left;
+			word-break:break-all;
+		}
+		.rectification_notice_deadline{
+			padding: 80rpx 50rpx 80rpx;
+			font-size: 12px;
+		}
+		.rectification_notice_date{
+			padding-right: 60rpx;
+			font-size: 12px;
+			text-align: right;
+		}
+		.rectification_notice_button{
+			padding: 60rpx 50rpx;
+			.button{
+				margin-top: 10rpx;
+				border-radius: 5px;
+				color: rgba(255, 255, 255, 1);
+				background:  linear-gradient(90deg, rgba(190, 163, 117, 1) 0%, rgba(190, 163, 117, 0.8) 100%);
+			}
+		}
+	}
+}

pages/ypczk/index/index.scss

@@ -28,8 +28,8 @@
 				font-weight: 500;
 				color: rgba(255, 255, 255, 1);
 				text-align: center;
-				padding-left: 20rpx;
-				padding-right: 40rpx;
+				padding-left: 40rpx;
+				padding-right: 20rpx;
 			}
 			.eyeIcon{
 				line-height: 100rpx;
@@ -109,23 +109,6 @@
 			}
 		}
 		.button_group{
-			border-top: 0.5px solid rgba(221, 221, 221, 1);
-			height: 80rpx;
-			display: flex;
-			justify-content: flex-start;
-			.button_item{
-				flex: 1;
-				text-align: center;
-				justify-content: center;
-				color: rgba(190, 163, 117, 1);
-				font-size: 17px;
-				font-weight: 400;
-			}
-			.button_item:first-child{
-				border-right: 0.5px solid rgba(221, 221, 221, 1);
-			}
-		}
-		.button_group{
 			display: flex;
 			justify-content: flex-start;
 			height: 80rpx;

pages/ypczk/index/leaderIndex.vue

@@ -27,7 +27,7 @@
 		</view>
 		<!-- 列表 -->
 		<view>
-			<uni-card v-for="(item,index) in pageData.taskList" padding="0" spacing="0" class="leaderIndex_list">
+			<uni-card is-shadow="false" v-for="(item,index) in pageData.taskList" padding="0" spacing="0" class="leaderIndex_list">
 				<view class="list_title">
 					<image :src="item.taskStatusIcon" class="statusIcon"></image>
 					<view>{{item.name}}</view>

pages/ypczk/zkTask/djTask.vue

@@ -65,7 +65,7 @@
 		<uni-popup ref="bhgDialog" type="dialog">
 			<uni-popup-dialog type="info" mode="input" confirmText="确定" cancelText="取消" title="不合格原因" value="" placeholder="请填写不合格原因" @confirm="bhgDialogConfirm"
 				@close="bhgDialogClose">
-				<uni-easyinput type="textarea" autoHeight v-model="pageData.reason" placeholder="请输入不合格原因"></uni-easyinput>
+				<uni-easyinput type="textarea" maxlength="50" autoHeight v-model="pageData.reason" placeholder="请输入不合格原因"></uni-easyinput>
 			</uni-popup-dialog>
 		</uni-popup>
 	</view>

pages/ypczk/zkTask/zkTaskList.vue

@@ -6,7 +6,7 @@
 				<ZkTaskListView ref="zkTaskListViewRef_1" state=""></ZkTaskListView>
 			</custom-tab-pane>
 			<!-- 待质控 -->
-			<custom-tab-pane label="待质控" name="zkTaskListViewRef_2">
+			<custom-tab-pane label="待质控" name="zkTaskListViewRef_2">	
 				<ZkTaskListView ref="zkTaskListViewRef_2" state="7003"></ZkTaskListView>
 			</custom-tab-pane>
 			<!-- 质控中 -->