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(() => {
{{ cabinetInfo.mainCabinet || '-' }}
{{ cabinetInfo.mainCabinetName || '-' }}
+
+ {{ cabinetInfo.belongType === 0 ? '借还柜' : '固资通' }}
+
{{ cabinetInfo.mqttServerId || '-' }}
{{ cabinetInfo.operator || '-' }}
@@ -343,7 +346,7 @@ onMounted(() => {
-
+
配置商品
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({
@@ -39,6 +40,9 @@ const rules = reactive({
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) => {
+
+
+
+
+
+
+
+
确认
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({
cabinetType: 1,
templateNo: "",
lockControlNo: 0,
- location: 0
+ location: 0,
+ belongType: 0
});
const rules = reactive({
@@ -43,6 +45,9 @@ const rules = reactive({
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]) => ({
+
+
+
+
+
+
+
+
确认