From a68829e953071ad7cd2339bb58efc35ba0650e30 Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 21 Aug 2025 18:39:34 +0800 Subject: [PATCH 1/3] --- .../components/package-unit.vue | 148 +++++++----------- .../supermarketerp/supermarketSpu/form.vue | 3 +- 2 files changed, 56 insertions(+), 95 deletions(-) diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue index a021459..9fbca26 100644 --- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue +++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue @@ -210,43 +210,6 @@ const slotInputChange = (slotParams: any) => { } // 底部新增行 -<<<<<<< HEAD -const pushEvent = (row?: rowVU | undefined) => { - const newRow = {} as rowVU - if (row) { - Object.assign(newRow, row) - } else { -1 row = { - id: "tmp_" + nanoid(5), - barCode: "", - spec: "", - unit: "", - status: "0", - packageNum: 1, - purchasePrice: 0, - retailPrice: 0.01, - promotionPrice: 0, - costPrice: 0, - tasteName: "", - tasteId: "", - } - Object.assign(newRow, row)1 - const pushEvent = (flag?: "flag" | undefined) => { - const newRow: rowVU = { - id: "tmp_" + nanoid(5), - barCode: "", - spec: "", - unit: "", - status: "0", - packageNum: 1, - purchasePrice: 0, - retailPrice: 0.01, - promotionPrice: 0, - costPrice: 0, - tasteName: "", - tasteId: "", - } -======= const pushEvent = (flag?: "flag" | undefined) => { const newRow: rowVU = { id: "tmp_" + nanoid(5), @@ -262,71 +225,70 @@ const pushEvent = (flag?: "flag" | undefined) => { tasteName: "", tasteId: "", } ->>>>>>> 09ed9cd1a67bafec7fdb6796de0dcfbb0b357dec - if (flag) newRow.flag = "defaultPackageUnitRow" + if (flag) newRow.flag = "defaultPackageUnitRow" - packageUnitList.value.push(newRow) - nextTick(() => { - const $table = tableRef.value - if ($table) { - $table.setEditRow(newRow) - } - }) - } + packageUnitList.value.push(newRow) + nextTick(() => { + const $table = tableRef.value + if ($table) { + $table.setEditRow(newRow) + } + }) +} // 删除行 - const removeRow = (rowIndex: number) => { - packageUnitList.value.splice(rowIndex, 1) - } +const removeRow = (rowIndex: number) => { + packageUnitList.value.splice(rowIndex, 1) +} // 设置单选的行 - const setRadioRow = (index: number) => { - const $table = tableRef.value - if ($table) { - $table.setRadioRow(packageUnitList.value[index]) - } - } +const setRadioRow = (index: number) => { + const $table = tableRef.value + if ($table) { + $table.setRadioRow(packageUnitList.value[index]) + } +} // 获取单选的行 - const getRadioRow = () => { - const $table = tableRef.value - if ($table) { - const currRadioRow = $table.getRadioRecord() - return currRadioRow - } - } +const getRadioRow = () => { + const $table = tableRef.value + if ($table) { + const currRadioRow = $table.getRadioRecord() + return currRadioRow + } +} // 校验表格 成功返回 true 失败返回 false - const tableValidate = async (filed?: string) => { - const $table = tableRef.value - if ($table) { - if (filed) { - const errMap = await $table.validateField(packageUnitList.value, filed) - if (errMap) { - console.log("字段校验失败！", errMap) - return false - } else { - console.log("字段校验成功！") - return true - } - } else { - const errMap = await $table.validate(true) - if (errMap) { - console.log("全量校验失败！", errMap) - return false - } else { - console.log("全量校验成功！") - return true - } - } - } - } +const tableValidate = async (filed?: string) => { + const $table = tableRef.value + if ($table) { + if (filed) { + const errMap = await $table.validateField(packageUnitList.value, filed) + if (errMap) { + console.log("字段校验失败！", errMap) + return false + } else { + console.log("字段校验成功！") + return true + } + } else { + const errMap = await $table.validate(true) + if (errMap) { + console.log("全量校验失败！", errMap) + return false + } else { + console.log("全量校验成功！") + return true + } + } + } +} - defineExpose({ - tableValidate, - setRadioRow, - getRadioRow, - pushEvent, - }) +defineExpose({ + tableValidate, + setRadioRow, + getRadioRow, + pushEvent, +}) diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue index bc84556..6d826e3 100644 --- a/src/views/supermarketerp/supermarketSpu/form.vue +++ b/src/views/supermarketerp/supermarketSpu/form.vue @@ -32,7 +32,7 @@ From 58e6f48738359f4dcfc26d6b661ab3ec08faeeda Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 22 Aug 2025 17:34:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarketerp/smErpTasteStock/form.vue | 111 ----------------- .../supermarketerp/smErpTasteStock/index.vue | 115 ------------------ .../components/package-unit.vue | 5 +- .../supermarketerp/supermarketSpu/form.vue | 11 +- 4 files changed, 5 insertions(+), 237 deletions(-) delete mode 100644 src/views/supermarketerp/smErpTasteStock/form.vue delete mode 100644 src/views/supermarketerp/smErpTasteStock/index.vue diff --git a/src/views/supermarketerp/smErpTasteStock/form.vue b/src/views/supermarketerp/smErpTasteStock/form.vue deleted file mode 100644 index 1e39acf..0000000 --- a/src/views/supermarketerp/smErpTasteStock/form.vue +++ /dev/null @@ -1,111 +0,0 @@ - - - diff --git a/src/views/supermarketerp/smErpTasteStock/index.vue b/src/views/supermarketerp/smErpTasteStock/index.vue deleted file mode 100644 index a09fd06..0000000 --- a/src/views/supermarketerp/smErpTasteStock/index.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue index 9fbca26..098fd61 100644 --- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue +++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue @@ -150,7 +150,6 @@ export interface rowVU { promotionPrice: number costPrice: number isBase?: boolean | null - flag?: string tasteName?: string tasteId: string } @@ -210,7 +209,7 @@ const slotInputChange = (slotParams: any) => { } // 底部新增行 -const pushEvent = (flag?: "flag" | undefined) => { +const pushEvent = () => { const newRow: rowVU = { id: "tmp_" + nanoid(5), barCode: "", @@ -226,8 +225,6 @@ const pushEvent = (flag?: "flag" | undefined) => { tasteId: "", } - if (flag) newRow.flag = "defaultPackageUnitRow" - packageUnitList.value.push(newRow) nextTick(() => { const $table = tableRef.value diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue index 6d826e3..87354fb 100644 --- a/src/views/supermarketerp/supermarketSpu/form.vue +++ b/src/views/supermarketerp/supermarketSpu/form.vue @@ -32,7 +32,7 @@