From 114d60ba9636ada8a5dfe70f9aac2c4e538450b6 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 17 Apr 2025 09:52:33 +0800
Subject: [PATCH 1/2] 11

---
 src/components/Select/SelectHardSpu.vue            | 4 ++--
 src/views/hard/hard-door-manager/goods-putaway.vue | 3 +++
 src/views/hard/hard-spu/index.vue                  | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/Select/SelectHardSpu.vue b/src/components/Select/SelectHardSpu.vue
index 6813f05..9a668ca 100644
--- a/src/components/Select/SelectHardSpu.vue
+++ b/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>
diff --git a/src/views/hard/hard-door-manager/goods-putaway.vue b/src/views/hard/hard-door-manager/goods-putaway.vue
index 72e897d..9603c4e 100644
--- a/src/views/hard/hard-door-manager/goods-putaway.vue
+++ b/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>
diff --git a/src/views/hard/hard-spu/index.vue b/src/views/hard/hard-spu/index.vue
index fbe3282..98f3e94 100644
--- a/src/views/hard/hard-spu/index.vue
+++ b/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>

From e60454b496a01426259338950c035eae10b700ca Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 17 Apr 2025 11:31:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E7=A1=AC=E4=BB=B6=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/hard-auth/index.vue | 61 +++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/views/hard/hard-auth/index.vue b/src/views/hard/hard-auth/index.vue
index 9bd5c32..5b7ceeb 100644
--- a/src/views/hard/hard-auth/index.vue
+++ b/src/views/hard/hard-auth/index.vue
@@ -2,13 +2,33 @@
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row>
+				<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+					<el-row>
+						<el-form-item style="width: 250px" label="用户" prop="userId">
+							<select-user v-model="state.queryForm.userId" />
+						</el-form-item>
+						<el-form-item style="width: 250px" label="智能柜设备" prop="hardId">
+							<select-hard v-model="state.queryForm.hardId" :apiParams="{ type: '4' }" />
+						</el-form-item>
+						<el-form-item style="width: 250px" label="是否授权" prop="authStatus">
+							<dict-select v-model="state.queryForm.authStatus" dict-code="yes_no_type" />
+						</el-form-item>
+						<el-form-item style="width: 250px" label="是否完成" prop="isDone">
+							<dict-select v-model="state.queryForm.isDone" dict-code="yes_no_type" />
+						</el-form-item>
+						<el-form-item style="width: 400px" label="授权时间" prop="authTimeList">
+							<el-date-picker v-model="state.queryForm.authTimeList" value-format="YYYY-MM-DD" type="daterange" />
+						</el-form-item>
+						<el-form-item style="width: 400px" label="完成时间" prop="isDoneTimeList">
+							<el-date-picker v-model="state.queryForm.isDoneTimeList" value-format="YYYY-MM-DD" type="daterange" />
+						</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>
+						</el-form-item>
+					</el-row>
+				</el-form>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'hard_hardAuth_add'">
-						新 增
-					</el-button>
-					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'hard_hardAuth_del'" @click="handleDelete(selectObjs)">
-						删除
-					</el-button>
 					<right-toolbar
 						v-model:showSearch="showSearch"
 						:export="'hard_hardAuth_export'"
@@ -29,25 +49,30 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
-				<el-table-column prop="userId" label="预定用户" show-overflow-tooltip />
-				<el-table-column prop="hardId" label="硬件id" show-overflow-tooltip />
-				<el-table-column prop="authStatus" label="是否授权" show-overflow-tooltip />
-				<el-table-column prop="authTime" label="授权时间" show-overflow-tooltip />
-				<el-table-column prop="isDone" label="是否完成" show-overflow-tooltip />
-				<el-table-column prop="isDoneTime" label="完成时间" show-overflow-tooltip />
+				<el-table-column type="index" label="#" width="80" />
+				<el-table-column prop="username" label="授权用户" />
+				<el-table-column prop="userMobile" label="授权用户手机号" />
+				<el-table-column prop="hardName" label="授权硬件设备" />
+				<el-table-column prop="authStatus" label="是否授权">
+					<template #default="{ row }">
+						<dict-tag :options="yes_no_type" :value="row.authStatus" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="authTime" label="授权时间" />
+				<el-table-column prop="isDone" label="是否完成">
+					<template #default="{ row }">
+						<dict-tag :options="yes_no_type" :value="row.isDone" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="isDoneTime" label="完成时间" />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardAuth_edit'" @click="formDialogRef.openDialog(scope.row.id)"
-							>编辑</el-button
-						>
 						<el-button icon="delete" text type="primary" v-auth="'hard_hardAuth_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" />
 		</div>
-
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 	</div>
@@ -62,7 +87,7 @@ import { useDict } from "/@/hooks/dict"
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
-
+const { yes_no_type } = useDict("yes_no_type")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量