扫码优化

pages/otherFunctions/equipmentRetrieval/equipmentInfo.vue

@@ -13,12 +13,18 @@
 		<view class="main">
 			<view class="title">
 				{{info.title}}
+				<span style="float: right;">{{info.code}}</span>
 			</view>
 			<!-- 标签 -->
 			<view class="tabs " v-if="false">
 				<u-tabs bar-width="120" inactive-color="#999999" active-color="#000000"   :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
 			</view>
 			<view class="content">
+				<!-- 提示 -->
+				<view class="hint" v-if="description">
+					<u-alert-tips  icon="bell-fill"  :type="info.healthStatus==1?'success':info.healthStatus==6?'error':'warning'"
+					 :show-icon="true" :title="title" :description="descriptionKey(info,true)"></u-alert-tips>
+				</view>
 				<!-- 设备信息 -->
 				<view class="infos">
 					<view class="name">
@@ -116,7 +122,7 @@
 					
 					<view class="details">
 						<view class="location">
-							{{info.addressId}}
+							{{info.addressId?info.addressId:'未录入'}}
 						</view>
 					</view>
 					
@@ -139,10 +145,7 @@
 						<u-icon :name="inspectionRecordDeviceListShow?'arrow-up':'arrow-down'"></u-icon>
 					</view>
 					</view>
-					<!-- 提示 -->
-					<view class="hint" v-if="description">
-						<u-alert-tips  icon="bell-fill"  type="warning" :show-icon="true" :title="title" :description="description"></u-alert-tips>
-					</view>
+					
 					
 					<view class="inspection-contents" v-for="(item,index) in inspectionRecordDeviceList" 
 					 v-show="index<3||inspectionRecordDeviceListShow"
@@ -245,10 +248,7 @@
 
 <script>
 	import * as API from '@/apis/pagejs/index.js'
-	import {
-		afterTimeStamp,parseUnixTime,newDate
 	
-	} from '@/apis/utils'
 	export default {
 		data() {
 			return {
@@ -280,7 +280,8 @@
 				var key=''
 				if(this.info.experimentPeriod&&this.info.experimentLastTime){
 					
-					key='下次巡检时间'+	parseUnixTime(afterTimeStamp(this.info.experimentPeriod,newDate(this.info.experimentLastTime)),'{y}-{m}-{d}')
+					key='1'
+					//'下次巡检时间'+	parseUnixTime(afterTimeStamp(this.info.experimentPeriod,newDate(this.info.experimentLastTime)),'{y}-{m}-{d}')
 				}
 				return key
 			}
@@ -436,7 +437,7 @@
 		  // 提示
 		  .hint{
 			  /deep/.u-alert-desc{
-				  color: rgba(255, 121, 0, 1);
+				 // color: rgba(255, 121, 0, 1);
 				  font-size: 28rpx
 			  }
 		  }

pages/otherFunctions/homePage.vue

@@ -38,8 +38,8 @@
 		 :closeable="true" >
 		 			<view class="scantitle">连续扫码</view>
 		 			<view class="list">
-		 			<view class=" list-infos">
-		 				<view class="infos-head">
+		 			<view class=" list-infos" :style="nowscan.healthStatus&&nowscan.healthStatus!=1?'background-color:#FFC107':''">
+		 				<view class="infos-head" @click="gotoInfo(nowscan.id)">
 		 					<view class="name">
 		 						{{nowscan.title?nowscan.title:'扫码后出当前结果'}}
 		 					</view>
@@ -47,35 +47,18 @@
 		 					<view class="name">
 		 						编号：{{nowscan.code}}
 		 					</view>
+							<view class="name" :style="nowscan.id?'color:blue;':'color:#fff;'">
+								点击查看
+							</view>
 		 				</view>
 		 				<view class="infos-head infos-head2" style="margin-bottom: 12rpx;">
-		 					<view class="name">
-		 						上次巡检:{{nowscan.experimentLastTime}}
+		 					<view class="name" v-html="descriptionKey(nowscan)">
+		 						
 		 					</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">
@@ -98,11 +81,12 @@
 		 				</view>
 		 				</view>
 		 			</view>
+					<!--  #ifdef  MP-WEIXIN -->
 		 			<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="gird"  >
@@ -487,7 +471,9 @@
 				})
 			},
 			changeShow5(){
-				this.showpopup=true
+				//this.showpopup=true
+				//this.gotoscanH5('')
+				this.gotoscan('')
 			},
 			changeShow3(openId){
 				this.carhelp.setOpenId(openId);
@@ -515,6 +501,7 @@
 				});
 			},
 			gotoscan(val) {
+				
 				// #ifdef H5
 					this.gotoscanH5(val)
 				// #endif
@@ -576,6 +563,7 @@
 			 				title: "二维码无效",
 			 				icon: "none"
 			 			})
+						this.nowscan={}
 			 		}
 			 
 			 	}).catch(error => {
@@ -777,4 +765,83 @@
 		 }
 	 }
  }
+ 
+ // 出库单列表
+ .list {	
+ 	//margin-top: 24rpx;
+ 	.list-view{
+ 		padding: 16rpx 32rpx;
+ 		background-color: #fff;
+ 	}
+ 	.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;
+ 			}
+ 		}
+ 	}
+ }
+ 
+ .scantitle{
+ 	text-align: center;
+ 	font-size: 44rpx;
+ 	 padding-top: 20px;
+ }
+ 
 </style>

pages/projectDepartment/exportApplication/deliveryFrom.vue

@@ -34,7 +34,7 @@
 					<u-input v-model="endTime" @click="show=true,showText='endTime'"  @clear="showText='endTime',change('')"   placeholder="请输入使用周期" 	 type="select" />
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" v-if="false">
 				<view class="name">
 					所属项目部<span style="color: red;">*</span>
 				</view>
@@ -43,7 +43,7 @@
 					<u-input v-model="project" @click="show2=true,showText='project'"  @clear="showText='project',change('')"   placeholder="请选择所属项目部" 	 type="select" />
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" v-if="false">
 				<view class="name">
 					第一步审批<span style="color: red;">*</span>
 				</view>
@@ -52,7 +52,7 @@
 					<u-input v-model="approve1" @click="show2=true,showText='approve1'"  @clear="showText='approve1',change('')"   placeholder="请选择第一步审批人" 	 type="select" />
 				</view>
 			</view>
-			<view class="item">
+			<view class="item" v-if="false">
 				<view class="name">
 					第二步审批<span style="color: red;">*</span>
 				</view>

pages/projectDepartment/exportReturn/deliveryFrom.vue

@@ -31,14 +31,13 @@
 		</u-navbar>
 		
 		
-		
 		<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=" list-infos" :style="nowscan.healthStatus&&nowscan.healthStatus!=1?'background-color:#FFC107':''">
+						<view class="infos-head" @click="gotoInfo(nowscan.id)">
 							<view class="name">
 								{{nowscan.title?nowscan.title:'扫码后出当前结果'}}
 							</view>
@@ -46,35 +45,18 @@
 							<view class="name">
 								编号：{{nowscan.code}}
 							</view>
+									<view class="name" :style="nowscan.id?'color:blue;':'color:#fff;'">
+										点击查看
+									</view>
 						</view>
 						<view class="infos-head infos-head2" style="margin-bottom: 12rpx;">
-							<view class="name">
-								上次巡检:{{nowscan.experimentLastTime}}
+							<view class="name" v-html="descriptionKey(nowscan)">
+								
 							</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">
@@ -97,11 +79,12 @@
 						</view>
 						</view>
 					</view>
+							<!--  #ifdef  MP-WEIXIN -->
 					<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>
 				
 		<!-- 出库设备清单 -->
@@ -336,6 +319,7 @@
 							title: "二维码无效",
 							icon: "none"
 						})
+						this.nowscan={}
 					}
 			
 				}).catch(error => {

pages/storeManagement/equipmentDelivery/deliveriedList.vue

@@ -19,81 +19,61 @@
 				</view>
 			</view>
 		</u-navbar>
-		<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">
-								厂家：
+		<u-popup  v-model="showpopup" class=""  mode="bottom"
+		border-radius="14"
+		:closeable="true" >
+					<view class="scantitle">连续扫码</view>
+					<view class="list">
+					<view class=" list-infos" :style="nowscan.healthStatus&&nowscan.healthStatus!=1?'background-color:#FFC107':''">
+						<view class="infos-head" @click="gotoInfo(nowscan.id)">
+							<view class="name">
+								{{nowscan.title?nowscan.title:'扫码后出当前结果'}}
 							</view>
-							<view class="item-value">
-								{{nowscan.manufactor}}
+						
+							<view class="name">
+								编号：{{nowscan.code}}
 							</view>
+									<view class="name" :style="nowscan.id?'color:blue;':'color:#fff;'">
+										点击查看
+									</view>
 						</view>
-						<view class="infos-item">
-							<view class="item-name">
-								单位：
-							</view>
-							<view class="item-value">
-								{{nowscan.unit}}
+						<view class="infos-head infos-head2" style="margin-bottom: 12rpx;">
+							<view class="name" v-html="descriptionKey(nowscan)">
+								
 							</view>
+						
 						</view>
-					</view>
-					<view class="infos-2">
-						<view class="infos-item">
-							<view class="item-name">
-								规格：
-							</view>
-							<view class="item-value">
-								{{nowscan.specifications}}
+						<view class="infos">
+							
+							<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 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>
+							<!--  #ifdef  MP-WEIXIN -->
+					<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="listHead " :class="status==1?'container':''" >
 		<view class="list" v-for="(item,index) in list" :key="index">
 			<!-- 清单信息 -->
@@ -653,7 +633,8 @@
 						uni.showToast({
 							title: "二维码无效",
 							icon: "none"
-						})
+						})
+						this.nowscan={}
 					}
 
 				}).catch(error => {

pages/storeManagement/equipmentEnter/deliveryDetails.vue

@@ -20,8 +20,8 @@
 		:closeable="true" >
 					<view class="scantitle">连续扫码</view>
 					<view class="list">
-					<view class=" list-infos">
-						<view class="infos-head">
+					<view class=" list-infos" :style="nowscan.healthStatus&&nowscan.healthStatus!=1?'background-color:#FFC107':''">
+						<view class="infos-head" @click="gotoInfo(nowscan.id)">
 							<view class="name">
 								{{nowscan.title?nowscan.title:'扫码后出当前结果'}}
 							</view>
@@ -29,35 +29,18 @@
 							<view class="name">
 								编号：{{nowscan.code}}
 							</view>
+									<view class="name" :style="nowscan.id?'color:blue;':'color:#fff;'">
+										点击查看
+									</view>
 						</view>
 						<view class="infos-head infos-head2" style="margin-bottom: 12rpx;">
-							<view class="name">
-								上次巡检:{{nowscan.experimentLastTime}}
+							<view class="name" v-html="descriptionKey(nowscan)">
+								
 							</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">
@@ -80,8 +63,7 @@
 						</view>
 						</view>
 					</view>
-					
-					<!--  #ifdef  MP-WEIXIN -->
+							<!--  #ifdef  MP-WEIXIN -->
 					<camera mode="scanCode"   resolution='medium' 
 					 @scancode="takeCode"  v-if="showpopup"
 					 device-position="back" flash="off" @error="error"
@@ -563,7 +545,8 @@
 						uni.showToast({
 							title: "二维码无效",
 							icon: "none"
-						})
+						})
+						this.nowscan={}
 					}
 
 				}).catch(error => {

pages/storeManagement/equipmentInspection/planDetail.vue

@@ -16,75 +16,61 @@
 		</u-navbar>
 		
 		
-		<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}}
+		<u-popup  v-model="showpopup" class=""  mode="bottom"
+		border-radius="14"
+		:closeable="true" >
+					<view class="scantitle">连续扫码</view>
+					<view class="list">
+					<view class=" list-infos" :style="nowscan.healthStatus&&nowscan.healthStatus!=1?'background-color:#FFC107':''">
+						<view class="infos-head" @click="gotoInfo(nowscan.id)">
+							<view class="name">
+								{{nowscan.title?nowscan.title:'扫码后出当前结果'}}
+							</view>
+						
+							<view class="name">
+								编号：{{nowscan.code}}
+							</view>
+									<view class="name" :style="nowscan.id?'color:blue;':'color:#fff;'">
+										点击查看
+									</view>
 						</view>
-					
-						<view class="name" v-show="nowscan.experimentPeriod">
-							周期:{{nowscan.experimentPeriod}}天
+						<view class="infos-head infos-head2" style="margin-bottom: 12rpx;">
+							<view class="name" v-html="descriptionKey(nowscan)">
+								
+							</view>
+						
 						</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>
-
-			<!--  #ifdef  MP-WEIXIN -->
-			<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="infos">
+							
+							<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>
+							<!--  #ifdef  MP-WEIXIN -->
+					<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">
 			
@@ -450,7 +436,8 @@
 						uni.showToast({
 							title: "二维码无效",
 							icon: "none"
-						})
+						})
+						this.nowscan={}
 					}
 
 				}).catch(error => {