Merge branch 'master' into master-uat

pages.json

@@ -159,6 +159,33 @@
             }
             
         }
+        ,{
+            "path" : "pages/login/login",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/projectDepartment/homePage/homePage",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/projectDepartment/exportApplication/exportApplication",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	

pages/projectDepartment/exportApplication/exportApplication.vue

@@ -0,0 +1,188 @@
+<template>
+	<view>
+		<view class="head">
+			<u-navbar title="出库申请"></u-navbar>
+			<view class="tabs">
+				<u-tabs bar-width="80" inactive-color="#777777" active-color="#101010":list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+			      <view class="screen" @click="changeShow()">
+			      	  筛选<u-icon size="24" name="arrow-down" color="#777777"></u-icon>
+			      </view>
+				  <view class="options" v-if="this.show==true" @click="changeShow()">
+				  	选项3
+				  </view>
+			</view>
+	
+		</view>
+		<view class="list1" v-if="this.current==0">
+			<view class="item" v-for="item in 2">
+				<view class="title">
+					刘群的出库申请
+				</view>
+				<view class="group">
+					<view class="name">
+						申请人：
+					</view>
+					<view class="value">
+						刘群
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						申请时间：
+					</view>
+					<view class="value">
+					2023/03/15 16:15
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="list2" v-if="this.current==1" > 
+			<view class="item" v-for="item in 2">
+				<view class="title">
+					刘群的出库申请2
+				</view>
+				<view class="group">
+					<view class="name">
+						申请人：
+					</view>
+					<view class="value">
+						刘群
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						申请时间：
+					</view>
+					<view class="value">
+					2023/03/15 16:15
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		
+		<view class="bottom">
+			<button>填写出库申请</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '未审批'
+				}, {
+					name: '已审批'
+				}	
+				],
+				current: 0,
+				show:false
+			}
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+			},
+			changeShow(){
+				this.show=!this.show
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom: 100rpx;
+		
+	}
+	.head{
+		background: linear-gradient(180deg, rgba(190,211,240,1) 0%,rgba(244,244,246,1) 100%) ;
+		height: 590rpx;
+		padding: 0 32rpx;
+		/deep/.u-navbar{
+			background: 0!important;
+		}
+		/deep/.u-border-bottom:after{
+			height: 0;
+		}
+	}
+	.tabs{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		/deep/.u-tabs{
+			background: 0 !important;
+			width: 250rpx;
+		}
+		/deep/.u-tab-bar{
+			background-color: #2A8EFB !important;
+		}
+		.screen{
+			color: #415058;
+			position: relative;
+			font-family: Microsoft Yahei;
+			/deep/.uicon-arrow-down{
+				margin-left: 4rpx;
+			}
+		}
+		.options{
+			width: 120rpx;
+			height: 60rpx;
+			line-height: 60rpx;
+			text-align: center;
+			background-color: #fff;
+			color: rgba(65, 80, 88, 1);
+			font-family: Microsoft Yahei;
+			position: absolute;
+			top: 160rpx;
+			right: 24rpx;
+			box-shadow:5px 5px 10px gray;
+		}
+		
+	}
+
+
+ .list1,.list2{
+	 padding: 0 32rpx;
+	 margin-top: -400rpx;
+	 .item{
+		 border-radius: 8px;
+		 background-color: rgba(255, 255, 255, 1);
+		 padding: 32rpx;
+		 margin-bottom: 24rpx;
+		 .title{
+			 color: rgba(51, 51, 51, 1);
+			 font-size: 36rpx;
+			 margin-bottom: 16rpx;
+		 }
+		 .group{
+			 display: flex;
+			 color: rgba(119, 119, 119, 1);
+			 margin-top: 16rpx;
+			 font-weight: bold;
+		 }
+	 }
+	 
+ }
+
+.bottom{
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	background-color: #fff;
+	padding: 16rpx 32rpx;
+	uni-button{
+		height: 88rpx;
+		line-height: 88rpx;
+		border-radius: 8px;
+		background: linear-gradient(180deg, rgba(22,119,255,1) 0%,rgba(16,98,213,1) 100%);
+		color: rgba(255, 255, 255, 1);
+		font-size: 32rpx;
+		font-family: Microsoft Yahei;
+	}
+}
+</style>

pages/projectDepartment/homePage/homePage.vue

@@ -0,0 +1,218 @@
+<template>
+	<view>
+		<view class="container">
+
+
+			<!-- 头部 -->
+			<view class="header">
+				<view class="main">
+					<view class="title">
+						<view class="name">
+							<view class="text">
+								你好，孙斌！
+							</view>
+							<view class="icon">
+								<u-icon name='arrow-down' color="#fff" size="28"></u-icon>
+							</view>
+						</view>
+
+					</view>
+					<!-- 公告 -->
+					<view class="notice">
+
+						<u-icon name="volume-up-fill" size="40" color="#fff"></u-icon>
+						<text>库存PDA设备将于2023年4月1日升级维护</text>
+					</view>
+				</view>
+
+			</view>
+			<!-- 宫格 -->
+			<view class="gird-scoll">
+				<view class="gird">
+					<view class="item">
+						<view class="title">
+							出库申请
+						</view>
+						<view class="hint">
+							提交出库申请单据
+						</view>
+						<view class="img">
+							<img src="../../../assets/img/projectGird1.png" alt="">
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							出库审核
+						</view>
+						<view class="hint">
+							审批出库申请单据
+						</view>
+						<view class="img">
+							<img src="../../../assets/img/projectGird2.png" alt="">
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							设备归还
+						</view>
+						<view class="hint">
+							提交设备归还单据
+						</view>
+						<view class="img">
+							<img src="../../../assets/img/projectGird3.png" alt="">
+						</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							设备检索
+						</view>
+						<view class="hint">
+							库存物品信息检索
+						</view>
+						<view class="img">
+							<img src="../../../assets/img/projectGird4.png" alt="">
+						</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: rgba(1, 122, 255, 1);
+		padding-bottom: 100rpx;
+		overflow-y: hidden;
+	}
+
+	.container {
+		overflow-y: hidden;
+		text-align: center;
+		position: relative;
+		min-height: 600px;
+	}
+
+	// 头部
+	.header {
+		width: 100%;
+		height: 219px;
+		background: linear-gradient(180deg, rgba(0, 45, 194, 1) 0%, rgba(0, 59, 254, 1) 49%, rgba(1, 122, 255, 1) 100%);
+		padding: 0 40rpx;
+
+		.main {
+			width: 100%;
+			height: 100%;
+			background: url(../../../assets/img/projecIndexCover.png) no-repeat;
+			background-position: top -70rpx right -50rpx;
+			position: relative;
+		}
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			color: rgba(255, 255, 255, 1);
+			line-height: 88rpx;
+
+			.name {
+				display: flex;
+				font-size: 40rpx;
+
+			}
+
+		}
+
+		// 公告
+		.notice {
+			display: flex;
+			align-items: center;
+			background-color: rgba(255, 255, 255, 0.35);
+			color: rgba(255, 255, 255, 1);
+			font-weight: bold;
+			border-radius: 8px;
+			height: 80rpx;
+			line-height: 80rpx;
+			padding: 0 24rpx;
+			position: absolute;
+			bottom: 30rpx;
+			left: 0;
+			right: 0;
+
+			text {
+				font-size: 28rpx;
+				width: 542px;
+				margin-left: 16rpx;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
+	}
+
+	// 宫格
+	.gird-scoll {
+		height: 600px;
+		overflow-y: auto;
+		position: absolute;
+	}
+
+	.gird {
+		padding: 0 40rpx;
+		display: flex;
+		justify-content: space-between;
+		align-content: flex-start;
+		flex-wrap: wrap;
+		height: 700px;
+
+		.item {
+			width: 320rpx;
+			height: 320rpx;
+			background-color: rgba(255, 255, 255, 1);
+			border-radius: 8px;
+			padding: 32rpx 24rpx;
+			position: relative;
+			margin-bottom: 30rpx;
+
+			.title {
+				color: rgba(16, 16, 16, 1);
+				font-size: 36rpx;
+				margin-bottom: 8rpx;
+				font-family: 'Alibaba-PuHuiTi-Regular';
+			}
+
+			.hint {
+				color: rgba(106, 121, 142, 1);
+				font-size: 24rpx;
+				margin-bottom: 44rpx;
+			}
+
+			.img {
+				width: 128rpx;
+				height: 128rpx;
+				position: absolute;
+				right: 24rpx;
+				bottom: 24rpx;
+
+				img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+	}
+</style>

pages/storeManagement/equipmentRetrieval/equipmentDetail.vue

@@ -491,7 +491,7 @@
 			  margin-top: 16rpx;
 			  .item{
 				  font-size: 24rpx;
-				  width: 230rpx;
+				  width: 300rpx;
 				  display: flex;
 				  margin-bottom: 16rpx;
 				  color: rgba(119, 119, 119, 1);