出库申请， 出库审批

apis/pagejs/approve.js

@@ -0,0 +1,39 @@
+import request from '@/apis/utils/request'
+
+
+
+export function saveRecordApprove(data) {
+	var url = '/mobile/out/saveRecordApprove';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+export function outRecordDetail(data) {
+	var url = '/mobile/out/outRecordDetail';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+export function outRecordDeviceById(data) {
+	var url = '/mobile/out/outRecordDeviceById';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}
+
+export function outApproveList(data) {
+	var url = '/mobile/out/outApproveList';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

apis/pagejs/index.js

@@ -1,7 +1,7 @@
 import requestWhite from '@/apis/utils/requestWhite'
  import request from '@/apis/utils/request'
  
-import Qs from 'qs';
+
 
 export function findByOpenId(data) {
 	var url='/mobile/user/findByOpenId';

apis/pagejs/projectDepartment.js

@@ -9,14 +9,14 @@ export function outApplyList(data) {
 		url: url
 	})
 }
-export function outRecord(data) {
-	var url = '/mobile/out/outRecord';
-	return request({
-		method: 'post',
-		data: data,
-		url: url
-	})
-}
+// export function outRecord(data) {
+// 	var url = '/mobile/out/outRecord';
+// 	return request({
+// 		method: 'post',
+// 		data: data,
+// 		url: url
+// 	})
+// }
 
 export function outRecordDeviceById(data) {
 	var url = '/mobile/out/outRecordDeviceById';
@@ -53,20 +53,3 @@ export function outRecordDetail(data) {
 		url: url
 	})
 }
-
-export const recordStatus = (val) => {
-	var retu = ""
-	switch (val) {
-		case '0':
-			retu = '待审核'
-			break;
-		case '1':
-			retu = '待出库'
-			break;
-		case '2':
-			retu = '已出库'
-			break;
-	}
-
-	return retu
-}

apis/pagejs/storeManagement.js

@@ -0,0 +1,10 @@
+import request from '@/apis/utils/request'
+
+export function outWaitList(data) {
+	var url = '/mobile/out/outWaitList';
+	return request({
+		method: 'post',
+		data: data,
+		url: url
+	})
+}

apis/status.js

@@ -0,0 +1,36 @@
+
+export const recordStatus = (val) => {
+	var retu = ""
+	switch (val) {
+		case '0':
+			retu = '待审核'
+			break;
+		case '1':
+			retu = '待出库'
+			break;
+		case '2':
+			retu = '已驳回'
+			break;
+	}
+
+	return retu
+}
+
+
+
+export const recordItemStatus = (val) => {
+	var retu = ""
+	switch (val) {
+		case '0':
+			retu = '预出库'
+			break;
+		case '1':
+			retu = '待出库'
+			break;
+		case '2':
+			retu = '已出库'
+			break;
+	}
+
+	return retu
+}

components/ApproveList.vue

@@ -0,0 +1,213 @@
+<template>
+	<view>
+		<!-- 流程 -->
+		<view class="process">
+			<view class="title">
+				流程
+			</view>
+			<u-time-line>
+		
+				<u-time-line-item node-top="10" v-for="(item,i) in approveList" :key="i" >
+					<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">
+									{{item.userName}}
+								</view>
+								<view class="date">
+									{{item.approveTime}}
+								</view>
+							</view>
+							<view class="u-order-time">
+								<view class="photo">
+									<u-avatar size="56" class="img" :src="item.userImg"></u-avatar>
+									
+								</view>
+								<view class="confirm">
+									
+									<u-icon v-if="item.status==0" name="more-circle-fill" color="#f29a38"></u-icon>
+
+									<u-icon v-if="item.status==1" name="checkmark-circle-fill" color="#52b56b"></u-icon>
+								<u-icon v-if="item.status==2" name="close-circle-fill" color="#c94031"></u-icon>
+								
+								</view>
+								<view class="name">
+									<view v-if="item.status==0">未审批</view>
+									<view v-if="item.status==1">审批通过</view>
+									<view v-if="item.status==2">审批驳回</view>
+								</view>
+							</view>
+						</view>
+					</template>
+				</u-time-line-item>
+		
+		<u-time-line-item  >
+		
+					<template v-slot:content >
+						<view class="u-order">
+							<view class="u-order-desc">
+								<view class="level">
+									仓库管理
+								</view>
+								<view class="state" v-if="outRecordDetailObj&&outRecordDetailObj.outRecord&&outRecordDetailObj.outRecord.status==1">
+									
+									<view v-if="operator.status==0">等待出库</view>
+									<view v-if="operator.status==1">出库成功</view>
+								</view>
+							</view>
+							
+							<view class="u-order-time" >
+								<view class="photo">
+									<u-avatar size="56" class="img" :src="operator.userImg"></u-avatar>
+								</view>
+								<view class="confirm" >
+									
+									<u-icon v-if="operator.status==0" name="more-circle-fill" color="#f29a38"></u-icon>
+								
+									<u-icon v-if="operator.status==1" name="checkmark-circle-fill" color="#52b56b"></u-icon>
+								<u-icon v-if="operator.status==2" name="close-circle-fill" color="#c94031"></u-icon>
+								
+								</view>
+								<view class="name" v-if="outRecordDetailObj&&outRecordDetailObj.outRecord&&outRecordDetailObj.outRecord.status==1">
+									<view v-if="operator.status==0">等待出库</view>
+									<view v-if="operator.status==1">出库成功</view>
+									
+								</view>
+								<view class="name" v-else>
+									<view >等待审批</view>
+									
+									
+								</view>
+							</view>
+						</view>
+					</template>
+				</u-time-line-item>
+			</u-time-line>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"ApproveList",
+		props:{
+			approveList:[],
+			
+			outRecordDetailObj:{}
+		},
+		data() {
+			return {
+				operator:{
+					userImg:"",
+					status:"",
+					name:"",
+				},
+			};
+		}
+	}
+</script>
+
+<style  scoped lang="scss">
+// 流程
+	.process {
+		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;
+		}
+		.u-time-axis {
+			//padding: 18rpx 40rpx;
+		}
+
+		.u-node {
+			width: 18rpx;
+			height: 18rpx;
+			border-radius: 100rpx !important;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background: #d0d0d0;
+		}
+		.u-order{
+			margin-bottom: 32rpx;
+		}
+		.u-order-title {
+			color: #333333;
+			font-weight: bold;
+			font-size: 32rpx;
+		}
+
+		.u-order-desc {
+			margin-bottom: 16rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.level {
+				color: #333333;
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+
+			.date {
+				color: rgba(119, 119, 119, 1);
+			}
+
+			.state {
+				color: rgba(255, 121, 0, 1);
+			}
+		}
+
+		.u-order-time {
+			width: 160rpx;
+			color: #777777;
+			font-size: 28rpx;
+			margin-top: 16rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.photo {
+				width: 56rpx;
+				height: 56rpx;
+				border-radius: 100px;
+				margin-bottom: 4rpx;
+
+				.img {
+					width: 100%;
+					height: 100%;
+					overflow: hidden;
+					position: relative;
+				}
+			}
+
+			.confirm {
+				position: absolute;
+				top: 46rpx;
+				left: 56rpx;
+			}
+
+			.name {
+				color: rgba(51, 51, 51, 1);
+				font-size: 24rpx;
+			}
+
+		}
+      
+	}
+</style>

config/.env.dev.js

@@ -14,7 +14,8 @@ const UNI_APP = {
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	//openId:"oBEnI6GDWCRQqn_xlyPlCYFY8Amg",//zkx
 	openId:"123456",//库管理
-	openId:"123",// 项目部
+	//openId:"123",// 项目部 - 审批1
+	//openId:"223",// 项目部 - 审批2
 	//openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
 	//openId:"oBEnI6N9gRq3xOVlw34JfYjhtB9k",//  伊明
 	

pages.json

@@ -184,6 +184,15 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		}
+		,{
+		    "path" : "pages/projectDepartment/branch/exportApplication/deliveriedList",
+		    "style" :                                                                                    
+		    {
+		        //navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
 		,{
 		    "path" : "pages/projectDepartment/branch/exportApplication/deliveryFrom",
@@ -211,6 +220,15 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/projectDepartment/branch/exportProcess/deliveryInfo",
+		    "style" :                                                                                    
+		    {
+		        //navigationBarTitleText": "",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		},
 		{
 		    "path" : "pages/projectDepartment/branch/exportProcess/exportProcess",

pages/index/homePage.vue

@@ -306,8 +306,8 @@
 	 flex-wrap: wrap;
 	 margin-top: -216rpx;
 	 .item{
-		 width: 320rpx;
-		 height: 320rpx;
+		 width: 720rpx;
+		 height: 100px;
 		 background-color: rgba(255, 255, 255, 1);
 		 border-radius: 8px;
 		 padding: 32rpx 24rpx;
@@ -315,18 +315,18 @@
 		 margin-bottom: 30rpx;
 		 .title{
 			 color: rgba(16, 16, 16, 1);
-			 font-size: 36rpx;
+			 font-size: 44rpx;
 			 margin-bottom: 8rpx;
 			 font-family: 'Alibaba-PuHuiTi-Regular';
 		 }
 		 .hint{
 			 color: rgba(106, 121, 142, 1);
-			 font-size: 24rpx;
+			 font-size: 32rpx;
 			 margin-bottom: 44rpx;
 		 }
 		 .img{
-			 width: 128rpx;
-			 height: 128rpx;
+			 width: 75px;
+			 height: 75px;
 			 position: absolute;
 			 right: 24rpx;
 			 bottom: 24rpx;

pages/projectDepartment/branch/exportApplication/deliveriedList.vue

@@ -0,0 +1,333 @@
+<template>
+	<view>
+		<u-navbar >
+			<view class="u-navbar " >
+				<view class="title" >
+					出库设备清单<text>({{recordsTotal}})</text>
+				</view>
+			</view>
+			
+		</u-navbar>
+		<view class="list" v-for="(item,index) in list" :key="index">
+			<!-- 清单信息 -->
+			<view class="list-infos" >
+				<view class="infos-head">
+					<view class="name">
+						{{item.deviceName}}
+					</view>
+					
+				</view>
+				<view class="infos">
+					<view class="infos-1">
+						<view class="infos-item" v-if="false">
+							<view class="item-name">
+								型号：
+							</view>
+							<view class="item-value">
+								GZYV GYVZ-50
+							</view>
+						</view>
+						<view class="infos-item">
+							<view class="item-name">
+								{{recordItemStatus(item.status)}}：
+							</view>
+							<view class="item-value">
+								{{item.needCount}}
+							</view>
+						</view>
+					</view>
+					<view class="infos-2" v-if="false">
+						<view class="infos-item">
+							<view class="item-name">
+								单位：
+							</view>
+							<view class="item-value">
+								台
+							</view>
+						</view>
+						<view class="infos-item">
+							<view class="item-name">
+								库存：
+							</view>
+							<view class="item-value">
+								20
+							</view>
+						</view>
+
+					</view>
+
+				</view>
+				<!-- 地址 -->
+				<view class="address"  v-if="false">
+					<view class="name">
+						位置：
+					</view>
+					<view class="value">
+						荆力总包仓库1仓库2号货架302
+					</view>
+				</view>
+				<!-- 备注 -->
+				<view class="remark"  v-if="false">
+					<view class="name">
+						备注：
+					</view>
+					<view class="value">
+						22
+					</view>
+				</view>
+
+				<view class="prepare-out" v-if="false"  >
+					<view class="head">
+						<view class="amount">
+							<view class="title">
+								实际领用：
+							</view>
+							<view class="value">
+								2
+							</view>
+						</view>
+
+						<view class="unfold">
+							展开<u-icon name="arrow-down" @click="changeShow()"></u-icon>
+							<view class="option" v-if="this.show==true">
+
+							</view>
+						</view>
+
+					</view>
+					<!-- 编号 -->
+					<view class="serial-number" v-for="item in 2">
+						<view class="item">
+							<view class="text">
+								设备编号：
+							</view>
+							<view class="number">
+								ND920182001511
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+ 
+   
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/projectDepartment.js'
+	import {
+		recordItemStatus
+	}  from '@/apis/status.js'
+	export default {
+		data() {
+			return {
+				show: false,
+				list:[],
+				id:"",
+				recordsTotal: 0,
+				listFrom:{
+					pageIndex: 1,
+					pageSize: 20,
+				
+				}
+			}
+		},
+		onReachBottom() {
+			
+			if (this.list.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
+		onLoad(op){
+			this.id=op.id
+			this.getList()
+		},
+		onReady(){
+			
+		},
+		methods: {
+			recordItemStatus,
+			getList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.outRecordDeviceById({
+					recordId:this.id,
+					pageSize:this.listFrom.pageSize,
+					pageIndex:this.listFrom.pageIndex,
+				}).then((res) => {
+					uni.hideLoading();
+					this.list=res.data.data;
+					this.recordsTotal=res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			myLoadmore(){
+				this.listFrom.pageIndex += 1;
+				this.getList();
+			},
+			changeShow() {
+				this.show = !this.show
+				
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page{
+		padding-bottom: 100px;
+	}
+	.u-navbar {
+		display: flex;
+		font-size: 36rpx;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60rpx;
+		text-align: center;
+		flex-shrink: 0;
+		left: 237rpx;
+		    right: 107rpx;
+		    width: 300rpx;
+		.title {
+			
+				
+			line-height: 60rpx;
+			font-size: 36rpx;
+			flex: 1;
+			text {
+				color: #2A8EFB
+			}
+		}
+	}
+
+	.list {
+		background-color: #fff;
+		margin: 24rpx;
+		padding: 22rpx 32rpx;
+
+		// 清单信息
+		.list-infos {
+			border-radius: 8px;
+
+			.infos-head {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 24rpx;
+
+				.name {
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+				}
+
+				.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: 64rpx;
+
+					text {
+						img {
+							vertical-align: middle;
+						}
+					}
+				}
+			}
+
+			.infos {
+				margin-top: 16rpx;
+				display: flex;
+				color: #777777;
+				font-size: 24rpx;
+
+				.infos-1 {
+					margin-right: 68rpx;
+				}
+
+
+				.infos-item {
+					display: flex;
+					margin-bottom: 8rpx;
+				}
+
+			}
+
+			.address,.remark {
+				display: flex;
+				color: #777777;
+				font-size: 24rpx;
+				margin-bottom: 8rpx;
+			}
+		}
+
+		.prepare-out {
+			padding: 24rpx;
+			margin-top: 40rpx;
+			border-radius: 8px;
+			background-color: rgba(245, 246, 249, 1);
+
+			.head {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+                margin-bottom: 24rpx;
+				.amount {
+					display: flex;
+					color: rgba(0, 81, 255, 1);
+					font-size: 32rpx;
+				}
+
+				.unfold {
+					color: rgba(146, 158, 165, 1);
+					font-size: 24rpx;
+					position: relative;
+
+					.u-icon--right {
+						margin-left: 8rpx;
+					}
+				}
+
+				.option {
+					width: 160rpx;
+					height: 32rpx;
+					background-color: #fff;
+					position: absolute;
+					top: 30rpx;
+					right: 0;
+				}
+			}
+
+			// 编号
+			.serial-number {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 16rpx;
+				color: rgba(51, 51, 51, 1);
+				font-weight: bold;
+ 
+				.item {
+					display: flex;
+				}
+			}
+
+		}
+
+		
+	}
+</style>

pages/projectDepartment/branch/exportApplication/deliveryDetails.vue

@@ -5,10 +5,12 @@
 		<view class="container">
 		<view class="head">
 			<view class="photo">
-				<img src="@/assets/img/photoCopy 3@1x.png" alt="">
+				<u-avatar size="84" :src="outUser.headImg"></u-avatar>
+				
+				
 			</view>
 			<view class="name">
-				{{info.createByName}}
+				{{outUser.name}}
 			</view>
 			<view class="submit">
 				提交了<text>出库申请</text>
@@ -59,22 +61,22 @@
 				<view class="title">
 					出库设备清单
 				</view>
-				<view class="amount">
-					全部 <text>18</text> 件设备
+				<view class="amount" @click="gotoUrl('pages/projectDepartment/branch/exportApplication/deliveriedList?id='+id)">
+					全部 <text>{{recordsTotal}}</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 outRecordDeviceList" :key="i" >
 				<view class="infos-head">
 					<view class="name">
-						接地线 220kV 无杆
+						{{item.deviceName}}
 					</view>
 					<view class="state">
-						预出库 <text>2</text>
+						预出库 <text>{{item.needCount}}</text>
 					</view>
 				</view>
-				<view class="infos">
+				<view class="infos" v-if="false">
 					<view class="infos-1">
 						<view class="infos-item">
 							<view class="item-name">
@@ -117,157 +119,15 @@
 			</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>
+		<approveList ref="approveList"
+		:outRecordDetailObj="outRecordDetailObj"
+		 :approveList="approveList"></approveList>
     </view>
 	<!-- 确认出库 -->
 	<view class="bottom" >
-		<button>确认出库</button>
+		<!-- <button>确认出库</button> -->
+		<u-button  v-if="info.status==0" type="revoke" >撤销</u-button>
+		<u-button   v-if="info.status==1" type="primary" >签字验收</u-button>
 	</view>
 	</view>
 </template>
@@ -276,13 +136,22 @@
 	import * as API from '@/apis/pagejs/projectDepartment.js'
 	import {
 		recordStatus
-	} from '@/apis/pagejs/projectDepartment.js'
+	} from '@/apis/status.js'
+	import approveList from "@/components/ApproveList.vue"
+	
 	export default {
+		components: {
+			approveList
+		},
 		data() {
 			return {
 				id:"",
 				info:{},
-				outRecordDeviceList:[]
+				outUser:{},
+				outRecordDetailObj:{},
+				outRecordDeviceList:[],
+				approveList:[],
+				recordsTotal:0,
 			}
 		},
 		onLoad(op){
@@ -299,7 +168,8 @@
 					pageIndex:1,
 				}).then((res) => {
 					uni.hideLoading();
-					this.outRecordDeviceList=res.data.outRecordDeviceList;
+					this.outRecordDeviceList=res.data.data;
+					this.recordsTotal=res.data.recordsTotal;
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -315,8 +185,10 @@
 				API.outRecordDetail({
 					id:this.id,
 				}).then((res) => {
-					
+					this.outRecordDetailObj=res.data;
 					this.info=res.data.outRecord;
+					this.approveList=res.data.approveList;
+					this.outUser=res.data.outUser;
 					this.getList()
 				}).catch(error => {
 					uni.showToast({
@@ -347,7 +219,9 @@
 			width: 84rpx;
 			height: 84rpx;
 			border-radius: 100rpx;
-
+			.u-avatar{
+				
+			}
 			img {
 				width: 100%;
 				height: 100%;
@@ -475,99 +349,7 @@
 		}
 	}
 
-	// 流程
-	.process {
-		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;
-		}
-		.u-time-axis {
-			//padding: 18rpx 40rpx;
-		}
-
-		.u-node {
-			width: 18rpx;
-			height: 18rpx;
-			border-radius: 100rpx !important;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background: #d0d0d0;
-		}
-		.u-order{
-			margin-bottom: 32rpx;
-		}
-		.u-order-title {
-			color: #333333;
-			font-weight: bold;
-			font-size: 32rpx;
-		}
-
-		.u-order-desc {
-			margin-bottom: 16rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.level {
-				color: #333333;
-				font-size: 32rpx;
-				font-weight: bold;
-			}
-
-			.date {
-				color: rgba(119, 119, 119, 1);
-			}
-
-			.state {
-				color: rgba(255, 121, 0, 1);
-			}
-		}
-
-		.u-order-time {
-			width: 90rpx;
-			color: #777777;
-			font-size: 28rpx;
-			margin-top: 16rpx;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-
-			.photo {
-				width: 56rpx;
-				height: 56rpx;
-				border-radius: 100px;
-				margin-bottom: 4rpx;
-
-				img {
-					width: 100%;
-					height: 100%;
-					overflow: hidden;
-					position: relative;
-				}
-			}
-
-			.confirm {
-				position: absolute;
-				top: 46rpx;
-				left: 56rpx;
-			}
-
-			.name {
-				color: rgba(51, 51, 51, 1);
-				font-size: 24rpx;
-			}
-
-		}
-      
-	}
+	
 	
 	// .u-time-axis{
 	// 	.u-time-axis-item:last-of-type{
@@ -584,13 +366,13 @@
 		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;
+		// 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/projectDepartment/branch/exportProcess/deliveryDetails.vue

@@ -5,16 +5,18 @@
 		<view class="container">
 		<view class="head">
 			<view class="photo">
-				<img src="@/assets/img/photoCopy 3@1x.png" alt="">
+				<u-avatar size="84" :src="outUser.headImg"></u-avatar>
+				
+				
 			</view>
 			<view class="name">
-				刘群
+				{{outUser.name}}
 			</view>
 			<view class="submit">
 				提交了<text>出库申请</text>
 			</view>
 			<view class="state">
-				待出库
+				{{recordStatus(info.status)}}
 			</view>
 		</view>
 		<!-- 出库单详情 -->
@@ -24,7 +26,7 @@
 					所属项目
 				</view>
 				<view class="value">
-					洪湖文泉110kV变电站二期
+					{{info.projectName}}
 				</view>
 			</view>
 			<view class="item">
@@ -32,7 +34,7 @@
 					需求时间
 				</view>
 				<view class="value">
-					无
+					{{info.startTime}}
 				</view>
 			</view>
 			<view class="item">
@@ -40,7 +42,7 @@
 					使用周期至
 				</view>
 				<view class="value">
-					2023年6月30日
+					{{info.endTime}}
 				</view>
 			</view>
 			<view class="item">
@@ -48,7 +50,7 @@
 					申请时间
 				</view>
 				<view class="value">
-					2023年3月27日 11:00
+					{{info.createTime}}
 				</view>
 			</view>
 
@@ -59,22 +61,22 @@
 				<view class="title">
 					出库设备清单
 				</view>
-				<view class="amount">
-					全部 <text>18</text> 件设备
+				<view class="amount" @click="gotoUrl('pages/projectDepartment/branch/exportApplication/deliveriedList?id='+id)">
+					全部 <text>{{recordsTotal}}</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 outRecordDeviceList" :key="i" >
 				<view class="infos-head">
 					<view class="name">
-						接地线 220kV 无杆
+						{{item.deviceName}}
 					</view>
 					<view class="state">
-						预出库 <text>2</text>
+						预出库 <text>{{item.needCount}}</text>
 					</view>
 				</view>
-				<view class="infos">
+				<view class="infos" v-if="false">
 					<view class="infos-1">
 						<view class="infos-item">
 							<view class="item-name">
@@ -117,166 +119,153 @@
 			</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>
+		<approveList ref="approveList"
+		:outRecordDetailObj="outRecordDetailObj"
+		 :approveList="approveList"></approveList>
     </view>
 	<!-- 确认出库 -->
-	<view class="bottom" >
-		<button>确认出库</button>
+	<view class="bottom" v-if="isSpPerson" >
+		<!-- <button>确认出库</button> -->
+		<u-button 
+		@click="submit(2)"
+		style="width: 49%;margin-right: 10rpx;"
+		  
+		  size="medium" type="revoke" >拒绝</u-button>
+		<u-button  
+		@click="submit(1)"
+		style="width: 49%;" size="medium"  type="primary" >签字同意</u-button>
 	</view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/approve.js'
+	import {
+		recordStatus
+	} from '@/apis/status.js'
+	import approveList from "@/components/ApproveList.vue"
+	
 	export default {
+		components: {
+			approveList
+		},
 		data() {
 			return {
-
+				isSpPerson:false,
+				id:"",
+				outRecordDetailObj:{},
+				info:{},
+				outUser:{},
+				outRecordDeviceList:[],
+				approveList:[],
+				recordsTotal:0,
+			}
+		},
+		onLoad(op){
+			this.id=op.id
+			this.getInfo()
+		},
+		methods: {
+			recordStatus,
+			getList(){
+				
+				API.outRecordDeviceById({
+					recordId:this.id,
+					pageSize:5,
+					pageIndex:1,
+				}).then((res) => {
+					uni.hideLoading();
+					this.outRecordDeviceList=res.data.data;
+					this.recordsTotal=res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.outRecordDetail({
+					id:this.id,
+				}).then((res) => {
+					var info=	this.carhelp.getPersonInfo()
+					this.info=res.data.outRecord;
+					this.approveList=res.data.approveList;
+					this.isSpPerson=false;
+					for(var i in this.approveList){
+						var item =this.approveList[i]
+						if(item.status==1){
+							continue
+						}
+						if(item.status==2){
+							break;
+						}
+						if(item.status==0){
+							if(item.userId==info.id){
+								this.isSpPerson=true;
+							}else{
+								break;
+							}
+						}
+					}
+					
+					
+					this.outUser=res.data.outUser;
+					this.outRecordDetailObj=res.data;
+					this.getList()
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},saveRecordApprove(status){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.saveRecordApprove({
+					recordId:this.id,
+					status:status,
+					signUrl:"123"
+				}).then((res) => {
+					
+					const eventChannel = this.getOpenerEventChannel();
+					eventChannel.emit('refreshData');
+					uni.showToast({
+						title:"操作成功"
+					})
+					this.getInfo()
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			submit(status){
+				var message=""
+				if(status==2){
+					message="拒绝"
+				}else{
+					message="同意"
+				}
+				var _this=this;
+				uni.showModal({
+					content:"是否"+message+"出库审批",
+					success(res) {
+						_this.saveRecordApprove(status);
+						if(res.confirm){
+							
+						}else{
+							
+						}
+					}
+				})
 			}
 		}
 	}
@@ -300,7 +289,9 @@
 			width: 84rpx;
 			height: 84rpx;
 			border-radius: 100rpx;
-
+			.u-avatar{
+				
+			}
 			img {
 				width: 100%;
 				height: 100%;
@@ -485,7 +476,7 @@
 		}
 
 		.u-order-time {
-			width: 90rpx;
+			width: 160rpx;
 			color: #777777;
 			font-size: 28rpx;
 			margin-top: 16rpx;
@@ -537,13 +528,13 @@
 		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;
+		// 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/projectDepartment/branch/exportProcess/deliveryInfo.vue

@@ -0,0 +1,466 @@
+<template>
+	<view >
+		<u-navbar title="出库单详情"></u-navbar>
+		<!-- 出库单状态 -->
+		<view class="container">
+		<view class="head">
+			<view class="photo">
+				<u-avatar size="84" :src="outUser.headImg"></u-avatar>
+				
+				
+			</view>
+			<view class="name">
+				{{outUser.name}}
+			</view>
+			<view class="submit">
+				提交了<text>出库申请</text>
+			</view>
+			<view class="state">
+				{{recordStatus(info.status)}}
+			</view>
+		</view>
+		<!-- 出库单详情 -->
+		<view class="details">
+			<view class="item">
+				<view class="name">
+					所属项目
+				</view>
+				<view class="value">
+					{{info.projectName}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					需求时间
+				</view>
+				<view class="value">
+					{{info.startTime}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					使用周期至
+				</view>
+				<view class="value">
+					{{info.endTime}}
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					申请时间
+				</view>
+				<view class="value">
+					{{info.createTime}}
+				</view>
+			</view>
+
+		</view>
+		<!-- 出库设备清单 -->
+		<view class="list">
+			<view class="list-head">
+				<view class="title">
+					出库设备清单
+				</view>
+				<view class="amount" @click="gotoUrl('pages/projectDepartment/branch/exportApplication/deliveriedList?id='+id)">
+					全部 <text>{{recordsTotal}}</text> 件设备
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+			<!-- 清单信息 -->
+			<view class="list-infos" v-for="(item,i) in outRecordDeviceList" :key="i" >
+				<view class="infos-head">
+					<view class="name">
+						{{item.deviceName}}
+					</view>
+					<view class="state">
+						预出库 <text>{{item.needCount}}</text>
+					</view>
+				</view>
+				<view class="infos" v-if="false">
+					<view class="infos-1">
+						<view class="infos-item">
+							<view class="item-name">
+								型号：
+							</view>
+							<view class="item-value">
+								GZYV GYVZ-50
+							</view>
+						</view>
+						<view class="infos-item">
+							<view class="item-name">
+								单位：
+							</view>
+							<view class="item-value">
+								台
+							</view>
+						</view>
+					</view>
+					<view class="infos-2">
+						<view class="infos-item">
+							<view class="item-name">
+								单位：
+							</view>
+							<view class="item-value">
+								台
+							</view>
+						</view>
+						<view class="infos-item">
+							<view class="item-name">
+								库存：
+							</view>
+							<view class="item-value">
+								20
+							</view>
+						</view>
+					</view>
+
+				</view>
+
+			</view>
+
+		</view>
+		<approve-list ref="approveList"
+		:outRecordDetailObj="outRecordDetailObj"
+		 :approveList="approveList"></approve-list>
+    </view>
+	
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/approve.js'
+	import approveList from "@/components/ApproveList.vue"
+	
+	import {
+		recordStatus
+	} from '@/apis/status.js'
+	export default {
+		components: {
+			approveList
+		},
+		data() {
+			return {
+				id:"",
+				info:{},
+				outUser:{},
+				outRecordDetailObj:{},
+				outRecordDeviceList:[],
+				approveList:[],
+				recordsTotal:0,
+			}
+		},
+		onLoad(op){
+			this.id=op.id
+			this.getInfo()
+		},
+		methods: {
+			recordStatus,
+			getList(){
+				
+				API.outRecordDeviceById({
+					recordId:this.id,
+					pageSize:5,
+					pageIndex:1,
+				}).then((res) => {
+					uni.hideLoading();
+					this.outRecordDeviceList=res.data.data;
+					this.recordsTotal=res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.outRecordDetail({
+					id:this.id,
+				}).then((res) => {
+					
+					this.info=res.data.outRecord;
+					this.approveList=res.data.approveList;
+					this.outUser=res.data.outUser;
+					this.outRecordDetailObj=res.data;
+					this.getList()
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		padding-bottom: 200rpx;
+	}
+
+	// 出库单状态
+	.head {
+		background-color: #fff;
+		padding: 24rpx 32rpx;
+		display: flex;
+		align-items: center;
+		color: #101010;
+		font-size: 32rpx;
+
+		.photo {
+			width: 84rpx;
+			height: 84rpx;
+			border-radius: 100rpx;
+			.u-avatar{
+				
+			}
+			img {
+				width: 100%;
+				height: 100%;
+				overflow: hidden;
+			}
+		}
+
+		.name {
+			color: #101010;
+			font-size: 32rpx;
+			margin-right: 8rpx;
+			margin-left: 24rpx;
+		}
+
+		.submit {
+			text {
+				color: #3385FF;
+			}
+		}
+
+		.state {
+			line-height: 48rpx;
+			padding: 0 24rpx;
+			border-radius: 50px;
+			background-color: rgba(255, 255, 255, 1);
+			color: rgba(51, 133, 255, 1);
+			font-size: 12px;
+			text-align: center;
+			font-family: Arial;
+			border: 1px solid rgba(51, 133, 255, 1);
+			margin-left: auto;
+		}
+	}
+
+	// 出库单详情
+	.details {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 0 32rpx;
+
+		.item {
+			display: flex;
+			justify-content: space-between;
+			padding: 22rpx 0;
+			border-bottom: 1px solid rgba(244, 244, 244, 1);
+
+			.name {
+				color: rgba(119, 119, 119, 1);
+			}
+
+			.value {
+				color: #101010;
+			}
+		}
+	}
+
+	// 出库单列表
+	.list {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 22rpx 32rpx;
+
+		.list-head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.title {
+				color: #333333;
+				font-size: 32rpx
+			}
+
+			.amount {
+				color: #777777;
+				font-size: 24rpx;
+
+				text {
+					color: #3385FF;
+				}
+
+				/deep/.u-icon--right {
+					margin-left: 8rpx;
+				}
+			}
+		}
+
+		// 清单信息
+		.list-infos {
+			border-radius: 8px;
+			background-color: #F5F6F9;
+			margin-top: 24rpx;
+			padding: 24rpx;
+
+			.infos-head {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 24rpx;
+
+				.name {
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+				}
+
+				.state {
+					color: rgba(0, 81, 255, 1);
+				}
+			}
+
+			.infos {
+				margin-top: 16rpx;
+				display: flex;
+				color: #777777;
+				font-size: 24rpx;
+
+				.infos-1 {
+					margin-right: 68rpx;
+				}
+
+				.infos-item {
+					display: flex;
+					margin-bottom: 8rpx;
+				}
+			}
+		}
+	}
+
+	// 流程
+	.process {
+		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;
+		}
+		.u-time-axis {
+			//padding: 18rpx 40rpx;
+		}
+
+		.u-node {
+			width: 18rpx;
+			height: 18rpx;
+			border-radius: 100rpx !important;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background: #d0d0d0;
+		}
+		.u-order{
+			margin-bottom: 32rpx;
+		}
+		.u-order-title {
+			color: #333333;
+			font-weight: bold;
+			font-size: 32rpx;
+		}
+
+		.u-order-desc {
+			margin-bottom: 16rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.level {
+				color: #333333;
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+
+			.date {
+				color: rgba(119, 119, 119, 1);
+			}
+
+			.state {
+				color: rgba(255, 121, 0, 1);
+			}
+		}
+
+		.u-order-time {
+			width: 90rpx;
+			color: #777777;
+			font-size: 28rpx;
+			margin-top: 16rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.photo {
+				width: 56rpx;
+				height: 56rpx;
+				border-radius: 100px;
+				margin-bottom: 4rpx;
+
+				img {
+					width: 100%;
+					height: 100%;
+					overflow: hidden;
+					position: relative;
+				}
+			}
+
+			.confirm {
+				position: absolute;
+				top: 46rpx;
+				left: 56rpx;
+			}
+
+			.name {
+				color: rgba(51, 51, 51, 1);
+				font-size: 24rpx;
+			}
+
+		}
+      
+	}
+	
+	// .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/projectDepartment/branch/exportProcess/exportProcess.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="head">
-			<u-navbar title="出库申请"></u-navbar>
+			<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()">
@@ -13,17 +13,17 @@
 			</view>
 	
 		</view>
-		<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">
@@ -31,64 +31,123 @@
 						申请时间：
 					</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>
 		</view>
+	
 		
-		<view class="bottom">
-			<button>填写出库申请</button>
-		</view>
+	
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/approve.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.menuList[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.outApproveList(listForm).then((res) => {
+							 
+								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;
+								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,status){
+				var url="./deliveryDetails?id="+id;
+				
+				if(status!=0){
+					url="./deliveryInfo?id="+id;	
+				}
+				uni.navigateTo({
+					url:url,
+					events: {
+					  refreshData: () => {
+					    this.init()
+					  }
+					}
+				})
+			},
+			
 			change(index) {
 				this.current = index;
+				 var list=this.list[this.current].list
+				 if(list.length==0){
+					 this.getList();
+				 }
+				
 			},
-			changeShow(){
-				this.show=!this.show
-			}
+			 
 		}
 	}
 </script>

pages/projectDepartment/branch/exportReturn/deliveryDetails.vue

@@ -5,7 +5,8 @@
 		<view class="container">
 		<view class="head">
 			<view class="photo">
-				<img src="@/assets/img/photoCopy 3@1x.png" alt="">
+				<u-avatar size="84" :src="item.userImg"></u-avatar>
+				
 			</view>
 			<view class="name">
 				刘群

pages/projectDepartment/branch/exportReturn/deliveryFrom.vue

@@ -5,7 +5,8 @@
 		<view class="container">
 		<view class="head">
 			<view class="photo">
-				<img src="@/assets/img/photoCopy 3@1x.png" alt="">
+				<u-avatar size="84" :src="item.userImg"></u-avatar>
+				
 			</view>
 			<view class="name">
 				刘群

pages/storeManagement/equipmentDelivery/deliveried.vue

@@ -4,7 +4,7 @@
 		<!-- 出库单状态 -->
 		<view class="head">
 			<view class="photo">
-				<img src="@/assets/img/photoCopy 3@1x.png" alt="">
+		<u-avatar size="84" :src="item.userImg"></u-avatar>
 			</view>
 			<view class="name">
 				刘群

pages/storeManagement/equipmentDelivery/deliveriedList.vue

@@ -1,22 +1,25 @@
 <template>
 	<view>
-		<u-navbar>
-			<view class="title">
-				出库设备清单<text>(18)</text>
+		<u-navbar >
+			<view class="u-navbar " >
+				<view class="title" >
+					出库设备清单<text>({{recordsTotal}})</text>
+				</view>
 			</view>
+			
 		</u-navbar>
-		<view class="list" >
+		<view class="list" v-for="(item,index) in list" :key="index">
 			<!-- 清单信息 -->
-			<view class="list-infos">
+			<view class="list-infos" >
 				<view class="infos-head">
 					<view class="name">
-						50KV直流高压电缆
+						{{item.deviceName}}
 					</view>
 					
 				</view>
 				<view class="infos">
 					<view class="infos-1">
-						<view class="infos-item">
+						<view class="infos-item" v-if="false">
 							<view class="item-name">
 								型号：
 							</view>
@@ -26,14 +29,14 @@
 						</view>
 						<view class="infos-item">
 							<view class="item-name">
-								待出库：
+								{{recordItemStatus(item.status)}}：
 							</view>
 							<view class="item-value">
-								10
+								{{item.needCount}}
 							</view>
 						</view>
 					</view>
-					<view class="infos-2">
+					<view class="infos-2" v-if="false">
 						<view class="infos-item">
 							<view class="item-name">
 								单位：
@@ -55,7 +58,7 @@
 
 				</view>
 				<!-- 地址 -->
-				<view class="address">
+				<view class="address"  v-if="false">
 					<view class="name">
 						位置：
 					</view>
@@ -64,7 +67,7 @@
 					</view>
 				</view>
 				<!-- 备注 -->
-				<view class="remark">
+				<view class="remark"  v-if="false">
 					<view class="name">
 						备注：
 					</view>
@@ -73,7 +76,7 @@
 					</view>
 				</view>
 
-				<view class="prepare-out"  >
+				<view class="prepare-out"   >
 					<view class="head">
 						<view class="amount">
 							<view class="title">
@@ -86,7 +89,7 @@
 
 						<view class="unfold">
 							展开<u-icon name="arrow-down" @click="changeShow()"></u-icon>
-							<view class="option" v-if="this.show==true">
+							<view class="option" v-if="show==true">
 
 							</view>
 						</view>
@@ -108,119 +111,68 @@
 
 		</view>
  
-     <view class="list" >
-     	<!-- 清单信息 -->
-     	<view class="list-infos">
-     		<view class="infos-head">
-     			<view class="name">
-     				汽油液压机
-     			</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
-     					</view>
-     				</view>
-     				<view class="infos-item">
-     					<view class="item-name">
-     						待出库：
-     					</view>
-     					<view class="item-value">
-     						10
-     					</view>
-     				</view>
-     			</view>
-     			<view class="infos-2">
-     				<view class="infos-item">
-     					<view class="item-name">
-     						单位：
-     					</view>
-     					<view class="item-value">
-     						台
-     					</view>
-     				</view>
-     				<view class="infos-item">
-     					<view class="item-name">
-     						库存：
-     					</view>
-     					<view class="item-value">
-     						20
-     					</view>
-     				</view>
-     
-     			</view>
-     
-     		</view>
-     		<!-- 地址 -->
-     		<view class="address">
-     			<view class="name">
-     				位置：
-     			</view>
-     			<view class="value">
-     				荆力总包仓库1仓库2号货架302
-     			</view>
-     		</view>
-     		<!-- 备注 -->
-     		<view class="remark">
-     			<view class="name">
-     				备注：
-     			</view>
-     			<view class="value">
-     				22
-     			</view>
-     		</view>
-     
-     		<view class="prepare-out"  >
-     			<view class="head">
-     				<view class="amount">
-     					<view class="title">
-     						实际领用：
-     					</view>
-     					<view class="value">
-     						1
-     					</view>
-     				</view>
-     
-     				<view class="unfold">
-     					展开<u-icon name="arrow-down" @click="changeShow()"></u-icon>
-     					<view class="option" v-if="this.show==true">
-     
-     					</view>
-     				</view>
-     
-     			</view>
-     			<!-- 编号 -->
-     			<view class="serial-number" >
-     				<view class="item">
-     					<view class="text">
-     						设备编号：
-     					</view>
-     					<view class="number">
-     						ND920182001511
-     					</view>
-     				</view>
-     			</view>
-     		</view>
-     	</view>
-     
-     </view>
+   
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/projectDepartment.js'
+	import {
+		recordItemStatus
+	}  from '@/apis/status.js'
 	export default {
 		data() {
 			return {
-				show: false
+				show: false,
+				list:[],
+				id:"",
+				recordsTotal: 0,
+				listFrom:{
+					pageIndex: 1,
+					pageSize: 20,
+				
+				}
+			}
+		},
+		onReachBottom() {
+			
+			if (this.list.length < this.recordsTotal) {			
+				this.myLoadmore();
 			}
+		},
+		onLoad(op){
+			this.id=op.id
+			this.getList()
+		},
+		onReady(){
+			
 		},
 		methods: {
+			recordItemStatus,
+			getList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.outRecordDeviceById({
+					recordId:this.id,
+					pageSize:this.listFrom.pageSize,
+					pageIndex:this.listFrom.pageIndex,
+				}).then((res) => {
+					uni.hideLoading();
+					this.list=res.data.data;
+					this.recordsTotal=res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			myLoadmore(){
+				this.listFrom.pageIndex += 1;
+				this.getList();
+			},
 			changeShow() {
 				this.show = !this.show
 				
@@ -234,21 +186,26 @@
 		padding-bottom: 100px;
 	}
 	.u-navbar {
+		display: flex;
+		font-size: 36rpx;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60rpx;
+		text-align: center;
+		flex-shrink: 0;
+		left: 237rpx;
+		    right: 107rpx;
+		    width: 300rpx;
 		.title {
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: center;
-			flex: 1;
-			position: absolute;
-			left: 0;
-			right: 0;
-			height: 30px;
-			text-align: center;
-			flex-shrink: 0;
+			
+				
+			line-height: 60rpx;
 			font-size: 36rpx;
-			color: #101010;
-
+			flex: 1;
 			text {
 				color: #2A8EFB
 			}

pages/storeManagement/equipmentDelivery/deliveryDetails.vue

@@ -5,16 +5,18 @@
 		<view class="container">
 		<view class="head">
 			<view class="photo">
-				<img src="@/assets/img/photoCopy 3@1x.png" alt="">
+				<u-avatar size="84" :src="outUser.headImg"></u-avatar>
+				
+				
 			</view>
 			<view class="name">
-				刘群
+				{{outUser.name}}
 			</view>
 			<view class="submit">
 				提交了<text>出库申请</text>
 			</view>
 			<view class="state">
-				待出库
+				{{recordStatus(info.status)}}
 			</view>
 		</view>
 		<!-- 出库单详情 -->
@@ -24,7 +26,7 @@
 					所属项目
 				</view>
 				<view class="value">
-					洪湖文泉110kV变电站二期
+					{{info.projectName}}
 				</view>
 			</view>
 			<view class="item">
@@ -32,7 +34,7 @@
 					需求时间
 				</view>
 				<view class="value">
-					无
+					{{info.startTime}}
 				</view>
 			</view>
 			<view class="item">
@@ -40,7 +42,7 @@
 					使用周期至
 				</view>
 				<view class="value">
-					2023年6月30日
+					{{info.endTime}}
 				</view>
 			</view>
 			<view class="item">
@@ -48,7 +50,7 @@
 					申请时间
 				</view>
 				<view class="value">
-					2023年3月27日 11:00
+					{{info.createTime}}
 				</view>
 			</view>
 
@@ -59,22 +61,22 @@
 				<view class="title">
 					出库设备清单
 				</view>
-				<view class="amount">
-					全部 <text>18</text> 件设备
+				<view class="amount" @click="gotoOut()">
+					全部 <text>{{recordsTotal}}</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 outRecordDeviceList" :key="i" >
 				<view class="infos-head">
 					<view class="name">
-						接地线 220kV 无杆
+						{{item.deviceName}}
 					</view>
 					<view class="state">
-						预出库 <text>2</text>
+						预出库 <text>{{item.needCount}}</text>
 					</view>
 				</view>
-				<view class="infos">
+				<view class="infos" v-if="false">
 					<view class="infos-1">
 						<view class="infos-item">
 							<view class="item-name">
@@ -117,166 +119,88 @@
 			</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>
+		<approve-list ref="approveList"
+		:outRecordDetailObj="outRecordDetailObj"
+		 :approveList="approveList"></approve-list>
     </view>
-	<!-- 确认出库 -->
-	<view class="bottom" >
-		<button>确认出库</button>
-	</view>
+		<!-- 确认出库 -->
+		<view class="bottom"  >
+			<u-button  type="primary"  @click="gotoOut()" >确认出库</u-button>
+			
+		</view>
 	</view>
 </template>
 
 <script>
+	import * as API from '@/apis/pagejs/approve.js'
+	import approveList from "@/components/ApproveList.vue"
+	
+	import {
+		recordStatus
+	} from '@/apis/status.js'
 	export default {
+		components: {
+			approveList
+		},
 		data() {
 			return {
-
+				id:"",
+				info:{},
+				outUser:{},
+				outRecordDetailObj:{},
+				outRecordDeviceList:[],
+				approveList:[],
+				recordsTotal:0,
+			}
+		},
+		onLoad(op){
+			this.id=op.id
+			this.getInfo()
+		},
+		methods: {
+			recordStatus,
+			getList(){
+				
+				API.outRecordDeviceById({
+					recordId:this.id,
+					pageSize:5,
+					pageIndex:1,
+				}).then((res) => {
+					uni.hideLoading();
+					this.outRecordDeviceList=res.data.data;
+					this.recordsTotal=res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			gotoOut(){
+				uni.navigateTo({
+					url:'/pages/storeManagement/equipmentDelivery/deliveriedList?id='+this.id
+				})
+			},
+			getInfo(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.outRecordDetail({
+					id:this.id,
+				}).then((res) => {
+					
+					this.info=res.data.outRecord;
+					this.approveList=res.data.approveList;
+					this.outUser=res.data.outUser;
+					this.outRecordDetailObj=res.data;
+					this.getList()
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			}
 		}
 	}
@@ -300,7 +224,9 @@
 			width: 84rpx;
 			height: 84rpx;
 			border-radius: 100rpx;
-
+			.u-avatar{
+				
+			}
 			img {
 				width: 100%;
 				height: 100%;
@@ -537,13 +463,13 @@
 		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;
+		// 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/equipmentDelivery/equipmentDelivery.vue

@@ -76,7 +76,7 @@
 </template>
 
 <script>
-	import * as API from '@/apis/pagejs/index.js'
+	import * as API from '@/apis/pagejs/storeManagement.js'
 	
 	export default {
 		data() {
@@ -122,7 +122,7 @@
 							 }
 							 delete listForm.list
 							 
-							 API.pageList(listForm).then((res) => {
+							 API.outWaitList(listForm).then((res) => {
 							 	uni.hideLoading();
 								if(listForm.pageIndex==1){
 									list = res.data.data;
@@ -132,6 +132,7 @@
 										...res.data.data
 									];
 								}
+							 	this.list[this.current].list=list
 							 	
 							 	this.list[this.current].recordsTotal = res.data.recordsTotal;
 							 }).catch(error => {

pages/storeManagement/equipmentEnter/enterDetails.vue

@@ -6,7 +6,7 @@
 		<!-- 归还单状态 -->
 		<view class="head">
 			<view class="photo">
-				<img src="@/assets/img/photoCopy 3@1x.png" alt="">
+			<u-avatar size="84" :src="item.userImg"></u-avatar>
 			</view>
 			<view class="name">
 				刘群

pages/storeManagement/equipmentEnter/verification.vue

@@ -8,7 +8,7 @@
 		<!-- 归还单状态 -->
 		<view class="head">
 			<view class="photo">
-				<img src="@/assets/img/photoCopy 3@1x.png" alt="">
+				<u-avatar size="84" :src="item.userImg"></u-avatar>
 			</view>
 			<view class="name">
 				刘群

uni_modules/uview-ui/components/u-button/u-button.vue

@@ -236,7 +236,7 @@ export default {
 		},
 		// 在'primary', 'success', 'error', 'warning'类型下，不显示边框，否则会造成四角有毛刺现象
 		showHairLineBorder() {
-			if (['primary', 'success', 'error', 'warning'].indexOf(this.type) >= 0 && !this.plain) {
+			if (['primary', 'success', 'error', 'warning','revoke'].indexOf(this.type) >= 0 && !this.plain) {
 				return '';
 			} else {
 				return 'u-hairline-border';
@@ -382,6 +382,12 @@ export default {
 		background-color: $u-type-primary;
 	}
 	
+	&--revoke {
+		color: #ffffff;
+		border-color: #bcbcbc;
+		background-color: #bcbcbc;
+	}
+	
 	&--success {
 		color: #ffffff;
 		border-color: $u-type-success;