细节优化，格式调整

components/ApproveList.vue

@@ -55,6 +55,9 @@
 									<view v-if="item.status==0">未审批</view>
 									<view v-if="item.status==1">审批通过</view>
 									<view v-if="item.status==2">审批驳回</view>
+								</view>
+								<view class="signUrl" v-if="item.signUrl">
+									<img :src="item.signUrl" >
 								</view>
 							</view>
 						</view>
@@ -235,13 +238,20 @@
 
 				.img {
 					width: 100%;
-					min-width: 30px;
+					min-width: 25px;
 					height: 100%;
 					overflow: hidden;
 					position: relative;
 				}
 			}
-
+			.signUrl{
+				border: 1px solid;
+				margin-left: 40px;
+				img{
+					width:200rpx;
+					height:80rpx;
+				}
+			}
 			.confirm {
 				position: absolute;
 				top: 46rpx;

config/.env.dev.js

@@ -19,7 +19,7 @@ const UNI_APP = {
 	//openId:"123",// 项目部 - 审批1
 	//openId:"223",// 项目部 - 审批2
 	//openId:"323",// 项目部 - 审批3
-	//openId:"oBEnI6PiaBMNUMTnjT0ffT1R2JOk",//杨所
+	//openId:"oBA__5fiKEszHSigQGwZbLCVbg5A",//杨所
 	//openId:"oBEnI6N9gRq3xOVlw34JfYjhtB9k",//  伊明
 	
 	

main.js

@@ -44,7 +44,11 @@ Vue.mixin({
 	methods: {
 		
 		takeCodeJp(val){
-			if(val&&val.indexOf("?jpdeviceid=")>-1){
+			if(val&&val.indexOf("jp=")==0){
+				val=val.split("jp=")[1]
+				
+				return val
+			}else if(val&&val.indexOf("?jpdeviceid=")>-1){
 				val=val.split("?jpdeviceid=")[1]
 				if(val.indexOf("&")>-1){
 					val=val.split("&")[0]	

pages/otherFunctions/homePage.vue

@@ -16,6 +16,7 @@
 					</view>
 					<view class="options" v-if="show==true" >
 						<view  v-if="false" @click="changeShow4()">订阅</view>
+						<view    @click="changeShow5()">扫码</view>
 						
 						<view v-if="false" @click="changeShow2()">修改openId</view> 
 						<view @click="logout()">退出账号</view>
@@ -31,6 +32,78 @@
 			</view>
 			
 		 </view>
+		 
+		 <u-popup  v-model="showpopup" class=""  mode="bottom"
+		 border-radius="14"
+		 :closeable="true" >
+		 			<view class="scantitle">连续扫码</view>
+		 			<view class="list">
+		 			<view class=" list-infos">
+		 				<view class="infos-head">
+		 					<view class="name">
+		 						{{nowscan.title?nowscan.title:'扫码后出当前结果'}}
+		 					</view>
+		 				
+		 					<view class="name">
+		 						编号：{{nowscan.code}}
+		 					</view>
+		 				</view>
+		 				<view class="infos-head infos-head2" style="margin-bottom: 12rpx;">
+		 					<view class="name">
+		 						上次巡检:{{nowscan.experimentLastTime}}
+		 					</view>
+		 				
+		 					<view class="name" v-show="nowscan.experimentPeriod">
+		 						周期:{{nowscan.experimentPeriod}}天
+		 					</view>
+		 				</view>
+		 				<view class="infos">
+		 					<view class="infos-1">
+		 						<view class="infos-item">
+		 							<view class="item-name">
+		 								厂家：
+		 							</view>
+		 							<view class="item-value">
+		 								{{nowscan.manufactor}}
+		 							</view>
+		 						</view>
+		 						<view class="infos-item">
+		 							<view class="item-name">
+		 								单位：
+		 							</view>
+		 							<view class="item-value">
+		 								{{nowscan.unit}}
+		 							</view>
+		 						</view>
+		 					</view>
+		 					<view class="infos-2">
+		 						<view class="infos-item">
+		 							<view class="item-name">
+		 								规格：
+		 							</view>
+		 							<view class="item-value">
+		 								{{nowscan.specifications}}
+		 							</view>
+		 						</view>
+		 						<view class="infos-item">
+		 							<view class="item-name">
+		 								型号：
+		 							</view>
+		 							<view class="item-value">
+		 								{{nowscan.model}}
+		 							</view>
+		 						</view>
+		 					</view>
+		 				
+		 				</view>
+		 				</view>
+		 			</view>
+		 			<camera mode="scanCode"   resolution='medium' 
+		 			 @scancode="takeCode"  v-if="showpopup"
+		 			 device-position="back" flash="off" @error="error"
+		 			 style="width: 100%; height: 300px;"></camera>
+		 			
+		 		</u-popup>
 		<!-- 宫格 -->
 		<view class="gird"  >
 			<!-- 公告 -->
@@ -189,6 +262,18 @@
 	export default {
 		data() {
 			return {
+				scanFunctionIsUseable:true,
+				nowscan:{
+					"title": "",
+					"specifications": "",
+					"experimentLastTime":"",
+					"manufactor": "",
+					"unit": "",
+					"model": "",
+					"code": "",
+				
+				},
+				showpopup:false,
 				show:false,
 				badgeexportProcess:0,
 				userInfo:{
@@ -401,6 +486,9 @@
 				  success (res) { }
 				})
 			},
+			changeShow5(){
+				this.showpopup=true
+			},
 			changeShow3(openId){
 				this.carhelp.setOpenId(openId);
 				this.carhelp.logoff();
@@ -425,7 +513,98 @@
 						}
 					}
 				});
-			}
+			},
+			gotoscan(val) {
+				// #ifdef H5
+					this.gotoscanH5(val)
+				// #endif
+				
+				// #ifdef MP-WEIXIN
+					
+						this.gotoscanMP(val)
+				// #endif
+			},
+			takeCode(e){
+				 console.log(e);
+				  if(this.scanFunctionIsUseable) {
+				         this.scanFunctionIsUseable = false;
+				         // 对扫码结果进行处理
+				         console.log(e.detail.result);
+						this.getscan(this.takeCodeJp(e.detail.result))
+				         // 扫码间隔两秒
+				         setTimeout(() => {
+				         this.scanFunctionIsUseable = true;
+						
+				         }, 1000)
+				     }
+				
+			 },
+			 gotoscanMP(val){
+				 this.showpopup=true;
+				  // const ctx = uni.createCameraContext();
+				  //            ctx.takePhoto({
+				  //                quality: 'high',
+				  //                success: (res) => {
+				  //                    this.src = res.tempImagePath
+				  //                }
+				  //            });
+			 },
+			 getscan(val) {
+			 	this.showpopup=true;
+			 	
+			 	
+			 	uni.showLoading({
+			 		title: "加载中",
+			 		mask: true,
+			 	})
+			 	API.queryDeviceByCode({
+			 		code: val,
+			 
+			 	}).then((res) => {
+			 		uni.hideLoading();
+			 		if (res.data.deviceInfo) {
+			 			console.log(res.data.deviceInfo)
+			 			this.nowscan=res.data.deviceInfo;
+			 			uni.showToast({
+			 				title: "添加成功",
+			 				icon: "none"
+			 			})
+			 
+			 
+			 		} else {
+			 			uni.showToast({
+			 				title: "二维码无效",
+			 				icon: "none"
+			 			})
+			 		}
+			 
+			 	}).catch(error => {
+			 		uni.showToast({
+			 			title: error,
+			 			icon: "none"
+			 		})
+			 	})
+			 },
+			gotoscanH5(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('用户点击取消');
+						}
+					}
+				});
+			
+			
+			},
+			
 			
 		}
 	}

pages/projectDepartment/components/l-signature/l-signature.vue

@@ -115,9 +115,10 @@ export {default}  from './render'
 				return this.landscape ? [canvasHeight, canvasWidth] : [canvasWidth, canvasHeight]
 			},
 			canvasStyle() {
-				const {canvasWidth, canvasHeight, backgroundColor} = this
+				const {canvasWidth, canvasHeight, backgroundColor} = this
+				//canvasWidth && (canvasWidth + 'px')
 				return {
-					width: canvasWidth && (canvasWidth + 'px'),
+					width: "100%",
 					height: canvasHeight && (canvasHeight + 'px'),
 					background: backgroundColor
 				}

pages/projectDepartment/exportApplication/deliveryDetails.vue

@@ -323,7 +323,7 @@
 		.item {
 			display: flex;
 			justify-content: space-between;
-			padding: 22rpx 0;
+			padding: 12rpx 0;
 			border-bottom: 1px solid rgba(244, 244, 244, 1);
 
 			.name {

pages/projectDepartment/exportApplication/deliveryFrom.vue

@@ -30,14 +30,40 @@
 					使用周期至<span style="color: red;">*</span>
 				</view>
 				<view class="value">
-					<ujp-calendar v-model="show" mode="date"  max-date="2099-01-01"  @change="change"></ujp-calendar>
 
 					<u-input v-model="endTime" @click="show=true,showText='endTime'"  @clear="showText='endTime',change('')"   placeholder="请输入使用周期" 	 type="select" />
 				</view>
 			</view>
-		
+			<view class="item">
+				<view class="name">
+					所属项目部<span style="color: red;">*</span>
+				</view>
+				<view class="value">
+					
+					<u-input v-model="project" @click="show2=true,showText='project'"  @clear="showText='project',change('')"   placeholder="请选择所属项目部" 	 type="select" />
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					第一步审批<span style="color: red;">*</span>
+				</view>
+				<view class="value">
+					
+					<u-input v-model="approve1" @click="show2=true,showText='approve1'"  @clear="showText='approve1',change('')"   placeholder="请选择第一步审批人" 	 type="select" />
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					第二步审批<span style="color: red;">*</span>
+				</view>
+				<view class="value">
+					
+					<u-input v-model="approve2" @click="show2=true,showText='approve2'"  @clear="showText='approve2',change('')"   placeholder="请选择第二步审批人" 	 type="select" />
+				</view>
+			</view>
 
 		</view>
+		
 		<!-- 出库设备清单 -->
 		<view class="list">
 			<view class="list-head">
@@ -144,15 +170,19 @@
 				<view>
 					
 					出库数量	
-					<u-number-box bg-color="#FFFFFF"
+					<u-number-box bg-color="#FFFFFF" :min="1"
 					 style="float: right;" v-model="item.count"></u-number-box>
 
 				</view>
 
 			</view>
-
+			<u-divider   v-show="list.length" border-color="#CFD2D5">已经到底了</u-divider>
+		
 		</view>
 	 </view>
+	 <ujp-calendar v-model="show" mode="date"  max-date="2099-01-01"  @change="change"></ujp-calendar>
+	 
+	 <u-select v-model="show2" :list="list2"   @confirm="confirm" ></u-select>
 	 <!-- -sync -sync -->
 	 <u-popup  v-model="showpopup"  mode="bottom" 
 	 border-radius="14"
@@ -209,21 +239,78 @@
 				},
 				
 				show:false,
+				project:"",
 				showText:"",
 				showpopup:false,
 				endTime:'',
 				needTime:'',
+				approve1:"",
+				approve2:"",
 				queryContent:'',
-				list:[]
+				list:[],
+				show2:false,//审批人 步骤1
+				//list2:[],
+				approveList1:[
+					{
+											value: '1',
+											label: '江1'
+										},
+										{
+											value: '2',
+											label: '湖1'
+										}
+				],
+				approveList2:[
+					{
+											value: '1',
+											label: '江2'
+										},
+										{
+											value: '2',
+											label: '湖2'
+										}
+				],
+				projectList:[
+					{
+											value: '1',
+											label: '江3'
+										},
+										{
+											value: '2',
+											label: '湖3'
+										}
+				],
 			}
 		},
 		components:{
 			equipmentRetrieval,ujpCalendar
 		},
 		computed:{
-			 
+			 list2(){
+				 var list=[];
+				 if(this.showText=='approve1'){
+					list=this.approveList1
+				 }
+				if(this.showText=='approve2'){
+					list=this.approveList2
+				}
+				if(this.showText=='project'){
+					list=this.projectList
+				}
+				 return list
+			 }
 		},
 		methods:{
+			confirm(e) {
+				if(e==''){
+					this.form[this.showText]='';
+					this[this.showText]=''
+				}else{
+					this.form[this.showText]=e[0].value;
+					this[this.showText]=e[0].label
+				}
+			},
+			
 			showpopupBtn(){
 				
 				
@@ -479,7 +566,7 @@
 		.item {
 			display: flex;
 			justify-content: space-between;
-			padding: 22rpx 0;
+			padding: 12rpx 0;
 			border-bottom: 1px solid rgba(244, 244, 244, 1);
 
 			.name {

pages/projectDepartment/exportProcess/deliveryDetails.vue

@@ -132,7 +132,7 @@
 			
 		<view class="signature">
 			<l-signature 
-			 
+			 width="100%"
 			 disableScroll ref="signatureRef" :penColor="penColor" :penSize="penSize"
 				:openSmooth="openSmooth"></l-signature>
 		</view>
@@ -229,10 +229,32 @@
 								this.signUrl ="";
 							}else{
 								
-							//	var file=base64ToFile( res.tempFilePath,'1.jpg')
-								//this.uploadBase64Json(file)
-								this.signUrl=res.tempFilePath
-								this.saveRecordApprove("1");
+						
+								
+								// #ifdef MP-WEIXIN
+								
+									var _this=this;
+									wx.getFileSystemManager()
+									  .readFile({ //读取本地文件内容
+									    filePath: res.tempFilePath, // 文件路径
+									    encoding: 'base64', // 返回格式
+									    success: ({data}) => {
+										
+									      _this.signUrl='data:image/png;base64,' + data;
+										  _this.saveRecordApprove("1");
+									    },
+									    fail(res) {
+									      console.log('fail', res)
+									    }
+									  });
+									  
+								// #endif
+								// #ifdef H5
+									this.signUrl=res.tempFilePath
+									this.saveRecordApprove("1");
+								// #endif
+								
+								
 							}
 						}
 					})
@@ -241,6 +263,7 @@
 				if (this.$refs.signatureRef)
 					this.$refs.signatureRef[type]()
 			},
+			 
 			uploadBase64Json(file){
 				
 				var formData={
@@ -487,7 +510,7 @@
 		.item {
 			display: flex;
 			justify-content: space-between;
-			padding: 22rpx 0;
+			padding: 12rpx 0;
 			border-bottom: 1px solid rgba(244, 244, 244, 1);
 
 			.name {

pages/projectDepartment/exportProcess/deliveryInfo.vue

@@ -274,7 +274,7 @@
 		.item {
 			display: flex;
 			justify-content: space-between;
-			padding: 22rpx 0;
+			padding: 12rpx 0;
 			border-bottom: 1px solid rgba(244, 244, 244, 1);
 
 			.name {

pages/projectDepartment/exportReturn/deliveryDetails.vue

@@ -243,7 +243,7 @@
 		.item {
 			display: flex;
 			justify-content: space-between;
-			padding: 22rpx 0;
+			padding: 12rpx 0;
 			border-bottom: 1px solid rgba(244, 244, 244, 1);
 
 			.name {

pages/projectDepartment/exportReturn/deliveryFrom.vue

@@ -1,36 +1,37 @@
 <template>
 	<view >
 		<u-navbar title="申请归还">
-			<!-- <view slot="right" style="margin-right: 10px;">
-			
-				<u-icon name="scan" size="48" @click="gotoscan('')"></u-icon>
-			</view> -->
-		</u-navbar>
-		
-		
-		<!-- 出库单详情 -->
-		<view class="details">
-			<view class="item">
-				<view class="name">
-					所属项目<span style="color: red;">*</span>
-				</view>
-				<view class="value">
-					<u-input v-model="form.projectName" placeholder="请输入所属项目" type="text" />
+			<view class="details" slot="bottom">
+				<view class="list">
+					<view class="list-head" style="margin-bottom: 3px;">
+						<view class="title">
+							出库设备清单
+						</view>
+						<view class="amount"  @click="gotoscan('')">
+							<u-icon name="scan" color="#0051ff" ></u-icon>扫码识别
+						</view>
+					</view>
+					<view class="list-head">
+						<view class="title">
+							所属项目<span style="color: red;">*</span>
+						</view>
+						<view class="amount" >
+							<u-input style="border-bottom: 1px solid;"
+							 v-model="form.projectName" placeholder="请输入所属项目" type="text" />
+						</view>
+					</view>
 					
 				</view>
-			</view>
-			<view class="item" v-if="false">
-				<view class="name">
-					归还至
-				</view>
-				<view class="value">
-					<u-input v-model="address" @click="show=true"  @clear="change('')"   placeholder="请输入使用周期" 	 type="select" />
+				<!-- 出库单详情 -->
+			
 					
-				</view>
+				
 			</view>
 			
-
-		</view>
+		</u-navbar>
+		
+		
+		
 		<u-popup  v-model="showpopup" class=""  mode="bottom"
 		border-radius="14"
 		:closeable="true" >
@@ -102,76 +103,80 @@
 					 style="width: 100%; height: 300px;"></camera>
 					
 				</u-popup>
+				
 		<!-- 出库设备清单 -->
-		<view class="list">
-			<view class="list-head">
-				<view class="title">
-					出库设备清单
-				</view>
-				<view class="amount"  @click="gotoscan('')">
-					<u-icon name="scan" color="#0051ff" ></u-icon>扫码识别
-				</view>
-			</view>
-			<!-- 清单信息 -->
-			<view class="list-infos" v-for="(item,i) in scanList" :key="i"  >
-				<view class="infos-head">
-					<view class="name">
-						{{item.title}}
-					</view>
-					<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">
-								{{item.code}}
-							</view>
+		<view class="list container" style="padding-bottom: 60px;" v-show="scanList.length" >
+			<view class="list-view">
+				
+				<!-- 清单信息 -->
+				<view class="list-infos" v-for="(item,i) in scanList" :key="i"  >
+					<view class="infos-head">
+						<view class="name">
+							{{item.title}}
 						</view>
-						<view class="infos-item">
-							<view class="item-name">
-								单位：
-							</view>
-							<view class="item-value">
-								{{item.unit}}
-							</view>
+						<view class="state" @click="delOutListMethod(i)">
+							<u-icon name="trash-fill" color="#777777" ></u-icon>
 						</view>
 					</view>
-					<view class="infos-2">
-						<view class="infos-item">
-							<view class="item-name">
-								规格：
+					<view class="infos">
+						<view class="infos-1">
+							<view class="infos-item">
+								<view class="item-name">
+									编号：
+								</view>
+								<view class="item-value">
+									{{item.code}}
+								</view>
 							</view>
-							<view class="item-value">
-								{{item.specifications}}
+							<view class="infos-item">
+								<view class="item-name">
+									单位：
+								</view>
+								<view class="item-value">
+									{{item.unit}}
+								</view>
 							</view>
 						</view>
-						<view class="infos-item">
-							<view class="item-name">
-								型号：
+						<view class="infos-2">
+							<view class="infos-item">
+								<view class="item-name">
+									规格：
+								</view>
+								<view class="item-value">
+									{{item.specifications}}
+								</view>
 							</view>
-							<view class="item-value">
-								{{item.model}}
+							<view class="infos-item">
+								<view class="item-name">
+									型号：
+								</view>
+								<view class="item-value">
+									{{item.model}}
+								</view>
 							</view>
 						</view>
+
 					</view>
 
 				</view>
-
 			</view>
-
+			<u-divider   :isnone="scanList.length==0"
+			
+			nonetext="点击'扫码'进行归还"  nonetop="110" border-color="#CFD2D5">已经到底了</u-divider>
+		
 		</view>
 		
-	<!-- 确认出库 -->
-	<view class="bottom"  >
+		<u-divider   :isnone="scanList.length==0" v-show="scanList.length==0"
 		
-		<u-button  type="primary"  @click="gotoOut()" >确认归还</u-button>
+		nonetext="点击'扫码'进行归还"  nonetop="110" border-color="#CFD2D5">已经到底了</u-divider>
+				
 		
-	</view>
+		<!-- 确认出库 -->
+		<view class="bottom"  >
+			
+			<u-button  type="primary"  @click="gotoOut()" >确认归还</u-button>
+			
+		</view>
 	</view>
 </template>
 
@@ -344,13 +349,13 @@
 			           console.log(e);
 			},
 			gotoscan(val) {
+				
 				// #ifdef H5
 					this.gotoscanH5(val)
 				// #endif
 				
 				// #ifdef MP-WEIXIN
-					
-						this.gotoscanMP(val)
+					this.gotoscanMP(val)
 				// #endif
 			},
 			takeCode(e){
@@ -462,22 +467,28 @@
 			margin-left: auto;
 		}
 	}
+	.container{
+		margin-top: 80px;
+		
+	}
 
 	// 出库单详情
 	.details {
 		background-color: #fff;
 		margin-top: 24rpx;
-		padding: 0 32rpx;
-
+		
+		padding: 16rpx 32rpx;
 		.item {
 			display: flex;
 			justify-content: space-between;
-			padding: 22rpx 0;
-			border-bottom: 1px solid rgba(244, 244, 244, 1);
-
+			padding: 12rpx 0;
+			//border-bottom: 1px solid rgba(244, 244, 244, 1);
+			
 			.name {
 				line-height: 30px;
-				color: rgba(119, 119, 119, 1);
+				color: #333333;
+				font-size: 32rpx
+				
 			}
 
 			.value {
@@ -487,11 +498,12 @@
 	}
 
 	// 出库单列表
-	.list {
-		background-color: #fff;
-		margin-top: 24rpx;
-		padding: 22rpx 32rpx;
-
+	.list {	
+		//margin-top: 24rpx;
+		.list-view{
+			padding: 16rpx 32rpx;
+			background-color: #fff;
+		}
 		.list-head {
 			display: flex;
 			justify-content: space-between;

pages/projectDepartment/exportReturn/exportReturn.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar title="出库申请" class="head">
+		<u-navbar title="归还单填写" class="head">
 		
 			<view class="tabs" slot="bottom">
 				<u-tabs bar-width="80" inactive-color="#777777" active-color="#101010" :list="list" :is-scroll="false"
@@ -59,14 +59,14 @@
 		data() {
 			return {
 				list: [{
-					name: '待入库',
+					name: '待归还',
 					pageIndex: 1,
 					pageSize: 20,
 					recordsTotal: 1,
 					status: "0",
 					list: []
 				}, {
-					name: '已入库',
+					name: '已归还',
 					pageIndex: 1,
 					pageSize: 20,
 					recordsTotal: 1,

pages/storeManagement/equipmentDelivery/deliveriedList.vue

@@ -6,7 +6,18 @@
 					出库设备清单<text>({{recordsTotal}})</text>
 				</view>
 			</view>
-			
+			<view class="details" v-if="status==1" slot="bottom">
+				<view class="list-details">
+					<view class="list-head">
+						<view class="title">
+							扫码出库
+						</view>
+						<view class="amount"   @click="gotoscan('')">
+							<u-icon name="scan" color="#0051ff" ></u-icon>扫码识别
+						</view>
+					</view>
+				</view>
+			</view>
 		</u-navbar>
 		<u-popup  v-model="showpopup" class=""  mode="bottom" 
 	 border-radius="14"
@@ -83,7 +94,7 @@
 			 style="width: 100%; height: 300px;"></camera>
 			
 		</u-popup>
-		<view class="listHead">
+		<view class="listHead " :class="status==1?'container':''" >
 		<view class="list" v-for="(item,index) in list" :key="index">
 			<!-- 清单信息 -->
 			<view class="list-infos">
@@ -92,11 +103,7 @@
 						{{item.deviceName}}
 					</view>
 
-					<view class="qr-code" v-if="status==1" @click="gotoscan(item.deviceName)">
-						<text><u-icon name="scan" color="#fff"></u-icon>
-						</text>
-						<text>扫码出库</text>
-					</view>
+					 
 				</view>
 				
 				<view class="infos">
@@ -754,13 +761,110 @@
 				color: #2A8EFB
 			}
 		}
+	}
+	.details {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 0 32rpx;
+		.list-details {
+			background-color: #fff;
+			margin: 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;
+		
+				.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:red;
+						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;
+				}
+			}
+		}
 	}
 	.scantitle{
 		text-align: center;
 		font-size: 44rpx;
 		 padding-top: 20px;
 	}
+	.container{
+		margin-top: 80px;
+		
+	}
 	.listHead{
+	
 		padding-bottom: 60px;
 	}
 	.list {

pages/storeManagement/equipmentDelivery/deliveryDetails.vue

@@ -306,7 +306,7 @@
 		.item {
 			display: flex;
 			justify-content: space-between;
-			padding: 22rpx 0;
+			padding: 12rpx 0;
 			border-bottom: 1px solid rgba(244, 244, 244, 1);
 
 			.name {

pages/storeManagement/equipmentEnter/deliveryDetails.vue

@@ -1,49 +1,21 @@
 <template>
 	<view >
-		<u-navbar title="归还单详情"></u-navbar>
-		<!-- 出库单状态 -->
-		<view class="container">
-		<view class="head">
-			<view class="photo">
-				<u-avatar size="84" :src="outUser.userImg"></u-avatar>
-				
-			</view>
-			<view class="name">
-				{{info.createByName}}
-			</view>
-			<view class="submit">
-				提交了<text>入库申请</text>
-			</view>
-			<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">
-					{{info.projectName}}
-				</view>
-			</view>
-			
-			<view class="item">
-				<view class="name">
-					创建时间
-				</view>
-				<view class="value">
-					{{info.createTime}}
+		<u-navbar title="归还单详情">
+			<view class="details" slot="bottom">
+				<view class="list">
+					<view class="list-head">
+						<view class="title">
+							扫码核验
+						</view>
+						<view class="amount"  @click="gotoscan('')">
+							<u-icon name="scan" color="#0051ff" ></u-icon>扫码识别
+						</view>
+					</view>
 				</view>
 			</view>
-
-		</view>
+		</u-navbar>
 		
-				<u-popup  v-model="showpopup" class=""  mode="bottom" 
+		<u-popup  v-model="showpopup" class=""  mode="bottom"
 		border-radius="14"
 		:closeable="true" >
 					<view class="scantitle">连续扫码</view>
@@ -116,6 +88,49 @@
 					 style="width: 100%; height: 300px;"></camera>
 					<!--  #endif -->
 				</u-popup>
+		<!-- 出库单状态 -->
+		<view class="container" style="margin-top: 60px;">
+		<view class="head">
+			<view class="photo">
+				<u-avatar size="84" :src="outUser.userImg"></u-avatar>
+				
+			</view>
+			<view class="name">
+				{{info.createByName}}
+			</view>
+			<view class="submit">
+				提交了<text>入库申请</text>
+			</view>
+			<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">
+					{{info.projectName}}
+				</view>
+			</view>
+			
+			<view class="item">
+				<view class="name">
+					创建时间
+				</view>
+				<view class="value">
+					{{info.createTime}}
+				</view>
+			</view>
+
+		</view>
+		
+				
 		<!-- 出库设备清单 -->
 		<view class="container">
 			<view class="main">
@@ -128,13 +143,12 @@
 							</view>
 							<template v-if="info.status==0">
 							
-								<view class="qr-code" v-if="deviceReList[index].deviceIdScan==0"  @click="gotoscan('')">
-									<text><u-icon name="scan"></u-icon></text>
-									<text>扫码核验</text>
+								<view class="qr-code" v-if="deviceReList[index].deviceIdScan==0"  >
+									
 								</view>
 								<view class="qr-code2" v-else    @click="gotoscan('')" >
 									<text><u-icon name="checkmark-circle" color="#45BA45" ></u-icon></text >
-									<text>已收到</text>
+									<text>扫码成功</text>
 								</view>
 							</template>
 							<template v-else>

pages/storeManagement/equipmentInspection/planDetail.vue

@@ -1,32 +1,21 @@
 <template>
 	<view>
 		<u-navbar title="计划详情">
-			<view class="head" slot="bottom">
-				<view class="title">
-
-				</view>
-
-				<view class="item">
-					<view class="name">
-						巡检时间
-					</view>
-					<view class="value">
-						{{queryDate}}
-					</view>
-					<view class="unfold">
-						<u-button type="primary" size="medium" @click="gotoscan('')">
-
-							<u-icon size="28" name="scan"></u-icon>扫码
-						</u-button>
-
-
-					</view>
-					<!-- <view class="options" v-if="this.show==true" @click="changeShow()">
-						选项3
-					</view> -->
-				</view>
+			<view class="details" slot="bottom">
+				<view class="list">
+					<view class="list-head">
+						<view class="title">
+							巡检时间{{queryDate}}
+						</view>
+						<view class="amount"  @click="gotoscan('')">
+							<u-icon name="scan" color="#0051ff" ></u-icon>扫码识别
+						</view>
+					</view>
+				</view>
 			</view>
-		</u-navbar>
+		</u-navbar>
+		
+		
 		<u-popup v-model="showpopup" class="" mode="bottom" border-radius="14" :closeable="true">
 			<view class="scantitle">连续扫码</view>
 			<view class="list">
@@ -95,8 +84,10 @@
 			<camera mode="scanCode" resolution='medium' @scancode="takeCode" v-if="showpopup" device-position="back"
 				flash="off" @error="error" style="width: 100%; height: 300px;"></camera>
 			<!--  #endif -->
-		</u-popup>
-		<view class="container">
+		</u-popup>
+		
+		<view class="container">
+			
 			<view class="main">
 				<view class="list-item" v-for="(item,index) in scanList" :key="index">
 					<!--信息 -->
@@ -166,7 +157,9 @@
 
 
 			</view>
-			<u-divider :isnone="scanList.length==0" nonetext="点击上方扫码进行巡查" border-color="#CFD2D5">已经到底了</u-divider>
+			<u-divider :isnone="scanList.length==0" 
+			
+			nonetext="点击'扫码'进行巡查" border-color="#CFD2D5">已经到底了</u-divider>
 			
 		</view>
 
@@ -526,11 +519,55 @@
 		font-size: 44rpx;
 		 padding-top: 20px;
 	}
+	.details {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 0 32rpx;
+	
+		.item {
+			display: flex;
+			justify-content: space-between;
+			padding: 12rpx 0;
+			border-bottom: 1px solid rgba(244, 244, 244, 1);
+	
+			.name {
+				line-height: 30px;
+				color: rgba(119, 119, 119, 1);
+			}
+	
+			.value {
+				color: #101010;
+			}
+		}
+	}
 	.list {
 		background-color: #fff;
 		margin: 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;

readme.md

@@ -1 +1,3 @@
-[](https://transfonter.org/)
+[](https://transfonter.org/)
+
+[](https://equipment.xiaoxinda.com/equipment-manage-portal/)

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

@@ -2,7 +2,7 @@
 	<view>
 		<view  class="carNone"  v-if="isnone" >
 			<!-- <img src="@/assets/img/暂无数据-缺省页.png" alt=""> -->
-			<view style=" margin-top: 40px;">
+			<view :style=" 'margin-top: '+nonetop+'px;'">
 				<u-empty  :text="nonetext" mode="search"></u-empty>
 				
 			</view>
@@ -57,6 +57,12 @@ export default {
 			type: String,
 			default: '没有找到相关内容'
 		},
+		nonetop: {
+			//列表显示为空显示文字
+			type: Number,
+			default: 80
+		},
+		
 		// 单一边divider横线的宽度(数值)，单位rpx。或者百分比
 		halfWidth: {
 			type: [Number, String],