From ba27975609be558989c78717c86c660be1161eff Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Fri, 13 Jun 2025 15:40:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E8=A7=84=E5=88=99=E5=92=8C=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在智能柜体表单中添加柜体名称长度限制
- 修改商品配置中belongType的计算逻辑
---
 src/views/cabinet/smart-cabinet-card/detail.vue               | 4 ++--
 .../smart-cabinet-card/smart-cabinet-card-form-modal.vue      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/cabinet/smart-cabinet-card/detail.vue b/src/views/cabinet/smart-cabinet-card/detail.vue
index e349035..e20bf8d 100644
--- a/src/views/cabinet/smart-cabinet-card/detail.vue
+++ b/src/views/cabinet/smart-cabinet-card/detail.vue
@@ -426,7 +426,7 @@ onMounted(() => {
         </div>
       </el-card>
       <GatewayConfigModal v-model="gatewayConfigVisible" :cabinet-id="cabinetId" @refresh="fetchCabinetDetail" />
-      <ShopConfigModal v-model="shopConfigVisible" :cabinet-id="cabinetId" :belong-type="cabinetInfo.belongType" @refresh="fetchCabinetDetail" />
+      <ShopConfigModal v-model="shopConfigVisible" :cabinet-id="cabinetId" @refresh="fetchCabinetDetail" />
       <MainCabinetConfigModal v-model="mainCabinetConfigVisible" :cabinet-id="cabinetId"
         @refresh="fetchCabinetDetail" />
       <el-drawer v-model="editCabinetDrawerVisible" title="编辑柜体" size="30%" direction="rtl">
@@ -434,7 +434,7 @@ onMounted(() => {
           @refresh="fetchCabinetDetail" />
       </el-drawer>
       <el-drawer v-model="goodsConfigVisible" title="配置商品" size="50%" direction="rtl">
-        <CabinetGoodsConfigModal v-model="goodsConfigVisible" :cell-id="currentCellId" :belong-type="shopInfo.belongType" @refresh="fetchCellList" />
+        <CabinetGoodsConfigModal v-model="goodsConfigVisible" :cell-id="currentCellId" :belong-type="shopInfo.mode == 4 ? 1 : 0" @refresh="fetchCellList" />
       </el-drawer>
       <el-drawer v-model="configuredGoodsVisible" title="管理商品" size="30%" direction="rtl">
         <ConfiguredGoodsModal v-model="configuredGoodsVisible" :cell-id="currentCell?.cellId"
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 4fb89bb..ccc0177 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
@@ -40,7 +40,7 @@ const formData = reactive<FormDTO>({
 });
 
 const rules = reactive<FormRules>({
-  cabinetName: [{ required: true, message: "柜体名称必填", trigger: "blur" }],
+  cabinetName: [{ required: true, max:4, message: "柜体名称必填", trigger: "blur" }],
   cabinetType: [{ required: true, message: "请选择柜体类型", trigger: "change" }],
   templateNo: [{ required: true, message: "请选择模板编号", trigger: "change" }],
   lockControlNo: [