From 6d35ba94030f67f40a331fba6f46a3746d65776c Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 14 Feb 2023 16:20:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/add_farming.vue | 2 +-
 pages/massif/agrSpecs.vue    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/massif/add_farming.vue b/pages/massif/add_farming.vue
index ba4fbad..997dcdd 100644
--- a/pages/massif/add_farming.vue
+++ b/pages/massif/add_farming.vue
@@ -166,7 +166,7 @@
 			<u-swipe-action v-for="(v,k) in formData.inputList" :key="k">
 				<u-swipe-action-item>
 					<view>
-						<text>{{v.parentName}}</text> <text>{{v.name}}</text> <text>{{v.total}}</text>
+						<text>{{v.goodsType}}</text> <text>{{v.substanceName}}</text> <text>{{v.total}}</text>
 					</view>
 					<view slot="button" class="u-swipe-action-item__right__button">
 						<button class="cu-btn bg-red" style="margin:auto;" @click="formData.inputList.splice(k,1)">删除</button>
diff --git a/pages/massif/agrSpecs.vue b/pages/massif/agrSpecs.vue
index 5fae91d..2dcffc5 100644
--- a/pages/massif/agrSpecs.vue
+++ b/pages/massif/agrSpecs.vue
@@ -171,6 +171,7 @@
 				<text>{{agrDetail.goodsDetailType}}</text> <text>{{agrDetail.supplier}}</text>
 			</view>
 		</view>
+
 		<view class="card">
 			<u-form class="inline" labelWidth="auto" ref="form" errorType="toast" :model="formData" :rules="rules">
 				<d-form
@@ -256,8 +257,8 @@ export default {
 					this.eventChannel.emit("update", {
 						...this.formData,
 						total: `${parseFloat(this.specsVal.num)*parseFloat(this.specsVal.specs[0])}${this.specsVal.specs[1]}`,
-						parentName: this.agrDetail.parentName,
-						name: this.agrDetail.name,
+						goodsType: this.agrDetail.goodsType,
+						substanceName: this.agrDetail.substanceName,
 					})
 					uni.navigateBack()
 				}