From b88b0b548f7b7c256ed5bdfb585f385c21392ea7 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 3 Dec 2024 09:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=A5=97=E9=A4=90=E5=95=86=E5=93=81=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageProduct/add-Product/add-Product.vue | 57 +++++++------------------
 1 file changed, 15 insertions(+), 42 deletions(-)

diff --git a/pageProduct/add-Product/add-Product.vue b/pageProduct/add-Product/add-Product.vue
index 90fdea6..52d0081 100644
--- a/pageProduct/add-Product/add-Product.vue
+++ b/pageProduct/add-Product/add-Product.vue
@@ -39,6 +39,10 @@
 									</up-radio-group>
 								</uni-forms-item>
 							</view>
+							<uni-forms-item required name="name" label="商品名称" showRequired>
+								<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
+									:inputBorder="inputBorder" v-model="FormData.name" placeholder="请输入商品名称" />
+							</uni-forms-item>
 							<uni-forms-item ref="fileItem" label="图片" required showRequired>
 								<my-upload-file ref="refFile" :images="FormData.images"
 									:imageStyles="imageStyles"></my-upload-file>
@@ -67,22 +71,15 @@
 							
 								</view>
 							</view>
-							<template v-if="FormData.type!='package'">
-								<uni-forms-item required name="name" label="商品名称" showRequired>
-									<uni-easyinput :paddingNone="inputPaddingNone" :placeholderStyle="placeholderStyle"
-										:inputBorder="inputBorder" v-model="FormData.name" placeholder="请输入商品名称" />
+							<view class="">
+								<uni-forms-item label="单位" required showRequired name="units">
+							
+									<uni-data-picker :clear-icon="false" @change="unitIdChange"
+										:map="{text:'name',value:'id'}" placeholder="请选择单位" popup-title="请选择单位"
+										:localdata="pageData.units" v-model="FormData.unitId">
+									</uni-data-picker>
 								</uni-forms-item>
-								
-								<view class="border-top-0">
-									<uni-forms-item label="单位" required showRequired name="units">
-
-										<uni-data-picker :clear-icon="false" @change="unitIdChange"
-											:map="{text:'name',value:'id'}" placeholder="请选择单位" popup-title="请选择单位"
-											:localdata="pageData.units" v-model="FormData.unitId">
-										</uni-data-picker>
-									</uni-forms-item>
-								</view>
-							</template>
+							</view>
 							<template v-if="FormData.type==='package'">
 								<!-- <view class="block border-top-0">
 									<uni-forms-item label="选择规格" required name="categoryId">
@@ -93,7 +90,7 @@
 										</uni-data-picker>
 									</uni-forms-item>
 								</view> -->
-								<view class="border-top" >
+								<view class="border-top" v-if="FormData.proGroupVo">
 									<view class=""
 										v-if=" (FormData.groupType==1&&FormData.proGroupVo.length)||(FormData.groupType==0&&FormData.proGroupVo.length&&FormData.proGroupVo[0].goods.length) ">
 										<view class="border-bottom  u-p-b-32"
@@ -1240,7 +1237,7 @@
 		singleOrderLimit:0,
 		singlePeopleLimit:0,
 		type: 'normal',
-		showType: 'table',
+		showType: ['table'],
 		specsInfoName: '',
 		id: "",
 		typeEnum: "normal",
@@ -1930,20 +1927,7 @@
 	})
 
 	watch(() => FormData.type, (newval) => {
-		if (option.type == 'edit') {
-			if (newval == $goodsData.type) {
-				if($goodsData.proGroupVo){
-					FormData.proGroupVo = $goodsData.proGroupVo||[]
-				}else{
-					initDefaultProGroupVo()
-				}
-			}
-		} else {
-			if (newval == 'package') {
-				initDefaultProGroupVo()
-			}
-		}
-
+		initDefaultProGroupVo()
 	})
 
 	function initDefaultProGroupVo() {
@@ -1956,17 +1940,6 @@
 		console.log(FormData.proGroupVo);
 	}
 	watch(() => FormData.groupType, (newval) => {
-		if (newval == 0) {
-			return initDefaultProGroupVo()
-		}
-		if (option.type == 'edit') {
-			if (newval == $goodsData.groupType) {
-				FormData.proGroupVo = $goodsData.proGroupVo
-			} else {
-
-			}
-			return
-		}
 		initDefaultProGroupVo()
 
 	})