Merge remote-tracking branch 'origin/master'

src/api/canteen/canteenSpu.ts

@@ -1,59 +1,56 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/selectPage",
+		method: "get",
+		params: query,
+	})
 }
 
 export function fetchErpList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/erp/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/erp/page",
+		method: "get",
+		params: query,
+	})
 }
 
-
 export function fetchSimpleList(query?: Object) {
-  return request({
-    url: '/canteen/canteenSpu/getCanteenSpuSimplePage',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenSpu/getCanteenSpuSimplePage",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/canteen/canteenSpu/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/canteen/canteenSpu/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenSpu',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenSpu",
+		method: "put",
+		data: obj,
+	})
 }
-
-

src/api/hard/hard-mq.ts

@@ -0,0 +1,12 @@
+import request from "/@/utils/request"
+
+/**
+ * 同步超市消费机分类和商品变化
+ */
+export function syncSupermarket(params: any) {
+    return request({
+        url: "/hard/hard-sync/sync-supermarket",
+        method: "get",
+        params: params,
+    })
+}

src/views/admin/system/menu/index.vue

@@ -28,6 +28,7 @@
 				</div>
 			</el-row>
 			<el-table
+				class="el-table"
 				ref="tableRef"
 				:data="tableList"
 				row-key="id"
@@ -212,3 +213,14 @@ const handleDelete = async (row: any) => {
 	}
 }
 </script>
+
+<style scoped>
+::v-deep(.el-table .el-table__row .cell) {
+	display: flex;
+}
+::v-deep(.el-table .el-table__row .cell .el-table__expand-icon .el-icon) {
+	width: 20px;
+	height: 20px;
+	font-size: 20px;
+}
+</style>

src/views/canteen/canteenInventoryRecords/select-dialog.vue

@@ -1,13 +1,14 @@
 <template>
 	<el-dialog v-model="dialogVisible" title="选择食材" width="80%" :close-on-click-modal="false" draggable @close="dialogVisible = false">
 		<el-row>
-			<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataListAndSelect">
+			<el-form :model="queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList(true)">
 				<el-form-item label="食材名称" prop="name">
 					<el-input placeholder="请输入食材名称" v-model="queryForm.name" />
 				</el-form-item>
 				<el-form-item>
-					<el-button icon="search" type="primary" @click="getDataListAndSelect">查询</el-button>
+					<el-button icon="search" type="primary" @click="getDataList(true)">查询</el-button>
 					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					<el-button icon="Refresh" @click="tableRef.clearSelection()">取消所有勾选</el-button>
 				</el-form-item>
 			</el-form>
 		</el-row>
@@ -19,6 +20,8 @@
 			:row-key="(row:any) => row.id"
 			@row-click="rowClick"
 			:row-style="{ cursor: 'pointer' }"
+			:cell-style="tableStyle.cellStyle"
+			:header-cell-style="tableStyle.headerCellStyle"
 		>
 			<el-table-column type="selection" reserve-selection width="40" fixed="left" align="center" />
 			<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
@@ -72,28 +75,25 @@ const dataList = ref<any[]>([]) // 对话框多选表格数据
 // 打开弹窗
 const openDialog = () => {
 	dialogVisible.value = true
-	getDataListAndSelect()
+	getDataList(false)
 }
 
-// 获取食材数据并且勾选
-const getDataListAndSelect = async () => {
+// 获取商品数据并且勾选
+const getDataList = async (isSearch = false) => {
+	if (isSearch) {
+		queryForm.current = 1
+	}
 	loading.value = true
 	try {
 		const { code, data } = await fetchErpMaterialPageList(queryForm)
-		if (code == 0) {
-			dataList.value = data.records.map((item: any) => ({ ...item, erpMaterialId: item.id }))
-			total.value = data.total
-
-			nextTick(() => {
-				const rowsToSelect = [
-					...props.selectedRows.filter((row) => dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)),
-				]
-				// 为匹配的行设置选中状态
-				rowsToSelect.forEach((row) => {
-					const targetRow = dataList.value.find((item) => item.erpMaterialId === row.erpMaterialId)
-					targetRow && tableRef.value?.toggleRowSelection(targetRow, true)
-				})
+		if (code === 0) {
+			dataList.value = data.records.map((item: any) => {
+				return {
+					...item,
+					erpMaterialId: item.id,
+				}
 			})
+			total.value = data.total
 		}
 	} catch (error) {
 		dataList.value = []
@@ -105,16 +105,16 @@ const getDataListAndSelect = async () => {
 // 分页变化
 const sizeChangeHandle = (val: number) => {
 	queryForm.size = val
-	getDataListAndSelect()
+	getDataList()
 }
 const currentChangeHandle = (val: number) => {
 	queryForm.current = val
-	getDataListAndSelect()
+	getDataList()
 }
 
 const resetQuery = () => {
 	queryRef.value?.resetFields()
-	getDataListAndSelect()
+	getDataList(true)
 }
 
 // 点击食材列表表格行
@@ -126,18 +126,22 @@ const rowClick = (row: any) => {
 const dialogConfirm = () => {
 	const $table = tableRef.value
 	if ($table) {
-		// 获取所有选中的行，包括其他页面的选择
 		const currentSelectedRows = $table.getSelectionRows()
-		// 合并当前选中的行和之前已选的行（排除当前页面的行）
-		const allSelectedRows = [
-			...currentSelectedRows,
-			...props.selectedRows.filter((row) => !dataList.value.some((item) => item.erpMaterialId === row.erpMaterialId)),
-		]
+
 		dialogVisible.value = false
-		emit("getSelectedRows", allSelectedRows)
+		emit("getSelectedRows", currentSelectedRows)
 	}
 }
 
+const tableStyle = {
+	cellStyle: { textAlign: "center" },
+	headerCellStyle: {
+		textAlign: "center",
+		background: "var(--el-table-row-hover-bg-color)",
+		color: "var(--el-text-color-primary)",
+	},
+}
+
 defineExpose({
 	openDialog,
 })

src/views/hard/hard-order/index.vue

@@ -66,6 +66,7 @@
 										class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
 										<span> {{ row.username }}</span>
 										<span> {{ row.userMobile }}</span>
+										<span> {{ row.userDeptName }}</span>
 									</div>
 								</div>
 								<div v-else>
@@ -73,6 +74,40 @@
 								</div>
 							</template>
 						</el-table-column>
+						<el-table-column width="200px" prop="paymentInformation" label="付款信息">
+							<template #default="{ row }">
+								<div class="status">
+									<span>商品总价</span>
+									<span class="color-success">
+										{{ displayPrice(row.totalPrice, "元", 2) }}
+									</span>
+								</div>
+								<div class="status">
+									<span>额外支付</span>
+									<span class="color-danger">
+										{{ displayPrice(row.extraPrice, "元", 2) }}
+									</span>
+								</div>
+								<div class="status">
+									<span>实际支付</span>
+									<span class="color-primary">
+										{{ displayPrice(row.payPrice, "元", 2) }}
+									</span>
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column label="支付时间" align="center" prop="payTime" width="250px">
+							<template #default="{ row }">
+								<div class="status">
+									<span>创建时间</span>
+									<span>{{ row.createTime }} </span>
+								</div>
+								<div class="status">
+									<span>支付时间</span>
+									<span>{{ row.payTime }} </span>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column width="200px" label="商品">
 							<template #default="{ row }">
 								<div class="desc">
@@ -133,28 +168,6 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column width="200px" prop="paymentInformation" label="付款信息">
-							<template #default="{ row }">
-								<div class="status">
-									<span>商品总价</span>
-									<span class="color-success">
-										{{ displayPrice(row.totalPrice, "元", 2) }}
-									</span>
-								</div>
-								<div class="status">
-									<span>额外支付</span>
-									<span class="color-danger">
-										{{ displayPrice(row.extraPrice, "元", 2) }}
-									</span>
-								</div>
-								<div class="status">
-									<span>实际支付</span>
-									<span class="color-primary">
-										{{ displayPrice(row.payPrice, "元", 2) }}
-									</span>
-								</div>
-							</template>
-						</el-table-column>
 						<el-table-column width="270px" label="退款信息">
 							<template #default="{ row }">
 								<div v-if="row.payRefundId">
@@ -179,18 +192,6 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column label="支付时间" align="center" prop="payTime" width="250px">
-							<template #default="{ row }">
-								<div class="status">
-									<span>创建时间</span>
-									<span>{{ row.createTime }} </span>
-								</div>
-								<div class="status">
-									<span>支付时间</span>
-									<span>{{ row.payTime }} </span>
-								</div>
-							</template>
-						</el-table-column>
 						<el-table-column fixed="right" label="操作" width="200">
 							<template #default="{ row }">
 								<div class="grid grid-cols-2 justify-evenly">

src/views/supermarketerp/components/select-dialog.vue

@@ -14,6 +14,7 @@
 				<el-form-item>
 					<el-button icon="search" type="primary" @click="getDataList(true)">查询</el-button>
 					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					<el-button icon="Refresh" @click="tableRef.clearSelection()">取消所有勾选</el-button>
 				</el-form-item>
 			</el-form>
 		</el-row>
@@ -37,13 +38,25 @@
 			</el-table-column>
 			<el-table-column prop="stock" label="库存" min-width="80px" show-overflow-tooltip />
 			<el-table-column prop="productCode" label="货号" min-width="100px" show-overflow-tooltip />
-			<el-table-column label="包装单位" min-width="300px">
+			<el-table-column label="规格" min-width="240px">
+				<template #default="scope">
+					<div v-if="scope.row.erpUnitVos && scope.row.erpUnitVos.length > 0" class="flex justify-center flex-wrap gap-2">
+						<div v-for="unit in scope.row.erpUnitVos" :key="unit.id">
+							<el-tag v-if="unit.spec" :type="unit.isBase ? 'primary' : 'info'" size="small">
+								{{ unit.spec }}
+							</el-tag>
+						</div>
+					</div>
+				</template>
+			</el-table-column>
+			<el-table-column label="包装单位/价格" min-width="280px">
 				<template #default="scope">
 					<div v-if="scope.row.erpUnitVos && scope.row.erpUnitVos.length > 0">
-						<div class="flex flex-wrap gap-2">
-							<el-tag v-for="unit in scope.row.erpUnitVos" :key="unit.id" :type="unit.isBase ? 'primary' : 'info'" size="small">
+						<div class="flex justify-center flex-wrap gap-2">
+							<el-tag v-for="unit in scope.row.erpUnitVos" :key="unit.id" :type="unit.isBase ? 'primary' : 'info'">
 								{{ unit.unit }}
-								<span class="text-xs ml-1">({{ displayPrice(unit.purchasePrice, "") }}元)</span>
+								<span class="text-xs ml-1">(进价：{{ displayPrice(unit.purchasePrice, "") }}元)</span>
+								<span class="text-xs ml-1">(零售价：{{ displayPrice(unit.retailPrice, "") }}元)</span>
 							</el-tag>
 						</div>
 					</div>

src/views/supermarketerp/supermarketSpu/index.vue

@@ -8,12 +8,14 @@
 					</el-form-item>
 					<el-form-item label="商品分类" prop="categoryId">
 						<el-select v-model="state.queryForm.categoryId" placeholder="请选择商品分类">
-							<el-option v-for="item in supermarketCategory" :key="item?.id" :label="item?.name" :value="item?.id" />
+							<el-option v-for="item in supermarketCategory" :key="item?.id" :label="item?.name"
+								:value="item?.id" />
 						</el-select>
 					</el-form-item>
 					<el-form-item label="商品性质" prop="productNature">
 						<el-select v-model="state.queryForm.productNature" placeholder="请选择商品性质">
-							<el-option v-for="item in supermarket_nature" :key="item?.id" :label="item?.label" :value="item?.value" />
+							<el-option v-for="item in supermarket_nature" :key="item?.id" :label="item?.label"
+								:value="item?.value" />
 						</el-select>
 					</el-form-item>
 					<el-form-item label="货号" prop="productCode">
@@ -30,79 +32,44 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'supermarket_supermarketSpu_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+						v-auth="'supermarket_supermarketSpu_add'">
 						新 增
 					</el-button>
-					<el-button
-						plain
-						:disabled="multiple"
-						icon="Delete"
-						type="primary"
-						v-auth="'supermarket_supermarketSpu_del'"
-						@click="handleDelete(selectObjs)"
-					>
+					<el-button plain :disabled="multiple" icon="Delete" type="primary"
+						v-auth="'supermarket_supermarketSpu_del'" @click="handleDelete(selectObjs)">
 						删 除
 					</el-button>
 
-					<right-toolbar
-						v-model:showSearch="showSearch"
-						:export="'supermarket_supermarketSpu_export'"
-						@exportExcel="exportExcel"
-						class="ml10 mr20"
-						style="float: right"
-						@queryTable="getDataList"
-					/>
-					<el-button
-						plain
-						v-auth="'supermarket_supermarketSpu_import'"
-						class="ml10"
-						icon="upload-filled"
-						type="primary"
-						@click="excelUploadRef.show()"
-					>
+					<right-toolbar v-model:showSearch="showSearch" :export="'supermarket_supermarketSpu_export'"
+						@exportExcel="exportExcel" class="ml10 mr20" style="float: right" @queryTable="getDataList" />
+					<el-button plain v-auth="'supermarket_supermarketSpu_import'" class="ml10" icon="upload-filled"
+						type="primary" @click="excelUploadRef.show()">
 						导入
 					</el-button>
 					<el-tooltip effect="dark" content="覆盖导入会覆盖已经存在的商品数据" placement="top">
-						<el-button
-							plain
-							v-auth="'supermarket_supermarketSpu_import'"
-							class="ml10"
-							icon="upload-filled"
-							type="primary"
-							@click="excelUploadUpdateRef.show()"
-						>
+						<el-button plain v-auth="'supermarket_supermarketSpu_import'" class="ml10" icon="upload-filled"
+							type="primary" @click="excelUploadUpdateRef.show()">
 							覆盖导入
 						</el-button>
 					</el-tooltip>
 					<el-tooltip effect="dark" content="导入盘点数据" placement="top">
-						<el-button
-							plain
-							v-auth="'supermarket_supermarketSpu_import'"
-							class="ml10"
-							icon="upload-filled"
-							type="primary"
-							@click="excelUploadPd.show()"
-						>
+						<el-button plain v-auth="'supermarket_supermarketSpu_import'" class="ml10" icon="upload-filled"
+							type="primary" @click="excelUploadPd.show()">
 							盘点导入
 						</el-button>
 					</el-tooltip>
+					<el-tooltip effect="dark" content="导入盘点数据" placement="top">
+						<el-button plain v-auth="'supermarket_supermarketSpu_sync'" class="ml10" icon="Refresh"
+							type="primary" @click="syncSupermarket">
+							商品分类同步至消费机
+						</el-button>
+					</el-tooltip>
 				</div>
 			</el-row>
-			<el-table
-				:data="state.dataList"
-				v-loading="state.loading"
-				border
-				:cell-style="tableStyle.cellStyle"
-				:header-cell-style="tableStyle.headerCellStyle"
-				@selection-change="selectionChangHandle"
-				@sort-change="sortChangeHandle"
-			>
+			<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle">
 				<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 min-width="160" />
@@ -111,7 +78,8 @@
 				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
 				<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip width="100">
 					<template #default="scope">
-						<el-tag>{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}</el-tag>
+						<el-tag>{{supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name
+						}}</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column prop="productNature" label="商品性质" show-overflow-tooltip width="150">
@@ -126,7 +94,8 @@
 				</el-table-column>
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip>
 					<template #default="scope">
-						{{ supermarketSupplier?.find((item: any) => item.supplierId == scope.row.supplierId)?.supplierName }}
+						{{supermarketSupplier?.find((item: any) => item.supplierId ==
+							scope.row.supplierId)?.supplierName}}
 					</template>
 				</el-table-column>
 				<!-- <el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
@@ -135,7 +104,7 @@
 					</template>
 				</el-table-column> -->
 				<el-table-column prop="costPrice" label="成本单价(元)" show-overflow-tooltip width="120">
-					<template #default="{ row }">{{ row.costPrice }}</template>
+					<template #default="{ row }">{{ displayPrice(row.costPrice, "") }}</template>
 				</el-table-column>
 				<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip width="120">
 					<template #default="{ row }">{{ displayPrice(row.retailPrice, "") }}</template>
@@ -162,46 +131,37 @@
 				<!-- <el-table-column prop="origin" label="产地" show-overflow-tooltip /> -->
 				<el-table-column label="操作" width="150" fixed="right">
 					<template #default="scope">
-						<el-button
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'supermarket_supermarketSpu_edit'"
-							@click="formDialogRef.openDialog(scope.row.id)"
-						>
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_supermarketSpu_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)">
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketSpu_del'" @click="handleDelete([scope.row.id])">
+						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketSpu_del'"
+							@click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
-			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+				v-bind="state.pagination" />
 		</div>
 
 		<!-- 编辑、新增 -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
-		<upload-excel
-			ref="excelUploadRef"
-			title="导入库存商品"
-			url="/supermarket/supermarketSpu/importNew"
-			@refreshDataList="refreshDataList"
-		/>
+		<upload-excel ref="excelUploadRef" title="导入库存商品" url="/supermarket/supermarketSpu/importNew"
+			@refreshDataList="refreshDataList" />
 
-		<upload-excel-update
-			ref="excelUploadUpdateRef"
-			title="覆盖导入库存商品"
-			url="/supermarket/supermarketSpu/importNewUpdate"
-			@refreshDataList="refreshDataList"
-		/>
+		<upload-excel-update ref="excelUploadUpdateRef" title="覆盖导入库存商品"
+			url="/supermarket/supermarketSpu/importNewUpdate" @refreshDataList="refreshDataList" />
 
-		<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPD" @refreshDataList="refreshDataList" />
+		<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPD"
+			@refreshDataList="refreshDataList" />
 	</div>
 </template>
 
 <script setup lang="ts" name="systemSupermarketSpu">
+import { ElLoading } from 'element-plus'
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
 import { useMessage, useMessageBox } from "/@/hooks/message"
@@ -210,6 +170,7 @@ import UploadExcel from "./components/upload-excel.vue"
 import UploadExcelUpdate from "./components/upload-excel-update.vue"
 import { displayPrice } from "/@/utils/formatMoney"
 import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier"
+import * as HardMqApi from "/@/api/hard/hard-mq"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -253,6 +214,23 @@ const refreshDataList = () => {
 	getSupplierAll()
 }
 
+// 商品分类同步至消费机
+const syncSupermarket = async () => {
+	const loading = ElLoading.service({
+		lock: true,
+		text: '同步中...',
+		background: 'rgba(0, 0, 0, 0.7)',
+	})
+	try {
+		const res = await HardMqApi.syncSupermarket({})
+		console.log("商品分类同步至消费机:", res);
+		loading.close()
+	} catch (error: any) {
+		console.error("商品分类同步至消费机:", error);
+		loading.close()
+	}
+}
+
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
 	selectObjs.value = objs.map(({ id }) => id)