From 5e81c494dc1ab4ea7bfff3bfc44930af9809490e Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 29 Apr 2025 09:16:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/template/批量新增菜品模板.xlsx | Bin 0 -> 12883 bytes
 src/api/accountCenter/butie.js        |  35 ++++++++++++++++----
 src/api/accountCenter/consume.js      |  35 ++++++++++++++++----
 src/api/accountCenter/freeze.js       |  10 ++++--
 src/api/accountCenter/manager.js      |   5 ++-
 src/api/accountCenter/traderecords.js |  15 +++++++--
 src/api/base/mobile.js                |  15 +++++++--
 src/api/device/index.js               |   5 ++-
 src/api/dish/dish.js                  |   5 ++-
 src/api/dish/menu.js                  |  10 ++++--
 src/api/reportCenter/index.js         |  40 +++++++++++++++++-----
 src/views/dish/dish/index.vue         |  46 +++++++++++++++++---------
 src/views/system/user/index.vue       |   7 +++-
 13 files changed, 177 insertions(+), 51 deletions(-)
 create mode 100644 public/template/批量新增菜品模板.xlsx

diff --git a/public/template/批量新增菜品模板.xlsx b/public/template/批量新增菜品模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..9426f861d76451dc9a5974db443f12ad8443eae4
GIT binary patch
literal 12883
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
K(x!g?@BaX}8bGK3

literal 0
HcmV?d00001

diff --git a/src/api/accountCenter/butie.js b/src/api/accountCenter/butie.js
index cee601cf..8a20a808 100644
--- a/src/api/accountCenter/butie.js
+++ b/src/api/accountCenter/butie.js
@@ -117,7 +117,10 @@ export function accSubsidyRechargePageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 //补贴明细-撤销操作
@@ -153,7 +156,10 @@ export function accSubsidyClearPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 //补贴撤销明细
@@ -165,7 +171,10 @@ export function accSubsidyRepealPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 //补贴未到账明细
@@ -177,7 +186,10 @@ export function accSubsidyHandReceivePageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 //补贴未到账明细-批量到账操作
@@ -189,7 +201,10 @@ export function accSubsidyHandReceiveBatchGrantApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 //补贴未到账明细-批量撤销操作
@@ -201,7 +216,10 @@ export function batchAccSubsidyRepealApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -216,7 +234,10 @@ export function accountSubsidyCustPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 } 
  
diff --git a/src/api/accountCenter/consume.js b/src/api/accountCenter/consume.js
index b3f088f8..2a0f5be0 100644
--- a/src/api/accountCenter/consume.js
+++ b/src/api/accountCenter/consume.js
@@ -57,7 +57,10 @@ export function consumeDeductSingleApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 } 
 
@@ -70,7 +73,10 @@ export function accountConsumeCustPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 } 
 // 消费类型汇总-用户类别
@@ -82,7 +88,10 @@ export function accountConsumePsnPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 } 
 // 消费类型汇总-用户组织
@@ -94,7 +103,10 @@ export function accountConsumeOrganizationPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
 }
 
@@ -107,7 +119,10 @@ export function walletConsumeCustPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 // 消费钱包汇总-用户类别
@@ -119,7 +134,10 @@ export function walletConsumePsnPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 // 消费钱包汇总-用户组织
@@ -131,7 +149,10 @@ export function walletConsumeOrganizationPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
diff --git a/src/api/accountCenter/freeze.js b/src/api/accountCenter/freeze.js
index b30cfe2e..f36b8215 100644
--- a/src/api/accountCenter/freeze.js
+++ b/src/api/accountCenter/freeze.js
@@ -58,7 +58,10 @@ export function accFrozenPageApi(data) {
         "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
   } 
 
@@ -71,7 +74,10 @@ export function accUnfrozenPageApi(data) {
         "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
   } 
 
diff --git a/src/api/accountCenter/manager.js b/src/api/accountCenter/manager.js
index 2f67bdf1..2c34b255 100644
--- a/src/api/accountCenter/manager.js
+++ b/src/api/accountCenter/manager.js
@@ -23,7 +23,10 @@ export function accInfoPageApi(data) {
         "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+        pageNum:data.pageNum,
+        pageSize:data.pageSize
+      }
     })
   }
 
diff --git a/src/api/accountCenter/traderecords.js b/src/api/accountCenter/traderecords.js
index 7ae62d12..7e74993c 100644
--- a/src/api/accountCenter/traderecords.js
+++ b/src/api/accountCenter/traderecords.js
@@ -9,7 +9,10 @@ export function accInfoOperationListApi(data) {
       "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
@@ -22,7 +25,10 @@ export function accInfoWalletHistoryApi(data) {
       "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
  
@@ -35,6 +41,9 @@ export function orderHistoryListApi(data) {
       "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
diff --git a/src/api/base/mobile.js b/src/api/base/mobile.js
index 3dfa70db..00dd0d85 100644
--- a/src/api/base/mobile.js
+++ b/src/api/base/mobile.js
@@ -22,7 +22,10 @@ export function getPlaintByPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 // 回复-投诉建议
@@ -48,7 +51,10 @@ export function getOrderEvaluatePageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
   }
   // 订单评价-回复
@@ -99,7 +105,10 @@ export function getEvaluateCountPageApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
   }
  
diff --git a/src/api/device/index.js b/src/api/device/index.js
index cadd9845..2021e055 100644
--- a/src/api/device/index.js
+++ b/src/api/device/index.js
@@ -10,7 +10,10 @@ export function getDeviceListPageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
diff --git a/src/api/dish/dish.js b/src/api/dish/dish.js
index 63c48194..d8bd24fb 100644
--- a/src/api/dish/dish.js
+++ b/src/api/dish/dish.js
@@ -78,7 +78,10 @@ export function getMenuDishesListApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
 }
 // 菜品列表-新增
diff --git a/src/api/dish/menu.js b/src/api/dish/menu.js
index 2dae2649..ba66d826 100644
--- a/src/api/dish/menu.js
+++ b/src/api/dish/menu.js
@@ -44,7 +44,10 @@ export function getDishesByTypePageApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
@@ -68,7 +71,10 @@ export function getPageRecipeListApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
 }
  
diff --git a/src/api/reportCenter/index.js b/src/api/reportCenter/index.js
index be810a3a..cbee97db 100644
--- a/src/api/reportCenter/index.js
+++ b/src/api/reportCenter/index.js
@@ -9,7 +9,10 @@ export function reportTradFlowListApi(data) {
           "merchant-id":"378915229716713472",
       },
       data: data,
-      params:data
+      params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
     })
 } 
 
@@ -22,7 +25,10 @@ export function reportAccRechargeListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -35,7 +41,10 @@ export function reportAccWithdrawListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -48,7 +57,10 @@ export function reportTradeOperatingListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -61,7 +73,10 @@ export function reportTradeCanteenListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 } 
 
@@ -74,7 +89,10 @@ export function reportTradeDeviceListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
@@ -87,7 +105,10 @@ export function reportTradeUserListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
@@ -100,7 +121,10 @@ export function reportTradeGoodsListApi(data) {
         "merchant-id":"378915229716713472",
     },
     data: data,
-    params:data
+    params:{
+      pageNum:data.pageNum,
+      pageSize:data.pageSize
+    }
   })
 }
 
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index 80487cce..317ac138 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -136,7 +136,7 @@
                 @click="handleBatchDel"
               >批量删除</el-button>
             </el-col> -->
-            <!-- <el-col :span="1.5">
+            <el-col :span="1.5">
               <el-upload
                   ref="upload"
                   :limit="1"
@@ -149,14 +149,19 @@
                   :on-success="handleFileSuccess" 
               >
                   <el-button
-                    type="success"
-                    plain
-                    icon="el-icon-edit"
+                    type="success"  
                     size="mini"  
                     >批量导入
                 </el-button>
-              </el-upload> 
-            </el-col>-->
+              </el-upload>
+            </el-col>
+            <el-col :span="1.5"> 
+              <el-button
+                  size="mini"
+                  @click="importTemplate" 
+                  >模板下载
+              </el-button> 
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
           </el-row>
   
@@ -993,6 +998,7 @@
   import { getMaterialListApi } from "@/api/dish/material"; 
   import { imgUpLoadTwo } from '@/api/system/upload'
   import { getToken } from '@/utils/auth'
+  import { downloadFileByUrl } from '@/utils/download'
   export default {
     name: "Material",
     components: { Treeselect },
@@ -1132,15 +1138,15 @@
         checkUrlList: [],//图片
         checkUrlNameList: [],//图片
         dialogVisible:false,//图片弹窗
-        dialogImageUrl:"",//图片弹窗
-        //导入参数
+        dialogImageUrl:"",//图片弹窗 
+         //导入参数
         upload: {  
-            // 是否禁用上传
-            isUploading: false, 
-            // 设置上传的请求头部
-            headers: { Authorization: 'Bearer ' + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + '/smart-canteen/api/v1/menumaterial/batch/import/material',
+          // 是否禁用上传
+          isUploading: false, 
+          // 设置上传的请求头部
+          headers: { Authorization: 'Bearer ' + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + '/smart-canteen/menu_dishes/import/check',
         },
         materialList:[],
         materialOptions:[],
@@ -1649,6 +1655,8 @@
           this.dialogImageUrl = file.url
           this.dialogVisible = true
       }, 
+      
+      
       //批量导入
       // /api/v1/menumaterial/batch/import/material
       // 文件上传中处理
@@ -1657,11 +1665,19 @@
       },
       // 文件上传成功处理
       handleFileSuccess(response, file, fileList) { 
+        console.log(response)
           this.upload.isUploading = false
           this.$refs.upload.clearFiles()
-          this.$modal.msgSuccess("后台导入中...");
+          this.$modal.msgSuccess("后台导入中，请稍后刷新列表！");
           this.getList()
       },
+
+      /** 下载模板操作 */
+      importTemplate() {
+        let url = window.location.origin + '/glweb/template/批量新增菜品模板.xlsx';
+        console.log(url)
+        downloadFileByUrl(url)
+      },
      
       handleNumericInput(field, event) {
         const value = event;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0897069d..feb187a0 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1079,6 +1079,7 @@ export default {
         handleAdd() {
             this.reset()
             this.loginTypeArr.splice(0)
+            this.fileList=[]
             getUser().then((response) => {
                 this.postOptions = response.posts
                 this.roleOptions = response.roles
@@ -1103,7 +1104,11 @@ export default {
                 this.$set(this.form, 'postIds', response.postIds)
                 this.$set(this.form, 'roleIds', response.roleIds)
                 // console.log(store.getters.face)
-                this.fileList=[{url:response.data.photoUrl}]
+                if(response.data.photoUrl){
+                    this.fileList=[{url:response.data.photoUrl}]
+                }else{
+                    this.fileList=[]
+                }
                 this.checkUrlList=[response.data.photoUrl]
                 this.open = true
                 this.title = '修改用户'