From 42c68fb48fa02ca0b1bc8d7ca5619a77ce7522b9 Mon Sep 17 00:00:00 2001
From: CHAN-MINATO <898043143@qq.com>
Date: Wed, 1 Feb 2023 21:11:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix 修正
---
 pages/purchase/agrProdList.vue                        | 4 ++--
 pages/purchase/apply.vue                              | 6 +++---
 pages/purchase/detail.vue                             | 4 ++--
 pages/purchase/specs.vue                              | 4 ++--
 uni_modules/d-picker/components/d-picker/d-picker.vue | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pages/purchase/agrProdList.vue b/pages/purchase/agrProdList.vue
index c2bd28f..cb804a5 100644
--- a/pages/purchase/agrProdList.vue
+++ b/pages/purchase/agrProdList.vue
@@ -61,10 +61,10 @@
 		<scroll-view scroll-y @scrolltolower="search">
 			<view class="card" v-for="(v,k) in list" :key="k" @click="toAddSepc(v.id)">
 				<view class="name">
-					<text>{{v.detailedType}}</text> {{v.goodsName}} <text class="plant-youbian"/>
+					<text>{{v.detailedParentName}}</text> {{v.goodsName}} <text class="plant-youbian"/>
 				</view>
 				<view class="company">
-					<text>{{v.detailedParentName}}</text> <text class="over">{{v.supplier}}</text>
+					<text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text>
 				</view>
 			</view>
 			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
diff --git a/pages/purchase/apply.vue b/pages/purchase/apply.vue
index 77e9322..ba3a190 100644
--- a/pages/purchase/apply.vue
+++ b/pages/purchase/apply.vue
@@ -108,13 +108,13 @@
 			
 			<view class="item" v-for="(v,k) in formData.plantPurchaseSubList" :key="k">
 				<view class="info">
-					<text>{{v.goodsName}}</text>
-					<text :data-unit="v.goodsSpecification">{{v.detailedType}}</text>
+					<text>{{v.detailedParentName}}</text>
+					<text :data-unit="v.goodsSpecification">{{v.goodsName}}</text>
 					<text class="plant-shanchu" @click="formData.plantPurchaseSubList.splice(k,1)">删除</text>
 				</view>
 				<view class="company">
 					<text style="--c:#707070;flex-shrink: 0;">{{v.supplier}}</text>
-					<text style="--c:#FBA83C;flex-grow:1;text-align:center;">{{v.detailedParentName}}</text>
+					<text style="--c:#FBA83C;flex-grow:1;text-align:center;">{{v.detailedType}}</text>
 				</view>
 			</view>
 			<u-empty v-if="formData.plantPurchaseSubList.length==0" width="70%" text=' ' icon="/static/noData.png"/>
diff --git a/pages/purchase/detail.vue b/pages/purchase/detail.vue
index 17e2d82..0ec34c9 100644
--- a/pages/purchase/detail.vue
+++ b/pages/purchase/detail.vue
@@ -67,10 +67,10 @@
 		<view class="card">
 			<view v-for="(v,k) in list" :key="k">
 				<view class="head">
-					<text>{{v.detailedType}}</text> <text>{{v.goodsName}}</text> <text>({{v.goodsSpecification}})</text>
+					<text>{{v.detailedParentName}}</text> <text>{{v.goodsName}}</text> <text>({{v.goodsSpecification}})</text>
 				</view>
 				<view class="info">
-					<text>{{v.detailedParentName}}</text> <text class="over">{{v.supplier}}</text> <text :data-total="v.heft">{{v.packing}}</text>
+					<text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text> <text :data-total="v.heft">{{v.packing}}</text>
 				</view>
 			</view>
 			<u-empty v-if="list.length==0" width="70%" icon="/static/noData.png"/>
diff --git a/pages/purchase/specs.vue b/pages/purchase/specs.vue
index 59d9b0a..c4ebfd6 100644
--- a/pages/purchase/specs.vue
+++ b/pages/purchase/specs.vue
@@ -116,12 +116,12 @@
 	<view class="container">
 		<view class="card fertilizer">
 			<view class="name">
-				<text>{{formData.detailedType}}</text>
+				<text>{{formData.detailedParentName}}</text>
 				<text>{{formData.goodsName}}</text>
 				<text class="plant-jiantou_zuoyouqiehuan" @click="$refs.dPicker.show=true"/>
 			</view>
 			<view class="company">
-				<text>{{formData.detailedParentName}}</text>
+				<text>{{formData.detailedType}}</text>
 				<text>{{formData.supplier}}</text>
 			</view>
 		</view>
diff --git a/uni_modules/d-picker/components/d-picker/d-picker.vue b/uni_modules/d-picker/components/d-picker/d-picker.vue
index 0bc0c8c..c612d6b 100644
--- a/uni_modules/d-picker/components/d-picker/d-picker.vue
+++ b/uni_modules/d-picker/components/d-picker/d-picker.vue
@@ -67,8 +67,8 @@
 		<picker-view :value="[value]" indicator-style="height:90rpx;" @change="changeVal=$event.detail.value[0]">
 			<picker-view-column>
 				<view v-for="(v,k) in list" :key="k" class="item" style="height:90rpx;">
-					<view class="name"><text>{{v.detailedType}}</text> <text>{{v.goodsName}}</text></view>
-					<view class="company" :data-name="v.detailedParentName" :data-company="v.supplier"/>
+					<view class="name"><text>{{v.detailedParentName}}</text> <text>{{v.goodsName}}</text></view>
+					<view class="company" :data-name="v.detailedType" :data-company="v.supplier"/>
 				</view>
 			</picker-view-column>
 		</picker-view>