From c01a01519a66c7bbf23ec9aab5c7839ca24bb1ba Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Fri, 23 May 2025 10:49:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=99=BA=E8=83=BD=E6=9F=9C):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BD=92=E5=B1=9E=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在智能柜模块中添加归属类型字段，包括表单、详情页和API接口的更新，以支持区分借还柜和固资通两种类型
---
 src/api/cabinet/smart-cabinet.ts              | 50 +++++++++++++++++++
 .../cabinet/smart-cabinet-card/detail.vue     |  5 +-
 .../edit-cabinet-drawer.vue                   | 14 +++++-
 .../smart-cabinet-card-form-modal.vue         | 15 +++++-
 4 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/src/api/cabinet/smart-cabinet.ts b/src/api/cabinet/smart-cabinet.ts
index 4fce1df..b114e33 100644
--- a/src/api/cabinet/smart-cabinet.ts
+++ b/src/api/cabinet/smart-cabinet.ts
@@ -2,47 +2,97 @@ import { http } from '@/utils/http';
 import { CabinetCellDTO } from './cabinet-cell';
 
 export interface SmartCabinetQuery extends BasePageQuery {
+  /** 柜机名称 */
   cabinetName?: string;
+  /** 柜机类型（0主柜 1副柜） */
   cabinetType?: number;
+  /** 柜机模版编号 */
   templateNo?: string;
+  /** 归属类型（0-借还柜 1-固资通） */
+  belongType?: number;
 }
 
+/**
+ * 智能柜信息
+ * @description 智能柜信息表
+ */
 export interface SmartCabinetDTO {
+  /** 柜机唯一ID */
   cabinetId?: number;
+  /** 柜机名称 */
   cabinetName: string;
+  /** 柜机类型（0主柜 1副柜） */
   cabinetType: number;
+  /** 归属主柜ID */
   mainCabinet?: number;
+  /** 归属主柜名称 */
   mainCabinetName?: string;
+  /** MQTT服务ID */
   mqttServerId?: number;
+  /** 商店ID */
   shopId?: number;
+  /** 商店名称 */
   shopName?: string;
+  /** 柜机模版编号 */
   templateNo: string;
+  /** 锁控板序号 */
   lockControlNo: number;
+  /** 柜机位置 */
   location: number;
+  /** 操作人 */
   operator?: string;
+  /** 归属类型（0-借还柜 1-固资通） */
+  belongType?: number;
 }
 
+/**
+ * 添加智能柜命令
+ */
 export interface AddSmartCabinetCommand {
+  /** 柜机名称 */
   cabinetName: string;
+  /** 柜机类型（0主柜 1副柜） */
   cabinetType: number;
+  /** 归属主柜ID */
   mainCabinet?: number;
+  /** MQTT服务ID */
   mqttServerId?: number;
+  /** 商店ID */
   shopId?: number;
+  /** 柜机模版编号 */
   templateNo: string;
+  /** 锁控板序号 */
   lockControlNo: number;
+  /** 柜机位置 */
   location: number;
+  /** 归属类型（0-借还柜 1-固资通） */
+  belongType: number;
 }
 
+/**
+ * 更新智能柜命令
+ */
 export interface UpdateSmartCabinetCommand {
+  /** 柜机唯一ID */
   cabinetId: number;
+  /** 柜机名称 */
   cabinetName?: string;
+  /** 柜机类型（0主柜 1副柜） */
   cabinetType?: number;
+  /** 归属主柜ID */
   mainCabinet?: number;
+  /** MQTT服务ID */
   mqttServerId?: number;
+  /** 商店ID */
   shopId?: number;
+  /** 柜机模版编号 */
   templateNo?: string;
+  /** 锁控板序号 */
   lockControlNo?: number;
+  /** 柜机位置 */
   location?: number;
+  /** 归属类型（0-借还柜 1-固资通） */
+  belongType?: number;
 }
 
 export interface AllCabinetDataDTO {
diff --git a/src/views/cabinet/smart-cabinet-card/detail.vue b/src/views/cabinet/smart-cabinet-card/detail.vue
index 86b47c8..650266a 100644
--- a/src/views/cabinet/smart-cabinet-card/detail.vue
+++ b/src/views/cabinet/smart-cabinet-card/detail.vue
@@ -295,6 +295,9 @@ onMounted(() => {
           <el-descriptions :column="2" border>
             <el-descriptions-item label="主柜ID">{{ cabinetInfo.mainCabinet || '-' }}</el-descriptions-item>
             <el-descriptions-item label="主柜名称">{{ cabinetInfo.mainCabinetName || '-' }}</el-descriptions-item>
+            <el-descriptions-item label="归属类型">
+              {{ cabinetInfo.belongType === 0 ? '借还柜' : '固资通' }}
+            </el-descriptions-item>
             <el-descriptions-item label="MQTT服务器ID">{{ cabinetInfo.mqttServerId || '-' }}</el-descriptions-item>
             <el-descriptions-item label="操作员">{{ cabinetInfo.operator || '-' }}</el-descriptions-item>
           </el-descriptions>
@@ -343,7 +346,7 @@ onMounted(() => {
             </el-table-column>
             <el-table-column label="操作" width="150" fixed="right">
               <template #default="{ row }">
-                <el-button type="success" link :icon="useRenderIcon(AddFill)" @click="handleConfigure(row)">
+                <el-button v-if="cabinetInfo.belongType === 0" type="success" link :icon="useRenderIcon(AddFill)" @click="handleConfigure(row)">
                   配置商品
                 </el-button>
 
diff --git a/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue b/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue
index 056b688..cdaadee 100644
--- a/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue
+++ b/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue
@@ -26,7 +26,8 @@ const formData = reactive({
   cabinetType: 1,
   templateNo: "",
   lockControlNo: 0,
-  location: 0
+  location: 0,
+  belongType: 0
 });
 
 const rules = reactive<FormRules>({
@@ -39,6 +40,9 @@ const rules = reactive<FormRules>({
   location: [
     { required: true, message: "位置信息必填", trigger: "blur" },
     { type: 'number', min: 0, message: '位置编号不能为负数', trigger: 'blur' }
+  ],
+  belongType: [
+    { required: true, message: "请选择归属类型", trigger: "change" }
   ]
 });
 
@@ -91,6 +95,14 @@ watch(() => props.cabinetInfo, (newVal) => {
         <el-option v-for="option in templateOptions" :key="option.value" :label="option.label" :value="option.value" />
       </el-select>
     </el-form-item>
+
+    <el-form-item label="归属类型" prop="belongType">
+      <el-select v-model="formData.belongType" placeholder="请选择归属类型">
+        <el-option label="借还柜" :value="0" />
+        <el-option label="固资通" :value="1" />
+      </el-select>
+    </el-form-item>
+
     <el-form-item>
       <el-button type="primary" :icon="useRenderIcon(Confirm)" @click="handleConfirm">
         确认
diff --git a/src/views/cabinet/smart-cabinet-card/smart-cabinet-card-form-modal.vue b/src/views/cabinet/smart-cabinet-card/smart-cabinet-card-form-modal.vue
index 9f4e080..384ed7d 100644
--- a/src/views/cabinet/smart-cabinet-card/smart-cabinet-card-form-modal.vue
+++ b/src/views/cabinet/smart-cabinet-card/smart-cabinet-card-form-modal.vue
@@ -13,6 +13,7 @@ export interface FormDTO {
   templateNo: string;
   lockControlNo: number;
   location: number;
+  belongType: number;
 }
 
 const props = defineProps({
@@ -30,7 +31,8 @@ const formData = reactive<FormDTO>({
   cabinetType: 1,
   templateNo: "",
   lockControlNo: 0,
-  location: 0
+  location: 0,
+  belongType: 0
 });
 
 const rules = reactive<FormRules>({
@@ -43,6 +45,9 @@ const rules = reactive<FormRules>({
   location: [
     { required: true, message: "位置信息必填", trigger: "blur" },
     { type: 'number', min: 0, message: '位置编号不能为负数', trigger: 'blur' }
+  ],
+  belongType: [
+    { required: true, message: "请选择归属类型", trigger: "change" }
   ]
 });
 
@@ -87,6 +92,14 @@ const templateOptions = Object.entries(CabinetImgMap).map(([value, item]) => ({
         <el-option v-for="option in templateOptions" :key="option.value" :label="option.label" :value="option.value" />
       </el-select>
     </el-form-item>
+
+    <el-form-item label="归属类型" prop="belongType">
+      <el-select v-model="formData.belongType" placeholder="请选择归属类型">
+        <el-option label="借还柜" :value="0" />
+        <el-option label="固资通" :value="1" />
+      </el-select>
+    </el-form-item>
+
     <el-form-item>
       <el-button type="primary" :icon="useRenderIcon(Confirm)" @click="handleConfirm">
         确认