From c660e84b8a4fbe58651d25dce5a642c40fc8cb98 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 7 May 2025 17:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E8=8F=9C=E8=B0=B1=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/template/导入菜谱模板.xlsx             | Bin 0 -> 18325 bytes
 src/api/dish/dish.js                          |  12 +-
 src/api/dish/menu.js                          |  18 ++-
 .../cardManage/cardRecord/index.vue           |   9 +-
 src/views/dish/dish/index.vue                 |  97 ++++++++++++-
 src/views/dish/menu/detail.vue                |  15 +-
 src/views/dish/menu/edit.vue                  |   6 +-
 src/views/dish/menu/index.vue                 | 137 +++++++++++++++---
 .../inComeSum/deptPaymentSum/index.vue        |  76 +++-------
 .../inComeSum/psnPaymentSum/index.vue         | 125 ++++++++++------
 10 files changed, 347 insertions(+), 148 deletions(-)
 create mode 100644 public/template/导入菜谱模板.xlsx

diff --git a/public/template/导入菜谱模板.xlsx b/public/template/导入菜谱模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..ee7c7b19b52a41878b31cc652fabf36962e660a2
GIT binary patch
literal 18325
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
YIgyiuc+9gv(1AY$z<08`0*|%-2Ue_acmMzZ

literal 0
HcmV?d00001

diff --git a/src/api/dish/dish.js b/src/api/dish/dish.js
index d8bd24fb..682f3b84 100644
--- a/src/api/dish/dish.js
+++ b/src/api/dish/dish.js
@@ -131,7 +131,17 @@ export function removeMenuDishesApi(data) {
 }
 
 
-
+// 菜品列表-导入
+export function importMenuDishesApi(data) {
+  return request({
+    url: '/smart-canteen/menu_dishes/import/dishes',
+    method: 'post',
+    headers: {
+        "merchant-id":"378915229716713472",
+    },
+    data: data
+  })
+}
 
 
 
diff --git a/src/api/dish/menu.js b/src/api/dish/menu.js
index ba66d826..dadae61f 100644
--- a/src/api/dish/menu.js
+++ b/src/api/dish/menu.js
@@ -138,11 +138,19 @@ export function getMenuRecipeTemplateDetailApi(data) {
     data: data
   })
 }
-
-
-
-
-
+ 
+
+export function menuUpLoadApi(param){
+  const formData = new FormData()
+  formData.append('file', param.file)
+  formData.append('recipeId', param.recipeId)
+  return request({
+    url: '/smart-canteen/menu_recipe/recipe/import/dishes',
+    method: 'post',
+    data: formData,
+    header:'multipart/form-data'
+  })
+}
 
 
 
diff --git a/src/views/accountCenter/cardManage/cardRecord/index.vue b/src/views/accountCenter/cardManage/cardRecord/index.vue
index 3610a5d5..c4323df5 100644
--- a/src/views/accountCenter/cardManage/cardRecord/index.vue
+++ b/src/views/accountCenter/cardManage/cardRecord/index.vue
@@ -29,7 +29,7 @@
         <el-row :gutter="10" class="mb8"> 
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table v-loading="loading" :data="tableListData1" height="550" ref="multipleTable1" :row-key="(row)=>{return row.tradeId}" @selection-change="handleSelectionChange1"> 
+        <el-table v-loading="loading" :data="tableListData1" height="550"> 
             <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
             <el-table-column label="序号" align="center" width="100" type="index" >
                 <template scope="scope">
@@ -179,14 +179,9 @@
                 "endDateTime":this.formatDate(this.dateRange[1])
             } 
             param.type=1
-            this.tableListData1 = []
-            this.total1 = 0
             accCardHistoryListApi(param).then(response => {
                 this.tableListData1 = response.rows;
-                this.total1 = Number(response.total);
-                // if(this.tableListData1.length>0){
-                //     this.tableListData1.push(response.data.sumVO)   
-                // }
+                this.total1 = Number(response.total); 
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index b83b90fc..7243b5dc 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -989,6 +989,79 @@
         </div>
       </el-dialog>
 
+
+      <!-- 批量导入预览 -->
+      <el-dialog title="批量导入预览" :visible.sync="openResult" width="1200px" append-to-body>
+        <div style="font-weight: 600;" v-if="resultData.successList&&resultData.errorList">导入的表格分析结果: (总笔数: {{ resultData.successList.length+resultData.errorList.length }} ， 无效的笔数：{{resultData.errorList.length}})</div>
+        <div style="font-weight: 600;color: #42d885;">导入成功</div>
+        <el-table :data="resultData.successList" height="300">
+            <el-table-column label="序号" type="index" width="60" :show-overflow-tooltip="true"/>
+            <el-table-column label="菜品名称" align="center" prop="dishesName" :show-overflow-tooltip="true"/>
+            <el-table-column label="菜品价格" align="center" key="price" prop="price" :show-overflow-tooltip="true" width="100"/>
+            <el-table-column label="菜品类型" align="center" prop="dishesTypeName" :show-overflow-tooltip="true"/>
+            <el-table-column label="原材料" align="center" prop="menuMaterialNames" :show-overflow-tooltip="true"/>
+            <el-table-column label="销售方式" align="center" prop="salesMode" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span v-if="scope.row.salesMode==1">按份</span>
+                <span v-if="scope.row.salesMode==2">称重</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="称重单位" align="center" prop="unitPrice" :show-overflow-tooltip="true"/>
+            <el-table-column label="规格类型" align="center" prop="sizeType" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span v-if="scope.row.sizeType==1">标准</span>
+                <span v-if="scope.row.sizeType==2">大小份</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="标准份量" align="center" prop="weight" :show-overflow-tooltip="true"/>
+            <el-table-column label="大份单价" align="center" prop="largePrice" :show-overflow-tooltip="true"/>
+            <el-table-column label="大份份量" align="center" prop="largeWeight" :show-overflow-tooltip="true"/>
+            <el-table-column label="小份单价" align="center" prop="littlePrice" :show-overflow-tooltip="true"/>
+            <el-table-column label="小份份量" align="center" prop="littleWeight" :show-overflow-tooltip="true"/>
+            <el-table-column label="区域名称" align="center" prop="areaName" :show-overflow-tooltip="true"/>
+            <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
+            <el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true"/>
+            <el-table-column label="灶类" align="center" prop="cookName" :show-overflow-tooltip="true"/>
+        </el-table>
+        <div style="font-weight: 600;color: red;">导入错误</div>
+        <el-table :data="resultData.errorList" height="300">
+            <el-table-column label="序号" type="index" width="60" :show-overflow-tooltip="true"/>
+            <el-table-column label="失败原因" align="center" prop="failReason" :show-overflow-tooltip="true" width="150"/>
+            <el-table-column label="菜品名称" align="center" prop="dishesName" :show-overflow-tooltip="true"/>
+            <el-table-column label="菜品价格" align="center" key="price" prop="price" :show-overflow-tooltip="true"/>
+            <el-table-column label="菜品类型" align="center" prop="dishesTypeName" :show-overflow-tooltip="true"/>
+            <el-table-column label="原材料" align="center" prop="menuMaterialNames" :show-overflow-tooltip="true"/>
+            <el-table-column label="销售方式" align="center" prop="salesMode" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span v-if="scope.row.salesMode==1">按份</span>
+                <span v-if="scope.row.salesMode==2">称重</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="称重单位" align="center" prop="unitPrice" :show-overflow-tooltip="true"/>
+            <el-table-column label="规格类型" align="center" prop="sizeType" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <span v-if="scope.row.sizeType==1">标准</span>
+                <span v-if="scope.row.sizeType==2">大小份</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="标准份量" align="center" prop="weight" :show-overflow-tooltip="true"/>
+            <el-table-column label="大份单价" align="center" prop="largePrice" :show-overflow-tooltip="true"/>
+            <el-table-column label="大份份量" align="center" prop="largeWeight" :show-overflow-tooltip="true"/>
+            <el-table-column label="小份单价" align="center" prop="littlePrice" :show-overflow-tooltip="true"/>
+            <el-table-column label="小份份量" align="center" prop="littleWeight" :show-overflow-tooltip="true"/>
+            <el-table-column label="区域名称" align="center" prop="areaName" :show-overflow-tooltip="true"/>
+            <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true"/>
+            <el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true"/>
+            <el-table-column label="灶类" align="center" prop="cookName" :show-overflow-tooltip="true"/> 
+            
+        </el-table> 
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="confirmUpdateList" v-if="resultData.successList&&resultData.successList.length>0">确认导入数据</el-button>
+          <!-- <el-button type="primary" @click="confirmBatchEdit" v-else>继 续</el-button>  -->
+          <el-button @click="openResult=false">取 消</el-button>
+        </div>
+      </el-dialog>
+
       <el-dialog :visible.sync="dialogVisible">
         <img width="100%" :src="dialogImageUrl" alt="">
       </el-dialog>
@@ -1000,7 +1073,7 @@
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall";
   import { menuDishesTypeAllListApi,addMenuDishesTypeApi, editMenuDishesTypeApi, removeMenuDishesTypeApi} from "@/api/dish/dish";//菜品类别
-  import { getMenuDishesListApi,addMenuDishesApi, editMenuDishesApi,menuDishesDetailApi,removeMenuDishesApi } from "@/api/dish/dish";
+  import { getMenuDishesListApi,addMenuDishesApi, editMenuDishesApi,menuDishesDetailApi,removeMenuDishesApi,importMenuDishesApi } from "@/api/dish/dish";
   import { getDishesTypeListApi } from "@/api/dish/dish";
   import { getMaterialListApi } from "@/api/dish/material"; 
   import { imgUpLoadTwo } from '@/api/system/upload'
@@ -1157,6 +1230,8 @@
         },
         materialList:[],
         materialOptions:[],
+        openResult:false,
+        resultData:{}
       };
     },
     created() {
@@ -1675,10 +1750,26 @@
         console.log(response)
           this.upload.isUploading = false
           this.$refs.upload.clearFiles()
-          this.$modal.msgSuccess("后台导入中，请稍后刷新列表！");
-          this.getList()
+          if(response.code==200){
+            this.resultData=response.data
+            this.openResult=true
+          }else{
+            this.$modal.msgError("导入校验失败，请重新选择文件！");
+          }
       },
+      confirmUpdateList(){
+        console.log(this.resultData)
+        importMenuDishesApi(this.resultData.successList).then(response => {
+          if(response.code==200){
+            this.openResult=false
+            this.$modal.msgSuccess("导入完成");
+            this.getList()
+          }else{
+            this.$modal.msgError(response.msg);
+          } 
+        }).catch(() => {});
 
+      },
       /** 下载模板操作 */
       importTemplate() {
         let url = window.location.origin + '/glweb/template/批量新增菜品模板.xlsx';
diff --git a/src/views/dish/menu/detail.vue b/src/views/dish/menu/detail.vue
index 766cbcae..2157e347 100644
--- a/src/views/dish/menu/detail.vue
+++ b/src/views/dish/menu/detail.vue
@@ -114,7 +114,7 @@
  
         <!-- 选择菜品 -->
         <el-dialog title="选择菜品" :visible.sync="openDishes" width="90%" append-to-body >
-            <div style="width: 100%;height:620px;display: flex;align-items: center;color: #000;">   
+            <div style="width: 100%;height:640px;display: flex;align-items: center;color: #000;">   
                 <div class="dialog-left">
                     <div>已选菜品数量：{{dishesList.length}}</div>
                     <div>
@@ -138,19 +138,18 @@
                         <div style="font-weight: bold;margin: 10px 0;">菜品名称</div>
                         <el-input  v-model="queryDish.dishesName" placeholder="请输入菜品名称" maxlength="30" clearable @input="getDishesPage"/>
                     </div>
-                    <div style="margin-top: 20px;">
-                        <el-card style="width: 100%;height: 360px;">
+                    <div style="padding-top: 20px;">
+                        <el-card style="width: 100%;height: 380px;">
                             <div slot="header">
                                 <span>菜品</span> 
                             </div>
-                            <div style="width: 100%;height: 350px;overflow-y: auto;">
+                            <div style="width: 100%;height: 320px;overflow-y: auto;">
                                 <div v-for="item in dishesPageList" :key="item.dishesId" class="dish-name" @click="chosenDishes(item)">
                                     <span v-if="item.sizeType==1">【标准】</span>
                                     <span v-if="item.sizeType==2">【大小份】</span>
                                     <span>{{ item.dishesName }}</span>
                                     <i class="el-icon-check" v-if="item.isChecked"></i>
-                                </div>
-                                 
+                                </div> 
                             </div>
                         </el-card> 
                     </div> 
@@ -163,7 +162,7 @@
                     </div> 
                 </div>
                 <div class="dialog-right">
-                    <el-table :data="dishesTableList" height="450">
+                    <el-table :data="dishesTableList" height="620">
                         <el-table-column label="菜品编号" align="center" prop="dishesNum" />
                         <el-table-column label="菜品名称" align="center" prop="dishesName" />
                         <el-table-column label="所属食堂" align="center" prop="canteenName" />
@@ -860,7 +859,7 @@ export default {
             getDishesByTypePageApi(param).then((response) => {
                 // console.log(response)
                 this.dishesPageList = response.rows;
-                for(let i =0 ;i < this.dishesList.length ;i++){
+                for(let i =0 ;i < this.dishesList.length;i++){
                     this.dishesPageList.forEach(item=>{
                         if(item.dishesId==this.dishesList[i].dishesId){
                             item.isChecked=true
diff --git a/src/views/dish/menu/edit.vue b/src/views/dish/menu/edit.vue
index 3aaaec3d..15f9b213 100644
--- a/src/views/dish/menu/edit.vue
+++ b/src/views/dish/menu/edit.vue
@@ -139,11 +139,11 @@
                         <el-input  v-model="queryDish.dishesName" placeholder="请输入菜品名称" maxlength="30" clearable @input="getDishesPage"/>
                     </div>
                     <div style="margin-top: 20px;">
-                        <el-card style="width: 100%;height: 360px;">
+                        <el-card style="width: 100%;height: 380px;">
                             <div slot="header">
                                 <span>菜品</span> 
                             </div>
-                            <div style="width: 100%;height: 350px;overflow-y: auto;">
+                            <div style="width: 100%;height: 320px;overflow-y: auto;">
                                 <div v-for="item in dishesPageList" :key="item.dishesId" class="dish-name" @click="chosenDishes(item)">
                                     <span v-if="item.sizeType==1">【标准】</span>
                                     <span v-if="item.sizeType==2">【大小份】</span>
@@ -163,7 +163,7 @@
                     </div> 
                 </div>
                 <div class="dialog-right">
-                    <el-table :data="dishesTableList" height="450">
+                    <el-table :data="dishesTableList" height="620">
                         <el-table-column label="菜品编号" align="center" prop="dishesNum" />
                         <el-table-column label="菜品名称" align="center" prop="dishesName" />
                         <el-table-column label="所属食堂" align="center" prop="canteenName" />
diff --git a/src/views/dish/menu/index.vue b/src/views/dish/menu/index.vue
index adf312f1..28ac341d 100644
--- a/src/views/dish/menu/index.vue
+++ b/src/views/dish/menu/index.vue
@@ -78,10 +78,10 @@
                     <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="区域名称" align="center" prop="areaName" fixed="left" width="150"/>
-            <el-table-column label="食堂名称" align="center" prop="canteenName" fixed="left" width="150"/>
-            <el-table-column label="档口名称" align="center" prop="stallName" fixed="left" width="150"/>
-            <el-table-column label="菜谱名称" align="center" prop="recipeName" width="200">
+            <el-table-column label="区域名称" align="center" prop="areaName" :show-overflow-tooltip="true" fixed="left" width="120"/>
+            <el-table-column label="食堂名称" align="center" prop="canteenName" :show-overflow-tooltip="true" fixed="left" width="120"/>
+            <el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true" fixed="left" width="150"/>
+            <el-table-column label="菜谱名称" align="center" prop="recipeName" :show-overflow-tooltip="true" width="200">
                 <template slot-scope="scope">
                     <div style="display: flex;align-items: center;justify-content: center;"  v-if="activeName=='currentRecipe'">
                         <span v-if="scope.row.recipeId">{{scope.row.recipeName}}</span> 
@@ -100,21 +100,38 @@
                 </template>
             </el-table-column> 
 
-            <el-table-column v-for="item in mealTimeList" :key="item.mealtimeType" :label="item.mealtimeName" align="center" v-if="activeName=='currentRecipe'" width="200">
+            <el-table-column v-for="item in mealTimeList" :key="item.mealtimeType" :label="item.mealtimeName" :show-overflow-tooltip="true" align="center" v-if="activeName=='currentRecipe'" width="140">
                 <template slot-scope="scope">
-                    <div v-if="scope.row.detail">
-                        <div v-for="subItem in scope.row.detail.details" :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>
-                                    <div v-if="index==4">...</div>
+                    <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-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>
+                                        </div>
+                                    </div>
                                 </div> 
                             </div>
+                            <div v-else>
+                                <span>无菜品</span>
+                            </div> 
+                        </div>
+
+                        <div v-if="scope.row.detail">
+                            <div v-for="subItem in scope.row.detail.details" :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>
+                                        <div v-if="index==4">...</div>
+                                    </div> 
+                                </div>
+                            </div> 
+                        </div>
+                        <div v-else>
+                            <span>无菜品</span>
                         </div> 
-                    </div>
-                    <div v-else>
-                        <span>无菜品</span>
-                    </div> 
+                    </el-tooltip>
                 </template>
             </el-table-column> 
             <el-table-column label="菜谱更新时间" align="center" prop="uptime" width="150" v-if="activeName=='currentRecipe'"/>
@@ -145,17 +162,18 @@
             </el-table-column>
             <el-table-column label="用户范围" align="center" prop="effName" v-if="activeName=='pageRecipe'"/>
             
-            <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right"  v-if="activeName=='currentRecipe'&&queryParams.key=='2'" >
+            <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" v-if="activeName=='currentRecipe'" >
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
-                    type="text"
+                    type="text" v-if="queryParams.key=='2'"
                     @click="handleDevice(scope.row)" 
                     >设备详情</el-button> 
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right" v-if="activeName=='pageRecipe'">
-                <template slot-scope="scope"> 
+            <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right" v-if="activeName=='pageRecipe'">
+                <template slot-scope="scope">   
+                    
                     <el-button
                     size="mini"
                     type="text" 
@@ -168,6 +186,11 @@
                     icon="el-icon-delete"
                     @click="handleDelete(scope.row)" 
                     >删除</el-button>
+                    <el-button
+                    size="mini"
+                    type="text" v-if="scope.row.recipeType==1" 
+                    @click="handleImport(scope.row)" 
+                    >导入</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -205,7 +228,38 @@
             </div>
         </el-dialog>
 
-
+        <el-dialog title="批量导入" :visible.sync="openUpload" width="500px" append-to-body>
+            <div style="font-weight: 600;margin-bottom: 10px;">说明：请按下载的模板填写数据并导入。</div>
+            <div style="width: 80%;display: flex;align-items: center;justify-content: space-between;">
+                <span>1、下载模板，按规范填写信息</span>
+                <el-button
+                    size="mini" type="text"
+                    @click="importTemplate" 
+                    style="margin-left: 40px;"
+                    >模板下载
+                </el-button> 
+            </div>
+            <div style="width: 80%;display: flex;align-items: center;justify-content: space-between;">
+                <span>2、上传文件</span>
+                <el-upload
+                  ref="upload"
+                  :http-request="fileUpLoad"
+                  action="#"
+                  :limit="1"
+                  accept=".xlsx, .xls" 
+                  :show-file-list="false"   
+              >
+                  <el-button
+                    type="text"
+                    size="mini"  
+                    >上传导入
+                </el-button>
+              </el-upload>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="openUpload=false">确 定</el-button> 
+            </div>
+        </el-dialog>
 
 
     </div>
@@ -214,7 +268,9 @@
   <script>
   import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall";
   import { mealTimeListApi,menuTypeListApi } from "@/api/dish/menu"; 
-  import { getCurrentRecipeListApi, getPageRecipeListApi,removeMenuRecipeApi,unbindMenuRecipeApi } from "@/api/dish/menu"; 
+  import { getCurrentRecipeListApi, getPageRecipeListApi,removeMenuRecipeApi,unbindMenuRecipeApi,menuUpLoadApi } from "@/api/dish/menu"; 
+  import { getToken } from '@/utils/auth'
+  import { downloadFileByUrl } from '@/utils/download'
   export default {
     name: "",
     dicts: [],
@@ -275,6 +331,17 @@
                 { required: true, message: "菜谱名称不能为空", trigger: "change" }
             ] 
         },
+         //导入参数
+         upload: {  
+          // 是否禁用上传
+          isUploading: false, 
+          // 设置上传的请求头部
+          headers: { Authorization: 'Bearer ' + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + '/smart-canteen/menu_recipe/recipe/import/dishes',
+        }, 
+        uploadRow:{},
+        openUpload:false
       };
     },
     created() { 
@@ -583,7 +650,33 @@
                 }
             });
         },
-        
+
+        /** 修改按钮操作 */
+        handleImport(row) { 
+            this.uploadRow = row
+            this.openUpload = true 
+        },
+        fileUpLoad(param){
+            param.recipeId = this.uploadRow.recipeId
+            menuUpLoadApi(param).then((res) => {
+              if (res.code == 200) {
+                this.$modal.msgSuccess("操作成功");
+                this.openUpload = false; 
+                this.getList()
+              } else {
+                this.$modal.msgError(res.msg);
+              }
+          }).catch((error) => { 
+            
+              this.$modal.msgError(error)
+          })
+        }, 
+        /** 下载模板操作 */
+        importTemplate() {
+            let url = window.location.origin + '/glweb/template/导入菜谱模板.xlsx'; 
+            downloadFileByUrl(url)
+        },
+            
     }
   };
   </script>
diff --git a/src/views/reportCenter/inComeSum/deptPaymentSum/index.vue b/src/views/reportCenter/inComeSum/deptPaymentSum/index.vue
index a1d2ecc5..407cf82f 100644
--- a/src/views/reportCenter/inComeSum/deptPaymentSum/index.vue
+++ b/src/views/reportCenter/inComeSum/deptPaymentSum/index.vue
@@ -44,74 +44,38 @@
                     <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
                 </template>
         </el-table-column> 
-        <el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="180"/> 
+        <el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true"/> 
 
-        <el-table-column label="上期余额" align="center" prop="accAllBal" :show-overflow-tooltip="true" width="100">
+        <el-table-column label="上期余额" align="center" prop="lastWalletBal" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-                <span>{{ (scope.row.accAllBal/100).toFixed(2) }}</span>
+                <span>{{ (scope.row.lastWalletBal/100).toFixed(2) }}</span>
             </template> 
         </el-table-column>  
-        <el-table-column label="账户总收入" align="center" prop="accAllBal" :show-overflow-tooltip="true" width="100">
-            <template slot-scope="scope">
-                <span>{{ (scope.row.accAllBal/100).toFixed(2) }}</span>
-            </template> 
-        </el-table-column>  
-        <el-table-column label="其他总收入" align="center" prop="accAllBal" :show-overflow-tooltip="true" width="100">
-            <template slot-scope="scope">
-                <span>{{ (scope.row.accAllBal/100).toFixed(2) }}</span>
-            </template> 
-        </el-table-column> 
-        <el-table-column label="账户总支出" align="center" prop="accAllBal" :show-overflow-tooltip="true" width="100">
-            <template slot-scope="scope">
-                <span>{{ (scope.row.accAllBal/100).toFixed(2) }}</span>
-            </template> 
-        </el-table-column>  
-        <el-table-column label="其他总支出" align="center" prop="accAllBal" :show-overflow-tooltip="true" width="100">
-            <template slot-scope="scope">
-                <span>{{ (scope.row.accAllBal/100).toFixed(2) }}</span>
-            </template> 
-        </el-table-column>  
-        <el-table-column label="账户余额" align="center" prop="accAllBal" :show-overflow-tooltip="true" width="100">
-            <template slot-scope="scope">
-                <span>{{ (scope.row.accAllBal/100).toFixed(2) }}</span>
-            </template> 
-        </el-table-column>  
-       
-        <!-- <el-table-column label="收入" align="center" prop="income" :show-overflow-tooltip="true" width="100">
+        <el-table-column label="账户总收入" align="center" prop="income" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
                 <span>{{ (scope.row.income/100).toFixed(2) }}</span>
             </template> 
+        </el-table-column>  
+        <el-table-column label="其他总收入" align="center" prop="otherIncome" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+                <span>{{ (scope.row.otherIncome/100).toFixed(2) }}</span>
+            </template> 
         </el-table-column> 
-        <el-table-column label="支出" align="center" prop="outcome" :show-overflow-tooltip="true" width="100">
+        <el-table-column label="账户总支出" align="center" prop="outcome" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
                 <span>{{ (scope.row.outcome/100).toFixed(2) }}</span>
             </template> 
-        </el-table-column>   -->
-       
-        <!-- <el-table-column label="交易时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/> 
-        <el-table-column label="交易类型" align="center" prop="tradeType" :show-overflow-tooltip="true" width="120">
-          <template slot-scope="scope">
-            <span v-if="scope.row.tradeType==10">充值</span>
-            <span v-if="scope.row.tradeType==20">补贴</span>
-            <span v-if="scope.row.tradeType==30">提现</span>
-            <span v-if="scope.row.tradeType==100">清空</span>
-            <span v-if="scope.row.tradeType==110">消费</span>
-            <span v-if="scope.row.tradeType==130">消费退款</span>
-          </template>
-        </el-table-column> 
-        <el-table-column label="支付方式" align="center" prop="payType" :show-overflow-tooltip="true" width="120">
-          <template slot-scope="scope">
-            <span v-if="scope.row.payType==1">账户支付</span>
-            <span v-if="scope.row.payType==2">现金支付</span>
-            <span v-if="scope.row.payType==3">餐券支付</span>
-            <span v-if="scope.row.payType==4">设备现金支付</span>
-            <span v-if="scope.row.payType==5">补贴支付</span>
-            <span v-if="scope.row.payType==6">红包支付</span>
-          </template>
         </el-table-column>  
-        <el-table-column label="设备编号" align="center" prop="machineSn" :show-overflow-tooltip="true" width="180"/> 
-        <el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="120"/>
-        <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/>  -->
+        <el-table-column label="其他总支出" align="center" prop="otherOutcome" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                <span>{{ (scope.row.otherOutcome/100).toFixed(2) }}</span>
+            </template> 
+        </el-table-column>  
+        <el-table-column label="账户余额" align="center" prop="walletBal" :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+                <span>{{ (scope.row.walletBal/100).toFixed(2) }}</span>
+            </template> 
+        </el-table-column>
         
         <!-- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope"> 
diff --git a/src/views/reportCenter/inComeSum/psnPaymentSum/index.vue b/src/views/reportCenter/inComeSum/psnPaymentSum/index.vue
index 5b1b464a..374d0e66 100644
--- a/src/views/reportCenter/inComeSum/psnPaymentSum/index.vue
+++ b/src/views/reportCenter/inComeSum/psnPaymentSum/index.vue
@@ -47,56 +47,39 @@
                   <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
               </template>
       </el-table-column>
-      <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
-      <el-table-column label="用户姓名" align="center" prop="userName" :show-overflow-tooltip="true" width="120" fixed="left"/>
-      <el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="组织全称" align="center" prop="deptFullName" :show-overflow-tooltip="true" width="180"/> 
-      <el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="收入" align="center" prop="income" :show-overflow-tooltip="true" width="100">
+      <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120"  />
+      <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120"  />
+      <el-table-column label="用户手机号" align="center" prop="phonenumber" :show-overflow-tooltip="true" width="120"/> 
+      <el-table-column label="上期余额" align="center" prop="lastWalletBal" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <span>{{ (scope.row.lastWalletBal/100).toFixed(2) }}</span>
+          </template> 
+      </el-table-column> 
+      <el-table-column label="本期余额" align="center" prop="walletBalNow" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <span>{{ (scope.row.walletBalNow/100).toFixed(2) }}</span>
+          </template> 
+      </el-table-column>  
+      <el-table-column label="总收入" align="center" prop="income" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
               <span>{{ (scope.row.income/100).toFixed(2) }}</span>
           </template> 
-      </el-table-column> 
-      <el-table-column label="支出" align="center" prop="outcome" :show-overflow-tooltip="true" width="100">
+      </el-table-column>  
+      
+      <el-table-column label="总支出" align="center" prop="outcome" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
               <span>{{ (scope.row.outcome/100).toFixed(2) }}</span>
           </template> 
       </el-table-column>  
-      <el-table-column label="账户余额" align="center" prop="accAllBal" :show-overflow-tooltip="true" width="100">
+     
+      <el-table-column label="账户余额" align="center" prop="walletBal" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
-              <span>{{ (scope.row.accAllBal/100).toFixed(2) }}</span>
+              <span>{{ (scope.row.walletBal/100).toFixed(2) }}</span>
           </template> 
-      </el-table-column>  
-      <el-table-column label="交易时间" align="center" prop="tradeTime" :show-overflow-tooltip="true" width="160"/> 
-      <el-table-column label="交易类型" align="center" prop="tradeType" :show-overflow-tooltip="true" width="120">
-        <template slot-scope="scope">
-          <span v-if="scope.row.tradeType==10">充值</span>
-          <span v-if="scope.row.tradeType==20">补贴</span>
-          <span v-if="scope.row.tradeType==30">提现</span>
-          <span v-if="scope.row.tradeType==100">清空</span>
-          <span v-if="scope.row.tradeType==110">消费</span>
-          <span v-if="scope.row.tradeType==130">消费退款</span>
-        </template>
-      </el-table-column> 
-      <el-table-column label="支付方式" align="center" prop="payType" :show-overflow-tooltip="true" width="120">
-        <template slot-scope="scope">
-          <span v-if="scope.row.payType==1">账户支付</span>
-          <span v-if="scope.row.payType==2">现金支付</span>
-          <span v-if="scope.row.payType==3">餐券支付</span>
-          <span v-if="scope.row.payType==4">设备现金支付</span>
-          <span v-if="scope.row.payType==5">补贴支付</span>
-          <span v-if="scope.row.payType==6">红包支付</span>
-        </template>
-      </el-table-column>  
-      <el-table-column label="设备编号" align="center" prop="machineSn" :show-overflow-tooltip="true" width="180"/> 
-      <el-table-column label="设备名称" align="center" prop="deviceName" :show-overflow-tooltip="true" width="120"/>
-      <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/> 
+      </el-table-column>
       
-      <!-- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope"> 
           <el-button
             size="mini"
@@ -104,7 +87,7 @@
             @click="handleView(scope.row)" 
           >详情</el-button> 
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -114,12 +97,60 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     /> 
+
+      <el-dialog title="查看" :visible.sync="openView" width="800px" append-to-body>
+        <div style="width: 100%;height: 300px;overflow-y: auto;">
+            <el-descriptions class="margin-top" title="" :column="2" size="small" border>  
+                <el-descriptions-item>
+                    <template slot="label">组织全称</template>
+                    {{ rowData.deptFullName }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                    <template slot="label">用户姓名</template>
+                    {{ rowData.nickName }}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                    <template slot="label">用户编号</template>
+                    {{rowData.userId}}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                    <template slot="label">用户手机号</template>
+                    {{ rowData.phonenumber }}
+                </el-descriptions-item> 
+                <el-descriptions-item>    
+                    <template slot="label">上期余额</template>
+                    {{ (rowData.lastWalletBal/100).toFixed(2) }}
+                </el-descriptions-item> 
+                <el-descriptions-item>
+                    <template slot="label">本期余额</template>
+                    {{ (rowData.walletBalNow/100).toFixed(2) }}
+                </el-descriptions-item> 
+                <el-descriptions-item>
+                    <template slot="label">总收入</template>
+                    {{ (rowData.income/100).toFixed(2) }}
+                </el-descriptions-item> 
+                <el-descriptions-item>
+                    <template slot="label">总支出</template>
+                    {{ (rowData.outcome/100).toFixed(2) }}
+                </el-descriptions-item> 
+                <el-descriptions-item>
+                    <template slot="label">账户余额</template>
+                    {{ (rowData.walletBal/100).toFixed(2) }}
+                </el-descriptions-item> 
+
+            </el-descriptions> 
+        </div> 
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="openView=false">确 定</el-button>
+          <el-button @click="openView=false">取 消</el-button>
+        </div>
+      </el-dialog>
   </div>
 </template>
 
 <script>
 import { deptTreeSelect } from '@/api/system/user' 
-import { reportTradFlowListApi } from "@/api/reportCenter/index";
+import { reportUserIncomeListApi } from "@/api/reportCenter/index";
 export default {//交易流水
   name: "",
   dicts: ['sys_user_type'], 
@@ -180,7 +211,9 @@ export default {//交易流水
         pageSize: 10, 
         deptIdList:[],
         searchValue:null
-      }, 
+      },
+      rowData:{},
+      openView:false,
     };
   },
   created() {  
@@ -231,12 +264,18 @@ export default {//交易流水
               "startDateTime":this.formatDate(this.dateRange[0]),
               "endDateTime":this.formatDate(this.dateRange[1])
           }
-          reportTradFlowListApi(param).then(response => {
+          reportUserIncomeListApi(param).then(response => {
               this.tableListData = response.rows;
               this.total = Number(response.total);
               this.loading = false;
           });
       },
+      handleView(row){
+        this.rowData = row;
+        this.openView = true
+      },
+
+
       defaultDateRange() {
         const end = new Date(new Date().toLocaleDateString());
         end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);