From 1d2cd48a7fa617f752aa716744293bc7c8205edf Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Wed, 11 Jun 2025 16:25:04 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=95=86=E5=93=81=E6=A8=A1=E5=BC=8F):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E6=A8=A1=E5=BC=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=8A=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在商店管理页面添加商品模式列显示
- 在商店表单中增加商品模式选择字段
- 更新API接口定义包含商品模式字段
- 在智能柜相关页面统一商品模式显示和编辑功能
---
 src/api/shop/shop.ts                               |  8 ++++++++
 src/views/cabinet/shop/index.vue                   |  5 +++++
 src/views/cabinet/shop/shop-form-modal.vue         | 12 ++++++++++--
 src/views/cabinet/smart-cabinet-card/detail.vue    |  8 ++++----
 .../smart-cabinet-card/edit-cabinet-drawer.vue     | 14 +++++++-------
 .../smart-cabinet-card-form-modal.vue              | 14 +++++++-------
 src/views/system/role/index.vue                    | 12 +++++++++++-
 7 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/src/api/shop/shop.ts b/src/api/shop/shop.ts
index 3959675..3805665 100644
--- a/src/api/shop/shop.ts
+++ b/src/api/shop/shop.ts
@@ -4,6 +4,8 @@ import { http } from '@/utils/http';
 export interface ShopQuery extends BasePageQuery {
   shopName?: string;
   corpid?: string;
+  /** 归属类型（0-借还柜 1-固资通） */
+  belongType?: number;
 }
 
 /** 商店DTO */
@@ -11,12 +13,16 @@ export interface ShopDTO {
   shopId: number;
   shopName: string;
   corpid?: string;
+  /** 归属类型（0-借还柜 1-固资通） */
+  belongType?: number;
 }
 
 /** 新增商店命令 */
 export interface AddShopCommand {
   shopName: string;
   corpid: string;
+  /** 归属类型（0-借还柜 1-固资通） */
+  belongType?: number;
 }
 
 /** 更新商店命令 */
@@ -24,6 +30,8 @@ export interface UpdateShopCommand {
   corpid: string;
   shopId: number;
   shopName: string;
+  /** 归属类型（0-借还柜 1-固资通） */
+  belongType?: number;
 }
 
 /** 获取商店列表 */
diff --git a/src/views/cabinet/shop/index.vue b/src/views/cabinet/shop/index.vue
index cda170e..a418774 100644
--- a/src/views/cabinet/shop/index.vue
+++ b/src/views/cabinet/shop/index.vue
@@ -166,6 +166,11 @@ getList();
         <el-table-column type="selection" width="55" />
         <el-table-column label="地址ID" prop="shopId" width="100" />
         <el-table-column label="地址名称" prop="shopName" />
+        <el-table-column label="商品模式" prop="belongType" width="120">
+          <template #default="{ row }">
+            {{ row.belongType === 0 ? '借还模式' : '固资模式' }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template #default="{ row }">
             <el-button type="primary" link :icon="useRenderIcon(EditPen)" @click="handleEdit(row)">
diff --git a/src/views/cabinet/shop/shop-form-modal.vue b/src/views/cabinet/shop/shop-form-modal.vue
index c2c2fd0..b215823 100644
--- a/src/views/cabinet/shop/shop-form-modal.vue
+++ b/src/views/cabinet/shop/shop-form-modal.vue
@@ -23,11 +23,13 @@ const formRef = ref();
 const formData = ref<UpdateShopCommand>({
   corpid: wxStore.corpid,
   shopId: 0,
-  shopName: ""
+  shopName: "",
+  belongType: undefined
 });
 
 const rules = {
-  shopName: [{ required: true, message: "请输入地址名称", trigger: "blur" }]
+  shopName: [{ required: true, message: "请输入地址名称", trigger: "blur" }],
+  belongType: [{ required: true, message: "请选择商品模式", trigger: "change" }]
 };
 
 watch(
@@ -85,6 +87,12 @@ const handleClose = () => {
       <el-form-item label="地址名称" prop="shopName">
         <el-input v-model="formData.shopName" placeholder="请输入地址名称" />
       </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>
     <template #footer>
       <el-button @click="handleClose">取消</el-button>
diff --git a/src/views/cabinet/smart-cabinet-card/detail.vue b/src/views/cabinet/smart-cabinet-card/detail.vue
index 4f956e6..d296dd2 100644
--- a/src/views/cabinet/smart-cabinet-card/detail.vue
+++ b/src/views/cabinet/smart-cabinet-card/detail.vue
@@ -304,9 +304,9 @@ onMounted(() => {
               </el-button></el-descriptions-item>
             <el-descriptions-item label="借呗支付">{{ getBalanceEnableText(cabinetInfo.balanceEnable)
               }}</el-descriptions-item>
-            <!-- <el-descriptions-item label="归属类型">
-              {{ cabinetInfo.belongType === 0 ? '借还柜' : '固资通' }}
-            </el-descriptions-item> -->
+            <el-descriptions-item label="商品模式">
+              {{ cabinetInfo.belongType === 0 ? '借还模式' : '固资模式' }}
+            </el-descriptions-item>
           </el-descriptions>
         </div>
 
@@ -351,7 +351,7 @@ onMounted(() => {
                   <!-- <div class="goods-name">{{ item.goodsId ? item.goodsName : '未配置商品' }}</div> -->
                 </div>
                 <div class="line-num">
-                  <el-divider direction="horizontal" class="vertical-divider"/>
+                  <el-divider direction="horizontal" class="vertical-divider" />
                   <span class="line-number">{{ item.cellNo }}</span>
                 </div>
                 <div class="action-buttons">
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 9afd92e..d9e3c40 100644
--- a/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue
+++ b/src/views/cabinet/smart-cabinet-card/edit-cabinet-drawer.vue
@@ -104,21 +104,21 @@ watch(() => props.cabinetInfo, (newVal) => {
       </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-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-form-item label="运行模式" prop="mode">
+    <!-- <el-form-item label="运行模式" prop="mode">
       <el-select v-model="formData.mode" placeholder="请选择运行模式">
         <el-option label="支付模式" :value="0" />
         <el-option label="审批模式" :value="1" />
         <el-option label="借还模式" :value="2" />
         <el-option label="会员模式" :value="3" />
       </el-select>
-    </el-form-item>
+    </el-form-item> -->
 
     <el-form-item label="借呗支付" prop="balanceEnable">
       <el-select v-model="formData.balanceEnable" placeholder="请选择借呗支付状态">
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 c9c871d..5d1db79 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
@@ -103,21 +103,21 @@ const templateOptions = Object.entries(CabinetImgMap).map(([value, item]) => ({
       </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-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-form-item label="运行模式" prop="mode">
+    <!-- <el-form-item label="运行模式" prop="mode">
       <el-select v-model="formData.mode" placeholder="请选择运行模式">
         <el-option label="支付模式" :value="0" />
         <el-option label="审批模式" :value="1" />
         <el-option label="借还模式" :value="2" />
         <el-option label="会员模式" :value="3" />
       </el-select>
-    </el-form-item>
+    </el-form-item> -->
 
     <el-form-item label="借呗支付" prop="balanceEnable">
       <el-select v-model="formData.balanceEnable" placeholder="请选择借呗支付状态">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 1cb1f7e..37d0a33 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -216,7 +216,17 @@ onSearch().then(() => {
             statusList[item].label }}</el-radio>
         </el-radio-group>
       </el-form-item> -->
-      <el-form-item label="菜单权限" prop="menuIds" class="form-input">
+      <el-form-item prop="menuIds" class="form-input">
+        <template #label>
+          <div class="menu-label">
+            <span>菜单权限</span>
+            <!-- <el-checkbox-group v-model="formData.menuIds" class="checkbox-group">
+              <el-checkbox v-model="formData.menuIds" label="all" class="menu-checkbox">
+                全部
+              </el-checkbox>
+            </el-checkbox-group> -->
+          </div>
+        </template>
         <el-checkbox-group v-model="formData.menuIds" class="checkbox-group">
           <template v-for="menu in processedMenuOptions" :key="menu.categoryName">
             <span class="menu-category">{{ menu.categoryName }}：</span>