From 5369b3173a6a1e00304a95b0716b0fc58f820f4b Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Wed, 15 Feb 2023 12:18:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8B=E6=8B=89=E9=80=89=E6=8E=A5=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stock/list.vue          | 5 ++++-
 pages/stock/prodWarehouse.vue | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index 5a69ffb..51174d7 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -207,6 +207,8 @@ export default{
 			this.detail=e
 			if(this.formData.substanceType==1){
 				this.fields.number.suffix=(e.specDescribe.match(/\/(.+)/)||['',''])[1]
+			}else{
+				this.fields.number.suffix="kg"
 			}
 			this.formData.goodsId=e.id
 		})
@@ -216,7 +218,8 @@ export default{
 		async init(){
 			var res=await request("/common/api/dict/queryDictItemByDictCode",{
 				method:"post",
-				params:{dictCode: ({out:"out_type",in:"in_type"})[this.mode]}
+				//农产品前面加上product_
+				params: {dictCode: (this.formData.substanceType=="2"?"product_":"")+({out:"out_type",in:"in_type"})[this.mode]}
 			})
 			if(res.statu){
 				this.fields.inOutType.columns=[res.data]
diff --git a/pages/stock/prodWarehouse.vue b/pages/stock/prodWarehouse.vue
index 12ec6c6..ca05039 100644
--- a/pages/stock/prodWarehouse.vue
+++ b/pages/stock/prodWarehouse.vue
@@ -71,7 +71,7 @@ export default {
 			//入库类型
 			var res=await request("/common/api/dict/queryDictItemByDictCode",{
 				method:"post",
-				params:{dictCode:"in_type"}
+				params:{dictCode:"product_in_type"}
 			})
 			if(res.statu){
 				this.fields.inOutType.columns=[res.data]