Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/api/supermarketerp/common.ts

@@ -15,10 +15,11 @@ export function getPlanCode(params: { type: 1 | 2 | 3 | 4 | 5 | 6 }) {
 }
 
 // 获取erp商品列表
-export function getErpSpuPage() {
+export function getErpSpuPage(params?: object) {
 	return request({
 		url: "/supermarket/smErpCgPlan/erpSpuPage",
 		method: "get",
+		params,
 	})
 }
 

src/views/supermarketerp/components/erpSpuSelectDialog.vue

@@ -3,26 +3,28 @@
 	<el-dialog
 		v-model="erpSpuSelectDialogVisible"
 		title="选择商品"
-		width="70%"
+		width="80%"
 		:close-on-click-modal="false"
 		draggable
 		@close="erpSpuSelectDialogVisible = false"
 	>
-		<!-- <el-row>
+		<el-row>
-			<el-form :model="foodQueryForm" ref="queryRef" :inline="true" @keyup.enter="getDataListAndSelect">
+			<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataListAndSelect">
-				<el-form-item label="商品名称" prop="name">
+				<el-form-item label="货号" prop="productCode">
-					<el-input placeholder="请输入商品名称" v-model="foodQueryForm.name" />
+					<el-input placeholder="请输入货号" v-model="queryForm.productCode" />
 				</el-form-item>
-				<el-form-item label="商品分类" prop="categoryId">
+				<el-form-item label="自编码/条码" prop="barcode">
-					<select-ctcg v-model="foodQueryForm.categoryId" style="width: 200px" />
+					<el-input placeholder="请输入自编码/条码" v-model="queryForm.barcode" />
+				</el-form-item>
+				<el-form-item label="商品名称" prop="productName">
+					<el-input placeholder="请输入商品名称" v-model="queryForm.productName" />
 				</el-form-item>
 				<el-form-item>
 					<el-button icon="search" type="primary" @click="getDataListAndSelect">查询</el-button>
 					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
 				</el-form-item>
 			</el-form>
-		</el-row> -->
+		</el-row>
-
 		<el-table
 			ref="spuMultipleTableRef"
 			:data="spuDataList"
@@ -32,30 +34,42 @@
 			@row-click="rowClick"
 			:row-style="{ cursor: 'pointer' }"
 		>
-			<el-table-column type="selection" width="40" align="center" fixed="left" />
+			<el-table-column type="selection" width="40" fixed="left" align="center" />
-			<el-table-column type="index" label="#" width="50" align="center" fixed="left" />
+			<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
-			<el-table-column prop="productName" label="商品名称" min-width="100px" align="center" show-overflow-tooltip />
+			<el-table-column prop="productName" label="商品名称" min-width="150px" align="center" show-overflow-tooltip />
-			<el-table-column prop="barcode" label="自编码/条码" min-width="100px" align="center" show-overflow-tooltip />
+			<el-table-column prop="picUrl" label="封面图" align="center" show-overflow-tooltip>
-			<el-table-column prop="productCode" label="货号" min-width="100px" align="center" show-overflow-tooltip />
-			<el-table-column prop="brandId" label="品牌" min-width="100px" align="center" show-overflow-tooltip />
-			<el-table-column prop="categoryId" label="分类" min-width="100px" align="center" show-overflow-tooltip />
-			<el-table-column prop="deptId" label="商户" min-width="100px" align="center" show-overflow-tooltip />
-			<el-table-column prop="supplierId" label="货商" min-width="100px" align="center" show-overflow-tooltip />
-			<el-table-column prop="status" label="状态" min-width="100px" align="center" show-overflow-tooltip />
-			<el-table-column prop="picUrl" label="商品封面图" align="center" show-overflow-tooltip>
 				<template #default="scope">
 					<preview-image @click.stop :src="scope.row.picUrl" />
 				</template>
 			</el-table-column>
-			<el-table-column prop="stock" label="库存" min-width="100px" align="center" show-overflow-tooltip />
+			<el-table-column prop="barcode" label="自编码/条码" min-width="150px" align="center" show-overflow-tooltip />
+			<el-table-column prop="stock" label="库存" min-width="80px" align="center" show-overflow-tooltip />
+			<el-table-column prop="productCode" label="货号" min-width="100px" align="center" show-overflow-tooltip />
+			<el-table-column prop="brandId" label="品牌" min-width="100px" align="center" show-overflow-tooltip>
+				<template #default="scope">
+					{{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
+				</template>
+			</el-table-column>
+			<el-table-column prop="categoryId" label="分类" min-width="100px" align="center" show-overflow-tooltip>
+				<template #default="scope">
+					{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
+				</template>
+			</el-table-column>
+			<el-table-column prop="deptId" label="商户" min-width="100px" align="center" show-overflow-tooltip />
+			<el-table-column prop="supplierId" label="货商" min-width="100px" align="center" show-overflow-tooltip />
+			<el-table-column prop="status" label="状态" min-width="100px" align="center" show-overflow-tooltip>
+				<template #default="scope">
+					<dict-tag :options="status" :value="scope.row.status" />
+				</template>
+			</el-table-column>
 		</el-table>
-		<!-- <pagination
+		<pagination
 			@size-change="sizeChangeHandle"
 			@current-change="currentChangeHandle"
-			v-model:current-page="foodQueryForm.current"
+			v-model:current-page="queryForm.current"
-			v-model:page-size="foodQueryForm.size"
+			v-model:page-size="queryForm.size"
 			:total="total"
-		/> -->
+		/>
 
 		<template #footer>
 			<el-button @click="erpSpuSelectDialogVisible = false">取消</el-button>
@@ -67,6 +81,8 @@
 <script setup lang="ts">
 import { ref } from "vue"
 import { getErpSpuPage } from "/@/api/supermarketerp/common"
+import { getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
+import { useDict } from "/@/hooks/dict"
 
 const erpSpuSelectDialogVisible = defineModel()
 const emit = defineEmits(["getSelectedSpuRows"])
@@ -79,22 +95,52 @@ const props = withDefaults(
 	},
 )
 
+const { status } = useDict("status")
+const queryRef = ref()
 const spuMultipleTableRef = ref() // 对话框多选表格ref
 const spuListLoading = ref(false) // 对话框多选表格loading
+const queryForm = reactive<any>({
+	productCode: "",
+	barcode: "",
+	productName: "",
+})
+const total = ref<number>(0)
 const spuDataList = ref<any[]>([]) // 对话框多选表格数据
+const supermarketCategory = ref<any>([]) // 商品分类
+const supermarketBrand = ref<any>([]) // 商品品牌
 
 // 打开弹窗
 const openDialog = async () => {
 	erpSpuSelectDialogVisible.value = true
+	getDataListAndSelect()
+}
+
+// 获取商品数据并且勾选
+const getDataListAndSelect = async () => {
+	spuListLoading.value = true
 	try {
-		spuListLoading.value = true
+		const { code, data } = await getErpSpuPage(queryForm).finally(() => (spuListLoading.value = false))
-		const { code, data } = await getErpSpuPage().finally(() => (spuListLoading.value = false))
 		if (code === 0) {
 			spuDataList.value = data.records.map((item: any) => ({ ...item, erpSpuId: item.id }))
+			total.value = data.total
 
-			// 勾选已经选择的商品
+			// 保存当前已选中的行
-			const target = spuDataList.value.filter((row: any) => props.selectedSpuRows.some((item: any) => row.erpSpuId === item.erpSpuId))
+			const currentSelectedRows = spuMultipleTableRef.value?.getSelectionRows() || []
-			target.forEach((row: any) => nextTick(() => spuMultipleTableRef.value!.toggleRowSelection(row)))
+			// 清空表格数据后重新设置
+			nextTick(() => {
+				// 合并当前页面数据中的已选行和之前保存的已选行
+				const rowsToSelect = [
+					...currentSelectedRows,
+					...props.selectedSpuRows.filter((row) => spuDataList.value.some((item) => item.erpSpuId === row.erpSpuId)),
+				]
+				// 去重
+				const uniqueRowsToSelect = Array.from(new Map(rowsToSelect.map((row) => [row.erpSpuId, row])).values())
+				// 为匹配的行设置选中状态
+				uniqueRowsToSelect.forEach((row) => {
+					const targetRow = spuDataList.value.find((item) => item.erpSpuId === row.erpSpuId)
+					targetRow && spuMultipleTableRef.value?.toggleRowSelection(targetRow, true)
+				})
+			})
 		}
 	} catch (error) {
 		spuDataList.value = []
@@ -102,6 +148,21 @@ const openDialog = async () => {
 	}
 }
 
+// 分页变化
+const sizeChangeHandle = (val: number) => {
+	queryForm.size = val
+	getDataListAndSelect()
+}
+const currentChangeHandle = (val: number) => {
+	queryForm.current = val
+	getDataListAndSelect()
+}
+
+const resetQuery = () => {
+	queryRef.value?.resetFields()
+	getDataListAndSelect()
+}
+
 // 点击商品列表表格行
 const rowClick = (row: any) => {
 	console.log("clicked-row", row)
@@ -112,11 +173,37 @@ const rowClick = (row: any) => {
 const handleSelectDialogConfirm = () => {
 	const $table = spuMultipleTableRef.value
 	if ($table) {
-		const selectionRows = spuMultipleTableRef.value.getSelectionRows()
+		// 获取所有选中的行，包括其他页面的选择
-		emit("getSelectedSpuRows", selectionRows)
+		const currentSelectedRows = $table.getSelectionRows()
+		// 合并当前选中的行和之前已选的行（排除当前页面的行）
+		const allSelectedRows = [
+			...currentSelectedRows,
+			...props.selectedSpuRows.filter((row) => !spuDataList.value.some((item) => item.erpSpuId === row.erpSpuId)),
+		]
+		// 去重
+		const uniqueSelectedRows = Array.from(new Map(allSelectedRows.map((row) => [row.erpSpuId, row])).values())
+
+		emit("getSelectedSpuRows", uniqueSelectedRows)
 	}
 }
 
+onMounted(async () => {
+	// 获取商品分类
+	try {
+		const res = await getSupermarketCategory()
+		supermarketCategory.value = res.data
+	} catch (error) {
+		supermarketCategory.value = []
+	}
+	// 获取商品品牌
+	try {
+		const res = await getSupermarketBrand()
+		supermarketBrand.value = res.data
+	} catch (error) {
+		supermarketBrand.value = []
+	}
+})
+
 defineExpose({
 	openDialog,
 })

src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue

@@ -6,11 +6,9 @@
 					<el-form-item label="单据编号" prop="inventoryCode">
 						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="关联入库单" prop="linkCode">
 						<el-input
 							v-model="baseDataForm.linkCode"
@@ -21,17 +19,14 @@
 							style="width: 200px"
 						/>
 					</el-form-item>
-
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="货商" prop="supplierId">
 						<el-select v-model="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
 							<el-option v-for="item in supplierTypeDict" :key="item?.id" :label="item?.typeName" :value="item?.id" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
 					</el-form-item>
@@ -88,16 +83,13 @@
 				align="center"
 			>
 				<vxe-column type="checkbox" width="40" fixed="left" />
-
 				<vxe-column type="seq" width="50" fixed="left" />
-
 				<vxe-column field="productName" title="库存商品">
 					<template #default="{ row }">
 						<span v-if="row.productName">{{ row.productName }}</span>
 						<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="unitId" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
 						<el-select v-model="row.unitId" placeholder="请选择包装单位">
@@ -116,13 +108,11 @@
 						<span v-else style="color: #c0c4cf">请选择</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.quantity" />
 					</template>
 				</vxe-column>
-
 				<vxe-column field="unitPrice" title="进价">
 					<template #default="{ row }">
 						{{
@@ -132,7 +122,6 @@
 						}}
 					</template>
 				</vxe-column>
-
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
 						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
@@ -143,7 +132,6 @@
 						</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.remark" />
@@ -175,10 +163,9 @@
 				ref="linkCgPlanDialogRef"
 				v-model="state.linkCgPlanDialogVisible"
 				title="关联采购订单"
-				:getTableData="getCgInventoryPage"
+				:getTableData="() => getCgInventoryPage({ inventoryType: '3' })"
 				@getSelectedLinkCode="getSelectedLinkCode"
 			/>
-			<!-- {inventoryType: "3"} -->
 		</div>
 	</div>
 </template>

src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue

@@ -6,14 +6,12 @@
 					<el-form-item label="编号" prop="code">
 						<el-input v-model="baseDataForm.code" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="单据日期" prop="dDate">
 						<el-input v-model="baseDataForm.ddDate" readonly style="width: 200px" />
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="关联补货申请" prop="linkCode">
 						<el-input
 							v-model="baseDataForm.linkCode"
@@ -24,19 +22,16 @@
 							style="width: 200px"
 						/>
 					</el-form-item>
-
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
 							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="货商" prop="supplierId">
 						<el-select v-model="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
 							<el-option v-for="item in supplierTypeDict" :key="item?.id" :label="item?.typeName" :value="item?.id" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
 					</el-form-item>
@@ -93,16 +88,13 @@
 				align="center"
 			>
 				<vxe-column type="checkbox" width="40" fixed="left" />
-
 				<vxe-column type="seq" width="50" fixed="left" />
-
 				<vxe-column field="productName" title="库存商品">
 					<template #default="{ row }">
 						<span v-if="row.productName">{{ row.productName }}</span>
 						<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="unitId" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
 						<el-select v-model="row.unitId" placeholder="请选择包装单位">
@@ -121,13 +113,11 @@
 						<span v-else style="color: #c0c4cf">请选择</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.quantity" />
 					</template>
 				</vxe-column>
-
 				<vxe-column field="purchasePrice" title="进价">
 					<template #default="{ row }">
 						{{
@@ -137,7 +127,6 @@
 						}}
 					</template>
 				</vxe-column>
-
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
 						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
@@ -148,7 +137,6 @@
 						</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.remark" />

src/views/supermarketerp/smErpCgInventory/smErpCgInventoryOption.vue

@@ -6,11 +6,9 @@
 					<el-form-item label="单据编号" prop="inventoryCode">
 						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="关联采购订单" prop="linkCode">
 						<el-input
 							v-model="baseDataForm.linkCode"
@@ -21,23 +19,19 @@
 							style="width: 200px"
 						/>
 					</el-form-item>
-
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
 							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="货商" prop="supplierId">
 						<el-select v-model="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
 							<el-option v-for="item in supplierTypeDict" :key="item?.id" :label="item?.typeName" :value="item?.id" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
 					</el-form-item>
@@ -94,16 +88,13 @@
 				align="center"
 			>
 				<vxe-column type="checkbox" width="40" fixed="left" />
-
 				<vxe-column type="seq" width="50" fixed="left" />
-
 				<vxe-column field="productName" title="库存商品">
 					<template #default="{ row }">
 						<span v-if="row.productName">{{ row.productName }}</span>
 						<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="unitId" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
 						<el-select v-model="row.unitId" placeholder="请选择包装单位">
@@ -122,13 +113,11 @@
 						<span v-else style="color: #c0c4cf">请选择</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.quantity" />
 					</template>
 				</vxe-column>
-
 				<vxe-column field="unitPrice" title="进价">
 					<template #default="{ row }">
 						{{
@@ -138,7 +127,6 @@
 						}}
 					</template>
 				</vxe-column>
-
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
 						<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
@@ -149,7 +137,6 @@
 						</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.remark" />

src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue

@@ -6,15 +6,12 @@
 					<el-form-item label="编号" prop="planCode">
 						<el-input v-model="baseDataForm.planCode" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="单据日期" prop="planDate">
 						<el-input v-model="baseDataForm.planDate" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" maxlength="200" style="width: 200px" />
 					</el-form-item>
@@ -71,22 +68,18 @@
 				align="center"
 			>
 				<vxe-column type="checkbox" width="40" fixed="left" />
-
 				<vxe-column type="seq" width="50" fixed="left" />
-
 				<!-- <vxe-column field="planId" title="采购" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.planId" />
 					</template>
 				</vxe-column> -->
-
 				<vxe-column field="productName" title="库存商品">
 					<template #default="{ row }">
 						<span v-if="row.productName">{{ row.productName }}</span>
 						<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId).productName }}</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="unitId" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
 						<el-select v-model="row.unitId" placeholder="请选择包装单位">
@@ -104,19 +97,16 @@
 						<span v-else style="color: #c0c4cf">请选择</span>
 					</template>
 				</vxe-column>
-
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.quantity" />
 					</template>
 				</vxe-column>
-
 				<!-- <vxe-column field="unitPrice" title="进价">
 					<template #default="{ row }">
 						{{ row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice }}
 					</template>
 				</vxe-column>
-
 				<vxe-column field="totalAmount" title="累计总金额">
 					<template #default="{ row }">
 						{{
@@ -126,19 +116,16 @@
 						}}
 					</template>
 				</vxe-column> -->
-
 				<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row }">
 						<el-input v-model="row.remark" />
 					</template>
 				</vxe-column>
-
 				<!--				<vxe-column field="merchantId" title="商户编号" :edit-render="{ autoFocus: 'input', placeholder: '请选择' }">-->
 				<!--					<template #edit="{ row }">-->
 				<!--						<select-mch v-model="row.merchantId" />-->
 				<!--					</template>-->
 				<!--				</vxe-column>-->
-
 				<!--				<vxe-column field="deptId" title="部门id" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">-->
 				<!--					<template #edit="{ row }">-->
 				<!--						<el-input v-model="row.deptId" />-->

src/views/supermarketerp/smErpRetailBack/smErpRetailBackOption.vue

@@ -6,11 +6,9 @@
 					<el-form-item label="单据编号" prop="inventoryCode">
 						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="关联采购订单" prop="linkCode">
 						<el-input
 							v-model="baseDataForm.linkCode"
@@ -21,27 +19,22 @@
 							style="width: 200px"
 						/>
 					</el-form-item>
-
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
 							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="货商" prop="supplierId">
 						<el-select v-model="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
 							<el-option v-for="item in supplierTypeDict" :key="item?.id" :label="item?.typeName" :value="item?.id" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="会员卡号" prop="memberNumber">
 						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" />
 					</el-form-item>
@@ -100,16 +93,13 @@
 						align="center"
 					>
 						<vxe-column type="checkbox" width="40" fixed="left" />
-
 						<vxe-column type="seq" width="50" fixed="left" />
-
 						<vxe-column field="productName" title="库存商品">
 							<template #default="{ row }">
 								<span v-if="row.productName">{{ row.productName }}</span>
 								<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
 							</template>
 						</vxe-column>
-
 						<vxe-column field="unitId" title="包装单位" :edit-render="{}">
 							<template #edit="{ row }">
 								<el-select v-model="row.unitId" placeholder="请选择包装单位">
@@ -128,13 +118,11 @@
 								<span v-else style="color: #c0c4cf">请选择</span>
 							</template>
 						</vxe-column>
-
 						<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 							<template #edit="{ row }">
 								<el-input v-model="row.quantity" />
 							</template>
 						</vxe-column>
-
 						<vxe-column field="unitPrice" title="进价">
 							<template #default="{ row }">
 								{{
@@ -144,7 +132,6 @@
 								}}
 							</template>
 						</vxe-column>
-
 						<vxe-column field="totalAmount" title="累计总金额">
 							<template #default="{ row }">
 								<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
@@ -155,7 +142,6 @@
 								</span>
 							</template>
 						</vxe-column>
-
 						<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 							<template #edit="{ row }">
 								<el-input v-model="row.remark" />
@@ -206,10 +192,9 @@
 				ref="linkCgPlanDialogRef"
 				v-model="state.linkCgPlanDialogVisible"
 				title="关联采购订单"
-				:getTableData="getCgInventoryPage"
+				:getTableData="() => getCgInventoryPage({ inventoryType: '5' })"
 				@getSelectedLinkCode="getSelectedLinkCode"
 			/>
-			<!-- { inventoryType: "5" } -->
 		</div>
 	</div>
 </template>

src/views/supermarketerp/smErpRetailDelivery/smErpRetailDeliveryOption.vue

@@ -6,11 +6,9 @@
 					<el-form-item label="单据编号" prop="inventoryCode">
 						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="单据日期" prop="inventoryDate">
 						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="关联采购订单" prop="linkCode">
 						<el-input
 							v-model="baseDataForm.linkCode"
@@ -21,27 +19,22 @@
 							style="width: 200px"
 						/>
 					</el-form-item>
-
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="审批状态" prop="checkStatus">
 						<el-select v-model="baseDataForm.checkStatus" placeholder="请选择审批状态" style="width: 200px">
 							<el-option :label="item.label" :value="item.value" v-for="(item, index) in check_status" :key="index" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="货商" prop="supplierId">
 						<el-select v-model="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
 							<el-option v-for="item in supplierTypeDict" :key="item?.id" :label="item?.typeName" :value="item?.id" />
 						</el-select>
 					</el-form-item>
-
 					<el-form-item label="备注" prop="remark">
 						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="会员卡号" prop="memberNumber">
 						<el-input v-model.trim="baseDataForm.memberNumber" placeholder="请输入会员卡号" style="width: 200px" />
 					</el-form-item>
@@ -100,16 +93,13 @@
 						align="center"
 					>
 						<vxe-column type="checkbox" width="40" fixed="left" />
-
 						<vxe-column type="seq" width="50" fixed="left" />
-
 						<vxe-column field="productName" title="库存商品">
 							<template #default="{ row }">
 								<span v-if="row.productName">{{ row.productName }}</span>
 								<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
 							</template>
 						</vxe-column>
-
 						<vxe-column field="unitId" title="包装单位" :edit-render="{}">
 							<template #edit="{ row }">
 								<el-select v-model="row.unitId" placeholder="请选择包装单位">
@@ -128,13 +118,11 @@
 								<span v-else style="color: #c0c4cf">请选择</span>
 							</template>
 						</vxe-column>
-
 						<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 							<template #edit="{ row }">
 								<el-input v-model="row.quantity" />
 							</template>
 						</vxe-column>
-
 						<vxe-column field="unitPrice" title="进价">
 							<template #default="{ row }">
 								{{
@@ -144,7 +132,6 @@
 								}}
 							</template>
 						</vxe-column>
-
 						<vxe-column field="totalAmount" title="累计总金额">
 							<template #default="{ row }">
 								<span v-if="row.unitId && row.quantity && row.unit && !row.erpUnitVos">
@@ -155,7 +142,6 @@
 								</span>
 							</template>
 						</vxe-column>
-
 						<vxe-column field="remark" title="备注" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 							<template #edit="{ row }">
 								<el-input v-model="row.remark" />

src/views/supermarketerp/supermarketSpu/index.vue

@@ -58,7 +58,7 @@
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
 			>
-				<el-table-column type="selection" width="40" align="center" fixed="left" />
+				<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" />