库存商品添加搜索条件

src/views/supermarketerp/supermarketSpu/index.vue

@@ -3,14 +3,19 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="商品名称" prop="productName">
+						<el-input placeholder="请输入商品名称" v-model="state.queryForm.productName" />
+					</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-select>
+					</el-form-item>
 					<el-form-item label="货号" prop="productCode">
 						<el-input placeholder="请输入货号" v-model="state.queryForm.productCode" />
 					</el-form-item>
-					<el-form-item label="自编码/条码" prop="barcode">
-						<el-input placeholder="请输入自编码/条码" v-model="state.queryForm.barcode" />
-					</el-form-item>
-					<el-form-item label="商品名称" prop="productName">
-						<el-input placeholder="请输入商品名称" v-model="state.queryForm.productName" />
+					<el-form-item label="条码" prop="barcode">
+						<el-input placeholder="条码" v-model="state.queryForm.barcode" />
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
@@ -103,6 +108,9 @@
 				<el-table-column prop="costPrice" label="成本单价(元)" show-overflow-tooltip width="120">
 					<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>
+				</el-table-column>
 				<el-table-column prop="stock" label="剩余总库存" show-overflow-tooltip />
 				<!-- <el-table-column prop="giveIntegral" label="赠送积分" show-overflow-tooltip /> -->
 				<!-- <el-table-column prop="merchantId" label="商户编号" show-overflow-tooltip /> -->