zc

pages/views/pupilPage/pupilHome.vue

@@ -192,6 +192,7 @@
 				} = await chemicalAppletSelectStockInfo({tagCode:code});
 				if (data.code == 200) {
 					if(data.data){
+						data.data.code = code;
 						//化学品信息
 						uni.navigateTo({
 							url: "/pages_basics/views/chemicalsInfo/chemicalsInfo?item=" + encodeURIComponent(JSON.stringify(data.data)),

pages/views/teacherPage/teacherHome.vue

@@ -274,6 +274,7 @@
 				} = await chemicalAppletSelectStockInfo({tagCode:code});
 				if (data.code == 200) {
 					if(data.data){
+						data.data.code = code;
 						//化学品信息
 						uni.navigateTo({
 							url: "/pages_basics/views/chemicalsInfo/chemicalsInfo?item=" + encodeURIComponent(JSON.stringify(data.data)),

pages_basics/api/index.js

@@ -234,3 +234,11 @@ export const systemUserEditUser  = (data) => {
 				data: { ...data }
     })
 };
+//扫码查询-化学品使用记录
+export const chemicalAppletSelectStockRecord  = (data) => {
+    return apiResquest({
+        url: `/chemical/applet/selectStockRecord`,
+        method: 'POST',
+				data: { ...data }
+    })
+};

pages_basics/views/chemicalsInfo/chemicalsInfo.vue

@@ -91,49 +91,100 @@
 		<scroll-view class="info-list-box" v-if="pageType == 2" scroll-y @scrolltolower="scrollGet">
 			<view class="for-max-big-box" v-for="(item,index) in dataList" :key="index">
 				<view class="for-title-box">
-					<view class="time-box">{{item.for0}}</view>
-					<view class="position-top-right" :class="item.for9?'colorA':'colorB'">{{item.for9?'领用':'归还'}}</view>
+					<view class="time-box">{{item.joinOutTime}}</view>
+					<view class="position-top-right" 
+					:class="item.type == 0?'colorF':(
+					item.type == 1?'colorD':(
+					item.type == 3?'colorD':(
+					item.type == 4?'colorE':(
+					item.type == 5?'colorD':(
+					item.type == 6?'colorG':'')))))">
+						{{item.type == 0?'归还':(
+						item.type == 1?'领用':(
+						item.type == 3?'空瓶出库':(
+						item.type == 4?'废弃出库':(
+						item.type == 5?'整瓶领用':(
+						item.type == 6?'存储':'')))))}}
+					</view>
 					<view class="border-box"></view>
 					<view class="position-left"></view>
 					<view class="position-right"></view>
 				</view>
-				<view class="for-info-box" v-if="item.for9">
+				<!-- 领用/整瓶领用 -->
+				<view class="for-info-box" v-if="item.type == 1 || item.type == 5">
 					<view class="for-info-min-box">
 						<view>领用人</view>
 						<view>：</view>
-						<view>{{item.for1}}</view>
+						<view>{{item.useName}}</view>
 					</view>
 					<view class="for-info-min-box">
 						<view>领用量</view>
 						<view>：</view>
-						<view>{{item.for2}}</view>
+						<view>{{item.collectStockNum}}</view>
 					</view>
 					<view class="for-info-min-box">
 						<view style="width:120rpx;">双人认证</view>
 						<view>：</view>
-						<view>{{item.for3}}</view>
+						<view>{{item.oneUserName}}</view>
 					</view>
 				</view>
-				<view class="for-info-box" v-if="!item.for9">
+				<!-- 存储 -->
+				<view class="for-info-box" v-if="item.type == 6">
+					<view class="for-info-min-box">
+						<view>存储人</view>
+						<view>：</view>
+						<view>{{item.useName}}</view>
+					</view>
+					<view class="for-info-min-box">
+						<view>余量</view>
+						<view>：</view>
+						<view>{{item.surplus}}</view>
+					</view>
+					<view class="for-info-min-box">
+						<view style="width:120rpx;">双人认证</view>
+						<view>：</view>
+						<view>{{item.oneUserName}}</view>
+					</view>
+				</view>
+				<!-- 废弃出库/空瓶出库 -->
+				<view class="for-info-box" v-if="item.type == 3 ||item.type == 4">
+					<view class="for-info-min-box">
+						<view>废弃人</view>
+						<view>：</view>
+						<view>{{item.useName}}</view>
+					</view>
+					<view class="for-info-min-box">
+						<view style="width:120rpx;">双人认证</view>
+						<view>：</view>
+						<view>{{item.oneUserName}}</view>
+					</view>
+					<view class="for-info-min-box">
+						<view>出库原因</view>
+						<view>：</view>
+						<view>{{item.reason}}</view>
+					</view>
+				</view>
+				<!-- 归还 -->
+				<view class="for-info-box" v-if="item.type == 0">
 					<view class="for-info-min-box">
 						<view>归还人</view>
 						<view>：</view>
-						<view>{{item.for4}}</view>
+						<view>{{item.useName}}</view>
 					</view>
 					<view class="for-info-min-box">
 						<view>使用量</view>
 						<view>：</view>
-						<view>{{item.for5}}</view>
+						<view>{{item.usages}}</view>
 					</view>
 					<view class="for-info-min-box">
 						<view>余量</view>
 						<view>：</view>
-						<view>{{item.for6}}</view>
+						<view>{{item.surplus}}</view>
 					</view>
 					<view class="for-info-min-box">
 						<view style="width:120rpx;">双人认证</view>
 						<view>：</view>
-						<view>{{item.for7}}</view>
+						<view>{{item.oneUserName}}</view>
 					</view>
 				</view>
 			</view>
@@ -141,13 +192,15 @@
 				<img :src="imagesUrl('commonality/chemicalsInfoNull.png')">
 				<view>暂无数据</view>
 			</view>
-			<view class="get-null-box">仅展示最近三个月使用记录</view>
-			<view class="get-null-box" v-if="getDataType">暂无更多数据</view>
+			<view class="get-null-box" v-if="getDataType">仅展示最近三个月使用记录</view>
 		</scroll-view>
 	</view>
 </template>
 
 <script>
+	import {
+		chemicalAppletSelectStockRecord,
+	} from '@/pages_basics/api/index.js'
 	export default {
 		data() {
 			return {
@@ -160,30 +213,7 @@
 					pageSize: 10,
 				},
 				total: 0,
-				dataList: [
-					{
-						for0:'2024-03-03  10:33',
-						for1:'黄老师',
-						for2:'300ml',
-						for3:'李腾腾  杨森',
-						for4:'黄老师',
-						for5:'300ml',
-						for6:'100ml',
-						for7:'李腾腾  杨森',
-						for9:true,
-					},
-					{
-						for0:'2024-03-03  10:33',
-						for1:'黄老师',
-						for2:'300ml',
-						for3:'李腾腾  杨森',
-						for4:'黄老师',
-						for5:'300ml',
-						for6:'100ml',
-						for7:'李腾腾  杨森',
-						for9:false,
-					},
-				],
+				dataList: [],
 				getDataType: false,
 			}
 		},
@@ -191,13 +221,10 @@
 			if(option.item){
 				let obj = JSON.parse(decodeURIComponent(option.item))
 				this.$set(this,'newData',obj);
-			}else{
-				
 			}
-			
 		},
 		onShow() {
-			
+			this.getList();
 		},
 		methods: {
 			tableButtonCheck(type){
@@ -217,26 +244,28 @@
 					})
 				}
 			},
-			getList(){
-				// let self = this;
-				// const {
-				// 	data
-				// } = await systemNoticeGetNoticeList(this.queryParams);
-				// if (data.code == 200) {
-				// 	if (self.queryParams.page == 1) {
-				// 		this.$set(this,'dataList',data.data.records);
-				// 		this.$set(this,'total',data.data.total);
-				// 		if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
-				// 			this.$set(this, 'getDataType', true);
-				// 		}
-				// 	} else {
-				// 		this.$set(this,'dataList',[...this.dataList, ...data.data.records]);
-				// 		this.$set(this,'total',data.data.total);
-				// 		if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
-				// 			this.$set(this, 'getDataType', true);
-				// 		}
-				// 	}
-				// }
+			async getList(){
+				let self = this;
+				let obj = JSON.parse(JSON.stringify(this.queryParams))
+				obj.tagCode = this.newData.code;
+				const {
+					data
+				} = await chemicalAppletSelectStockRecord(obj);
+				if (data.code == 200) {
+					if (self.queryParams.page == 1) {
+						this.$set(this,'dataList',data.data.records);
+						this.$set(this,'total',data.data.total);
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					} else {
+						this.$set(this,'dataList',[...this.dataList, ...data.data.records]);
+						this.$set(this,'total',data.data.total);
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					}
+				}
 			},
 		},
 	}
@@ -430,7 +459,6 @@
 						display: flex;
 						padding:0 30rpx;
 						view{
-							height:80rpx;
 							line-height:80rpx;
 							font-size:28rpx;
 							color:#333;
@@ -447,6 +475,8 @@
 						view:nth-child(3){
 							flex:1;
 							text-align: right
+							line-height:30rpx;
+							padding:25rpx 0 25rpx 25rpx;
 						}
 					}
 				}