- 新 增
+ 新 增
删 除
- 编辑
+ 编辑
删除
@@ -124,10 +124,8 @@ const selectionChangHandle = (objs: { id: string }[]) => {
multiple.value = !objs.length
}
-// 点击创建出库入库记录表
-const handleClickCreateInventoryRecord = () => router.push({ path: "/supermarketerp/stockTaking/form" })
-// 点击编辑出库入库记录表
-const handleClickEditInventoryRecord = (id: string) => router.push({ path: "/supermarketerp/stockTaking/form", query: { id } })
+const handleClickCreateStockTaking = () => router.push({ path: "/supermarketerp/stockTaking/form" })
+const handleClickEditStockTaking = (id: string) => router.push({ path: "/supermarketerp/stockTaking/form", query: { id } })
// 删除操作
const handleDelete = async (ids: string[]) => {
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 9eaaf9a..ab0237b 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -1,5 +1,5 @@
-
+
@@ -162,14 +162,14 @@ const resetForm = () => {
const handleTabChange = (name: TabPaneName) => (currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name))
// 计算包装单位列表
-const usePackageUnitList = computed(() => {
- const smErpUnitEntityList = JSON.parse(JSON.stringify(form.smErpUnitEntityList))
+const usePackageUnitList = () => {
const curRadioRowUnit = packageUnitRef.value.getRadioEvent()
+ const smErpUnitEntityList = JSON.parse(JSON.stringify(form.smErpUnitEntityList)) // 深拷贝
return smErpUnitEntityList.map((item: rowVU) => {
if (item.id === curRadioRowUnit.id) {
item.isBase = true
} else {
- item.isBase = false
+ item.isBase = null
}
item.costPrice = storePrice(item.costPrice)
item.promotionPrice = storePrice(item.promotionPrice)
@@ -181,16 +181,17 @@ const usePackageUnitList = computed(() => {
}
return item
})
-})
+}
// 计算辅助条码列表
-const useAuxiliaryCode = computed(() => {
- const smErpUnitEntityList = JSON.parse(JSON.stringify(form.smErpUnitEntityList))
- return form.smErpAuxiliaryCodeEntityList
+const useAuxiliaryCode = () => {
+ const smErpAuxiliaryCodeEntityList = [...form.smErpAuxiliaryCodeEntityList]
+ return smErpAuxiliaryCodeEntityList
.filter((item: rowVC) => item.unitId)
.map((item: rowVC) => {
- const curPackageUnitItem = smErpUnitEntityList.find((unitItem: any) => unitItem.id === item.unitId)
- // if (curAuxiliaryCodeItem.barCode) item.barCode = curAuxiliaryCodeItem.barCode
+ const curPackageUnitItem = form.smErpUnitEntityList.find((unitItem: any) => unitItem.id === item.unitId)
+ console.log(form.smErpUnitEntityList)
+
if (item.isNew) {
item.id = ""
if (curPackageUnitItem?.isNew) item.unitId = ""
@@ -198,7 +199,7 @@ const useAuxiliaryCode = computed(() => {
}
return item
})
-})
+}
// 提交
const onSubmit = async () => {
@@ -212,13 +213,17 @@ const onSubmit = async () => {
// if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0) return useMessage().warning("请添加辅助条码")
// if (!(await auxiliaryCodeRef.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整")
+ console.log(form.smErpUnitEntityList)
+
+ const smErpAuxiliaryCodeEntityList = useAuxiliaryCode()
+ const smErpUnitEntityList = usePackageUnitList()
try {
loading.value = true
const _pa = {
...form,
grossMargin: storePrice(form.grossMargin),
- smErpAuxiliaryCodeEntityList: useAuxiliaryCode.value,
- smErpUnitEntityList: usePackageUnitList.value,
+ smErpAuxiliaryCodeEntityList,
+ smErpUnitEntityList,
}
console.log("提交的数据", _pa)