Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/supermarketerp/supermarketSpu/components/auxiliary-code.vue

@@ -10,6 +10,7 @@
 			border
 			show-overflow
 			max-height="380"
+			:edit-rules="validRules"
 			:column-config="{ resizable: true }"
 			:row-config="{ isHover: true }"
 			:resizable-config="{ dragMode: 'fixed' }"
@@ -47,9 +48,6 @@
 				<template #edit="{ row }">
 					<el-input v-model.trim="row.barCode" />
 				</template>
-				<!-- <template #default="{ row }">
-					{{ computedSmErpUnitEntityList?.find((item) => item.id == row.unitId)?.barCode }}
-				</template> -->
 			</vxe-column>
 		</vxe-table>
 	</div>
@@ -90,10 +88,10 @@ const props = withDefaults(
 
 const editableTableRef = ref()
 
-// const validRules = {
+const validRules = {
-// 	unit: [{ required: true, message: "包装单位不能为空", trigger: "blur" }],
+	// unit: [{ required: true, message: "包装单位不能为空", trigger: "blur" }],
-// 	barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
+	// barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
-// }
+}
 
 // 底部表格行新增
 const pushEvent = () => {

src/views/supermarketerp/supermarketSpu/components/base-info.vue

@@ -32,13 +32,13 @@
 		<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-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index" />
 				</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>
+				<upload-img v-model:imageUrl="form.picUrl" />
 			</el-form-item>
 		</el-col>
 		<el-col :span="24" class="mb20">

src/views/supermarketerp/supermarketSpu/components/package-unit.vue

@@ -54,7 +54,7 @@
 					<el-input v-model.trim="row.spec" />
 				</template>
 			</vxe-column>
-			<vxe-column field="unit" title="单位" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+			<vxe-column field="unit" title="单位名称" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 				<template #edit="{ row }">
 					<el-input v-model.trim="row.unit" />
 				</template>
@@ -113,7 +113,7 @@ export interface rowVU {
 	packageNum: number
 	purchasePrice: number
 	retailPrice: number
-	promotionPrice: number | null
+	promotionPrice: number
 	costPrice: number
 	isNew?: boolean
 	isBase?: boolean | null
@@ -127,11 +127,11 @@ const packageUnitList = defineModel<rowVU[]>("modelValue", {
 			barCode: "",
 			spec: "",
 			unit: "",
-			status: "",
+			status: "0",
 			packageNum: 1,
 			purchasePrice: 0,
 			retailPrice: 0.01,
-			promotionPrice: null,
+			promotionPrice: 0,
 			costPrice: 0,
 		},
 	],
@@ -160,11 +160,11 @@ const pushEvent = (row?: rowVU | undefined) => {
 			barCode: "",
 			spec: "",
 			unit: "",
-			status: "",
+			status: "0",
 			packageNum: 1,
 			purchasePrice: 0,
 			retailPrice: 0.01,
-			promotionPrice: null,
+			promotionPrice: 0,
 			costPrice: 0,
 			isNew: true,
 		}
@@ -191,7 +191,7 @@ const removeSelectRowEvent = () => {
 }
 
 // 获取单选的行
-const getRadioEvent = () => {
+const getRadioRow = () => {
 	const $table = editableTableRef.value
 	if ($table) {
 		const currRadioRow = $table.getRadioRecord()
@@ -225,7 +225,7 @@ const editableTableValidate = async () => {
 
 defineExpose({
 	editableTableValidate,
-	getRadioEvent,
+	getRadioRow,
 	setRadioRow,
 	pushEvent,
 })

src/views/supermarketerp/supermarketSpu/form.vue

@@ -1,34 +1,31 @@
 <template>
 	<el-dialog width="80%" :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="150px" v-loading="loading">
+		<el-form ref="formRef" :model="form" :rules="dataRules" label-width="150px" v-loading="loading">
 			<el-tabs class="el-tabs" v-model="tabPaneActiveName" @tab-change="handleTabChange" type="border-card">
-				<el-tab-pane class="el-tab-pane" label="基础信息" name="基础信息" :disabled="true">
+				<el-tab-pane class="el-tab-pane" label="基础信息" name="基础信息">
 					<base-info v-model="form" />
 				</el-tab-pane>
-				<el-tab-pane class="el-tab-pane" label="包装单位" name="包装单位" :disabled="true">
+				<el-tab-pane class="el-tab-pane" label="包装单位" name="包装单位">
 					<package-unit ref="packageUnitRef" v-model="form.smErpUnitEntityList" />
 				</el-tab-pane>
-				<el-tab-pane class="el-tab-pane" label="库存" name="库存" :disabled="true">
+				<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 class="el-tab-pane" label="辅助条码" name="辅助条码" :disabled="true">
+				<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>
 
 		<template #footer>
-			<!-- <el-button @click="visible = false">取消</el-button> -->
 			<el-button v-if="currentTabPaneIndex != 0" type="primary" @click="currentTabPaneIndex--" :disabled="loading">上一步</el-button>
-			<el-button v-if="currentTabPaneIndex == 0" type="primary" @click="addPackageUnitNextStep">下一步</el-button>
+			<el-button v-if="currentTabPaneIndex != tabPaneEnum.length - 1" type="primary" @click="nextStep">下一步</el-button>
-			<el-button v-if="currentTabPaneIndex == 1 || currentTabPaneIndex == 2" type="primary" @click="currentTabPaneIndex++">
+			<el-button v-if="currentTabPaneIndex == tabPaneEnum.length - 1" type="primary" @click="onSubmit" :loading="loading">提 交</el-button>
-				下一步
+			<el-button @click="visible = false">取消</el-button>
-			</el-button>
-			<el-button v-if="currentTabPaneIndex == 3" type="primary" @click="onSubmit" :loading="loading">提 交</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -46,7 +43,7 @@ import { nanoid } from "nanoid"
 
 const emit = defineEmits(["refresh"])
 
-const dataFormRef = ref()
+const formRef = ref()
 const packageUnitRef = ref()
 const visible = ref(false)
 const loading = ref(false)
@@ -87,8 +84,8 @@ const form = reactive<any>({
 	costPrice: 0,
 })
 
-// 表单金额转为单位分
+// 基本信息的金额转为单位分
-const formatedMoney = computed(() => {
+const formatedBaseFormMoney = computed(() => {
 	return {
 		grossMargin: storePrice(form.grossMargin),
 		purchasePrice: storePrice(form.purchasePrice),
@@ -176,51 +173,63 @@ const getsupermarketSpuData = async (id: string) => {
 
 // 重置表单数据
 const resetForm = () => {
-	dataFormRef.value?.resetFields()
+	formRef.value?.resetFields()
 	form.smErpUnitEntityList = []
 	form.smErpAuxiliaryCodeEntityList = []
 }
 
-// 第一步的下一步
+// tab栏切换
-const addPackageUnitNextStep = () => {
+const handleTabChange = (name: TabPaneName) => {
-	currentTabPaneIndex.value++
+	currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name)
 	if (form.id) return
-
+	setDefaultPackageUnit()
-	const row = {
-		id: nanoid(5),
-		barCode: form.barCode,
-		spec: form.spec,
-		unit: form.unit,
-		status: form.unitStatus,
-		packageNum: form.packageNum,
-		purchasePrice: form.purchasePrice,
-		retailPrice: form.retailPrice,
-		promotionPrice: form.promotionPrice,
-		costPrice: form.costPrice,
-		isNew: true,
-		flag: "addPackageUnitNextStep",
-	}
-	const isFlagRowExist = form.smErpUnitEntityList.some((item: rowVU) => item.flag === "addPackageUnitNextStep")
-	if (isFlagRowExist) return
-	packageUnitRef.value.pushEvent(row)
-	packageUnitRef.value.setRadioRow(0) // 设置基础包装单位的单选行
 }
 
-// tab栏切换
+// 下一步
-const handleTabChange = (name: TabPaneName) => (currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name))
+const nextStep = () => {
+	currentTabPaneIndex.value++
+	if (form.id) return
+	setDefaultPackageUnit()
+}
 
-// 计算包装单位列表
+// 默认设置一行基础包装单位
-const usePackageUnitList = () => {
+const setDefaultPackageUnit = () => {
-	const curRadioRowUnit = packageUnitRef.value.getRadioEvent()
+	if (currentTabPaneIndex.value == 1) {
+		const isFlagRowExist = form.smErpUnitEntityList.some((item: rowVU) => item.flag === "defaultAddedPackageUnit")
+		if (isFlagRowExist) return
+		const row = {
+			id: nanoid(5),
+			barCode: form.barCode,
+			spec: form.spec,
+			unit: form.unit,
+			status: form.unitStatus,
+			packageNum: form.packageNum,
+			purchasePrice: form.purchasePrice,
+			retailPrice: form.retailPrice,
+			promotionPrice: form.promotionPrice,
+			costPrice: form.costPrice,
+			isNew: true,
+			flag: "defaultAddedPackageUnit",
+		}
+		packageUnitRef.value.pushEvent(row)
+		packageUnitRef.value.setRadioRow(0) // 自动设置基础包装单位的radio单选行
+	}
+}
+
+// 整理包装单位列表
+const settlePackageUnitList = () => {
+	const curRadioRowUnit = packageUnitRef.value.getRadioRow()
 	const smErpUnitEntityList = JSON.parse(JSON.stringify(form.smErpUnitEntityList))
 	return smErpUnitEntityList.map((item: rowVU) => {
+		// 设置基础包装单位标识(isBase)
 		if (item.id === curRadioRowUnit.id) {
 			item.isBase = true
 		} else {
 			item.isBase = false
 		}
+		// 转换金额单位
 		item.costPrice = storePrice(item.costPrice)
-		item.promotionPrice = item.promotionPrice ? storePrice(item.promotionPrice) : null
+		item.promotionPrice = storePrice(item.promotionPrice)
 		item.purchasePrice = storePrice(item.purchasePrice)
 		item.retailPrice = storePrice(item.retailPrice)
 		if (item.isNew) {
@@ -231,14 +240,13 @@ const usePackageUnitList = () => {
 	})
 }
 
-// 计算辅助条码列表
+// 整理辅助条码列表
-const useAuxiliaryCode = () => {
+const settleAuxiliaryCode = () => {
 	const smErpAuxiliaryCodeEntityList = [...form.smErpAuxiliaryCodeEntityList]
 	return smErpAuxiliaryCodeEntityList
 		.filter((item: rowVC) => item.unitId)
 		.map((item: rowVC) => {
 			const curPackageUnitItem = form.smErpUnitEntityList.find((unitItem: any) => unitItem.id == item.unitId)
-			console.log(form.smErpUnitEntityList)
 
 			if (item.isNew) {
 				item.id = ""
@@ -251,26 +259,25 @@ const useAuxiliaryCode = () => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await formRef.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 packageUnitRef.value.editableTableValidate())) return useMessage().warning("包装单位必填项未填写完整")
-	if (!packageUnitRef.value.getRadioEvent()) return useMessage().warning("请选择基础包装单位")
+	if (!packageUnitRef.value.getRadioRow()) 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 auxiliaryCodeRef.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整")
 
-	console.log(form.smErpUnitEntityList)
+	console.log("未整理-包装单位", form.smErpUnitEntityList)
+	console.log("未整理-辅助条码", form.smErpAuxiliaryCodeEntityList)
 
-	const smErpAuxiliaryCodeEntityList = useAuxiliaryCode()
+	const smErpAuxiliaryCodeEntityList = settleAuxiliaryCode()
-	const smErpUnitEntityList = usePackageUnitList()
+	const smErpUnitEntityList = settlePackageUnitList()
 	try {
 		loading.value = true
 		const _pa = {
 			...form,
-			...formatedMoney.value,
+			...formatedBaseFormMoney.value,
-			grossMargin: storePrice(form.grossMargin),
 			smErpAuxiliaryCodeEntityList,
 			smErpUnitEntityList,
 		}