From 42d11045620f74b1afd1811ed3e582a41556aa14 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Mon, 13 Feb 2023 15:54:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stock/already.vue |   9 +++
 pages/stock/record.vue  | 172 +++++++++++++++++++++++++---------------
 2 files changed, 119 insertions(+), 62 deletions(-)

diff --git a/pages/stock/already.vue b/pages/stock/already.vue
index 24378a2..c57690d 100644
--- a/pages/stock/already.vue
+++ b/pages/stock/already.vue
@@ -98,6 +98,8 @@ export default {
 		return{
 			searchVal:{
 				baseId: "1611250480973049857"||this.$store.state.plantBaseInfoId,
+				userId:"",
+				enterpriseId:"",
 				search: "",
 				pageNo:1,
 				pageSize:6,
@@ -107,6 +109,13 @@ export default {
 		}
 	},
 	onLoad(options){
+		if (this.$store.getters['userInfo'].roleCode=="baseAdmin") {
+			this.searchVal.userId = this.$store.getters['userInfo'].id
+			this.searchVal.enterpriseId = ''
+		} else {
+			this.searchVal.enterpriseId = this.$store.getters.userInfo.companyId
+			this.searchVal.userId = ''
+		}
 		this.search()
 	},
 	methods:{
diff --git a/pages/stock/record.vue b/pages/stock/record.vue
index 5b2baa9..536b11f 100644
--- a/pages/stock/record.vue
+++ b/pages/stock/record.vue
@@ -1,63 +1,88 @@
 <style lang="scss">
 	.container{
-		min-height: 100%;
+		height: 100%;
 		background:#f6f6f6;
-		padding:30rpx 0;
-		.card{
-			margin-top:0;
-			&>.head{
-				display:flex;
-				align-items: center;
-				border-bottom: 2rpx solid #D8D8D8;
-				padding-bottom:20rpx;
-				text{
-					&:first-child{
-						flex-shrink: 0;
-						color:#10C176;
-						margin-right:20rpx;
-					}
-					&:nth-child(2){
-						flex-grow: 1;
-						color:#10C176;
-					}
-					&:nth-child(3){
-						flex-shrink: 0;
-						color:#FBB65C;
-						margin-left:10rpx;
-					}
+		
+		&>.btns{
+			flex-shrink: 0;
+			margin:0 30rpx 30rpx;
+			display:flex;
+			border-radius: 30rpx;
+			button{
+				width:50%;
+				color:#999;
+				&:first-child{
+					border-radius: 30rpx 0 0 30rpx;
+				}
+				&:nth-child(2){
+					border-radius:0 30rpx 30rpx 0;
+				}
+				&.active{
+					background:#10C176;
+					color:#fff;
 				}
 			}
-			&>.plant-youbian{
-				margin-top:20rpx;
-				display:flex;
-				flex-direction: row-reverse;
-				align-items: center;
-				justify-content: flex-end;
-				text{
-					flex-grow: 1;
-					font-weight: bold;
+		}
+		scroll-view{
+			flex-grow: 1;
+			height:1rpx;
+
+			.card{
+				margin-top:0;
+				&>.head{
 					display:flex;
 					align-items: center;
-					&:after{
-						content:"("attr(data-unit)")";
-						font-size:20rpx;
-						color:#999;
-						margin-left:6rpx;
+					border-bottom: 2rpx solid #D8D8D8;
+					padding-bottom:20rpx;
+					text{
+						&:first-child{
+							flex-shrink: 0;
+							color:#10C176;
+							margin-right:20rpx;
+						}
+						&:nth-child(2){
+							flex-grow: 1;
+							color:#10C176;
+						}
+						&:nth-child(3){
+							flex-shrink: 0;
+							color:#FBB65C;
+							margin-left:10rpx;
+						}
 					}
 				}
-			}
-			&>.company{
-				margin-top:12rpx;
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				text{
-					&:first-child{
-						font-size:24rpx;
-						color:#999;
+				&>.plant-youbian{
+					margin-top:20rpx;
+					display:flex;
+					flex-direction: row-reverse;
+					align-items: center;
+					justify-content: flex-end;
+					text{
+						flex-grow: 1;
+						font-weight: bold;
+						display:flex;
+						align-items: center;
+						&:after{
+							content:"("attr(data-unit)")";
+							font-size:20rpx;
+							color:#999;
+							margin-left:6rpx;
+						}
 					}
-					&:nth-child(2){
-						color:#10C176;
+				}
+				&>.company{
+					margin-top:12rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					text{
+						&:first-child{
+							font-size:24rpx;
+							color:#999;
+						}
+						&:nth-child(2){
+							color:#10C176;
+						}
 					}
 				}
 			}
@@ -65,17 +90,27 @@
 	}
 </style>
 <template>
-	<view class="container">
-		<view class="card" v-for="(v,k) in list" :key="k" @click="toDetail(v)">
-			<view class="head">
-				<text class="plant-rili"/> <text>批次号：{{v.inOutBatchNo}}</text> <text>{{v.inOutType}}</text>
-			</view>
-			<view class="plant-youbian"> <text :data-unit="v.specDescribe">{{v.substanceName}}</text> </view>
-			<view class="company">
-				<text>{{v.supplier}}</text> <text>{{v.number}}{{v.packgeUnit}}(共{{v.equivalentAmount}}{{v.unit}})</text>
-			</view>
+	<view class="container flex">
+		
+		<d-search v-model="searchVal.search" @search="clean();search()"/>
+
+		<view class="btns shadow bg-white">
+			<button class="cu-btn bg-white" :class="{active:searchVal.type=='nz'}" @click="trigger('nz')">农资</button>
+			<button class="cu-btn bg-white" :class="{active:searchVal.type=='ncp'}" @click="trigger('ncp')">农产品</button>
 		</view>
-		<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
+
+		<scroll-view scroll-y >
+			<view class="card" v-for="(v,k) in list" :key="k" @click="toDetail(v)">
+				<view class="head">
+					<text class="plant-rili"/> <text>批次号：{{v.inOutBatchNo}}</text> <text>{{v.inOutType}}</text>
+				</view>
+				<view class="plant-youbian"> <text :data-unit="v.specDescribe">{{v.substanceName}}</text> </view>
+				<view class="company">
+					<text>{{v.supplier}}</text> <text>{{v.number}}{{v.packgeUnit}}(共{{v.equivalentAmount}}{{v.unit}})</text>
+				</view>
+			</view>
+			<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
+		</scroll-view>
 	</view>
 </template>
 <script>
@@ -88,22 +123,35 @@ export default {
 				enterpriseId: '',
 				pageNo:1,
 				pageSize:6,
+				type:"nz"
 			},
 			list:[],
 			total:0,
 		}
 	},
 	onLoad(options){
-		this.search()
 		if (this.$store.getters['userInfo'].roleCode=="baseAdmin") {
 			this.searchVal.userId = this.$store.getters['userInfo'].id
 			this.searchVal.enterpriseId = ''
 		} else {
-			this.searchVal.enterpriseId = this.$store.getters.userInfo.companyId
+			this.searchVal.enterpriseId = this.$store.getters['userInfo'].companyId
 			this.searchVal.userId = ''
 		}
+		this.search()
 	},
 	methods:{
+		trigger(e){
+			if(this.searchVal.type!=e){
+				this.searchVal.type=e;
+				this.clean();
+				this.search()
+			}
+		},
+		clean(){
+			this.list=[]
+			this.total=0
+			this.searchVal.pageNo=1
+		},
 		async search(){
 			if(this.total==0 || this.list.length<this.total){
 				var res=await request("/api/Inventory/queryOutInRecord",{