From 89dd6ad4f8562131ac6e6c3fc71266a92a82041e Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Wed, 15 Feb 2023 11:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stock/list.vue | 78 ++++++++++----------------------------------
 1 file changed, 17 insertions(+), 61 deletions(-)

diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index c8fca21..7e8f535 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -49,16 +49,19 @@
 				display:flex;
 				align-items: center;
 				text{
-					&:first-child{
+					&.type{
 						flex-shrink: 0;
 						font-size:20rpx;
 						color:#FBA83C;
 					}
-					&:nth-child(2){
+					&.name{
 						margin-left:20rpx;
 						font-size:20rpx;
 						color:#707070;
 					}
+					&.specs{
+						margin-left:auto;
+					}
 				}
 			}
 		}
@@ -115,56 +118,6 @@
 				}
 			}
 		}
-		.dPicker{
-			.stock-picker{
-				display:flex;
-				flex-direction: column;
-				justify-content: space-evenly;
-				padding:0 20rpx;
-				&>.info{
-					display:flex;
-					align-items: center;
-					text{
-						&:first-child{
-							color:#fff;
-							background:#10C176;
-							height:40rpx;
-							min-width:80rpx;
-							text-align: center;
-							line-height: 40rpx;
-							border-radius: 0 20rpx 0 20rpx;
-							margin-right:10rpx;
-							padding:0 6rpx;
-							font-size:24rpx;
-						}
-						&:nth-child(2){
-							&:after{
-								content:"("attr(data-unit)")";
-								color:#999;
-								font-size:18rpx;
-								line-height: 40rpx;
-								margin-left:6rpx;
-							}
-						}
-						&:nth-child(3){
-							margin-left:auto;
-							color:#F34848;
-							font-size:20rpx;
-						}
-					}
-				}
-				&>.company{
-					font-size:24rpx;
-					display: flex;
-					text{
-						color:var(--c);
-						&:first-child{
-							flex-shrink: 0;
-						}
-					}
-				}
-			}
-		}
 	}
 </style>
 <template>
@@ -176,12 +129,13 @@
 				<!-- <text class="plant-jiantou_zuoyouqiehuan" @click="$refs.dPicker.show=true"/> -->
 			</view>
 			<view class="company">
-				<text>{{detail.detailType}}</text>
-				<text>{{detail.supplierName}}</text>
+				<text class="type">{{detail.detailType}}</text>
+				<text v-if="formData.substanceType==1" class="name">{{detail.supplierName}}</text>
+				<text v-else class="specs">{{detail.equivalentInventory}}{{detail.unit}}</text>
 			</view>
 		</view>
 
-		<view class="card specs">
+		<view class="card specs" v-if="formData.substanceType==1">
 			<view class="title">
 				<text>规格</text> <text>{{detail.specDescribe}}</text>
 			</view>
@@ -245,17 +199,19 @@ export default{
 		}
 	},
 	onLoad(options){
-		this.eventChannel=this.getOpenerEventChannel()
-		this.eventChannel.on("detail", e=>{
-			this.detail=e
-			this.fields.number.suffix=(e.specDescribe.match(/\/(.+)/)||['',''])[1]
-			this.formData.goodsId=e.id
-		})
 		this.formData.substanceType = ({nz:1, ncp:2})[options.type],
 		this.mode=options.mode
 		uni.setNavigationBarTitle({
 			title:({out:"出库",in:"入库"})[this.mode]
 		})
+		this.eventChannel=this.getOpenerEventChannel()
+		this.eventChannel.on("detail", e=>{
+			this.detail=e
+			if(this.formData.substanceType==1){
+				this.fields.number.suffix=(e.specDescribe.match(/\/(.+)/)||['',''])[1]
+			}
+			this.formData.goodsId=e.id
+		})
 		this.init()
 	},
 	methods:{