Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/supermarketerp/supermarketSpu/form.vue

@@ -163,12 +163,13 @@ const handleTabChange = (name: TabPaneName) => (currentTabPaneIndex.value = tabP
 
 // 计算包装单位列表
 const usePackageUnitList = computed(() => {
+	const smErpUnitEntityList = JSON.parse(JSON.stringify(form.smErpUnitEntityList))
 	const curRadioRowUnit = packageUnitRef.value.getRadioEvent()
-	return [...form.smErpUnitEntityList].map((item: rowVU) => {
+	return smErpUnitEntityList.map((item: rowVU) => {
 		if (item.id === curRadioRowUnit.id) {
 			item.isBase = true
 		} else {
-			item.isBase = null
+			item.isBase = false
 		}
 		item.costPrice = storePrice(item.costPrice)
 		item.promotionPrice = storePrice(item.promotionPrice)
@@ -184,14 +185,15 @@ const usePackageUnitList = computed(() => {
 
 // 计算辅助条码列表
 const useAuxiliaryCode = computed(() => {
+	const smErpUnitEntityList = JSON.parse(JSON.stringify(form.smErpUnitEntityList))
 	return form.smErpAuxiliaryCodeEntityList
 		.filter((item: rowVC) => item.unitId)
 		.map((item: rowVC) => {
-			// const curAuxiliaryCodeItem = form.smErpUnitEntityList.find((unitItem: any) => unitItem.id === item.unitId)
+			const curPackageUnitItem = smErpUnitEntityList.find((unitItem: any) => unitItem.id === item.unitId)
 			// if (curAuxiliaryCodeItem.barCode) item.barCode = curAuxiliaryCodeItem.barCode
 			if (item.isNew) {
 				item.id = ""
-				// if (curAuxiliaryCodeItem.isNew) item.unitId = ""
+				if (curPackageUnitItem?.isNew) item.unitId = ""
 				delete item.isNew
 			}
 			return item
@@ -215,8 +217,8 @@ const onSubmit = async () => {
 		const _pa = {
 			...form,
 			grossMargin: storePrice(form.grossMargin),
-			smErpUnitEntityList: usePackageUnitList.value,
 			smErpAuxiliaryCodeEntityList: useAuxiliaryCode.value,
+			smErpUnitEntityList: usePackageUnitList.value,
 		}
 
 		console.log("提交的数据", _pa)