From ea243c7a34331401c09db02beb4e0162252b8766 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Mon, 6 Mar 2023 16:15:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E4=BA=A7=E5=93=81=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=20=E9=80=89=E6=8B=A9=E9=87=87=E6=94=B6=E6=89=B9=E6=AC=A1=20?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E5=87=BA=E5=BA=93=E6=89=B9=E6=AC=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stock/list.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index cca911b..ca36028 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -157,7 +157,7 @@
 					v-if="recoveryBatch.list.length>0" label="采收批次" field="inInventoryBatch" required type="select" :columns="recoveryBatch.list" custom
 					:tip="recoveryBatch.surplus>0?`剩余:${recoveryBatch.surplus}kg`:''"
 					:value="recoveryBatch.value"
-					@select="recoveryBatch.value=[$event[0].value];recoveryBatch.number=$event[0].surplus;recoveryBatch.surplus=$event[0].surplus;formData.inInventoryBatch=recoveryBatch.value.at(-1)">
+					@select="recoveryBatch.value=[$event[0].value];formData.inOutBatchNo=$event[0].batchNo;recoveryBatch.number=$event[0].surplus;recoveryBatch.surplus=$event[0].surplus;formData.inInventoryBatch=recoveryBatch.value.at(-1)">
 					<view slot-scope="{row}" style="display:flex;">
 						<text style="margin-left:10rpx;font-weight:bold;">{{row.batchNo}}</text>
 						<text style="font-size:24rpx;color:#999;margin-left:10rpx;">{{row.substanceName}}</text>
@@ -165,13 +165,13 @@
 					</view>
 				</d-form>
 				<d-form :label="`${({in:'入',out:'出'})[mode]}库类型`" field="inOutType" required type="select" :columns="inOutType.list" :value="inOutType.value" @select="inOutType.value=$event.map(v=>v.value);formData.inOutType=inOutType.value.at(-1)"/>
-				<d-form :label="`${({in:'入',out:'出'})[mode]}库批次号`" field="inOutBatchNo" required :value="formData.inOutBatchNo" @input="formData.inOutBatchNo=$event" btnText="生成" :btnFun="()=>this.formData.inOutBatchNo=`${({in:'RK',out:'CK'})[this.mode]}${new Date().format('yyyyMMdd')}${new Date().getTime()}`"/>
+				<d-form :label="`${({in:'入',out:'出'})[mode]}库批次号`" field="inOutBatchNo" required :disabled="formData.substanceType==2" :value="formData.inOutBatchNo" @input="formData.inOutBatchNo=$event" :btnText="formData.substanceType==1?'生成':''" :btnFun="()=>this.formData.inOutBatchNo=`${({in:'RK',out:'CK'})[this.mode]}${new Date().format('yyyyMMdd')}${new Date().getTime()}`"/>
 				<d-form :label="({1:`${({in:'入',out:'出'})[mode]}库数量`,2:'交易重量'})[formData.substanceType]" field="number" required :suffix="number.suffix" :value="formData.number" @input="formData.number=$event" type="digit"/>
 				<template v-if="formData.substanceType==2&&formData.inOutType=='out01'&&recoveryBatch.list.length>0">
-					<view style="display:flex;align-items: center;">
+					<view style="display:flex;margin:-20rpx 0;">
 						<d-form label="规格" required field="specification" type="digit" suffix="kg" :value="formData.specification" @input="formData.specification=$event"/>
-						<text style="margin:45rpx 20rpx 0 20rpx;">/</text>
-						<d-form style="width:max-content;margin-top:40rpx;" type="select" placeholder=" " @select="formData.packUnit=$event[0].value" :columns="[packWeightList]" :value="[formData.packUnit]"/>
+						<text style="margin:90rpx 20rpx 0 20rpx;">/</text>
+						<d-form style="width:max-content;margin-top:62rpx;" type="select" placeholder=" " @select="formData.packUnit=$event[0].value" :columns="[packWeightList]" :value="[formData.packUnit]"/>
 					</view>
 					<d-form label="交易数量" disabled type="digit" :suffix="formData.packUnit" :value="tradeNum"/>
 					<d-form label="买方名称" required field="buyerName" btnIcon="plant-sousuo" :btnFun="searchBuy" :value="formData.buyerName" @input="formData.buyerName=$event"/>