zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商品管理调整

Browse Source
This commit is contained in:
weiwei committed 2025-03-05 18:46:09 +08:00
1 parent b34608b876
commit 0b7b27708d
7 files changed
+242 -288
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue → src/views/supermarketerp/supermarketSpu/components/auxiliaryCode.vue
+4 -6
View File
@@ -13,7 +13,7 @@
:column-config="{ resizable: true }"
:row-config="{ isHover: true }"
:resizable-config="{ dragMode: 'fixed' }"
:data="supermarketAuxiliaryCodeEntityList"
:data="auxiliaryCodeList"
:edit-config="{
trigger: 'click',
mode: 'cell',
@@ -55,7 +55,7 @@
<script setup lang="ts">
import { nanoid } from "nanoid"
const supermarketAuxiliaryCodeEntityList = defineModel("supermarketAuxiliaryCodeEntityList", {
const auxiliaryCodeList = defineModel("modelValue", {
default: [
{
id: nanoid(5),
@@ -83,7 +83,7 @@ const pushEvent = () => {
barCode: "",
isNew: true,
}
supermarketAuxiliaryCodeEntityList.value.push(newRow)
auxiliaryCodeList.value.push(newRow)
nextTick(() => {
const $table = editableTableRef.value
if ($table) {
@@ -98,9 +98,7 @@ const removeSelectRowEvent = () => {
if ($table) {
const selectRecords = $table.getCheckboxRecords()
if (selectRecords.length > 0) {
supermarketAuxiliaryCodeEntityList.value = supermarketAuxiliaryCodeEntityList.value.filter(
(item: any) => !selectRecords.some((row: any) => row.id === item.id),
)
auxiliaryCodeList.value = auxiliaryCodeList.value.filter((item: any) => !selectRecords.some((row: any) => row.id === item.id))
}
}
}
src/views/supermarketerp/supermarketSpu/components/baseInfo.vue
+142
View File
@@ -0,0 +1,142 @@
<template>
<el-row>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="商户" prop="merchantId">-->
<!-- <select-mch v-model="form.merchantId" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="货号" prop="productCode">
<el-input v-model.trim="form.productCode" placeholder="请输入货号" />
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="自编码/条码" prop="barcode">-->
<!-- <el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="商品名称" prop="productName">
<el-input v-model.trim="form.productName" placeholder="请输入商品名称" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="货商" prop="supplierId">
<select-supplier v-model="form.supplierId" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品分类" prop="categoryId">
<el-select v-model="form.categoryId" placeholder="请选择商品分类">
<el-option v-for="item in categoryOptions" :key="item?.id" :label="item?.name" :value="item?.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="品牌" prop="brandId">
<el-select v-model="form.brandId" placeholder="请选择品牌">
<el-option v-for="item in brandOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品性质" prop="productNature">
<el-select v-model="form.productNature" placeholder="请选择商品性质">
<el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商品封面图" prop="picUrl">
<upload-img v-model:imageUrl="form.picUrl"></upload-img>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="单位" prop="unit">-->
<!-- &lt;!&ndash; <el-alert type="warning" show-icon>&ndash;&gt;-->
<!-- &lt;!&ndash; <p>最小售卖的基本单位</p>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<!-- <el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="14" class="mb20">-->
<!-- <el-form-item label="内装数" prop="packageNum">-->
<!-- &lt;!&ndash; <el-alert type="warning" show-icon >&ndash;&gt;-->
<!-- &lt;!&ndash; <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
<!-- &lt;!&ndash; 例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<!-- <el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="零售价" prop="retailPrice">-->
<!-- <el-input-number v-model="form.retailPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="进价" prop="purchasePrice">-->
<!-- <el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="促销价" prop="promotionPrice">-->
<!-- <el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="成本价" prop="costPrice">-->
<!-- <el-input-number v-model="form.costPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24" class="mb20">
<el-form-item label="商品状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="规格" prop="spec">-->
<!-- <el-input placeholder="请输入规格" v-model.trim="form.spec" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="产地" prop="origin">
<el-input v-model.trim="form.origin" placeholder="请输入产地" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="排序字段" prop="sort">
<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="毛利率" prop="grossMargin">
<el-input-number v-model="form.grossMargin" :min="0" :precision="2" />
</el-form-item>
</el-col>
</el-row>
</template>
<script setup lang="ts">
import { ref, onMounted } from "vue"
import { useDict } from "/@/hooks/dict"
import { getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
const form = defineModel<any>("modelValue")
const { supermarket_nature, status } = useDict("supermarket_nature", "status")
const categoryOptions = ref<any>([]) // 商品分类的下拉选项
const brandOptions = ref<any>([]) // 超市品牌的下拉选项
onMounted(async () => {
// 获取分类下拉选项 & 获取品牌下拉选项
const [categoryDict, brandDict] = await Promise.allSettled([getSupermarketCategory(), getSupermarketBrand()]).then((results) =>
results.map((result) => (result.status === "fulfilled" ? result.value : null)),
)
categoryDict && categoryDict.code === 0 && (categoryOptions.value = categoryDict.data)
brandDict && brandDict.code === 0 && (brandOptions.value = brandDict.data)
})
</script>
src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue → src/views/supermarketerp/supermarketSpu/components/packageUnit.vue
+5 -7
View File
@@ -25,7 +25,7 @@
:column-config="{ resizable: true }"
:row-config="{ isHover: true }"
:resizable-config="{ dragMode: 'fixed' }"
:data="supermarketUnitEntityList"
:data="packageUnitList"
:edit-rules="validRules"
:edit-config="{
trigger: 'click',
@@ -100,7 +100,7 @@
<script setup lang="ts">
import { nanoid } from "nanoid"
const supermarketUnitEntityList = defineModel("supermarketUnitEntityList", {
const packageUnitList = defineModel("modelValue", {
default: [
{
id: nanoid(5),
@@ -145,7 +145,7 @@ const pushEvent = () => {
costPrice: 0,
isNew: true,
}
supermarketUnitEntityList.value.push(newRow)
packageUnitList.value.push(newRow)
nextTick(() => {
const $table = editableTableRef.value
if ($table) {
@@ -160,9 +160,7 @@ const removeSelectRowEvent = () => {
if ($table) {
const selectRecords = $table.getCheckboxRecords()
if (selectRecords.length > 0) {
supermarketUnitEntityList.value = supermarketUnitEntityList.value.filter(
(item: any) => !selectRecords.some((row: any) => row.id === item.id),
)
packageUnitList.value = packageUnitList.value.filter((item: any) => !selectRecords.some((row: any) => row.id === item.id))
}
}
}
@@ -180,7 +178,7 @@ const getRadioEvent = () => {
const setRadioRow = (index: number) => {
const $table = editableTableRef.value
if ($table) {
$table.setRadioRow(supermarketUnitEntityList.value[index])
$table.setRadioRow(packageUnitList.value[index])
}
}
src/views/supermarketerp/supermarketSpu/components/productInventory.vue
+31
View File
@@ -0,0 +1,31 @@
<template>
<el-row>
<el-col :span="24" class="mb20">
<el-form-item label="总库存" prop="stock" class="flex w-full h-full">
<el-input-number v-model="stock" :min="0" :precision="0" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="库存上限" prop="inventoryUpperLimit">
<el-input-number v-model="inventoryUpperLimit" :min="0" :precision="0" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="库存下限" prop="inventoryLowerLimit">
<el-input-number v-model="inventoryLowerLimit" :min="0" :precision="0" />
</el-form-item>
</el-col>
<el-alert type="warning" show-icon :closable="false">
注：最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品，都会进行总库存-内装数，实现多种包装形式售卖
</el-alert>
</el-row>
</template>
<script setup lang="ts">
const stock = defineModel<number | null>("stock")
const inventoryUpperLimit = defineModel<number | null>("inventoryUpperLimit")
const inventoryLowerLimit = defineModel<number | null>("inventoryLowerLimit")
</script>
src/views/supermarketerp/supermarketSpu/components/supermarketInventory.vue
-96
View File
@@ -1,96 +0,0 @@
<template>
<div class="w-full h-full">
<el-tooltip effect="light" placement="right">
<template #content>
<el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
<p>注：最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品，都会进行总库存-内装数，实现多种包装形式售卖</p>
</el-alert>
</template>
<el-icon class="text-xl my-auto ml-4 text-yellow-600"><WarningFilled /></el-icon>
</el-tooltip>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px">
<el-row>
<el-col :span="24" class="mb20">
<el-form-item label="总库存" prop="stock" class="flex w-full h-full">
<el-input-number v-model="stock" :min="0" :precision="0" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="库存上限" prop="inventoryUpperLimit">
<el-input-number v-model="inventoryUpperLimit" :min="0" :precision="0" />
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="库存下限" prop="inventoryLowerLimit">
<el-input-number v-model="inventoryLowerLimit" :min="0" :precision="0" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script setup lang="ts">
import { ref } from "vue"
const stock = defineModel<number | null>("stock")
const inventoryUpperLimit = defineModel<number | null>("inventoryUpperLimit")
const inventoryLowerLimit = defineModel<number | null>("inventoryLowerLimit")
const dataFormRef = ref()
const form = reactive<{
stock: number | null | undefined
inventoryUpperLimit: number | null | undefined
inventoryLowerLimit: number | null | undefined
}>({
stock: null,
inventoryUpperLimit: null,
inventoryLowerLimit: null,
})
watch(
() => stock.value,
(val) => {
form.stock = val
},
{
immediate: true,
},
)
watch(
() => inventoryUpperLimit.value,
(val) => {
form.inventoryUpperLimit = val
},
{
immediate: true,
},
)
watch(
() => inventoryLowerLimit.value,
(val) => {
form.inventoryLowerLimit = val
},
{
immediate: true,
},
)
const dataRules = ref({
stock: [{ required: true, message: "总库存不能为空", trigger: "blur" }],
inventoryUpperLimit: [{ required: true, message: "库存上限不能为空", trigger: "blur" }],
inventoryLowerLimit: [{ required: true, message: "库存下限不能为空", trigger: "blur" }],
})
// 库存校验
const stockValidate = async () => {
const valid = await dataFormRef.value.validate().catch(() => {})
return valid
}
defineExpose({
stockValidate,
})
</script>
src/views/supermarketerp/supermarketSpu/form.vue
+41 -166
View File
@@ -1,144 +1,22 @@
<template>
<el-dialog width="80%" :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
<el-dialog width="70%" :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="auto" v-loading="loading">
<el-tabs v-model="tabPaneActiveName" @tab-change="handleTabChange">
<el-tab-pane label="基础信息" name="基础信息" style="overflow-y: auto; height: 60vh">
<el-row>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="商户" prop="merchantId">-->
<!-- <select-mch v-model="form.merchantId" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="货号" prop="productCode">
<el-input v-model.trim="form.productCode" placeholder="请输入货号" />
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="自编码/条码" prop="barcode">-->
<!-- <el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="商品名称" prop="productName">
<el-input v-model.trim="form.productName" placeholder="请输入商品名称" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="货商" prop="supplierId">
<select-supplier v-model="form.supplierId" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品分类" prop="categoryId">
<el-select v-model="form.categoryId" placeholder="请选择商品分类">
<el-option v-for="item in categoryOptions" :key="item?.id" :label="item?.name" :value="item?.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="品牌" prop="brandId">
<el-select v-model="form.brandId" placeholder="请选择品牌">
<el-option v-for="item in brandOptions" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="商品性质" prop="productNature">
<el-select v-model="form.productNature" placeholder="请选择商品性质">
<el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" class="mb20">
<el-form-item label="商品封面图" prop="picUrl">
<upload-img v-model:imageUrl="form.picUrl"></upload-img>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="单位" prop="unit">-->
<!-- &lt;!&ndash; <el-alert type="warning" show-icon>&ndash;&gt;-->
<!-- &lt;!&ndash; <p>最小售卖的基本单位</p>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<!-- <el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="14" class="mb20">-->
<!-- <el-form-item label="内装数" prop="packageNum">-->
<!-- &lt;!&ndash; <el-alert type="warning" show-icon >&ndash;&gt;-->
<!-- &lt;!&ndash; <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
<!-- &lt;!&ndash; 例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-alert>&ndash;&gt;-->
<!-- <el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="零售价" prop="retailPrice">-->
<!-- <el-input-number v-model="form.retailPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="进价" prop="purchasePrice">-->
<!-- <el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="促销价" prop="promotionPrice">-->
<!-- <el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="成本价" prop="costPrice">-->
<!-- <el-input-number v-model="form.costPrice" :min="0" :precision="2" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24" class="mb20">
<el-form-item label="商品状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="12" class="mb20">-->
<!-- <el-form-item label="规格" prop="spec">-->
<!-- <el-input placeholder="请输入规格" v-model.trim="form.spec" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" class="mb20">
<el-form-item label="产地" prop="origin">
<el-input v-model.trim="form.origin" placeholder="请输入产地" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="排序字段" prop="sort">
<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item label="毛利率" prop="grossMargin">
<el-input-number v-model="form.grossMargin" :min="0" :precision="2" />
</el-form-item>
</el-col>
</el-row>
<el-tab-pane class="el-tab-pane" label="基础信息" name="基础信息">
<base-info v-model="form" />
</el-tab-pane>
<el-tab-pane label="包装单位" name="包装单位" style="overflow-y: auto; height: 60vh">
<supermarket-unit ref="supermarketUnitEntityListRef" v-model:supermarketUnitEntityList="form.smErpUnitEntityList" />
<el-tab-pane class="el-tab-pane" label="包装单位" name="包装单位">
<package-unit ref="packageUnitRef" v-model="form.smErpUnitEntityList" />
</el-tab-pane>
<el-tab-pane label="库存" name="库存" style="overflow-y: auto; height: 60vh">
<supermarket-inventory
ref="supermarketInventoryRef"
<el-tab-pane class="el-tab-pane" label="库存" name="库存">
<product-inventory
v-model:stock="form.stock"
v-model:inventoryUpperLimit="form.inventoryUpperLimit"
v-model:inventoryLowerLimit="form.inventoryLowerLimit"
/>
</el-tab-pane>
<el-tab-pane label="辅助条码" name="辅助条码" style="overflow-y: auto; height: 60vh">
<supermarket-auxiliaryCode
ref="supermarketAuxiliaryCodeEntityList"
:smErpUnitEntityList="form.smErpUnitEntityList"
v-model:supermarketAuxiliaryCodeEntityList="form.smErpAuxiliaryCodeEntityList"
/>
<el-tab-pane class="el-tab-pane" label="辅助条码" name="辅助条码">
<auxiliary-code :smErpUnitEntityList="form.smErpUnitEntityList" v-model="form.smErpAuxiliaryCodeEntityList" />
</el-tab-pane>
</el-tabs>
</el-form>
@@ -153,27 +31,25 @@
</template>
<script setup lang="ts">
import { useDict } from "/@/hooks/dict"
import { useMessage } from "/@/hooks/message"
import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
import { rule } from "/@/utils/validate"
import SupermarketUnit from "./components/supermarketUnit.vue"
import supermarketInventory from "./components/supermarketInventory.vue"
import SupermarketAuxiliaryCode from "./components/supermarketAuxiliaryCode.vue"
import baseInfo from "./components/baseInfo.vue"
import packageUnit from "./components/packageUnit.vue"
import productInventory from "./components/productInventory.vue"
import auxiliaryCode from "./components/auxiliaryCode.vue"
import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketSpu"
import { TabPaneName } from "element-plus"
import { useMessage } from "/@/hooks/message"
import { displayPrice, storePrice } from "/@/utils/formatMoney"
const emit = defineEmits(["refresh"])
const supermarketUnitEntityListRef = ref()
const supermarketInventoryRef = ref()
const supermarketAuxiliaryCodeEntityList = ref()
const tabPaneEnum = ["基础信息", "包装单位", "库存", "辅助条码"]
const dataFormRef = ref()
const packageUnitRef = ref()
const visible = ref(false)
const loading = ref(false)
const tabPaneEnum = ["基础信息", "包装单位", "库存", "辅助条码"]
const currentTabPaneIndex = ref(0)
const tabPaneActiveName = computed(() => tabPaneEnum[currentTabPaneIndex.value])
// 提交表单数据
const form = reactive<any>({
id: "",
@@ -224,17 +100,17 @@ const dataRules = {
promotionPrice: [{ required: true, message: "促销价不能为空", trigger: "blur" }],
costPrice: [{ required: true, message: "成本价不能为空", trigger: "blur" }],
packageNum: [{ required: true, message: "内装数不能为空", trigger: "blur" }],
stock: [{ required: true, message: "总库存不能为空", trigger: "blur" }],
inventoryUpperLimit: [{ required: true, message: "库存上限不能为空", trigger: "blur" }],
inventoryLowerLimit: [{ required: true, message: "库存下限不能为空", trigger: "blur" }],
}
const { supermarket_nature, status } = useDict("supermarket_nature", "status")
const categoryOptions = ref<any>([]) // 商品分类的下拉选项
const brandOptions = ref<any>([]) // 超市品牌的下拉选项
// 打开弹窗
const openDialog = async (id: string) => {
visible.value = true
currentTabPaneIndex.value = 0
form.id = ""
// 重置表单数据
resetForm()
@@ -243,17 +119,9 @@ const openDialog = async (id: string) => {
form.id = id
await getsupermarketSpuData(id)
// 设置基础包装单位单选行
supermarketUnitEntityListRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
// 设置基础包装单位的单选行
packageUnitRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
}
// 获取分类下拉选项 & 获取品牌下拉选项
const [categoryDict, brandDict] = await Promise.allSettled([getSupermarketCategory(), getSupermarketBrand()]).then((results) =>
results.map((result) => (result.status === "fulfilled" ? result.value : null)),
)
categoryDict && categoryDict.code === 0 && (categoryOptions.value = categoryDict.data)
brandDict && brandDict.code === 0 && (brandOptions.value = brandDict.data)
}
// 初始化表单数据
@@ -292,9 +160,9 @@ const resetForm = () => {
dataFormRef.value?.resetFields()
form.smErpUnitEntityList = []
form.smErpAuxiliaryCodeEntityList = []
form.stock = null
form.inventoryUpperLimit = null
form.inventoryLowerLimit = null
form.stock = 0
form.inventoryUpperLimit = 0
form.inventoryLowerLimit = 0
}
// tab栏切换
@@ -302,7 +170,7 @@ const handleTabChange = (name: TabPaneName) => (currentTabPaneIndex.value = tabP
// 整理包装单位列表
const useHandleUnit = () => {
const curRadioRow = supermarketUnitEntityListRef.value.getRadioEvent()
const curRadioRow = packageUnitRef.value.getRadioEvent()
return form.smErpUnitEntityList.map((item: any) => {
if (item.id === curRadioRow.id) {
item.isBase = true
@@ -324,7 +192,7 @@ const useHandleUnit = () => {
// 整理辅助条码列表
const useHandleAuxiliaryCode = () => {
return form.smErpAuxiliaryCodeEntityList.map((item: any) => {
const barCode = form.smErpUnitEntityList.find((item2: any) => item2.unit === item.unit).barCode
const barCode = form.smErpUnitEntityList.find((item2: any) => item2.unit === item.unit)?.barCode
item.barCode = barCode
if (item.isNew) {
item.id = ""
@@ -337,13 +205,13 @@ const useHandleAuxiliaryCode = () => {
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {})
if (!valid) return useMessage().warning("基础信息必填项未填写完整")
if (!valid) return useMessage().warning("基础信息和库存必填项未填写完整")
if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0) return useMessage().warning("请添加包装单位")
if (!(await supermarketUnitEntityListRef.value.editableTableValidate())) return useMessage().warning("包装单位必填项未填写完整")
if (!supermarketUnitEntityListRef.value.getRadioEvent()) return useMessage().warning("请选择基础包装单位")
if (!(await supermarketInventoryRef.value.stockValidate())) return useMessage().warning("库存必填项未填写完整")
if (!(await packageUnitRef.value.editableTableValidate())) return useMessage().warning("包装单位必填项未填写完整")
if (!packageUnitRef.value.getRadioEvent()) return useMessage().warning("请选择基础包装单位")
// if (!form.stock || !form.inventoryUpperLimit || !form.inventoryLowerLimit) return useMessage().warning("库存必填项未填写完整")
// if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0) return useMessage().warning("请添加辅助条码")
// if (!(await supermarketAuxiliaryCodeEntityList.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整")
// if (!(await auxiliaryCodeRef.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整")
const handleUnit = useHandleUnit()
const handleAuxiliaryCode = useHandleAuxiliaryCode()
@@ -367,3 +235,10 @@ defineExpose({
openDialog,
})
</script>
<style scoped>
.el-tab-pane {
overflow-y: auto;
height: 60vh;
}
</style>
src/views/supermarketerp/supermarketSpu/index.vue
+19 -13
View File
@@ -48,9 +48,16 @@
style="float: right"
@queryTable="getDataList"
/>
<el-button plain v-auth="'supermarket_supermarketSpu_export'" class="ml10" icon="upload-filled" type="primary" @click="excelUploadRef.show()">
{{ $t("common.importBtn") }}
</el-button>
<el-button
plain
v-auth="'supermarket_supermarketSpu_export'"
class="ml10"
icon="upload-filled"
type="primary"
@click="excelUploadRef.show()"
>
{{ $t("common.importBtn") }}
</el-button>
</div>
</el-row>
<el-table
@@ -65,7 +72,7 @@
<el-table-column type="selection" width="40" fixed="left" />
<el-table-column type="index" label="#" width="50" fixed="left" />
<el-table-column prop="productCode" label="货号" show-overflow-tooltip />
<!-- <el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip width="100" />-->
<!-- <el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip width="100" /> -->
<el-table-column prop="productName" label="商品名称" show-overflow-tooltip width="100" />
<el-table-column prop="unit" label="单位" show-overflow-tooltip />
<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip width="100">
@@ -73,11 +80,11 @@
{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
</template>
</el-table-column>
<!-- <el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
<!-- <el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
<template #default="scope">
{{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
</template>
</el-table-column>-->
</el-table-column> -->
<el-table-column prop="picUrl" label="封面图" width="100">
<template #default="scope">
<preview-image :src="scope.row.picUrl" />
@@ -128,12 +135,12 @@
<!-- 编辑、新增 -->
<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
<upload-excel
ref="excelUploadRef"
:title="$t('supermarket.importErpSpuTip')"
url="/supermarket/supermarketSpu/import"
@refreshDataList="getDataList"
/>
<upload-excel
ref="excelUploadRef"
:title="$t('supermarket.importErpSpuTip')"
url="/supermarket/supermarketSpu/import"
@refreshDataList="getDataList"
/>
</div>
</template>
@@ -160,7 +167,6 @@ const state: BasicTableProps = reactive<BasicTableProps>({
pageList: fetchList,
})
// table hook
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
// 清空搜索条件