From c06c2afbf484cb82e97cf831e41736a09d5a268c Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Mon, 6 Mar 2023 15:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=87=87=E6=94=B6=E6=89=B9=E6=AC=A1=E8=A1=A8=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stock/list.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index 401399a..cca911b 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -140,7 +140,7 @@
 			<view class="company">
 				<text class="type">{{detail.detailType}}</text>
 				<text v-if="formData.substanceType==1" class="name">{{detail.supplierName}}</text>
-				<text v-else-if="inInventoryBatch.list.length<=0" class="specs">{{detail.equivalentInventory}}{{detail.unit}}</text>
+				<text v-else-if="recoveryBatch.list.length<=0" class="specs">{{detail.equivalentInventory}}{{detail.unit}}</text>
 			</view>
 		</view>
 
@@ -153,7 +153,11 @@
 
 		<view class="card">
 			<u-form class="inline" :model="formData" ref="form" :rules="rules" labelWidth="auto">
-				<d-form v-if="inInventoryBatch.list.length>0" label="采收批次" field="inInventoryBatch" required type="select" :columns="inInventoryBatch.list" custom :value="inInventoryBatch.value" @select="inInventoryBatch.value=[$event[0].value];inInventoryBatch.number=$event[0].surplus;formData.inInventoryBatch=inInventoryBatch.value.at(-1)">
+				<d-form
+					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)">
 					<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>
@@ -163,7 +167,7 @@
 				<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="({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'&&inInventoryBatch.list.length>0">
+				<template v-if="formData.substanceType==2&&formData.inOutType=='out01'&&recoveryBatch.list.length>0">
 					<view style="display:flex;align-items: center;">
 						<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>
@@ -190,7 +194,7 @@ export default{
 			mode:"",
 			detail:{},
 
-			inInventoryBatch:{list:[],value:[],number:0},
+			recoveryBatch:{list:[],value:[],number:0,surplus:0},
 			inOutType:{list:[],value:[]},
 			pic:"",
 			number:{suffix:""},
@@ -225,8 +229,8 @@ export default{
 				number:{required:true,validator:(rule,val,call)=>{
 					var title=({1:({in:'入',out:'出'})[this.mode],2:'交易重量'})[this.formData.substanceType]
 					if(!(val>0))call(new Error(`请输入${title}！`));
-					else if(this.mode=='out' &&this.inInventoryBatch.list<=0&& val>this.detail.equivalentInventory)call(new Error(`${title}不能大于剩余数量${this.detail.equivalentInventory}！`));
-					else if(this.mode=='out' &&this.inInventoryBatch.list>0&& val>this.inInventoryBatch.number)call(new Error(`${title}不能大于剩余数量${this.inInventoryBatch.number}！`));
+					else if(this.mode=='out' &&this.recoveryBatch.list<=0&& val>this.detail.equivalentInventory)call(new Error(`${title}不能大于剩余数量${this.detail.equivalentInventory}！`));
+					else if(this.mode=='out' &&this.recoveryBatch.list>0&& val>this.recoveryBatch.number)call(new Error(`${title}不能大于剩余数量${this.recoveryBatch.number}！`));
 					else call()
 				},type:"number",trigger:['blur','change']},
 				
@@ -271,7 +275,7 @@ export default{
 				params:{inventoryId}
 			})
 			if(res.statu){
-				this.inInventoryBatch.list=res.data.length>0?[res.data.map(v=>({...v,label:v.substanceName,value:v.batchNo}))]:[]
+				this.recoveryBatch.list=res.data.length>0?[res.data.map(v=>({...v,label:v.substanceName,value:v.batchNo}))]:[]
 			}else{
 				uni.showModal({
 					title:"提示",