入库， 归还 调整

apis/pagejs/projectDepartment.js

@@ -8,6 +8,14 @@ export function outApplyList(data) {
 		data: data,
 		url: url
 	})
+}
+export function inApplyList(data) {
+	var url = '/mobile/in/inApplyList';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
 }
 // export function outRecord(data) {
 // 	var url = '/mobile/out/outRecord';
@@ -36,6 +44,19 @@ export function saveOutRecord(data) {
 		url: url
 	})
 }
+
+export function saveInRecord(data) {
+	var url = '/mobile/in/saveOutRecord';
+	return request({
+		//	header:{'Content-Type':'application/json'},
+
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+
 
 export function createOutRecord(data) {
 	var url = '/mobile/out/createOutRecord';
@@ -61,4 +82,22 @@ export function queryDeviceByCode(data) {
 		data: data,
 		url: url
 	})
-}
+}
+export function cancelOutRecord(data) {
+	var url = '/mobile/out/cancelOutRecord';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+
+export function inRecordDetail(data) {
+	var url = '/mobile/in/inRecordDetail';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

apis/pagejs/storeManagement.js

@@ -44,3 +44,21 @@ export function saveRecordOut(data) {
 	})
 }
 
+
+export function inWaitList(data) {
+	var url = '/mobile/in/inWaitList';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+export function inRecordDetail(data) {
+	var url = '/mobile/in/inRecordDetail';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

apis/status.js

@@ -15,7 +15,10 @@ export const recordStatus = (val,item) => {
 			retu = '已驳回'
 				break;
 		case '3':
-				retu = '完成出库'
+				retu = '完成出库'
+				break;
+			case '5':
+				retu = '已撤销'
 			break;
 	}
 	if(item&&item.statusN&&!retu){
@@ -43,6 +46,9 @@ export const recordStatusColor = (val) => {
 		case '3':
 			retu = '#3a3bc2'
 			break;
+		case '5':
+			retu = '#c94031'
+			break;
 		default:
 			retu = '#52b56b'
 			break;

config/.env.dev.js

@@ -13,8 +13,8 @@ const UNI_APP = {
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	//openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
-	//openId:"123456",//库管理
-	openId:"123",// 项目部 - 审批1
+	openId:"123456",//库管理
+	//openId:"123",// 项目部 - 审批1
 	//openId:"223",// 项目部 - 审批2
 	//openId:"323",// 项目部 - 审批3
 	//openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所

pages.json

@@ -76,7 +76,7 @@
             
         }
         ,{
-            "path" : "pages/storeManagement/equipmentEnter/enterDetails",
+            "path" : "pages/storeManagement/equipmentEnter/deliveryDetails",
             "style" :                                                                                    
             {
                 //navigationBarTitleText": "",
@@ -128,7 +128,16 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        }
+		,{
+		    "path" : "pages/index/equipmentRetrieval/equipmentInfo",
+		    "style" :                                                                                    
+		    {
+		        //navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
         ,{
             "path" : "pages/otherFunctions/messageCenter/messageCenter",
             "style" :                                                                                    

pages/index/equipmentRetrieval/equipmentDetail.vue

@@ -139,7 +139,7 @@
 					</view>
 					<!-- 提示 -->
 					<view class="hint">
-						<u-alert-tips  icon="bell-fill" show-icon="true" type="warning" :title="title" :description="description"></u-alert-tips>
+						<u-alert-tips  icon="bell-fill"  type="warning" :show-icon="true" :title="title" :description="description"></u-alert-tips>
 					</view>
 					
 					<view class="inspection-contents">
@@ -266,6 +266,8 @@
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/index.js'
+	
 	export default {
 		data() {
 			return {
@@ -275,15 +277,40 @@
 					name: '设备信息'
 				}, {
 					name: '设备位置'
-				}, {
-					name: '巡检记录',
-				},{
-					name:'出入库记录'
-				}],
-				current: 0
+				}
+				// , {
+				// 	name: '巡检记录',
+				// },{
+				// 	name:'出入库记录'
+				// },
+				
+				],
+				current: 0,
+				title:""
 			}
 		},
 		methods: {
+			onLoad(op){
+				this.name=op.name
+				this.getInfo()
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.deviceDetailsByName({
+					
+					name:this.name
+				}).then((res) => {
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 			change(index) {
 				this.current = index;
 			}

pages/index/equipmentRetrieval/equipmentInfo.vue

@@ -0,0 +1,506 @@
+<template>
+	<view>
+		<u-navbar title="接地线无杆(新）"></u-navbar>
+		<!-- 图片 -->
+		<view class="picture">
+			<img :src="info.img" alt="">
+			<view class="amount">
+				<text>1</text>/
+				<text>5</text>
+			</view>
+		</view>
+		<!-- 信息 -->
+		<view class="main">
+			<view class="title">
+				接地线无杆(新）
+			</view>
+			<!-- 标签 -->
+			<view class="tabs ">
+				<u-tabs bar-width="120" inactive-color="#999999" active-color="#000000"   :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+			</view>
+			<view class="content">
+				<!-- 设备信息 -->
+				<view class="infos">
+					<view class="name">
+					<view class="icon"><img src="@/assets/img/riLine-robot-line@1x.png" alt=""></view>
+					<view class="text">
+						设备信息
+					</view>
+					</view>
+					
+					<view class="details">
+						<view class="item">
+							<view class="item-title">
+								规格
+							</view>
+							<view class="item-value">
+								220kV
+							</view>
+						</view>
+						
+						<view class="item" >
+							<view class="item-title">
+								购置时间
+							</view>
+							<view class="item-value">
+								2022.5
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								数量
+							</view>
+							<view class="item-value">
+								48
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								设备状况
+							</view>
+							<view class="item-value">
+								合格
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								单位
+							</view>
+							<view class="item-value">
+								根
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								试验时间
+							</view>
+							<view class="item-value">
+								2022.05.19
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								制造厂家
+							</view>
+							<view class="item-value">
+								鸿瑞电力工程有限公司
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								试验周期
+							</view>
+							<view class="item-value">
+								1年
+							</view>
+						</view>
+						<view class="item" >
+							<view class="item-title">
+								单价
+							</view>
+							<view class="item-value">
+								无
+							</view>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+			<!-- 存放地点 -->
+			<view class="content">
+				<view class="infos">
+					<view class="name">
+					<view class="icon"><img src="@/assets/img/riLine-robot-line@1x.png" alt=""></view>
+					<view class="text">
+						存放地点
+					</view>
+					</view>
+					
+					<view class="details">
+						<view class="location">
+							荆力总包仓库A区C货架2-12
+						</view>
+					</view>
+					
+				</view>
+			</view>
+			<!-- 巡检记录 -->
+			<view class="content">
+				<view class="infos">
+					<view class="name">
+					<view class="icon"><img src="@/assets/img/riLine-device-recover-line@1x.png" alt=""></view>
+					<view class="text">
+						巡检记录
+					</view>
+					
+					<view class="all">
+						全部记录<u-icon name="arrow-right"></u-icon>
+					</view>
+					</view>
+					<!-- 提示 -->
+					<view class="hint">
+						<u-alert-tips  icon="bell-fill" show-icon="true" type="warning" :title="title" :description="description"></u-alert-tips>
+					</view>
+					
+					<view class="inspection-contents">
+						<view class="inspection-title">
+							<view class="text">
+								巡检内容名称
+							</view>
+							<view class="state">
+								合格
+							</view>
+						</view>
+						<view class="inspection-infos">
+							<view class="inspection-personnel">
+								<view class="inspection-name">
+									巡检人：
+								</view>
+								<view class="value">
+									孙斌
+								</view>
+							</view>
+							<view class="inspection-date">
+								2023/03/15 09:45:21
+							</view>
+						</view>
+						
+					</view>
+				</view>
+			</view>
+			<!-- 出入库记录 -->
+			<view class="content">
+				<view class="infos">
+					<view class="name">
+					<view class="icon"><img src="@/assets/img/riLine-todo-line@1x.png" alt=""></view>
+					<view class="text">
+						出入库记录
+					</view>
+					<view class="all">
+						全部记录<u-icon name="arrow-right"></u-icon>
+					</view>
+					</view>
+					<view class="records">
+						<view class="records-title">
+							洪湖华电光伏线路
+						</view>
+						<view class="records-infos">
+							<view class="item">
+								<view class="item-title">
+									借用数量：
+								</view>
+								<view class="item-value">
+									4
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									借出时间：
+								</view>
+								<view class="item-value">
+									2023.2.13
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									借用人：
+								</view>
+								<view class="item-value">
+									丁文
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									归还时间：
+								</view>
+								<view class="item-value highlight">
+									未归还
+								</view>
+							</view>
+						</view>
+					</view>
+					
+					<view class="records">
+						<view class="records-title">
+							仙桃华润恒升线路
+						</view>
+						<view class="records-infos">
+							<view class="item">
+								<view class="item-title">
+									借用数量：
+								</view>
+								<view class="item-value">
+									4
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									借出时间：
+								</view>
+								<view class="item-value">
+									2023.2.13
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									借用人：
+								</view>
+								<view class="item-value">
+									丁文
+								</view>
+							</view>
+							<view class="item">
+								<view class="item-title">
+									归还时间：
+								</view>
+								<view class="item-value">
+									2023.4.1
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info:{},
+				description: '下次巡检时间：2023/03/30',
+				list: [{
+					name: '设备信息'
+				}, {
+					name: '设备位置'
+				}, {
+					name: '巡检记录',
+				},{
+					name:'出入库记录'
+				}],
+				current: 0
+			}
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom:100px;
+	}
+	/deep/.u-line-1{
+		overflow: inherit;	
+	}
+	// 图片
+	.picture{
+		width: 100%;
+		height: 400rpx;
+		overflow: hidden;
+		position: relative;
+		img{
+			width: 100%;
+			height: 100%;
+		}
+		.amount{
+			width: 108rpx;
+			height: 48rpx;
+			line-height: 48rpx;
+			border-radius: 4px;
+			background-color: rgba(0, 0, 0, 1);
+			color: rgba(255, 255, 255, 1);
+			font-size: 28rpx;
+			text-align: center;
+			font-family: Arial;
+			position: absolute;
+			bottom: 48rpx;
+			right: 32rpx;
+		}
+	}
+  // 信息
+  .main{
+	  border-radius: 16px 16px 0px 0px;
+	  background-color: #ffffff;
+	  padding-top: 24rpx;
+	  margin-top:-24rpx;
+	  z-index: 999;
+	  position: relative;
+	  .title{
+		  color: rgba(51, 51, 51, 1);
+		  font-size: 36rpx;
+		  margin-bottom: 24rpx;
+		  padding:0 32rpx;
+	  }
+	  // 标签
+	  .tabs{
+		  position: sticky;
+		  top: 0;
+		  z-index: 9999;
+		  /deep/.u-tab-bar{
+			  background-color: #2A8EFB !important;
+			  bottom:-8rpx;
+		  }
+	  }
+	
+	  
+	  .content{
+		  
+		  border-top: 1px solid #B7BDBF;
+		  .infos{
+			  padding: 32rpx;
+		  }
+		  .name{
+			  font-size: 32rpx;
+			  margin-bottom: 16rpx;
+			  display: flex;
+			  align-items: center;
+			  color: rgba(51, 51, 51, 1);
+			  .icon{
+				  width: 32rpx;
+				  height: 32rpx;
+				  margin-right: 8rpx;
+				  img{
+					  width: 100%;
+					  height: 100%;
+				  }
+			  }
+			 .text{
+				 line-height: 50rpx;
+			 }
+		  }
+		  .all{
+			  margin-left: auto;
+			  color: rgba(119, 119, 119, 1);
+			  font-size: 24rpx;
+		  }
+		  // 提示
+		  .hint{
+			  /deep/.u-alert-desc{
+				  color: rgba(255, 121, 0, 1);
+				  font-size: 28rpx
+			  }
+		  }
+		  .details{
+			  border-radius: 8px;
+			  background-color: rgba(245, 246, 249, 1);
+			  padding: 24rpx 24rpx 8rpx 24rpx;
+			  display: flex;
+			  justify-content: space-between;
+			  flex-wrap: wrap;
+			  .item{
+				  display: flex;
+				  margin-bottom: 16rpx;
+				  font-size: 24rpx;
+				  width: 45%;
+				  .item-title{
+					  width: 96rpx;
+					  color: rgba(119, 119, 119, 1);	  
+				  }
+				  @media screen and (max-width: 375px) {
+				     .item-title{
+				     	width: 120rpx;
+				     					  
+				     }
+				  }
+				  @media screen and (max-width: 300px) {
+				     .item-title{
+				     	width: 130rpx;
+				     					  
+				     }
+				  }
+				  .item-value{
+					  flex: 1;
+					  color: rgba(51, 51, 51, 1);
+					  margin-left: 16rpx;
+					  white-space: nowrap;
+					  overflow: hidden;
+					  text-overflow: ellipsis;
+				  }
+			  }
+			  
+			  .location{
+				  color: rgba(51, 51, 51, 1);
+				  padding-bottom: 8rpx;
+			  }
+		  }
+	  }
+	  
+	  .inspection-contents{
+		  border-radius: 8px;
+		  background-color: rgba(245, 246, 249, 1);
+		  padding: 24rpx ;
+		  margin-top: 16rpx;
+		  .inspection-title{
+			  display: flex;
+			  justify-content: space-between;
+			  align-items: center;
+			  font-weight: bold;
+			  color: rgba(51, 51, 51, 1);
+			  .state{
+				  width: 80rpx;
+				  height: 48rpx;
+				  line-height: 48rpx;
+				  border-radius: 4px;
+				  background-color: rgba(255, 255, 255, 1);
+				  color: rgba(0, 185, 98, 1);
+				  font-size: 24rpx;
+				  text-align: center;
+				  font-family: Microsoft Yahei;
+				  border: 1px solid rgba(141, 217, 181, 1);
+			  }
+			  
+		  }
+		  .inspection-infos{
+			  display: flex;
+			  justify-content: space-between;
+			  align-items: center;
+			  font-size: 24rpx;
+			  margin-top: 8rpx;
+			  line-height: 36rpx;
+			  .inspection-personnel{
+			  			  display: flex;
+						  align-items: center;
+			  			  color: rgba(119, 119, 119, 1);
+			  			  
+			  };
+			  .date{
+				  color: rgba(119, 119, 119, 1);
+				  
+			  }
+		  }
+		  
+	  }
+	  // 出入库记录
+	  .records{
+		  border-radius: 8px;
+		  background-color: rgba(245, 246, 249, 1);
+		  padding: 24rpx 24rpx 8rpx 24rpx ;
+		  margin-top: 16rpx;
+		  .records-title{
+			  font-weight: bold;
+			  color: #333333;
+		  }
+		  .records-infos{
+			  display: flex;
+			  flex-wrap: wrap;
+			  margin-top: 16rpx;
+			  .item{
+				  font-size: 24rpx;
+				  width: 300rpx;
+				  display: flex;
+				  margin-bottom: 16rpx;
+				  color: rgba(119, 119, 119, 1);
+			  }
+		  }
+	  }
+  }
+  .highlight{
+	  color:#E60012
+  }
+</style>

pages/index/homePage.vue

@@ -102,7 +102,7 @@
 					<img src="@/assets/img/projectGird2.png" alt="">
 				</view>
 			</view>
-			<view class="item"  @click="gotoUrl('pages/storeManagement/equipmentDelivery/equipmentDelivery')">
+			<view class="item"  @click="gotoUrl('pages/projectDepartment/branch/exportReturn/exportReturn')">
 				<view class="title">
 					设备归还
 				</view>

pages/projectDepartment/branch/exportApplication/deliveryDetails.vue

@@ -7,7 +7,6 @@
 			<view class="photo">
 				<u-avatar size="84" :src="outUser.headImg"></u-avatar>
 				
-				
 			</view>
 			<view class="name">
 				{{outUser.name}}
@@ -15,7 +14,10 @@
 			<view class="submit">
 				提交了<text>出库申请</text>
 			</view>
-			<view class="state">
+			<view class="state" :style="{
+				color:recordStatusColor(info.status),
+				borderColor:recordStatusColor(info.status)
+			}">
 				{{recordStatus(info.status)}}
 			</view>
 		</view>
@@ -126,7 +128,7 @@
 	<!-- 确认出库 -->
 	<view class="bottom" >
 		<!-- <button>确认出库</button> -->
-		<u-button  v-if="info.status==0" type="revoke" >撤销</u-button>
+		<u-button  v-if="info.status==0" type="revoke" @click="revokeBtn" >撤销</u-button>
 		<u-button   v-if="info.status==1" type="primary" >签字验收</u-button>
 	</view>
 	</view>
@@ -135,7 +137,7 @@
 <script>
 	import * as API from '@/apis/pagejs/projectDepartment.js'
 	import {
-		recordStatus
+		recordStatus,recordStatusColor
 	} from '@/apis/status.js'
 	import approveList from "@/components/ApproveList.vue"
 	
@@ -159,6 +161,7 @@
 			this.getInfo()
 		},
 		methods: {
+			recordStatusColor,
 			recordStatus,
 			getList(){
 				
@@ -177,7 +180,41 @@
 					})
 				})
 			},
-			getInfo(){
+			revokeMethod(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.cancelOutRecord({
+					recordId:this.id,
+				
+				}).then((res) => {
+					uni.hideLoading();
+					
+					this.getInfo(true)
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			revokeBtn(){
+				var _this=this
+				uni.showModal({
+					content:"确认是否撤销?",
+					title:"提示",
+					success(res) {
+					
+						if(res.confirm){
+							_this.revokeMethod()
+						}else{
+							
+						}
+					}
+				})
+			},
+			getInfo(bl){
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -189,7 +226,14 @@
 					this.info=res.data.outRecord;
 					this.approveList=res.data.approveList;
 					this.outUser=res.data.outUser;
-					this.getList()
+					if(bl){
+						const eventChannel = this.getOpenerEventChannel();
+						eventChannel.emit('refreshData');
+						uni.hideLoading();
+					}else{
+							this.getList()
+					}
+				
 				}).catch(error => {
 					uni.showToast({
 						title: error,

pages/projectDepartment/branch/exportProcess/deliveryDetails.vue

@@ -260,6 +260,7 @@
 				}
 				var _this=this;
 				uni.showModal({
+					title:"提示",
 					content:"是否"+message+"出库审批",
 					success(res) {
 						_this.saveRecordApprove(status);

pages/projectDepartment/branch/exportReturn/deliveryDetails.vue

@@ -1,21 +1,24 @@
 <template>
 	<view >
-		<u-navbar title="出库单详情"></u-navbar>
+		<u-navbar title="归还单详情"></u-navbar>
 		<!-- 出库单状态 -->
 		<view class="container">
 		<view class="head">
 			<view class="photo">
-				<u-avatar size="84" :src="item.userImg"></u-avatar>
+				<u-avatar size="84" :src="outUser.userImg"></u-avatar>
 				
 			</view>
 			<view class="name">
-				刘群
+				{{info.createByName}}
 			</view>
 			<view class="submit">
-				提交了<text>出库申请</text>
+				提交了<text>入库申请</text>
 			</view>
-			<view class="state">
-				待出库
+			<view class="state" :style="{
+				color:recordStatusColor(info.status),
+				borderColor:recordStatusColor(info.status)
+			}">
+				{{info.status=='1'?'已入库':'待入库'}}
 			</view>
 		</view>
 		<!-- 出库单详情 -->
@@ -25,31 +28,16 @@
 					所属项目
 				</view>
 				<view class="value">
-					洪湖文泉110kV变电站二期
-				</view>
-			</view>
-			<view class="item">
-				<view class="name">
-					需求时间
-				</view>
-				<view class="value">
-					无
-				</view>
-			</view>
-			<view class="item">
-				<view class="name">
-					使用周期至
-				</view>
-				<view class="value">
-					2023年6月30日
+					{{info.projectName}}
 				</view>
 			</view>
+			
 			<view class="item">
 				<view class="name">
-					申请时间
+					创建时间
 				</view>
 				<view class="value">
-					2023年3月27日 11:00
+					{{info.createTime}}
 				</view>
 			</view>
 
@@ -61,28 +49,28 @@
 					出库设备清单
 				</view>
 				<view class="amount">
-					全部 <text>18</text> 件设备
-					<u-icon name="arrow-right"></u-icon>
+					全部 <text>{{deviceInfoList.length}}</text> 件设备
+					<!-- <u-icon name="arrow-right"></u-icon> -->
 				</view>
 			</view>
 			<!-- 清单信息 -->
-			<view class="list-infos" v-for="item in 2">
+			<view class="list-infos" v-for="(item,i) in deviceInfoList" :key="i" >
 				<view class="infos-head">
 					<view class="name">
-						接地线 220kV 无杆
+						{{item.title}}
 					</view>
-					<view class="state">
-						预出库 <text>2</text>
+					<view class="state" v-if="false">
+						 <text>2</text>
 					</view>
 				</view>
 				<view class="infos">
 					<view class="infos-1">
 						<view class="infos-item">
 							<view class="item-name">
-								型号：
+								编号：
 							</view>
 							<view class="item-value">
-								GZYV GYVZ-50
+								{{item.code}}
 							</view>
 						</view>
 						<view class="infos-item">
@@ -90,25 +78,25 @@
 								单位：
 							</view>
 							<view class="item-value">
-								台
+								{{item.unit}}
 							</view>
 						</view>
 					</view>
 					<view class="infos-2">
 						<view class="infos-item">
 							<view class="item-name">
-								单位：
+								规格：
 							</view>
 							<view class="item-value">
-								台
+								{{item.specifications}}
 							</view>
 						</view>
 						<view class="infos-item">
 							<view class="item-name">
-								库存：
+								型号：
 							</view>
 							<view class="item-value">
-								20
+								{{item.model}}
 							</view>
 						</view>
 					</view>
@@ -118,166 +106,57 @@
 			</view>
 
 		</view>
-		<!-- 流程 -->
-		<view class="process">
-			<view class="title">
-				流程
-			</view>
-			<u-time-line>
-
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view>
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view class="u-order">
-							<view class="u-order-desc">
-								<view class="level">
-									项目部
-								</view>
-								<view class="date">
-									2023-03-26 13:00
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-									李天择
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view class="">
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view class="u-order">
-							<view class="u-order-desc">
-								<view class="level">
-									部门负责人
-								</view>
-								<view class="date">
-									2023-03-26 13:00
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-									李天择
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view>
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view class="u-order">
-							<view class="u-order-desc">
-								<view class="level">
-									主管领导
-								</view>
-								<view class="date">
-									2023-03-26 13:00
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-									李天择
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view class="">
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view class="u-order">
-							<view class="u-order-desc">
-								<view class="level">
-									仓库管理
-								</view>
-								<view class="state">
-									等待出库
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-gradienter-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-								   周乐心
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-			</u-time-line>
-		</view>
+		
     </view>
 	<!-- 确认出库 -->
-	<view class="bottom" >
+	<view class="bottom" v-if="false" >
 		<button>确认出库</button>
 	</view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/projectDepartment.js'
+	import {
+		recordStatus,recordStatusColor
+	} from '@/apis/status.js'
+	
 	export default {
 		data() {
 			return {
-
+				id:"",
+				info:{},
+				outUser:{
+					userImg:""
+				},
+				deviceInfoList:{},
+			}
+		},
+		onLoad(op){
+			this.id=op.id
+			this.getInfo()
+		},
+		methods:{
+			recordStatus,recordStatusColor,
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.inRecordDetail({
+					id:this.id,
+				}).then((res) => {
+					uni.hideLoading();
+					this.info=res.data.inRecord;
+					this.deviceInfoList=res.data.deviceInfoList;
+					//this.outUser=res.data.outUser;
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			}
 		}
 	}

pages/projectDepartment/branch/exportReturn/deliveryFrom.vue

@@ -1,57 +1,34 @@
 <template>
 	<view >
-		<u-navbar title="出库单详情"></u-navbar>
-		<!-- 出库单状态 -->
-		<view class="container">
-		<view class="head">
-			<view class="photo">
-				<u-avatar size="84" :src="item.userImg"></u-avatar>
-				
-			</view>
-			<view class="name">
-				刘群
-			</view>
-			<view class="submit">
-				提交了<text>出库申请</text>
-			</view>
-			<view class="state">
-				待出库
+		<u-navbar title="申请归还">
+			<view slot="right" style="margin-right: 10px;">
+			
+				<u-icon name="scan" size="48" @click="gotoscan('')"></u-icon>
 			</view>
-		</view>
+		</u-navbar>
+		
+		
 		<!-- 出库单详情 -->
 		<view class="details">
 			<view class="item">
 				<view class="name">
-					所属项目
-				</view>
-				<view class="value">
-					洪湖文泉110kV变电站二期
-				</view>
-			</view>
-			<view class="item">
-				<view class="name">
-					需求时间
-				</view>
-				<view class="value">
-					无
-				</view>
-			</view>
-			<view class="item">
-				<view class="name">
-					使用周期至
+					所属项目<span style="color: red;">*</span>
 				</view>
 				<view class="value">
-					2023年6月30日
+					<u-input v-model="form.projectName" placeholder="请输入所属项目" type="text" />
+					
 				</view>
 			</view>
 			<view class="item">
 				<view class="name">
-					申请时间
+					归还至
 				</view>
 				<view class="value">
-					2023年3月27日 11:00
+					<u-input v-model="address" @click="show=true"  @clear="change('')"   placeholder="请输入使用周期" 	 type="select" />
+					
 				</view>
 			</view>
+			
 
 		</view>
 		<!-- 出库设备清单 -->
@@ -60,29 +37,28 @@
 				<view class="title">
 					出库设备清单
 				</view>
-				<view class="amount">
-					全部 <text>18</text> 件设备
-					<u-icon name="arrow-right"></u-icon>
+				<view class="amount"  @click="gotoscan('')">
+					<u-icon name="scan" color="#0051ff" ></u-icon>扫码识别
 				</view>
 			</view>
 			<!-- 清单信息 -->
-			<view class="list-infos" v-for="item in 2">
+			<view class="list-infos" v-for="(item,i) in scanList" :key="i"  >
 				<view class="infos-head">
 					<view class="name">
-						接地线 220kV 无杆
+						{{item.title}}
 					</view>
-					<view class="state">
-						预出库 <text>2</text>
+					<view class="state" @click="delOutListMethod(i)">
+						<u-icon name="trash-fill" color="#777777" ></u-icon>
 					</view>
 				</view>
 				<view class="infos">
 					<view class="infos-1">
 						<view class="infos-item">
 							<view class="item-name">
-								型号：
+								编号：
 							</view>
 							<view class="item-value">
-								GZYV GYVZ-50
+								{{item.code}}
 							</view>
 						</view>
 						<view class="infos-item">
@@ -90,25 +66,25 @@
 								单位：
 							</view>
 							<view class="item-value">
-								台
+								{{item.unit}}
 							</view>
 						</view>
 					</view>
 					<view class="infos-2">
 						<view class="infos-item">
 							<view class="item-name">
-								单位：
+								规格：
 							</view>
 							<view class="item-value">
-								台
+								{{item.specifications}}
 							</view>
 						</view>
 						<view class="infos-item">
 							<view class="item-name">
-								库存：
+								型号：
 							</view>
 							<view class="item-value">
-								20
+								{{item.model}}
 							</view>
 						</view>
 					</view>
@@ -118,167 +94,172 @@
 			</view>
 
 		</view>
-		<!-- 流程 -->
-		<view class="process">
-			<view class="title">
-				流程
-			</view>
-			<u-time-line>
-
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view>
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view class="u-order">
-							<view class="u-order-desc">
-								<view class="level">
-									项目部
-								</view>
-								<view class="date">
-									2023-03-26 13:00
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-									李天择
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view class="">
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view class="u-order">
-							<view class="u-order-desc">
-								<view class="level">
-									部门负责人
-								</view>
-								<view class="date">
-									2023-03-26 13:00
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-									李天择
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view>
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view class="u-order">
-							<view class="u-order-desc">
-								<view class="level">
-									主管领导
-								</view>
-								<view class="date">
-									2023-03-26 13:00
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-									李天择
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view class="">
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view class="u-order">
-							<view class="u-order-desc">
-								<view class="level">
-									仓库管理
-								</view>
-								<view class="state">
-									等待出库
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-gradienter-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-								   周乐心
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-			</u-time-line>
-		</view>
-    </view>
+		
 	<!-- 确认出库 -->
-	<view class="bottom" >
+	<view class="bottom" @click="gotoOut()" >
 		<button>确认出库</button>
 	</view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/projectDepartment.js'
+	
 	export default {
 		data() {
 			return {
-
+				address:"",
+				form:{
+					projectName:"",
+					addressId:"",
+					recordId:"",
+					deviceIds:"",
+				},
+				scanList:[],
 			}
+		},
+		methods: {
+			delOutListMethod(c) {
+			
+				if (c > -1) {
+					this.scanList.splice(c, 1)
+					uni.showToast({
+						title: "删除成功",
+						icon: "none"
+					})
+				}
+			},
+			gotoOut() {
+				if(!this.form.projectName){
+					
+					uni.showToast({
+						title: "请输入项目名称",
+						icon: "none"
+					})
+					return
+				}
+				if(this.scanList.length==0){
+					uni.showToast({
+						title: "请扫码添加出库设备",
+						icon: "none"
+					})
+					return
+				}
+				var _this=this;
+				uni.showModal({
+					title: '提示',
+					content:"确认清单无误",
+					//content: '这是一个模态弹窗',
+					success: function(res) {
+						if (res.confirm) {
+							_this.gotoOutMethod(res.content)
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			gotoOutMethod() {
+				//recordData
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var list=this.scanList.map(item=>{
+					return item.id
+				});
+				
+				this.form.deviceIds=list.join()
+				
+			
+				
+				API.saveInRecord(this.form).then((res) => {
+					uni.hideLoading();
+					const eventChannel = this.getOpenerEventChannel();
+					  eventChannel.emit('refreshData');
+					  uni.hideLoading()
+					uni.showModal({
+						title: '提示',
+						content: '操作成功',
+						showCancel:false,
+						success: function (res) {
+							if (res.confirm) {
+								
+								uni.navigateBack()
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getscan(val) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.queryDeviceByCode({
+					code: val,
+			
+				}).then((res) => {
+					uni.hideLoading();
+					if (res.data.deviceInfo) {
+						console.log(res.data.deviceInfo)
+			
+						var c = this.scanList.find(item => {
+							return item.id == res.data.deviceInfo.id
+						})
+						if (c) {
+							uni.showToast({
+								title: "已存在,添加失败",
+								icon: "none"
+							})
+						} else {
+							this.scanList.push(res.data.deviceInfo)
+							uni.showToast({
+								title: "添加成功",
+								icon: "none"
+							})
+						}
+			
+			
+			
+					} else {
+						uni.showToast({
+							title: "二维码无效",
+							icon: "none"
+						})
+					}
+			
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			gotoscan(val) {
+				console.log('111')
+				var _this = this;
+				uni.showModal({
+					title: '提示',
+					editable: true,
+					//content: '这是一个模态弹窗',
+					success: function(res) {
+						if (res.confirm) {
+							_this.getscan(res.content)
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
 		}
 	}
 </script>

pages/projectDepartment/branch/exportReturn/exportReturn.vue

@@ -15,17 +15,17 @@
 		</u-navbar>
 		
 		<scroll-view scroll-y="true" @scrolltolower="onReachBottom()">
-		<view class="list1" v-if="this.current==0">
-			<view class="item" v-for="item in 2">
+		<view class="list1" >
+			<view class="item"  v-for="(item,i) in list[current].list" @click="ckInfo(item.id,current)" :key="i">
 				<view class="title">
-					刘群的出库申请
+					{{item.projectName}}
 				</view>
 				<view class="group">
 					<view class="name">
 						申请人：
 					</view>
 					<view class="value">
-						刘群
+						{{item.createByName}}
 					</view>
 				</view>
 				<view class="group">
@@ -33,64 +33,149 @@
 						申请时间：
 					</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
+					{{item.createTime}}
 					</view>
 				</view>
 				
 			</view>
+			<u-divider  v-if="list[current].recordsTotal==list[current].list.length"
+			 :isnone="list[current].recordsTotal==0" nonetext="没有找到相关内容" 
+			border-color="#CFD2D5">已经到底了</u-divider>
 		</view>
+		
 		</scroll-view>
-		<view class="bottom">
-			<button>填写出库申请</button>
+		<view class="bottom"  @click="addInfo">
+			<button>填写归还单</button>
 		</view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/projectDepartment.js'
+	
 	export default {
 		data() {
 			return {
 				list: [{
-					name: '未审批'
+					name: '待入库',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "0",
+					list: []
 				}, {
-					name: '已审批'
-				}	
-				],
+					name: '已入库',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					status: "1",
+					list: []
+				}],
 				current: 0,
 				show:false
 			}
 		},
+		onReachBottom() {
+			var obj = this.list[this.current]
+			if (obj.list.length < obj.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		onReady() {
+			this.getList()
+		},
 		methods: {
 			change(index) {
+				
 				this.current = index;
+				var list = this.list[this.current].list
+				if (list.length == 0) {
+					this.getList();
+				}
+				
 			},
 			changeShow(){
 				this.show=!this.show
-			}
+			},
+			getList() {
+			
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				var list = this.list[this.current].list
+				var obj = this.list[this.current]
+				var listForm = {
+					...obj
+				}
+				delete listForm.list
+			
+				API.inApplyList(listForm).then((res) => {
+			
+					if (listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+			
+					// list = [
+					// 	...list,
+					// 	...res.data.data
+					// ];
+					// list = [
+					// 	...list,
+					// 	...res.data.data
+					// ];
+					// list = [
+					// 	...list,
+					// 	...res.data.data
+					// ];
+					this.list[this.current].list = list
+			
+					this.list[this.current].recordsTotal = res.data.recordsTotal;
+					uni.hideLoading();
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			
+			},myLoadmore() {
+				this.list[this.current].pageIndex += 1;
+				this.getList();
+			},
+			init() {
+				this.current = 0
+				this.list[0].pageIndex = 1
+				this.list[1].pageIndex = 1
+				this.getList()
+			},
+			ckInfo(id) {
+				var url = "./deliveryDetails?id=" + id;
+				uni.navigateTo({
+					url: url,
+					events: {
+						refreshData: () => {
+							this.init()
+						}
+					}
+				})
+			},
+			addInfo() {
+				var url = "./deliveryFrom";
+				uni.navigateTo({
+					url: url,
+					events: {
+						refreshData: () => {
+							this.init()
+						}
+					}
+				})
+			},
 		}
 	}
 </script>

pages/storeManagement/equipmentDelivery/deliveriedList.vue

@@ -365,7 +365,6 @@
 				})
 				API.queryDeviceByCode({
 					code: val,
-
 				}).then((res) => {
 					uni.hideLoading();
 					if (res.data.deviceInfo) {

pages/storeManagement/equipmentDelivery/deliveryDetails.vue

@@ -6,8 +6,6 @@
 		<view class="head">
 			<view class="photo">
 				<u-avatar size="84" :src="outUser.headImg"></u-avatar>
-				
-				
 			</view>
 			<view class="name">
 				{{outUser.name}}

pages/storeManagement/equipmentEnter/enterDetails.vue → pages/storeManagement/equipmentEnter/deliveryDetails.vue

@@ -1,193 +1,162 @@
 <template>
 	<view >
-		<u-navbar title="入库单详情"></u-navbar>
+		<u-navbar title="归还单详情"></u-navbar>
+		<!-- 出库单状态 -->
 		<view class="container">
-				
-		<!-- 归还单状态 -->
 		<view class="head">
 			<view class="photo">
-			<u-avatar size="84" :src="item.userImg"></u-avatar>
+				<u-avatar size="84" :src="outUser.userImg"></u-avatar>
+				
 			</view>
 			<view class="name">
-				刘群
+				{{info.createByName}}
 			</view>
 			<view class="submit">
-				提交了<text>设备归还单</text>
+				提交了<text>入库申请</text>
 			</view>
-			<view class="state">
-				已入库
+			<view class="state" :style="{
+				color:recordStatusColor(info.status),
+				borderColor:recordStatusColor(info.status)
+			}">
+				{{info.status=='1'?'已入库':'待入库'}}
 			</view>
 		</view>
-		<!-- 归还单详情 -->
+		<!-- 出库单详情 -->
 		<view class="details">
 			<view class="item">
 				<view class="name">
-					项目部
+					所属项目
 				</view>
 				<view class="value">
-					洪湖文泉110kV变电站二期施工单位
-				</view>
-			</view>
-			<view class="item">
-				<view class="name">
-					归还仓库
-				</view>
-				<view class="value">
-					荆力总包仓库
+					{{info.projectName}}
 				</view>
 			</view>
+			
 			<view class="item">
 				<view class="name">
-					提交时间
+					创建时间
 				</view>
 				<view class="value">
-					2020-11-27 11:00
+					{{info.createTime}}
 				</view>
 			</view>
-		
+
 		</view>
-		<!-- 归还设备清单 -->
+		<!-- 出库设备清单 -->
 		<view class="list">
 			<view class="list-head">
 				<view class="title">
-					归还设备清单
+					出库设备清单
 				</view>
 				<view class="amount">
-					全部 <text>18</text> 件设备
-					<u-icon name="arrow-right"></u-icon>
+					全部 <text>{{deviceInfoList.length}}</text> 件设备
+					<!-- <u-icon name="arrow-right"></u-icon> -->
 				</view>
 			</view>
 			<!-- 清单信息 -->
-			<view class="list-infos" v-for="item in 2" >
+			<view class="list-infos" v-for="(item,i) in deviceInfoList" :key="i" >
 				<view class="infos-head">
 					<view class="name">
-						50KV直流高压电缆检测仪
+						{{item.title}}
 					</view>
-					<view class="state">
-					<text><img src="@/assets/img/riLine-checkbox-circle-line@1x.png" alt=""></text>	已收到	 
+					<view class="state" v-if="false">
+						 <text>2</text>
 					</view>
 				</view>
 				<view class="infos">
 					<view class="infos-1">
 						<view class="infos-item">
 							<view class="item-name">
-								型号：
+								编号：
 							</view>
 							<view class="item-value">
-								GZYV GYVZ-50
+								{{item.code}}
 							</view>
 						</view>
-
-					</view>
-					<view class="infos-2">
 						<view class="infos-item">
 							<view class="item-name">
-								设备编号：
+								单位：
 							</view>
 							<view class="item-value">
-								ND920182001511
+								{{item.unit}}
 							</view>
 						</view>
-						
 					</view>
-
-				</view>
-
-			</view>
-			
-			
-
-		</view>
-		<!-- 流程 -->
-		<view class="process" >
-			<view class="title">
-				流程
-			</view>
-			<u-time-line>
-
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view>
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
+					<view class="infos-2">
+						<view class="infos-item">
+							<view class="item-name">
+								规格：
+							</view>
+							<view class="item-value">
+								{{item.specifications}}
 							</view>
 						</view>
-					</template>
-
-					<template v-slot:content>
-						<view>
-							<view class="u-order-desc">
-								<view class="level">
-									项目部
-								</view>
-								<view class="date">
-									2023-03-26 13:00
-								</view>
+						<view class="infos-item">
+							<view class="item-name">
+								型号：
 							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-									李天择
-								</view>
+							<view class="item-value">
+								{{item.model}}
 							</view>
 						</view>
-					</template>
-				</u-time-line-item>
+					</view>
 
-				
-				
+				</view>
+
+			</view>
 
-				<u-time-line-item node-top="10">
-					<template v-slot:node>
-						<view class="">
-							<view class="u-node" style="background:#CDCDCD;">
-								<!-- 此处为uView的icon组件 -->
-								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
-							</view>
-						</view>
-					</template>
-
-					<template v-slot:content>
-						<view>
-							<view class="u-order-desc">
-								<view class="level">
-									仓库管理
-								</view>
-								<view class="date">
-									2023-03-26 13:00
-								</view>
-							</view>
-							<view class="u-order-time">
-								<view class="photo">
-									<img src="@/assets/img/level.png" alt="">
-								</view>
-								<view class="confirm">
-									<img src="@/assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
-								</view>
-								<view class="name">
-								   周乐心
-								</view>
-							</view>
-						</view>
-					</template>
-				</u-time-line-item>
-			</u-time-line>
 		</view>
-		</view>	
+		
+    </view>
+	<!-- 确认出库 -->
+	<view class="bottom" v-if="false" >
+		<button>确认出库</button>
+	</view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/storeManagement.js'
+	import {
+		recordStatus,recordStatusColor
+	} from '@/apis/status.js'
+	
 	export default {
 		data() {
 			return {
-
+				id:"",
+				info:{},
+				outUser:{
+					userImg:""
+				},
+				deviceInfoList:{},
+			}
+		},
+		onLoad(op){
+			this.id=op.id
+			this.getInfo()
+		},
+		methods:{
+			recordStatus,recordStatusColor,
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.inRecordDetail({
+					id:this.id,
+				}).then((res) => {
+					uni.hideLoading();
+					this.info=res.data.inRecord;
+					this.deviceInfoList=res.data.deviceInfoList;
+					//this.outUser=res.data.outUser;
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			}
 		}
 	}
@@ -196,9 +165,9 @@
 <style scoped lang="scss">
 	page {
 		padding-bottom: 200rpx;
-		}
+	}
 
-	// 归还单状态
+	// 出库单状态
 	.head {
 		background-color: #fff;
 		padding: 24rpx 32rpx;
@@ -237,16 +206,16 @@
 			padding: 0 24rpx;
 			border-radius: 50px;
 			background-color: rgba(255, 255, 255, 1);
-			color: rgba(69, 186, 69, 1);
-			font-size: 24rpx;
+			color: rgba(51, 133, 255, 1);
+			font-size: 12px;
 			text-align: center;
 			font-family: Arial;
-			border: 1px solid rgba(69, 186, 69, 1);
+			border: 1px solid rgba(51, 133, 255, 1);
 			margin-left: auto;
 		}
 	}
 
-	// 归还单详情
+	// 出库单详情
 	.details {
 		background-color: #fff;
 		margin-top: 24rpx;
@@ -268,7 +237,7 @@
 		}
 	}
 
-	// 归还单列表
+	// 出库单列表
 	.list {
 		background-color: #fff;
 		margin-top: 24rpx;
@@ -317,46 +286,18 @@
 				}
 
 				.state {
-					border: 1px solid rgba(69, 186, 69, 1);
-					border-radius: 4px;
-					color: rgba(69, 186, 69, 1);
-					font-size: 24rpx;
-					line-height: 48rpx;
-					width: 160rpx;
-					text-align: center;
-					text{
-						img{
-							vertical-align: middle;
-							margin-right: 4rpx;
-						}
-					}
-				}
-				.qr-code {
-					border-radius: 4px;
-					background: linear-gradient(180deg, rgba(22, 119, 255, 1) 0%, rgba(16, 98, 213, 1) 100%);
-					color: rgba(255, 255, 255, 1);
-					font-size: 24rpx;
-					width: 160rpx;
-					text-align: center;
-					line-height: 48rpx;
-				
-					text {
-						img {
-							vertical-align: middle;
-						}
-					}
+					color: rgba(0, 81, 255, 1);
 				}
 			}
 
 			.infos {
 				margin-top: 16rpx;
 				display: flex;
-				justify-content: space-between;
 				color: #777777;
 				font-size: 24rpx;
 
 				.infos-1 {
-					
+					margin-right: 68rpx;
 				}
 
 				.infos-item {
@@ -372,15 +313,16 @@
 		background-color: #fff;
 		margin-top: 24rpx;
 		padding: 24rpx 32rpx;
+
 		.title {
 			color: rgba(51, 51, 51, 1);
 			font-size: 32rpx;
 		}
         .u-time-axis-item{
-			margin-bottom: 76rpx;
+			//margin-bottom: 76rpx;
 		}
 		.u-time-axis {
-			padding: 18rpx 40rpx;
+			//padding: 18rpx 40rpx;
 		}
 
 		.u-node {
@@ -392,7 +334,9 @@
 			align-items: center;
 			background: #d0d0d0;
 		}
-
+		.u-order{
+			margin-bottom: 32rpx;
+		}
 		.u-order-title {
 			color: #333333;
 			font-weight: bold;
@@ -458,10 +402,28 @@
       
 	}
 	
-	.u-time-axis{
-		.u-time-axis-item:last-of-type{
-			margin-bottom: 0;
+	// .u-time-axis{
+	// 	.u-time-axis-item:last-of-type{
+	// 		margin-bottom: 0;
+	// 	}
+	// }
+	// 确认出库
+	.bottom{
+		background-color: #fff;
+		margin-top: 44rpx;
+		padding: 16rpx 32rpx;
+		z-index: 999;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		uni-button{
+			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;
+			line-height: 88rpx;
+			
 		}
-	}	
-	
+	}
 </style>

pages/storeManagement/equipmentEnter/equipmentEnter.vue

@@ -11,58 +11,18 @@
 		
 		<scroll-view scroll-y="true" @scrolltolower="onReachBottom()">
 		
-		<view class="list1" v-if="this.current==0">
-			<view class="item" v-for="item in 2">
+		<view class="list1" >
+			<view class="item" v-for="(item,i) in list[current].list" @click="ckInfo(item.id)" :key="i" >
 				<view class="title">
 					<view class="name">
-						BR23-0001-01
+						{{item.projectName}}
 					</view>
-					<view class="classify">
+					<!-- <view class="classify">
 						耗材
 					</view>
 					<view class="state">
 						待入库
-					</view>
-				</view>
-				<view class="group">
-					<view class="name">
-						入库位置：
-					</view>
-					<view class="value">
-						十号路仓库
-					</view>
-				</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:31
-					</view>
-				</view>
-				
-			</view>
-		</view>
-		<view class="list2" v-if="this.current==1" > 
-			<view class="item" v-for="item in 2">
-				<view class="title">
-					<view class="name">
-						BR23-0001-02
-					</view>
-					<view class="classify">
-						耗材
-					</view>
-					<view class="state">
-						待入库
-					</view>
+					</view> -->
 				</view>
 				<view class="group">
 					<view class="name">
@@ -91,25 +51,103 @@
 				
 			</view>
 		</view>
+		
+		
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/storeManagement.js'
+	
 	export default {
 		data() {
 			return {
+				
 				list: [{
-					name: '待入库'
+					name: '待入库',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					 typeId:"1",
+					list:[]
 				}, {
-					name: '已入库'
-				}
-					
-				],
+					name: '已入库',
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+					 typeId:"2",
+					list:[]
+				}],
 				current: 0
 			}
 		},
+		onReachBottom() {
+		
+			var obj=this.list[this.current]
+			if (obj.list.length < obj.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		onReady(){
+			this.getList()
+		},
 		methods: {
+			getList(){
+							
+							 uni.showLoading({
+							 	title: "加载中",
+							 	mask: true,
+							 })
+							 var list=this.list[this.current].list
+							 var obj=this.list[this.current]
+							 var listForm={
+								...obj
+							 }
+							 delete listForm.list
+							 
+							 API.inWaitList(listForm).then((res) => {
+							 	uni.hideLoading();
+								if(listForm.pageIndex==1){
+									list = res.data.data;
+								}else{
+									list = [
+										...list,
+										...res.data.data
+									];
+								}
+							 	this.list[this.current].list=list
+							 	
+							 	this.list[this.current].recordsTotal = res.data.recordsTotal;
+							 }).catch(error => {
+							 	uni.showToast({
+							 		title: error,
+							 		icon: "none"
+							 	})
+							 })
+							 
+			},
+			myLoadmore(){
+				this.list[this.current].pageIndex += 1;
+				this.getList();
+			},
+			init(){
+				this.current=0
+				this.list[0].pageIndex=1
+				this.list[1].pageIndex=1
+				this.getList()
+			},
+			ckInfo(id){
+				var url="./deliveryDetails?id="+id;
+				uni.navigateTo({
+					url:url,
+					events: {
+					  refreshData: () => {
+					    this.init()
+					  }
+					}
+				})
+			},
 			change(index) {
 				this.current = index;
 			}
@@ -122,16 +160,23 @@
 		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;
+	.head {
+		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
+	
+		/deep/.u-navbar {
+			//background: 0!important;
+			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
+			height: 95px;
+			//padding: 0 32rpx;
 		}
-		/deep/.u-border-bottom:after{
+	
+		/deep/.u-border-bottom:after {
 			height: 0;
 		}
+	
+		.tabs {
+			padding: 0 32rpx
+		}
 	}
 	.tabs{
 		width: 250rpx;