zc

api/request/config.js

@@ -9,7 +9,7 @@ const config = {
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.43/api',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
-	base_url: 'http://192.168.1.39:8080',//高升
+	// base_url: 'http://192.168.1.39:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试

pages/api/index.js

@@ -530,3 +530,12 @@ export const laboratorySubPassOutIsotopeSubSign  = (data) => {
         data: data,
     })
 };
+
+//扫码查询-化学品基本信息
+export const chemicalAppletSelectStockInfo  = (data) => {
+    return apiResquest({
+        url: `/chemical/applet/selectStockInfo`,
+				method: 'POST',
+				data: { ...data }
+    })
+};

pages/views/pupilPage/pupilHome.vue

@@ -64,12 +64,13 @@
 
 <script>
 	import {
-		pageRestrictVerify
-	} from '@/utils/index'
-	import {
+		chemicalAppletSelectStockInfo,
 		laboratorySubPassOutIsotopeSubSign,
 	} from '@/pages/api/index.js'
 	import {
+		pageRestrictVerify
+	} from '@/utils/index'
+	import {
 		tabBar
 	} from '@/pages/component/tabBar.vue'
 	import {
@@ -165,12 +166,10 @@
 						if(res.result.indexOf('type') != -1){
 							//项目二维码
 							let list = res.result.split("?")[1].split("&");
-								console.log('list',list)
 							let codeData = {};
 							list.forEach((item) => {
 								codeData[item.split("=")[0]] = item.split("=")[1];
 							})
-								console.log('codeData',codeData)
 							if (codeData.type == 1 || codeData.type == 2 || codeData.type == 3 || codeData.type == 7 ||
 								codeData.type == 8 || codeData.type == 9 || codeData.type == 10 ||
 								codeData.type == 11 || codeData.type == 12 || codeData.type == 13 || codeData.type == 14) {
@@ -181,15 +180,34 @@
 								self.laboratorySubPassOutIsotopeSubSign(codeData.subId,res.result);
 							}
 						}else{
-							//化学品信息
-							uni.navigateTo({
-								url: "/pages_basics/views/chemicalsInfo/chemicalsInfo",
-							});
+							self.chemicalAppletSelectStockInfo(res.result);
 						}
 					}
 				});
 			},
-			//分类下拉列表
+			//扫码查询-化学品基本信息
+			async chemicalAppletSelectStockInfo(code) {
+				const {
+					data
+				} = await chemicalAppletSelectStockInfo({tagCode:code});
+				if (data.code == 200) {
+					if(data.data){
+						//化学品信息
+						uni.navigateTo({
+							url: "/pages_basics/views/chemicalsInfo/chemicalsInfo?item=" + encodeURIComponent(JSON.stringify(data.data)),
+						});
+					}else{
+						uni.showToast({
+							mask: true,
+							icon: "none",
+							position: "center",
+							title: '未找到相关信息,请扫描正确的二维码',
+							duration: 2000
+						});
+					}
+				}
+			},
+			//查询是否是同位素实验并且有签退
 			async laboratorySubPassOutIsotopeSubSign(subId,result) {
 				const {
 					data
@@ -200,7 +218,6 @@
 							subId:subId,
 							subName:data.data.subName,
 						}
-						console.log('====',obj)
 						uni.navigateTo({
 							url: "/pages_basics/views/photoInspection?item=" + encodeURIComponent(JSON.stringify(obj)),
 						});

pages/views/teacherPage/teacherHome.vue

@@ -90,6 +90,7 @@
 		pageRestrictVerify
 	} from '@/utils/index'
 	import {
+		chemicalAppletSelectStockInfo,
 		laboratorySubPassOutIsotopeSubSign,
 	} from '@/pages/api/index.js'
 	import {
@@ -261,15 +262,34 @@
 								self.laboratorySubPassOutIsotopeSubSign(codeData.subId,res.result);
 							}
 						}else{
-							//化学品信息
-							uni.navigateTo({
-								url: "/pages_basics/views/chemicalsInfo/chemicalsInfo",
-							});
+							self.chemicalAppletSelectStockInfo(res.result);
 						}
 					}
 				});
 			},
-			//分类下拉列表
+			//扫码查询-化学品基本信息
+			async chemicalAppletSelectStockInfo(code) {
+				const {
+					data
+				} = await chemicalAppletSelectStockInfo({tagCode:code});
+				if (data.code == 200) {
+					if(data.data){
+						//化学品信息
+						uni.navigateTo({
+							url: "/pages_basics/views/chemicalsInfo/chemicalsInfo?item=" + encodeURIComponent(JSON.stringify(data.data)),
+						});
+					}else{
+						uni.showToast({
+							mask: true,
+							icon: "none",
+							position: "center",
+							title: '未找到相关信息,请扫描正确的二维码',
+							duration: 2000
+						});
+					}
+				}
+			},
+			//查询是否是同位素实验并且有签退
 			async laboratorySubPassOutIsotopeSubSign(subId,result) {
 				const {
 					data
@@ -280,7 +300,6 @@
 							subId:subId,
 							subName:data.data.subName,
 						}
-						console.log('====',obj)
 						uni.navigateTo({
 							url: "/pages_basics/views/photoInspection?item=" + encodeURIComponent(JSON.stringify(obj)),
 						});

pages_basics/views/chemicalsInfo/chemicalsInfo.vue

@@ -5,12 +5,22 @@
 			<img class="logo-img" :src="circularLogo">
 			<view class="title-box">
 				<view class="title-one-box">
-					<span>{{newData.data1}}</span>
-					<span class="colorA">{{newData.data2?'管控':'非管控'}}</span>
-					<span class="colorB">{{newData.data3}}</span>
+					<span>{{newData.chemicalName}}</span>
+					<span class="color-border">{{newData.chemicalLevel == 1?'管控':'非管控'}}</span>
+					<span :class="newData.useStatus == 0 || newData.useStatus == -1?'colorA':(
+					newData.useStatus == 1 || newData.useStatus == 5?'colorB':(
+					newData.useStatus == 2 ?'colorC':(
+					newData.useStatus == 3 ?'colorD':(
+					newData.useStatus == 4 ?'colorE':''))))">
+					{{newData.useStatus == 0 || newData.useStatus == -1?'未使用':(
+					newData.useStatus==1 || newData.useStatus==5?'使用中':(
+					newData.useStatus==2?'超时未归还':(
+					newData.useStatus==3?'空瓶出库':(
+					newData.useStatus==4?'废弃出库':''))))}}
+					</span>
 				</view>
-				<view class="title-two-box">编号：{{newData.data4}}</view>
-				<view class="title-three-box">余量：{{newData.data5}}</view>
+				<view class="title-two-box">编号：{{newData.tagCode}}</view>
+				<view class="title-three-box">余量：{{newData.surplus}}{{newData.specUnit}}</view>
 			</view>
 		</view>
 		<view class="table-button-max-box">
@@ -31,49 +41,49 @@
 				<view class="info-box">
 					<view>C A S</view>
 					<view>:</view>
-					<view>{{newData.data6}}</view>
+					<view>{{newData.casNum}}</view>
 				</view>
 				<view class="info-box">
 					<view>别名</view>
 					<view>:</view>
-					<view>{{newData.data7}}</view>
+					<view>{{newData.chemicalNameChar}}</view>
 				</view>
 				<view class="info-box">
 					<view>类别</view>
 					<view>:</view>
-					<view>{{newData.data8}}</view>
+					<view>{{newData.chemicalCategory}}</view>
 				</view>
 				<view class="info-box">
 					<view>规格</view>
 					<view>:</view>
-					<view>{{newData.data9}}</view>
+					<view>{{newData.specNum}}{{newData.specUnit?newData.specUnit+'/瓶':''}}</view>
 				</view>
 				<view class="info-box">
 					<view>归属人</view>
 					<view>:</view>
-					<view>{{newData.data10}}</view>
+					<view>{{newData.belongName}}</view>
 				</view>
 				<view class="info-box">
 					<view style="width:120rpx;">存储位置</view>
 					<view>:</view>
-					<view>{{newData.data11}}</view>
+					<view>{{newData.cabinetName}}{{newData.doorName?' - '+newData.doorName:''}}{{newData.layers?' - '+newData.layers:''}}</view>
 				</view>
 			</view>
 			<view class="info-big-box">
 				<view class="info-box">
 					<view>学院</view>
 					<view>:</view>
-					<view>{{newData.data12}}</view>
+					<view>{{newData.deptName}}</view>
 				</view>
 				<view class="info-box">
 					<view>楼栋</view>
 					<view>:</view>
-					<view>{{newData.data13}}</view>
+					<view>{{newData.schoolName}} - {{newData.buildName}}</view>
 				</view>
 				<view class="info-box">
 					<view>实验室</view>
 					<view>:</view>
-					<view>{{newData.data14}}</view>
+					<view>{{newData.subName}}{{newData.subRoom?'('+newData.subRoom+')':''}}</view>
 				</view>
 			</view>
 		</view>
@@ -142,22 +152,7 @@
 		data() {
 			return {
 				circularLogo: uni.getStorageSync('circularLogo'),
-				newData:{
-					data1:'化学品名称化学品名称化学品名称化学品名称化学品名称',
-					data2:'1',
-					data3:'使用中',
-					data4:'123456789',
-					data5:'450ml',
-					data6:'123456789',
-					data7:'别名名称',
-					data8:'普通危化品',
-					data9:'450ml/瓶',
-					data10:'课题组',
-					data11:'化学品柜-柜门-柜层',
-					data12:'学院名称',
-					data13:'校区-楼栋',
-					data14:'实验室名称-(房间号)',
-				},
+				newData:{},
 				pageType:1,
 				//使用记录 相关
 				queryParams: {
@@ -193,6 +188,12 @@
 			}
 		},
 		onLoad(option) {
+			if(option.item){
+				let obj = JSON.parse(decodeURIComponent(option.item))
+				this.$set(this,'newData',obj);
+			}else{
+				
+			}
 			
 		},
 		onShow() {
@@ -288,26 +289,6 @@
 						text-align: center;
 						border-radius:6rpx;
 					}
-					.colorA{
-						border:1px solid #0183FA;
-						background-color: #fff;
-						color:#0183FA;
-					}
-					.colorB{
-						border:1px solid #D6D6D6;
-						background-color: #D6D6D6;
-						color:#666666;
-					}
-					.colorC{
-						border:1px solid rgba(43,128,255,0.2);
-						background: rgba(43,128,255,0.2);
-						color:#666666;
-					}
-					.colorD{
-						border:1px solid rgba(255,140,0,0.2);
-						background: rgba(255,140,0,0.2);
-						color:#FF8C00;
-					}
 				}
 				.title-two-box{
 					line-height:50rpx;
@@ -359,7 +340,6 @@
 					border-top:1rpx solid #E0E0E0;
 					margin:0 30rpx;
 					view{
-						height:80rpx;
 						line-height:80rpx;
 						font-size:28rpx;
 						color:#333;
@@ -375,7 +355,9 @@
 					}
 					view:nth-child(3){
 						flex:1;
-						text-align: right
+						text-align: right;
+						line-height:30rpx;
+						padding:25rpx 0 25rpx 25rpx;
 					}
 				}
 			}
@@ -492,5 +474,53 @@
 				padding-bottom:200rpx;
 			}
 		}
+		//管控/非管控
+		.color-border{
+			border:1px solid #0183FA;
+			background: #fff;
+			color:#0183FA;
+		}
+		//未使用
+		.colorA{
+			border:1px solid #EDEDED;
+			background: #EDEDED;
+			color:#999;
+		}
+		//使用中
+		.colorB{
+			border:1px solid rgba(1,131,250,0.2);
+			background: rgba(1,131,250,0.2);
+			color:#0183FA;
+		}
+		//超时未归还
+		.colorC{
+			border:1px solid rgba(255,140,0,0.2);
+			background: rgba(255,140,0,0.2);
+			color:#FF8C00;
+		}
+		//空瓶出库
+		.colorD{
+			border:1px solid rgba(43,128,255,0.2);
+			background: rgba(43,128,255,0.2);
+			color:#2B80FF;
+		}
+		//废弃出库
+		.colorE{
+			border:1px solid #D6D6D6;
+			background: #D6D6D6;
+			color:#666666;
+		}
+		//归还
+		.colorF{
+			border:1px solid rgba(7,188,17,0.2);
+			background: rgba(7,188,17,0.2);
+			color:#07BC11;
+		}
+		//存储
+		.colorG{
+			border:1px solid rgba(0,185,191,0.2);
+			background: rgba(0,185,191,0.2);
+			color:#00B9BF;
+		}
 	}
 </style>