From d68a19a9885b6275d2dcdabf4f8180b4cfcdbd31 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 21 Feb 2023 10:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=90=9C=E7=B4=A2=E7=9A=84?=
 =?UTF-8?q?=E4=B9=B0=E6=96=B9=E5=90=8D=E7=A7=B0=E5=90=8E=E5=B8=A6=E5=85=A5?=
 =?UTF-8?q?=E4=B9=B0=E6=96=B9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/search.vue                         | 2 +-
 pages/stock/list.vue                            | 2 ++
 uni_modules/d-form/components/d-form/d-form.vue | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/massif/search.vue b/pages/massif/search.vue
index 668e26b..bb3e1a5 100644
--- a/pages/massif/search.vue
+++ b/pages/massif/search.vue
@@ -30,7 +30,7 @@
 			:columns="columns"
 			@close="show=false"
 			@cancel="show=false"
-			@confirm="eventChannel.emit('update',{buyerName:selectVal.buyerName,address:$event.value[0]});$u.route({type:'back'})"/>
+			@confirm="eventChannel.emit('update',{...selectVal,address:$event.value[0]});$u.route({type:'back'})"/>
 	</view>
 </template>
 <script>
diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index cf92cef..401399a 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -361,6 +361,8 @@ export default{
 				events:{update:e=>{
 					this.formData.buyerName=e.buyerName
 					this.formData.buyerAddress=e.address
+					this.formData.buyerType=e.buyerType[1]
+					this.buyerType.value=e.buyerType
 				}}
 			})
 		},
diff --git a/uni_modules/d-form/components/d-form/d-form.vue b/uni_modules/d-form/components/d-form/d-form.vue
index ea33ed7..beb1e90 100644
--- a/uni_modules/d-form/components/d-form/d-form.vue
+++ b/uni_modules/d-form/components/d-form/d-form.vue
@@ -335,6 +335,9 @@ import {computeArea} from '@/common/utils'
 					setPickerCol(columns[i].children, value, ++n)
 				}
 			}
+		}else if(dataType(columns[0].children,"array")){
+			this.setColumnValues(n,columns[0].children)
+			setPickerCol(columns[0].children, value, ++n)
 		}
 	}
 	function setPickerVal(columns, value){
@@ -440,7 +443,6 @@ import {computeArea} from '@/common/utils'
 		watch:{
 			columns(n){
 				if(this.type=='select'){
-					console.log(n[0],this.value)
 					this.$nextTick(()=>{
 						setPickerCol.bind(this.$refs.picker)(n[0]||[],this.value,1)
 					})