11

src/components/Select/SelectHardSpu.vue

@@ -16,9 +16,9 @@
 		<el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
 			<div class="flex items-center">
 				<div class="color-primary">{{ v.name }}</div>
-				<div class="flex items-center justify-center ml5">
+				<div v-if="v.categoryName" class="flex items-center justify-center ml5">
 					<div class="flex items-center justify-center ml5">
-						<el-tag size="small"> {{ v.merchantName }} </el-tag>
+						<el-tag size="small"> {{ v.categoryName }} </el-tag>
 					</div>
 				</div>
 			</div>

src/views/hard/hard-door-manager/goods-putaway.vue

@@ -8,6 +8,9 @@
 				<el-form-item style="width: 300px" label="商品类型" prop="skuType">
 					<dict-select v-model="state.queryForm.skuType" dict-code="hard_ks_sku_type" />
 				</el-form-item>
+				<el-form-item style="width: 300px" label="商品分类" prop="spuCategoryId">
+					<select-hard-spu-category v-model="state.queryForm.spuCategoryId" placeholder="请输入商品分类" />
+				</el-form-item>
 				<el-form-item>
 					<el-button icon="Search" type="primary" @click="getDataList">查询</el-button>
 					<el-button icon="Refresh" @click="resetQuery">重置</el-button>

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

@@ -9,6 +9,9 @@
 					<el-form-item style="width: 300px" label="商品类型" prop="skuType">
 						<dict-select v-model="state.queryForm.skuType" dict-code="hard_ks_sku_type" />
 					</el-form-item>
+					<el-form-item style="width: 300px" label="商品分类" prop="spuCategoryId">
+						<select-hard-spu-category v-model="state.queryForm.spuCategoryId" placeholder="请输入商品分类" />
+					</el-form-item>
 					<el-form-item>
 						<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
 						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>