From cf76c556909b0aadadbb6beda46a1cfb10d5633e Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 28 Feb 2025 18:23:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=8A=A9=E6=9D=A1=E7=A0=81=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=8C=85=E8=A3=85=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/supermarketAuxiliaryCode.vue   | 26 ++++++++++++++++---
 .../components/supermarketUnit.vue            |  2 +-
 .../supermarketerp/supermarketSpu/form.vue    |  7 +++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue
index e5dfa19..f9c80b5 100644
--- a/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue
@@ -31,9 +31,22 @@
 		>
 			<vxe-column type="checkbox" width="40" fixed="left" />
 			<vxe-column type="seq" width="50" fixed="left" />
-			<vxe-column field="barCode" title="条码" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+			<vxe-column field="unit" title="单位" :edit-render="{}">
 				<template #edit="{ row }">
-					<el-input v-model.trim="row.barCode" />
+					<el-select v-model="row.unit">
+						<div v-for="item in smErpUnitEntityList">
+							<el-option v-if="item.unit !== ''" :label="item.unit" :value="item.unit" />
+						</div>
+					</el-select>
+				</template>
+				<template #default="{ row }">
+					<span v-if="row.unit">{{ row.unit }}</span>
+					<span v-else style="color: #c0c4cf">请选择</span>
+				</template>
+			</vxe-column>
+			<vxe-column field="barCode" title="条码">
+				<template #default="{ row }">
+					{{ smErpUnitEntityList?.find((item: any) => item.unit == row.unit)?.barCode }}
 				</template>
 			</vxe-column>
 		</vxe-table>
@@ -47,20 +60,27 @@ const supermarketAuxiliaryCodeEntityList = defineModel("supermarketAuxiliaryCode
 	default: [
 		{
 			id: nanoid(5),
+			unit: "",
 			barCode: "",
 		},
 	],
 })
 
+defineProps<{
+	smErpUnitEntityList: any[]
+}>()
+
 const editableTableRef = ref()
 const validRules = {
-	barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
+	unit: [{ required: true, message: "包装单位不能为空", trigger: "blur" }],
+	// barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
 }
 
 // 底部表格行新增
 const pushEvent = () => {
 	const newRow: any = {
 		id: nanoid(5),
+		unit: "",
 		barCode: "",
 		isNew: true,
 	}
diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue
index cb7a348..038ff39 100644
--- a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue
@@ -59,7 +59,7 @@
 					<el-input v-model.trim="row.unit" />
 				</template>
 			</vxe-column>
-			<vxe-column field="status" title="状态" :edit-render="{ autoFocus: 'input', placeholder: '请选择' }">
+			<vxe-column field="status" title="状态" :edit-render="{}">
 				<template #edit="{ row }">
 					<el-select v-model="row.status">
 						<el-option label="正常" :value="0" />
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 8110bf8..2238ca1 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -138,6 +138,7 @@
 				<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>
@@ -330,6 +331,8 @@ const useHandleUnit = () => {
 // 整理辅助条码列表
 const useHandleAuxiliaryCode = () => {
 	return form.smErpAuxiliaryCodeEntityList.map((item: any) => {
+		const barCode = form.smErpUnitEntityList.find((item2: any) => item2.unit === item.unit).barCode
+		item.barCode = barCode
 		if (item.isNew) {
 			item.id = ""
 			delete item.isNew
@@ -340,8 +343,6 @@ const useHandleAuxiliaryCode = () => {
 
 // 提交
 const onSubmit = async () => {
-	console.log("提交的数据", form)
-
 	const valid = await dataFormRef.value.validate().catch(() => {})
 	if (!valid) return useMessage().warning("基础信息必填项未填写完整")
 	if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0) return useMessage().warning("请添加包装单位")
@@ -353,6 +354,8 @@ const onSubmit = async () => {
 
 	const handleUnit = useHandleUnit()
 	const handleAuxiliaryCode = useHandleAuxiliaryCode()
+	console.log("提交的数据", { ...form, smErpUnitEntityList: handleUnit, smErpAuxiliaryCodeEntityList: handleAuxiliaryCode })
+
 	try {
 		loading.value = true
 		const _pa = { ...form, smErpUnitEntityList: handleUnit, smErpAuxiliaryCodeEntityList: handleAuxiliaryCode }