diff --git a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
index ee1b759..a3905aa 100644
--- a/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
+++ b/pages/backMaterialReceiveDetail/backMaterialReceiveDetail.vue
@@ -80,122 +80,63 @@
 </template>
 
 <script>
-	import QS from "qs"
-	export default {
-		data() {
-			return {
-				fetchList: [
+import QS from "qs"
+export default {
+	data() {
+		return {
+			fetchList: [
 
-				],
-				codeVal: '',
-				manageType: '',
-				infoList: '',
-				multiNum: 1,
-				subList: {},
-				fixVal: '',
-				fixRange: [{
-						text: '合格',
-						value: '0'
-					},
-					{
-						text: '待修',
-						value: '1'
-					},
-					{
-						text: '待报废',
-						value: '2'
-					}
-				],
-				passedNum: '',
-				waitRepairNum: '',
-				waitCrashNum: '',
-				detailsId: '',
-				taskId: '',
-				submitFlag:false,
-				taskStatus:'',
-				transMaCode: '',
-				rfidNum: '',
-				sendTypeId: '',
-				parentId: ''
+			],
+			codeVal: '',
+			manageType: '',
+			infoList: '',
+			multiNum: 1,
+			subList: {},
+			fixVal: '',
+			fixRange: [{
+				text: '合格',
+				value: '0'
+			},
+			{
+				text: '待修',
+				value: '1'
+			},
+			{
+				text: '待报废',
+				value: '2'
 			}
-		},
-		methods: {
-			openPopup(list) {
-				console.log(list);
-				this.infoList = list
-				this.rfidNum = list.num
-				this.transMaCode = list.code
-				this.sendTypeId = list.typeId
-				this.parentId = list.id
-				if(Number(list.num)==0){
-					uni.showToast({
-						icon: 'none',
-						title: '待退料数据为0，请勿再点击'
-					})
-					return 
-				}
-				if (this.infoList.manageType == '0') {
-					this.$refs.popup1.open()
-				} else {
-					const userInfo = uni.getStorageSync('userInfo');
-					console.log("userInfo", userInfo)
-					const userId = userInfo.userid
-
-					const {
-						taskId,
-						id,
-						typeId,
-						modelId,
-						manageType,
-						typeName,
-						typeCode,
-						num
-					} = this.infoList
-					const params = {
-						taskId,
-						id,
-						typeId,
-						modelId,
-						manageType,
-						userId,
-						typeName,
-						typeCode,
-						num
-					}
-					const urlStr = QS.stringify(params)
-					console.log("urlSTR", urlStr)
-					uni.navigateTo({
-						url: `/pages/numReceive/numReceive?${urlStr}`
-					})
-				}
-			},
-			closePopup1() {
-				this.$refs.popup1.close()
-			},
-			closePopup2() {
-				this.$refs.popup2.close()
-			},
-			scanCode() {
-				const that = this
-				that.closePopup1()
-				/* uni.scanCode({
-					success: (res) => {
-						console.log("beforeScan", res);
-						const userInfo = uni.getStorageSync('userInfo');
-						console.log("beforeScan11111", userInfo,that.taskId)
-						const userId = userInfo.userid
-						uni.navigateTo({
-							url: `/pages/scanReceive/scanReceive?code=${res.result}&typeId=${that.infoList.typeId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
-						})
-					}
-				}) */
-				const userId = uni.getStorageSync('userInfo').userid
-				uni.navigateTo({
-					url: `/pages/QRIn/QRIn?typeId=${that.infoList.modelId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
+			],
+			passedNum: '',
+			waitRepairNum: '',
+			waitCrashNum: '',
+			detailsId: '',
+			taskId: '',
+			submitFlag: false,
+			taskStatus: '',
+			transMaCode: '',
+			rfidNum: '',
+			sendTypeId: '',
+			parentId: ''
+		}
+	},
+	methods: {
+		openPopup(list) {
+			console.log(list);
+			this.infoList = list
+			this.rfidNum = list.num
+			this.transMaCode = list.code
+			this.sendTypeId = list.typeId
+			this.parentId = list.id
+			if (Number(list.num) == 0) {
+				uni.showToast({
+					icon: 'none',
+					title: '待退料数据为0，请勿再点击'
 				})
-			},
-			codeOut() {
-				this.closePopup1()
+				return
+			}
+			if (this.infoList.manageType == '0') {
+				this.$refs.popup1.open()
+			} else {
 				const userInfo = uni.getStorageSync('userInfo');
 				console.log("userInfo", userInfo)
 				const userId = userInfo.userid
@@ -224,285 +165,345 @@
 				const urlStr = QS.stringify(params)
 				console.log("urlSTR", urlStr)
 				uni.navigateTo({
-					url: `/pages/codeReceive/codeReceive?${urlStr}&maCode=${this.transMaCode}`
+					url: `/pages/numReceive/numReceive?${urlStr}`
 				})
-			},
-			rfidOut () {
-				this.closePopup1()
-				uni.navigateTo({
-					url: `/pages/rfidReceive/rfidReceive?waitOut=${this.rfidNum}&typeId=${this.sendTypeId}&parentId=${this.parentId}&taskId=${this.taskId}`
-				})
-			},
-			multiOut() {
-				let that = this
-				this.closePopup2()
-				that.subList = {
-					parentId: that.infoList.parenntId,
-					typeId: that.infoList.typeId,
-					outNum: that.multiNum,
-					companyId: uni.getStorageSync('userInfo').sysUser.companyId
-				}
-				console.log(that.subList);
-				that.$api.fetchMaterialOutStore.subOutStore(that.subList, null).then(res => {
-					console.log(res);
-					if (res.data.code == 200) {
-						uni.showToast({
-							icon: 'none',
-							title: '退料接收成功！',
-							success: () => {
-								uni.navigateBack()
-							}
-						})
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: '退料接收失败！'
-						})
-					}
-				}).catch(err => {
-					console.log(err);
-				})
-			},
-			initListData() {
-				let that = this
-				console.log(that.detailsId);
-				that.$api.backMaterialReceive.backMaterialReceiveDetail({
-					id: that.detailsId
-				}).then(res => {
-					console.log(res);
-					if (res.data.code == 200) {
-						/* for (let i = 0; i < res.data.data.length; i++) {
-							res.data.data[i].num = res.data.data[i].num.split('.')[0]
-						} */
-						that.fetchList = res.data.data
-						console.log(that.fetchList);
-					}
-				}).catch(err => {
-					console.log(err);
-				})
-			},
-			backReceiveEndBackFn() {
-				const that = this
-				let total = that.reduceNumTotal()
-				console.log("total==",total)
-				if (total > 0) {
-					uni.showToast({
-						icon: 'none',
-						title: '请完成退料接收后才能结束任务'
-					})
-					return
-				}
-				// submitFlag false
-			
-				if(that.submitFlag==true){
-					return 
-				}
-				that.submitFlag = true
-				console.log(that.taskId, that.detailsId);
-				that.$api.backMaterialReceive.backReceiveEndBack({
-					createBy: uni.getStorageSync('userInfo').userid,
-					taskId: that.taskId,
-					parentId: that.detailsId
-				}).then(res => {
-					console.log(res)
-					if (res.data.code == 200) {
-						uni.showToast({
-							icon: 'none',
-							title: '结束任务成功'
-						})
-						console.log("退料结束",res)
-						that.submitFlag = false
-						uni.navigateBack()
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: res.data.msg
-						})
-					}
-				}).catch(err=>{
-					that.submitFlag = false
-				}).finally(result=>{
-					that.submitFlag = false
-				})
-			},
-			reduceNumTotal() {
-				const that = this
-				let sum = that.fetchList.reduce((accumulator, currentValue) => {
-					return accumulator + Number(currentValue.num);
-				}, 0);
-				console.log("numaccumulator", sum)
-				return sum
 			}
 		},
-		onLoad(params) {
-			console.log(params);
-			this.taskId = params.taskId
-			this.detailsId = params.id
-			this.taskStatus = params.taskStatus
+		closePopup1() {
+			this.$refs.popup1.close()
 		},
-		onShow() {
-			this.initListData()
+		closePopup2() {
+			this.$refs.popup2.close()
 		},
-		onNavigationBarButtonTap(ev) {
-			console.log("点击了自定义按钮", ev);
+		scanCode() {
 			const that = this
-			if (ev.text == '结束任务') {
-				if(this.taskStatus=="40"){
+			that.closePopup1()
+			/* uni.scanCode({
+				success: (res) => {
+					console.log("beforeScan", res);
+					const userInfo = uni.getStorageSync('userInfo');
+					console.log("beforeScan11111", userInfo,that.taskId)
+					const userId = userInfo.userid
+					uni.navigateTo({
+						url: `/pages/scanReceive/scanReceive?code=${res.result}&typeId=${that.infoList.typeId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
+					})
+				}
+			}) */
+			const userId = uni.getStorageSync('userInfo').userid
+			uni.navigateTo({
+				url: `/pages/QRIn/QRIn?typeId=${that.infoList.modelId}&num=${that.infoList.num}&parentId=${that.infoList.id}&manageType=${that.infoList.manageType}&taskId=${that.taskId}&createBy=${userId}&scanType="back"`
+			})
+		},
+		codeOut() {
+			this.closePopup1()
+			const userInfo = uni.getStorageSync('userInfo');
+			console.log("userInfo", userInfo)
+			const userId = userInfo.userid
+
+			const {
+				taskId,
+				id,
+				typeId,
+				modelId,
+				manageType,
+				typeName,
+				typeCode,
+				num
+			} = this.infoList
+			const params = {
+				taskId,
+				id,
+				typeId,
+				modelId,
+				manageType,
+				userId,
+				typeName,
+				typeCode,
+				num
+			}
+			const urlStr = QS.stringify(params)
+			console.log("urlSTR", urlStr)
+			uni.navigateTo({
+				url: `/pages/codeReceive/codeReceive?${urlStr}&maCode=${this.transMaCode}`
+			})
+		},
+		rfidOut() {
+			this.closePopup1()
+			uni.navigateTo({
+				url: `/pages/rfidReceive/rfidReceive?waitOut=${this.rfidNum}&typeId=${this.sendTypeId}&parentId=${this.parentId}&taskId=${this.taskId}`
+			})
+		},
+		multiOut() {
+			let that = this
+			this.closePopup2()
+			that.subList = {
+				parentId: that.infoList.parenntId,
+				typeId: that.infoList.typeId,
+				outNum: that.multiNum,
+				companyId: uni.getStorageSync('userInfo').sysUser.companyId
+			}
+			console.log(that.subList);
+			that.$api.fetchMaterialOutStore.subOutStore(that.subList, null).then(res => {
+				console.log(res);
+				if (res.data.code == 200) {
 					uni.showToast({
 						icon: 'none',
-						title: '请勿再点击'
+						title: '退料接收成功！',
+						success: () => {
+							uni.navigateBack()
+						}
 					})
-					return
-				}  
-				that.backReceiveEndBackFn()
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: '退料接收失败！'
+					})
+				}
+			}).catch(err => {
+				console.log(err);
+			})
+		},
+		initListData() {
+			let that = this
+			console.log(that.detailsId);
+			that.$api.backMaterialReceive.backMaterialReceiveDetail({
+				id: that.detailsId
+			}).then(res => {
+				console.log(res);
+				if (res.data.code == 200) {
+					/* for (let i = 0; i < res.data.data.length; i++) {
+						res.data.data[i].num = res.data.data[i].num.split('.')[0]
+					} */
+					that.fetchList = res.data.data
+					console.log(that.fetchList);
+				}
+			}).catch(err => {
+				console.log(err);
+			})
+		},
+		backReceiveEndBackFn() {
+			const that = this
+			let total = that.reduceNumTotal()
+			console.log("total==", total)
+			if (total > 0) {
+				uni.showToast({
+					icon: 'none',
+					title: '请完成退料接收后才能结束任务'
+				})
+				return
 			}
+			// submitFlag false
+
+			if (that.submitFlag == true) {
+				return
+			}
+			that.submitFlag = true
+			console.log(that.taskId, that.detailsId);
+			that.$api.backMaterialReceive.backReceiveEndBack({
+				createBy: uni.getStorageSync('userInfo').userid,
+				taskId: that.taskId,
+				parentId: that.detailsId
+			}).then(res => {
+				console.log(res)
+				if (res.data.code == 200) {
+					uni.showToast({
+						icon: 'none',
+						title: '结束任务成功'
+					})
+					console.log("退料结束", res)
+					that.submitFlag = false
+					uni.navigateBack()
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: res.data.msg
+					})
+				}
+			}).catch(err => {
+				console.log(err, 'sss');
+				that.submitFlag = false
+			}).finally(result => {
+				that.submitFlag = false
+			})
+		},
+		reduceNumTotal() {
+			const that = this
+			let sum = that.fetchList.reduce((accumulator, currentValue) => {
+				return accumulator + Number(currentValue.num);
+			}, 0);
+			console.log("numaccumulator", sum)
+			return sum
+		}
+	},
+	onLoad(params) {
+		console.log(params);
+		this.taskId = params.taskId
+		this.detailsId = params.id
+		this.taskStatus = params.taskStatus
+	},
+	onShow() {
+		this.initListData()
+	},
+	onNavigationBarButtonTap(ev) {
+		console.log("点击了自定义按钮", ev);
+		const that = this
+		if (ev.text == '结束任务') {
+			if (this.taskStatus == "40") {
+				uni.showToast({
+					icon: 'none',
+					title: '请勿再点击'
+				})
+				return
+			}
+			that.backReceiveEndBackFn()
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-	.single-fetch {
-		width: 100%;
+.single-fetch {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 20rpx 35rpx;
+	border-bottom: 1px solid #DDDDDD;
+
+	view {
+		display: flex;
+		align-items: center;
+		margin-bottom: 25rpx;
+
+		span {
+			color: #A7A7A7;
+			padding-right: 20rpx;
+		}
+
+		h4 {
+			font-size: 14px;
+			font-weight: normal;
+		}
+	}
+
+	view:last-child {
+		margin-bottom: 0;
+	}
+}
+
+.btm-exam {
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	box-sizing: border-box;
+	padding: 20rpx 40rpx;
+	display: flex;
+	justify-content: flex-end;
+	border-top: 2px solid #F6F8FF;
+
+	.exam {
 		box-sizing: border-box;
-		padding: 20rpx 35rpx;
-		border-bottom: 1px solid #DDDDDD;
+		padding: 10rpx 50rpx;
+		border-radius: 30rpx;
+		background-color: #3788FF;
+		font-size: 14px;
+		color: #fff;
+	}
+}
+
+.popup1 {
+	width: 80vw;
+	height: 20vh;
+	background-color: #fff;
+	border-radius: 15rpx;
+	overflow: hidden;
+	background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
+
+	.pop-top {
+		width: 100%;
+		height: 5vh;
+		box-sizing: border-box;
+		padding: 0 25rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.select-area {
+		width: 85%;
+		margin: 40rpx auto;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
 
 		view {
+			box-sizing: border-box;
+			font-size: 14px;
+			padding: 10rpx 20rpx;
+			border: 1px solid #D5D5D4;
+			border-radius: 20rpx;
+		}
+	}
+
+	.ipt-area {
+		width: 85%;
+		margin: 40rpx auto;
+	}
+}
+
+.popup2 {
+	width: 80vw;
+	height: 60vh;
+	background-color: #fff;
+	border-radius: 15rpx;
+	overflow: hidden;
+	background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
+
+	.pop-top {
+		width: 100%;
+		height: 5vh;
+		box-sizing: border-box;
+		padding: 0 25rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.info-area {
+		width: 85%;
+		margin: 30rpx auto;
+		display: flex;
+		flex-direction: column;
+
+		view {
+			margin-bottom: 15rpx;
 			display: flex;
 			align-items: center;
-			margin-bottom: 25rpx;
-
-			span {
-				color: #A7A7A7;
-				padding-right: 20rpx;
-			}
 
 			h4 {
-				font-size: 14px;
 				font-weight: normal;
-			}
-		}
-
-		view:last-child {
-			margin-bottom: 0;
-		}
-	}
-
-	.btm-exam {
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		box-sizing: border-box;
-		padding: 20rpx 40rpx;
-		display: flex;
-		justify-content: flex-end;
-		border-top: 2px solid #F6F8FF;
-
-		.exam {
-			box-sizing: border-box;
-			padding: 10rpx 50rpx;
-			border-radius: 30rpx;
-			background-color: #3788FF;
-			font-size: 14px;
-			color: #fff;
-		}
-	}
-
-	.popup1 {
-		width: 80vw;
-		height: 20vh;
-		background-color: #fff;
-		border-radius: 15rpx;
-		overflow: hidden;
-		background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
-
-		.pop-top {
-			width: 100%;
-			height: 5vh;
-			box-sizing: border-box;
-			padding: 0 25rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-		}
-
-		.select-area {
-			width: 85%;
-			margin: 40rpx auto;
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-
-			view {
-				box-sizing: border-box;
+				color: #989898;
 				font-size: 14px;
-				padding: 10rpx 20rpx;
-				border: 1px solid #D5D5D4;
-				border-radius: 20rpx;
+				width: 35%;
 			}
-		}
 
-		.ipt-area {
-			width: 85%;
-			margin: 40rpx auto;
+			span {
+				font-size: 14px;
+			}
 		}
 	}
 
-	.popup2 {
-		width: 80vw;
-		height: 60vh;
-		background-color: #fff;
-		border-radius: 15rpx;
-		overflow: hidden;
-		background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
-
-		.pop-top {
-			width: 100%;
-			height: 5vh;
-			box-sizing: border-box;
-			padding: 0 25rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-		}
-
-		.info-area {
-			width: 85%;
-			margin: 30rpx auto;
-			display: flex;
-			flex-direction: column;
-
-			view {
-				margin-bottom: 15rpx;
-				display: flex;
-				align-items: center;
-
-				h4 {
-					font-weight: normal;
-					color: #989898;
-					font-size: 14px;
-					width: 35%;
-				}
-
-				span {
-					font-size: 14px;
-				}
-			}
-		}
-
-		.sub-btn {
-			width: 85%;
-			margin: 30rpx auto;
-			background-color: #3788FF;
-			color: #fff;
-			box-sizing: border-box;
-			padding: 15rpx 0;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			border-radius: 40rpx;
-			font-size: 14px;
-		}
+	.sub-btn {
+		width: 85%;
+		margin: 30rpx auto;
+		background-color: #3788FF;
+		color: #fff;
+		box-sizing: border-box;
+		padding: 15rpx 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 40rpx;
+		font-size: 14px;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue b/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue
index df80576..4661547 100644
--- a/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue
+++ b/pages/fetchMaterialOutStore/fetchMaterialOutStore.vue
@@ -1,18 +1,10 @@
 <template>
 	<view>
 		<view class="ipt-area">
-			<uni-easyinput
-				suffixIcon="search" 
-				v-model="keywordVal" 
-				placeholder="请输入关键字" 
-				@iconClick="searchKeyword"
-			></uni-easyinput>
+			<uni-easyinput suffixIcon="search" v-model="keywordVal" placeholder="请输入领料单号"
+				@iconClick="searchKeyword"></uni-easyinput>
 		</view>
-		<view
-			class="single-fetch"
-			v-for="(fetch, index) in fetchMaterialList"
-			:key="index"
-		>
+		<view class="single-fetch" v-for="(fetch, index) in fetchMaterialList" :key="index">
 			<view class="fetch-upper">
 				<!-- {{ fetch.taskStatus }} -->
 				<!-- <checkbox-group 
@@ -30,10 +22,7 @@
 					<h4 style="color: #989898;">{{ fetch.phoneNumber }}</h4>
 				</view>
 			</view>
-			<view 
-				class="fetch-lower"
-				@click="seeDetail(fetch.taskId, fetch.taskStatus, fetch.id)"
-			>
+			<view class="fetch-lower" @click="seeDetail(fetch.taskId, fetch.taskStatus, fetch.id)">
 				<view>
 					<span>领料申请单位</span>
 					<h4>{{ fetch.unitName }}</h4>
@@ -82,38 +71,22 @@
 				</view>
 			</view> -->
 			<view class="sticky-area">
-				<h4
-					v-show="fetch.taskStatus == '33'"
-				>
+				<h4 v-show="fetch.taskStatus == '33'">
 					待出库
 				</h4>
-				<h4
-					v-show="fetch.taskStatus == '34'"
-				>
+				<h4 v-show="fetch.taskStatus == '34'">
 					出库进行中
 				</h4>
-				<h4
-					v-show="fetch.taskStatus == '35'"
-					style="border: 1px solid #27D870; color: #27D870;"
-				>
+				<h4 v-show="fetch.taskStatus == '35'" style="border: 1px solid #27D870; color: #27D870;">
 					出库完成
 				</h4>
-				<h4
-					v-show="fetch.taskStatus == '98'"
-					style="border: 1px solid #EE603D; color: #EE603D;"
-				>
+				<h4 v-show="fetch.taskStatus == '98'" style="border: 1px solid #EE603D; color: #EE603D;">
 					分公司审核驳回
 				</h4>
-				<h4
-					v-show="fetch.taskStatus == '99'"
-					style="border: 1px solid #EE603D; color: #EE603D;"
-				>
+				<h4 v-show="fetch.taskStatus == '99'" style="border: 1px solid #EE603D; color: #EE603D;">
 					分管审核驳回
 				</h4>
-				<h4
-					v-show="fetch.taskStatus == '100'"
-					style="border: 1px solid #EE603D; color: #EE603D;"
-				>
+				<h4 v-show="fetch.taskStatus == '100'" style="border: 1px solid #EE603D; color: #EE603D;">
 					内部审核驳回
 				</h4>
 			</view>
@@ -138,232 +111,248 @@
 
 <script>
 import { basePath } from '../../public'
-	export default {
-		data() {
-			return {
-				keywordVal: '',
-				showLoading: false,
-				allChecked: false,
-				fetchMaterialList: [
-					
-				],
-				examList: []
+export default {
+	data() {
+		return {
+			keywordVal: '',
+			showLoading: false,
+			allChecked: false,
+			fetchMaterialList: [
+
+			],
+			examList: []
+		}
+	},
+	methods: {
+		seeDetail(taskId, taskStatus, id) {
+			// if (taskStatus == 33) {
+			uni.navigateTo({
+				url: `/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail?taskId=${taskId}&taskStatus=${taskStatus}&id=${id}`
+			})
+			// }
+		},
+		/* checkAll() {
+			this.allChecked = !this.allChecked
+			if (this.allChecked) {
+				this.fetchMaterialList.map(item => {
+					if (item.checked == false) {
+						item.checked = true
+					}
+				})
+			} else {
+				this.fetchMaterialList.map(item => {
+					if (item.checked == true) {
+						item.checked = false
+					}
+				})
 			}
 		},
-		methods: {
-			seeDetail (taskId, taskStatus, id) {
-				// if (taskStatus == 33) {
-					uni.navigateTo({
-						url: `/pages/fetchMaterialOutStoreDetail/fetchMaterialOutStoreDetail?taskId=${taskId}&taskStatus=${taskStatus}&id=${id}`
-					})
-				// }
-			},
-			/* checkAll() {
-				this.allChecked = !this.allChecked
-				if (this.allChecked) {
-					this.fetchMaterialList.map(item => {
-						if (item.checked == false) {
-							item.checked = true
-						}
-					})
+		checkClick(item) {
+			item.checked = !item.checked
+			if (!item.checked) {
+				this.allChecked = false
+			} else {
+				const goods = this.fetchMaterialList.every(item => {
+					return item.checked === true
+				})
+				if (goods) {
+					this.allChecked = true
 				} else {
-					this.fetchMaterialList.map(item => {
-						if (item.checked == true) {
-							item.checked = false
-						}
-					})
-				}
-			},
-			checkClick(item) {
-				item.checked = !item.checked
-				if (!item.checked) {
 					this.allChecked = false
-				} else {
-					const goods = this.fetchMaterialList.every(item => {
-						return item.checked === true
-					})
-					if (goods) {
-						this.allChecked = true
-					} else {
-						this.allChecked = false
-					}
 				}
-			}, */
-			toggleExam () {
-				let that = this
-				that.examList = that.fetchMaterialList.filter((item) => {
-					return item.checked == true
-				}).map((subItem) => {
-					return {
-						name: subItem['name'],
-						number: subItem['fetchNum']
-					}
-				})
-				console.log(that.examList);
-			},
-			closePopup () {
-				this.$refs.popup.close()
-			},
-			seeExam (name) {
-				console.log(name);
-				this.$refs.popup.open()
-			},
-			formSubmit () {
-				let that = this
-				that.$refs.examForm.validate().then(formData => {
-					console.log(formData);
-					that.$refs.popup.close()
-				})
-			},
-			initFetch (code) {
-				let that = this
-				that.showLoading = true
-				// 获取领料出库数据
-				that.$api.fetchExam.fetchExamList({
-					code,
-					role: uni.getStorageSync('roles').join(','),
-					flag: 0
-				}).then(res => {
-					console.log(res);
-					if (res.data.code == 200) {
-						if (res.data.data.rows.length == 0) {
-							that.showLoading = false
-							uni.showToast({
-								icon: 'none',
-								title: '未查询到相关数据！'
-							})
-						} else {
-							that.showLoading = false
-							that.fetchMaterialList = res.data.data.rows
-						}
-					} else {
+			}
+		}, */
+		toggleExam() {
+			let that = this
+			that.examList = that.fetchMaterialList.filter((item) => {
+				return item.checked == true
+			}).map((subItem) => {
+				return {
+					name: subItem['name'],
+					number: subItem['fetchNum']
+				}
+			})
+			console.log(that.examList);
+		},
+		closePopup() {
+			this.$refs.popup.close()
+		},
+		seeExam(name) {
+			console.log(name);
+			this.$refs.popup.open()
+		},
+		formSubmit() {
+			let that = this
+			that.$refs.examForm.validate().then(formData => {
+				console.log(formData);
+				that.$refs.popup.close()
+			})
+		},
+		initFetch(code) {
+			let that = this
+			that.showLoading = true
+			// 获取领料出库数据
+			that.$api.fetchExam.fetchExamList({
+				code,
+				role: uni.getStorageSync('roles').join(','),
+				flag: 0
+			}).then(res => {
+				console.log(code);
+				if (res.data.code == 200) {
+					if (res.data.data.rows.length == 0) {
 						that.showLoading = false
 						uni.showToast({
 							icon: 'none',
-							title: res.data.msg
+							title: '未查询到相关数据！'
 						})
+					} else {
+						that.showLoading = false
+						that.fetchMaterialList = res.data.data.rows
 					}
-				}).catch(err => {
-					console.log(err);
-				})
-			},
-			searchKeyword () {
-				this.initFetch(this.keywordVal)
-			}
+				} else {
+					that.showLoading = false
+					uni.showToast({
+						icon: 'none',
+						title: res.data.msg
+					})
+				}
+			}).catch(err => {
+				console.log(err);
+			})
 		},
-		onShow() {
-			let that = this
-			console.log(uni.getStorageSync('roles').join(','));
-			that.initFetch('')
+		searchKeyword() {
+			this.initFetch(this.keywordVal)
 		}
+	},
+	onShow() {
+		let that = this
+		console.log(uni.getStorageSync('roles').join(','));
+		that.initFetch('')
 	}
+}
 </script>
 
 <style lang="scss">
-	body{
-		background-color: #f8f8f8;
-		box-sizing: border-box;
-		padding-bottom: 10vh;
-	}
-	.ipt-area{
-		width: 95%;
-		margin: 20rpx auto;
-	}
-	.single-fetch{
-		width: 95%;
-		margin: 20rpx auto;
-		background-color: #fff;
-		border-radius: 15rpx;
+body {
+	background-color: #f8f8f8;
+	box-sizing: border-box;
+	padding-bottom: 10vh;
+}
+
+.ipt-area {
+	width: 95%;
+	margin: 20rpx auto;
+}
+
+.single-fetch {
+	width: 95%;
+	margin: 20rpx auto;
+	background-color: #fff;
+	border-radius: 15rpx;
+	box-sizing: border-box;
+	padding: 15rpx;
+	position: relative;
+
+	.fetch-upper {
+		width: 100%;
 		box-sizing: border-box;
 		padding: 15rpx;
-		position: relative;
-		.fetch-upper{
-			width: 100%;
-			box-sizing: border-box;
-			padding: 15rpx;
-			border-bottom: 1px solid #D7D7D7;
+		border-bottom: 1px solid #D7D7D7;
+		display: flex;
+		align-items: center;
+
+		.upper-lef {
+			width: 12%;
+			height: 5vh;
+			border-radius: 15rpx;
 			display: flex;
+			justify-content: center;
 			align-items: center;
-			.upper-lef{
-				width: 12%;
-				height: 5vh;
-				border-radius: 15rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				background-color: #3789FD;
-				color: #fff;
-				font-size: 24px;
-			}
-			.upper-rig{
-				flex: 1;
-				box-sizing: border-box;
-				padding: 10rpx 20rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
-				h4{
-					font-weight: normal;
-					font-size: 14px;
-				}
-			}
+			background-color: #3789FD;
+			color: #fff;
+			font-size: 24px;
 		}
-		.fetch-lower{
-			width: 100%;
+
+		.upper-rig {
+			flex: 1;
 			box-sizing: border-box;
-			padding: 15rpx;
-			view{
-				width: 100%;
-				display: flex;
-				align-items: center;
-				margin-bottom: 15rpx;
-				font-size: 14px;
-				span{
-					color: #9D9D9D;
-					padding-right: 20rpx;
-				}
-				h4{
-					color: #000;
-					font-size: 14px;
-					font-weight: normal;
-				}
-			}
-			view:last-child{
-				margin-bottom: 0;
-			}
-		}
-		.fetch-btns{
-			width: 100%;
-			box-sizing: border-box;
-			padding: 15rpx;
+			padding: 10rpx 20rpx;
 			display: flex;
-			justify-content: flex-end;
-			view{
-				box-sizing: border-box;
-				padding: 8rpx 25rpx;
-				border-radius: 15rpx;
-				color: #fff;
-				margin-right: 15rpx;
-				font-size: 14px;
-			}
-			view:last-child{
-				margin-right: 0;
-			}
-		}
-		.sticky-area{
-			position: absolute;
-			top: 20rpx;
-			right: 20rpx;
-			h4{
-				box-sizing: border-box;
-				padding: 8rpx 20rpx;
-				border-radius: 15rpx;
-				font-size: 14px;
+			flex-direction: column;
+			justify-content: space-around;
+
+			h4 {
 				font-weight: normal;
-				background-color: #fff;
-				border: 1px solid #3788FF; 
-				color: #3788FF;
+				font-size: 14px;
 			}
 		}
 	}
+
+	.fetch-lower {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 15rpx;
+
+		view {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			margin-bottom: 15rpx;
+			font-size: 14px;
+
+			span {
+				color: #9D9D9D;
+				padding-right: 20rpx;
+			}
+
+			h4 {
+				color: #000;
+				font-size: 14px;
+				font-weight: normal;
+			}
+		}
+
+		view:last-child {
+			margin-bottom: 0;
+		}
+	}
+
+	.fetch-btns {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 15rpx;
+		display: flex;
+		justify-content: flex-end;
+
+		view {
+			box-sizing: border-box;
+			padding: 8rpx 25rpx;
+			border-radius: 15rpx;
+			color: #fff;
+			margin-right: 15rpx;
+			font-size: 14px;
+		}
+
+		view:last-child {
+			margin-right: 0;
+		}
+	}
+
+	.sticky-area {
+		position: absolute;
+		top: 20rpx;
+		right: 20rpx;
+
+		h4 {
+			box-sizing: border-box;
+			padding: 8rpx 20rpx;
+			border-radius: 15rpx;
+			font-size: 14px;
+			font-weight: normal;
+			background-color: #fff;
+			border: 1px solid #3788FF;
+			color: #3788FF;
+		}
+	}
+}
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 41b20e1..f3bbc69 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,46 +9,44 @@
 			</view>
 		</view>
 		<view class="switch-log">
-			<view
-				:class="[{ active: switchStatus == 1 }]"
-				@click="switchUpper(1)"
-			>
+			<view :class="[{ active: switchStatus == 1 }]" @click="switchUpper(1)">
 				账号登录
 			</view>
-			<view
-				:class="[{ active: switchStatus == 2 }]"
-				@click="switchUpper(2)"
-			>
+			<view :class="[{ active: switchStatus == 2 }]" @click="switchUpper(2)">
 				手机登录
 			</view>
 		</view>
 		<view class="login-area">
-			<uni-forms v-show="switchStatus == 1" ref="accountForm" :modelValue="accountFormData" :rules="accountRules" class="form-area" label-position="top">
+			<uni-forms v-show="switchStatus == 1" ref="accountForm" :modelValue="accountFormData" :rules="accountRules"
+				class="form-area" label-position="top">
 				<uni-forms-item name="username" required label="用户名" label-width="100">
-					<uni-easyinput placeholder="请输入用户名称" maxlength="60" v-model="accountFormData.username"></uni-easyinput>
+					<uni-easyinput placeholder="请输入用户名称" maxlength="60"
+						v-model="accountFormData.username"></uni-easyinput>
 				</uni-forms-item>
 				<uni-forms-item name="password" required label="密码" label-width="100">
-					<uni-easyinput type="password" placeholder="请输入密码" maxlength="60" v-model="accountFormData.password"></uni-easyinput>
+					<uni-easyinput type="password" placeholder="请输入密码" maxlength="60"
+						v-model="accountFormData.password"></uni-easyinput>
 				</uni-forms-item>
-				<text
-					style="
+				<text style="
 						width: 100%; 
 						display: flex; 
 						justify-content: flex-end;
 						color: #3689FF;
 						font-size: 14px;
-					"
-				>
+					">
 					忘记密码
 				</text>
 				<button class="submit-btn" @click="accountSubmit">登录</button>
 			</uni-forms>
-			<uni-forms v-show="switchStatus == 2" ref="veriForm" :modelValue="veriFormData" :rules="veriRules" class="form-area" label-position="top">
+			<uni-forms v-show="switchStatus == 2" ref="veriForm" :modelValue="veriFormData" :rules="veriRules"
+				class="form-area" label-position="top">
 				<uni-forms-item name="phone" required label="手机号码" label-width="100">
-					<uni-easyinput placeholder="请输入手机号码" type="number" v-model="veriFormData.phone" maxlength="11"></uni-easyinput>
+					<uni-easyinput placeholder="请输入手机号码" type="number" v-model="veriFormData.phone"
+						maxlength="11"></uni-easyinput>
 				</uni-forms-item>
 				<uni-forms-item name="code" required label="验证码" label-width="100">
-					<uni-easyinput type="number" maxlength="6" placeholder="请输入验证码" v-model="veriFormData.code"></uni-easyinput>
+					<uni-easyinput type="number" maxlength="6" placeholder="请输入验证码"
+						v-model="veriFormData.code"></uni-easyinput>
 					<button class="count-down" :disabled="sendDisabled" @click="sendVeriCode" style="font-size: 14px;">
 						<span v-if="countDownStatus == 0">发送验证码</span>
 						<span v-if="countDownStatus == 1">
@@ -65,236 +63,245 @@
 
 <script>
 import { authPath, publicPath, systemPath } from '../../public'
-	export default {
-		data() {
-			return {
-				showLoading: false,
-				accountFormData: {
-					username: '',
-					password: ''
-				},
-				veriFormData: {
-					phone: '',
-					code: ''
-				},
-				switchStatus: 1,
-				countDown: 60,
-				countDownStatus: 0,
-				sendDisabled: false,
-				givenCode: '',
-				accountRules: {
-					username: {
-						rules: [
-							{
-								required: true,
-								errorMessage: '请输入用户名称！'
-							}
-						]
-					},
-					password: {
-						rules: [
-							{
-								required: true,
-								errorMessage: '请输入密码！'
-							}
-						]
-					}
-				},
-				veriRules: {
-					phone: {
-						rules: [
-							{
-								required: true,
-								errorMessage: '请输入手机号码！'
-							}
-						]
-					},
-					code: {
-						rules: [
-							{
-								required: true,
-								errorMessage: '请输入验证码！'
-							}
-						]
-					}
-				}
-			}
-		},
-		methods: {
-			switchUpper (count) {
-				this.switchStatus = count
+export default {
+	data() {
+		return {
+			showLoading: false,
+			accountFormData: {
+				username: '',
+				password: ''
 			},
-			sendVeriCode () {
-				let that = this
-				let phoneReg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/
-				if (!phoneReg.test(that.veriFormData.phone)) {
-					uni.showToast({
-						icon: 'none',
-						title: '请输入正确格式的手机号！'
-					})
-				} else {
-					that.$api.login.codeLogin({
-						phone: String(that.veriFormData.phone)
-					}).then(res => {
-						console.log(res);
-					}).catch(err => {
-						console.log(err);
-					})
-					that.countDownStatus = 1
-					that.sendDisabled = true
-					let timeInterval = setInterval(() => {
-						that.countDown -= 1
-					}, 1000)
-					let timeOut = setTimeout(() => {
-						that.countDownStatus = 0
-						that.countDown = 60
-						that.sendDisabled = false
-						clearInterval(timeInterval)
-						clearTimeout(timeOut)
-					}, 1000 * 60)
+			veriFormData: {
+				phone: '',
+				code: ''
+			},
+			switchStatus: 1,
+			countDown: 60,
+			countDownStatus: 0,
+			sendDisabled: false,
+			givenCode: '',
+			accountRules: {
+				username: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '请输入用户名称！'
+						}
+					]
+				},
+				password: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '请输入密码！'
+						}
+					]
 				}
 			},
-			veriSubmit () {
-				let that = this
-				that.$refs.veriForm.validate().then(formRes => {
-					that.showLoading = true
-					console.log(formRes);
-					that.$api.login.checkCode(formRes).then(res => {
-						console.log(res);
-						if (res.data.code == 200) {
-							uni.setStorageSync('userInfo', res.data.data)
-							uni.setStorageSync('token', res.data.data.token)
-							uni.setStorageSync('roles', res.data.data.login_user.roles)
-							uni.setStorageSync('deptId', res.data.data.login_user.sysUser.dept.deptId)
-							uni.showToast({
-								icon: 'none',
-								title: '登录成功！',
-								success: () => {
-									that.showLoading = false
-									uni.switchTab({
-										url: '/pages/index/index'
-									})
-								}
-							})
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: res.data.msg,
-								success: () => {
-									that.showLoading = false
-								}
-							})
+			veriRules: {
+				phone: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '请输入手机号码！'
 						}
-					}).catch(err => {
-						console.log(err);
-					})
-				})
-			},
-			accountSubmit () {
-				let that = this
-				that.$refs.accountForm.validate().then(formData => {
-					that.showLoading = true
-					console.log(formData);
-					that.$api.login.log(formData).then(res => {
-						console.log(res);
-						if (res.data.code == 200) {
-							uni.setStorageSync('userInfo', res.data.data.login_user)
-							uni.setStorageSync('token', res.data.data.access_token)
-							uni.setStorageSync('roles', res.data.data.login_user.roles)
-							uni.setStorageSync('deptId', res.data.data.login_user.sysUser.dept.deptId)
-							uni.showToast({
-								icon: 'none',
-								title: '登录成功！',
-								success: () => {
-									that.showLoading = false
-									uni.switchTab({
-										url: '/pages/index/index'
-									})
-								}
-							})
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: res.data.msg,
-								success: () => {
-									that.showLoading = false
-								}
-							})
+					]
+				},
+				code: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '请输入验证码！'
 						}
-					}).catch(err => {
-						console.log(err);
-					})
-				})
+					]
+				}
 			}
 		}
+	},
+	methods: {
+		switchUpper(count) {
+			this.switchStatus = count
+		},
+		sendVeriCode() {
+			let that = this
+			let phoneReg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/
+			if (!phoneReg.test(that.veriFormData.phone)) {
+				uni.showToast({
+					icon: 'none',
+					title: '请输入正确格式的手机号！'
+				})
+			} else {
+				that.$api.login.codeLogin({
+					phone: String(that.veriFormData.phone)
+				}).then(res => {
+					console.log(res);
+				}).catch(err => {
+					console.log(err);
+				})
+				that.countDownStatus = 1
+				that.sendDisabled = true
+				let timeInterval = setInterval(() => {
+					that.countDown -= 1
+				}, 1000)
+				let timeOut = setTimeout(() => {
+					that.countDownStatus = 0
+					that.countDown = 60
+					that.sendDisabled = false
+					clearInterval(timeInterval)
+					clearTimeout(timeOut)
+				}, 1000 * 60)
+			}
+		},
+		veriSubmit() {
+			let that = this
+			that.$refs.veriForm.validate().then(formRes => {
+				that.showLoading = true
+				console.log(formRes);
+				that.$api.login.checkCode(formRes).then(res => {
+					console.log(res);
+					if (res.data.code == 200) {
+						uni.setStorageSync('userInfo', res.data.data.login_user)
+						uni.setStorageSync('token', res.data.data.access_token)
+						uni.setStorageSync('roles', res.data.data.login_user.roles)
+						uni.setStorageSync('deptId', res.data.data.login_user.sysUser.dept.deptId)
+						uni.showToast({
+							icon: 'none',
+							title: '登录成功！',
+							success: () => {
+								that.showLoading = false
+								uni.switchTab({
+									url: '/pages/index/index'
+								})
+							}
+						})
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg,
+							success: () => {
+								that.showLoading = false
+							}
+						})
+					}
+				}).catch(err => {
+					console.log(err);
+				})
+			})
+		},
+		accountSubmit() {
+			let that = this
+			that.$refs.accountForm.validate().then(formData => {
+				that.showLoading = true
+				console.log(formData);
+				that.$api.login.log(formData).then(res => {
+					console.log(res);
+					if (res.data.code == 200) {
+						uni.setStorageSync('userInfo', res.data.data.login_user)
+						uni.setStorageSync('token', res.data.data.access_token)
+						uni.setStorageSync('roles', res.data.data.login_user.roles)
+						uni.setStorageSync('deptId', res.data.data.login_user.sysUser.dept.deptId)
+						uni.showToast({
+							icon: 'none',
+							title: '登录成功！',
+							success: () => {
+								that.showLoading = false
+								uni.switchTab({
+									url: '/pages/index/index'
+								})
+							}
+						})
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.data.msg,
+							success: () => {
+								that.showLoading = false
+							}
+						})
+					}
+				}).catch(err => {
+					console.log(err);
+				})
+			})
+		}
 	}
+}
 </script>
 
 <style lang="scss">
-	body{
-		background: url('/static/log-bgd.png');
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-	}
-	.upper-bgd{
-		width: 100%;
-		height: 25vh;
-		box-sizing: border-box;
-		padding-top: 10vh;
-		.logo{
-			width: 20%;
-			height: 10vh;
-			margin: 0 auto;
-			margin-bottom: 2vh;
-			image{
-				width: 100%;
-				height: 100%;
-			}
-		}
-		.tit{
-			width: 100%;
-			font-size: 20px;
-			font-weight: bold;
-			display: flex;
-			justify-content: center;
-			color: #3C87F3;
-		}
-	}
-	.switch-log{
-		width: 80%;
-		height: 100rpx;
-		margin: 6vh auto;
-		margin-bottom: 1vh;
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		font-size: 26rpx;
-		.active{
-			font-size: 14px;
-			font-weight: bold;
-			border-bottom: 4px solid #B4D0FF;
-			border-bottom-left-radius: 15rpx;
-			border-bottom-right-radius: 15rpx;
-		}
-	}
-	.login-area{
-		width: 80%;
-		box-sizing: border-box;
-		padding: 3vh;
+body {
+	background: url('/static/log-bgd.png');
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+}
+
+.upper-bgd {
+	width: 100%;
+	height: 25vh;
+	box-sizing: border-box;
+	padding-top: 10vh;
+
+	.logo {
+		width: 20%;
+		height: 10vh;
 		margin: 0 auto;
-		background-color: #fff;
-		border-radius: 20rpx;
-		box-shadow: 0 3px 5px #E6EEFE;
-		.uni-forms-item__content[data-v-61dfc0d0]{
-			display: flex;
-		}
-		.submit-btn{
-			background-color: #3888FF;
-			margin: 10vh auto;
-			margin-bottom: 0;
-			border-radius: 50rpx;
-			color: #fff;
-			font-size: 26rpx;
+		margin-bottom: 2vh;
+
+		image {
+			width: 100%;
+			height: 100%;
 		}
 	}
+
+	.tit {
+		width: 100%;
+		font-size: 20px;
+		font-weight: bold;
+		display: flex;
+		justify-content: center;
+		color: #3C87F3;
+	}
+}
+
+.switch-log {
+	width: 80%;
+	height: 100rpx;
+	margin: 6vh auto;
+	margin-bottom: 1vh;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	font-size: 26rpx;
+
+	.active {
+		font-size: 14px;
+		font-weight: bold;
+		border-bottom: 4px solid #B4D0FF;
+		border-bottom-left-radius: 15rpx;
+		border-bottom-right-radius: 15rpx;
+	}
+}
+
+.login-area {
+	width: 80%;
+	box-sizing: border-box;
+	padding: 3vh;
+	margin: 0 auto;
+	background-color: #fff;
+	border-radius: 20rpx;
+	box-shadow: 0 3px 5px #E6EEFE;
+
+	.uni-forms-item__content[data-v-61dfc0d0] {
+		display: flex;
+	}
+
+	.submit-btn {
+		background-color: #3888FF;
+		margin: 10vh auto;
+		margin-bottom: 0;
+		border-radius: 50rpx;
+		color: #fff;
+		font-size: 26rpx;
+	}
+}
 </style>