From 96cd6b48ba21bab160688b576656eb344cc9254a Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 4 Jun 2025 17:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/superStore/device.js                  |   6 +-
 src/api/superStore/orderShenhe.js             |  19 +---
 src/api/superStore/salesSummary.js            |  19 +---
 src/api/superStore/superOrder.js              |  18 +--
 src/views/dish/menu/index.vue                 |   6 +-
 src/views/superstore/doubleScreen/index.vue   | 103 +++++++++---------
 .../salesSummary/categorySalesSummary.vue     |  20 ++--
 .../salesSummary/productSalesSummary.vue      |  11 +-
 8 files changed, 80 insertions(+), 122 deletions(-)

diff --git a/src/api/superStore/device.js b/src/api/superStore/device.js
index 5bdd1f69..48a8c0fe 100644
--- a/src/api/superStore/device.js
+++ b/src/api/superStore/device.js
@@ -3,12 +3,12 @@ import request from '@/utils/request'
 // 通过区域Id查询超市
 export function getSupermarketByAreaApi(data) {
     return request({
-      url: '/smart-canteen/supermarket_info/getSupermarketList',
-      method: 'post',
+      url: '/smart-canteen/supermarket_info/list',
+      method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
       },
-      data: data
+      params: data
     })
   }
   
diff --git a/src/api/superStore/orderShenhe.js b/src/api/superStore/orderShenhe.js
index 0c23deca..fa773277 100644
--- a/src/api/superStore/orderShenhe.js
+++ b/src/api/superStore/orderShenhe.js
@@ -1,27 +1,16 @@
 import request from '@/utils/request'
 
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-} 
 // 通过区域Id查询超市
 export function getSupermarketByAreaApi(data) {
     return request({
-      url: '/smart-canteen/api/v1/basics-supermarket/page-supermarket',
-      method: 'post',
+      url: '/smart-canteen/supermarket_info/list',
+      method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
       },
-      data: data
+      params: data
     })
-} 
+  }
 // 通过区域Id查询食堂
 export function getCanteenByAreaApi(data) {
   return request({
diff --git a/src/api/superStore/salesSummary.js b/src/api/superStore/salesSummary.js
index 630dbdad..c9dbaf4e 100644
--- a/src/api/superStore/salesSummary.js
+++ b/src/api/superStore/salesSummary.js
@@ -1,26 +1,15 @@
 import request from '@/utils/request'
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-} 
 // 通过区域Id查询超市
 export function getSupermarketByAreaApi(data) {
     return request({
-      url: '/smart-canteen/api/v1/basics-supermarket/page-supermarket',
-      method: 'post',
+      url: '/smart-canteen/supermarket_info/list',
+      method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
       },
-      data: data
+      params: data
     })
-} 
+  }
 
 // 原料类别
 export function systemMaterialTreeApi(data) {
diff --git a/src/api/superStore/superOrder.js b/src/api/superStore/superOrder.js
index 562af61c..2a80812a 100644
--- a/src/api/superStore/superOrder.js
+++ b/src/api/superStore/superOrder.js
@@ -1,26 +1,14 @@
 import request from '@/utils/request'
 
-// 系统区域权限树
-export function systemAreaTreeApi(data) {
-  return request({
-    url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
-    method: 'post',
-    headers: {
-      "merchant-id":"378915229716713472",
-    },
-    data: data
-  })
-}
-
 // 通过区域Id查询超市
 export function getSupermarketByAreaApi(data) {
     return request({
-      url: '/smart-canteen/api/v1/basics-supermarket/page-supermarket',
-      method: 'post',
+      url: '/smart-canteen/supermarket_info/list',
+      method: 'get',
       headers: {
           "merchant-id":"378915229716713472",
       },
-      data: data
+      params: data
     })
   }
 
diff --git a/src/views/dish/menu/index.vue b/src/views/dish/menu/index.vue
index 391a9b52..e1822409 100644
--- a/src/views/dish/menu/index.vue
+++ b/src/views/dish/menu/index.vue
@@ -105,7 +105,7 @@
                     <el-tooltip placement="top">
                         <div slot="content">
                             <div v-if="scope.row.detail">
-                                <div v-for="subItem in scope.row.detail.details" :key="subItem.detailId">
+                                <div v-for="subItem in scope.row.detail.detailList" :key="subItem.detailId">
                                     <div v-if="subItem.mealtimeType==item.mealtimeType" style="display: flex;max-width: 320px;flex-wrap: wrap;">
                                         <div v-for="(lastItem) in subItem.dishesList" :key="lastItem.dishesId">
                                             <div>{{ lastItem.dishesName }}; </div>
@@ -119,7 +119,7 @@
                         </div>
 
                         <div v-if="scope.row.detail">
-                            <div v-for="subItem in scope.row.detail.details" :key="subItem.detailId">
+                            <div v-for="subItem in scope.row.detail.detailList" :key="subItem.detailId">
                                 <div v-if="subItem.mealtimeType==item.mealtimeType">
                                     <div v-for="(lastItem,index) in subItem.dishesList" :key="lastItem.dishesId">
                                         <div v-if="index<4">{{ lastItem.dishesName }}</div>
@@ -134,7 +134,7 @@
                     </el-tooltip>
                 </template>
             </el-table-column> 
-            <el-table-column label="菜谱更新时间" align="center" prop="updateTime" width="150" v-if="activeName=='currentRecipe'"/>
+            <el-table-column label="菜谱更新时间" align="center" prop="uptime" width="150" v-if="activeName=='currentRecipe'"/>
 
             <el-table-column label="菜谱类型" align="center" prop="recipeType" v-if="activeName=='pageRecipe'"> 
                 <template slot-scope="scope">
diff --git a/src/views/superstore/doubleScreen/index.vue b/src/views/superstore/doubleScreen/index.vue
index f596049f..75888df7 100644
--- a/src/views/superstore/doubleScreen/index.vue
+++ b/src/views/superstore/doubleScreen/index.vue
@@ -109,56 +109,6 @@
             <!-- 基础设置 -->
             <el-tab-pane label="基础设置" name="baseSetting" style="height: 400px;">
                 <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="设备编号" prop="deviceNumber">
-                            <el-input  v-model="baseForm.deviceNumber" placeholder="请输入设备编号" maxlength="30" clearable :disabled="title=='查看'"/>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="设备名称" prop="deviceName">
-                            <el-input  v-model="baseForm.deviceName" placeholder="请输入设备名称" maxlength="30" clearable :disabled="title=='查看'"/>
-                            </el-form-item> 
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="设备Sn" prop="deviceSn">
-                                <el-input  v-model="baseForm.deviceSn" placeholder="请输入设备Sn" maxlength="30" clearable :disabled="title=='查看'"/>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="设备Ip" prop="deviceIp">
-                                <el-input  v-model="baseForm.deviceIp" placeholder="请输入设备Ip" maxlength="30" clearable :disabled="title=='查看'"/>
-                            </el-form-item> 
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="设备key" prop="deviceKey">
-                                <el-input  v-model="baseForm.deviceKey" placeholder="请输入设备key" maxlength="30" clearable :disabled="title=='查看'"/>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="设备Mac" prop="deviceMac">
-                                <el-input  v-model="baseForm.deviceMac" placeholder="请输入设备key" maxlength="30" clearable :disabled="title=='查看'"/>
-                            </el-form-item>
-                        </el-col>
-                        
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="设备型号" prop="deviceModel">
-                                <el-input  v-model="baseForm.deviceModel" placeholder="请输入设备型号" maxlength="30" clearable :disabled="title=='查看'"/>
-                            </el-form-item> 
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="安装地址" prop="deviceAddr">
-                                <el-input  v-model="baseForm.deviceAddr" placeholder="请输入安装地址" maxlength="30" clearable :disabled="title=='查看'"/>
-                            </el-form-item> 
-                        </el-col> 
-                    </el-row>
-
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="所属区域" prop="areaId"> 
@@ -185,8 +135,49 @@
                                 </el-select> 
                             </el-form-item> 
                         </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="设备编号" prop="deviceNumber">
+                            <el-input  v-model="baseForm.deviceNumber" placeholder="请输入设备编号" maxlength="30" clearable :disabled="title=='查看'"/>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="设备名称" prop="deviceName">
+                            <el-input  v-model="baseForm.deviceName" placeholder="请输入设备名称" maxlength="30" clearable :disabled="title=='查看'"/>
+                            </el-form-item> 
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="设备Sn" prop="deviceSn">
+                                <el-input  v-model="baseForm.deviceSn" placeholder="请输入设备Sn" maxlength="30" clearable :disabled="title=='查看'"/>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="设备Ip" prop="deviceIp">
+                                <el-input  v-model="baseForm.deviceIp" placeholder="请输入设备Ip" maxlength="30" clearable :disabled="title=='查看'"/>
+                            </el-form-item> 
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="设备key" prop="deviceKey">
+                                <el-input  v-model="baseForm.deviceKey" placeholder="请输入设备key" maxlength="30" clearable :disabled="title=='查看'"/>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="设备Mac" prop="deviceMac">
+                                <el-input  v-model="baseForm.deviceMac" placeholder="请输入设备key" maxlength="30" clearable :disabled="title=='查看'"/>
+                            </el-form-item>
+                        </el-col>
+                        
                     </el-row>
                     <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="设备型号" prop="deviceModel">
+                                <el-input  v-model="baseForm.deviceModel" placeholder="请输入设备型号" maxlength="30" clearable :disabled="title=='查看'"/>
+                            </el-form-item> 
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="安装地址" prop="deviceAddr">
+                                <el-input  v-model="baseForm.deviceAddr" placeholder="请输入安装地址" maxlength="30" clearable :disabled="title=='查看'"/>
+                            </el-form-item> 
+                        </el-col>
                         <el-col :span="12">
                             <el-form-item label="密码" prop="devicePwd">
                                 <el-input  v-model="baseForm.devicePwd" placeholder="请输入密码" maxlength="30" clearable :disabled="title=='查看'"/>
@@ -303,7 +294,8 @@
             //查询-区域树
             handleTreeChange(e){ 
                 let param= {
-                    areaId:this.queryParams.areaId
+                    "areaId":this.queryParams.areaId,
+                    "pagenation":true
                 }
                 getSupermarketByAreaApi(param).then((response) => {
                     this.supermarketOptions=response.rows||[]
@@ -357,7 +349,8 @@
             handleUpdate(row) {
                 this.reset();  
                 let param= {
-                    areaId:row.areaId
+                    "areaId":row.areaId,
+                    "pagenation":true
                 }
                 getSupermarketByAreaApi(param).then((response) => {
                     this.supermarketOptions2=response.rows||[]
@@ -372,7 +365,8 @@
             handleView(row) {
                 this.reset();  
                 let param= {
-                    areaId:row.areaId
+                    "areaId":row.areaId,
+                    "pagenation":true
                 }
                 getSupermarketByAreaApi(param).then((response) => {
                     this.supermarketOptions2=response.rows||[]
@@ -390,7 +384,8 @@
             handleTreeChange2(val){ 
                 setTimeout(()=>{  
                     let param= {
-                        areaId:val
+                        "areaId":val,
+                        "pagenation":true
                     }
                     getSupermarketByAreaApi(param).then((response) => {
                         this.supermarketOptions2=response.rows||[]
diff --git a/src/views/superstore/salesSummary/categorySalesSummary.vue b/src/views/superstore/salesSummary/categorySalesSummary.vue
index 2277d2da..3fb81fce 100644
--- a/src/views/superstore/salesSummary/categorySalesSummary.vue
+++ b/src/views/superstore/salesSummary/categorySalesSummary.vue
@@ -14,8 +14,8 @@
                 :picker-options="pickerOptions" >
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="所属区域" prop="areaIdList">
-            <el-cascader v-model="queryParams.areaIdList"
+        <el-form-item label="所属区域" prop="areaId">
+            <el-cascader v-model="queryParams.areaId"
             :options="treeAreaOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
             :props="{  
                 emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
@@ -35,7 +35,7 @@
         </el-form-item>
         <br> 
         <el-form-item label="商品类别" prop="categoryIdList">
-            <el-cascader v-model="queryParams.areaIdList"
+            <el-cascader v-model="queryParams.categoryIdList"
             :options="categoryTypeOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
             :props="{ 
                 multiple: true,
@@ -121,7 +121,7 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          areaIdList:[],
+          areaId:null,
           canteenIdList:[],
           materialName:null, 
           categoryIdList:[],
@@ -172,12 +172,10 @@
                 this.treeAreaOptions = response.data; 
             });
         },
-        handleAreaChange(e){
-            console.log(this.queryParams.areaIdList)
+        handleAreaChange(e){ 
             let param= {
-                areaIdList:this.queryParams.areaIdList,
-                current:1,
-                size:-1
+                "areaId":this.queryParams.areaId,
+                "pagenation":true
             }
             getSupermarketByAreaApi(param).then((response) => {
                 this.supermarketOptions=response.records||[]
@@ -200,7 +198,7 @@
             this.queryParams = {
                 pageNum: 1,
                 pageSize: 10,
-                areaIdList:[],
+                areaId:null,
                 canteenIdList:[],
                 materialName:null, 
                 categoryIdList:[],
@@ -214,7 +212,7 @@
         getList() {
             this.loading = true;
             let param = {
-                "areaIdList":this.queryParams.areaIdList,
+                "areaId":this.queryParams.areaId,
                 "canteenIdList":this.queryParams.canteenIdList,
                 "categoryIdList":this.queryParams.categoryIdList,
                 "saleType":this.queryParams.saleType, 
diff --git a/src/views/superstore/salesSummary/productSalesSummary.vue b/src/views/superstore/salesSummary/productSalesSummary.vue
index 462201cb..c967291e 100644
--- a/src/views/superstore/salesSummary/productSalesSummary.vue
+++ b/src/views/superstore/salesSummary/productSalesSummary.vue
@@ -138,7 +138,7 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          areaIdList:[],
+          areaId:null,
           canteenIdList:[],
           materialName:null, 
           categoryIdList:[],
@@ -191,9 +191,8 @@
         },
         handleAreaChange(e){ 
             let param= {
-                areaIdList:this.queryParams.areaIdList,
-                current:1,
-                size:-1
+                "areaId":this.queryParams.areaId,
+                "pagenation":true
             }
             getSupermarketByAreaApi(param).then((response) => {
                 this.supermarketOptions=response.records||[]
@@ -216,7 +215,7 @@
             this.queryParams = {
                 pageNum: 1,
                 pageSize: 10,
-                areaIdList:[],
+                areaId:null,
                 canteenIdList:[],
                 materialName:null, 
                 categoryIdList:[],
@@ -230,7 +229,7 @@
         getList() {
             this.loading = true;
             let param = {
-                "areaIdList":this.queryParams.areaIdList,
+                "areaId":this.queryParams.areaId,
                 "canteenIdList":this.queryParams.canteenIdList,
                 "categoryIdList":this.queryParams.categoryIdList,
                 "materialName":this.queryParams.materialName,