From c2dbf10e70c35e67dd3b381f3f633890a89d6d19 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Fri, 7 Mar 2025 20:28:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E5=BD=95?=
=?UTF-8?q?=EF=BC=8C=E7=A6=81=E6=AD=A2=E7=88=AC=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/index.html b/index.html
index e2e0ef1..4421d6d 100644
--- a/index.html
+++ b/index.html
@@ -1,24 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
- PIGX 微服务快速开发平台
+ 浦江县机关事务智慧后勤一体化平台
From 35c27fe672cc71c067285a60a51396d49ee2dc7d Mon Sep 17 00:00:00 2001
From: weiwei
Date: Fri, 7 Mar 2025 22:16:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/supermarketerp/supermarketSpu/form.vue | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 09bd184..9eaaf9a 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/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)