From 240c71b511591b766cdbc8835f6acea8a318364b Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 9 May 2025 15:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 .env.production                               |   2 +-
 .env.staging                                  |   2 +-
 package.json                                  |   2 +-
 src/api/accountCenter/card.js                 |  14 +-
 src/api/accountCenter/consume.js              |   2 +-
 src/api/device/index.js                       |   8 +-
 src/api/dish/dish.js                          |   8 +-
 .../accountCenter/account/consume/index.vue   | 312 ++++++++++++++++++
 src/views/accountCenter/butie/butie/index.vue |  20 +-
 .../cardManage/cardList/index.vue             |  19 +-
 .../cardManage/cardRecord/index.vue           |  25 +-
 src/views/base/canteenStall/area/index.vue    |   2 +-
 src/views/base/mobile/evaManeager/index.vue   |   6 +-
 src/views/device/doubleScreen/index.vue       |   8 +-
 src/views/dish/dish/index.vue                 |   4 +-
 .../material/components/MaterialDialog.vue    |  38 ++-
 src/views/dish/menu/detail.vue                |  16 +-
 src/views/index.vue                           |   2 +-
 src/views/login.vue                           |   2 +-
 src/views/login1.vue                          |   2 +-
 src/views/register.vue                        |   2 +-
 src/views/register1.vue                       |   2 +-
 23 files changed, 435 insertions(+), 65 deletions(-)
 create mode 100644 src/views/accountCenter/account/consume/index.vue

diff --git a/.env.development b/.env.development
index e2949acf..40bd065d 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 博诺思管理系统
+VUE_APP_TITLE = 国网安徽经研院绿智食堂
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.production b/.env.production
index 46d5f12b..ef2a9a77 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 博诺思管理系统
+VUE_APP_TITLE = 国网安徽经研院绿智食堂
 
 # 生产环境配置
 ENV = 'production'
diff --git a/.env.staging b/.env.staging
index 455b9ac1..4738afe1 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 博诺思管理系统
+VUE_APP_TITLE = 国网安徽经研院绿智食堂
 
 NODE_ENV = production
 
diff --git a/package.json b/package.json
index 0768f633..eef04c86 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bonus",
   "version": "3.6.4",
-  "description": "博诺思管理系统",
+  "description": "国网安徽经研院绿智食堂",
   "author": "博诺思",
   "license": "MIT",
   "scripts": {
diff --git a/src/api/accountCenter/card.js b/src/api/accountCenter/card.js
index 35824883..15881200 100644
--- a/src/api/accountCenter/card.js
+++ b/src/api/accountCenter/card.js
@@ -37,7 +37,7 @@ export function accCardApi(data) {
       data: data
     })
 } 
-// 换卡/退卡
+// 换卡
 export function accCardChangeApi(data) {
     return request({
       url: '/smart-canteen/acc_card/change',
@@ -48,6 +48,18 @@ export function accCardChangeApi(data) {
       data: data
     })
 }
+//退卡
+
+export function accCardRefundApi(data) {
+  return request({
+    url: '/smart-canteen/acc_card/refund',
+    method: 'post',
+    headers: {
+        "merchant-id":"378915229716713472",
+    },
+    data: data
+  })
+}
 
 // 挂失
 export function accCardLossApi(data) {
diff --git a/src/api/accountCenter/consume.js b/src/api/accountCenter/consume.js
index 2a0f5be0..7c2c8324 100644
--- a/src/api/accountCenter/consume.js
+++ b/src/api/accountCenter/consume.js
@@ -51,7 +51,7 @@ export function consumeDeductSingleApi(data) {
   // 消费明细列表
   export function accountFlowPageApi(data) {
     return request({
-      url: '/smart-canteen/summary/account/flow/page',
+      url: '/smart-canteen/acc_trade/consume/detail',
       method: 'post',
       headers: {
           "merchant-id":"378915229716713472",
diff --git a/src/api/device/index.js b/src/api/device/index.js
index 2021e055..a6208f83 100644
--- a/src/api/device/index.js
+++ b/src/api/device/index.js
@@ -5,15 +5,11 @@ import request from '@/utils/request'
 export function getDeviceListPageApi(data) {
   return request({
     url: '/smart-canteen/doubleScreenMachine/getDoubleScreenMachineList',
-    method: 'post',
+    method: 'get',
     headers: {
         "merchant-id":"378915229716713472",
     },
-    data: data,
-    params:{
-      pageNum:data.pageNum,
-      pageSize:data.pageSize
-    }
+    params:data
   })
 } 
 
diff --git a/src/api/dish/dish.js b/src/api/dish/dish.js
index 682f3b84..a1a58874 100644
--- a/src/api/dish/dish.js
+++ b/src/api/dish/dish.js
@@ -47,7 +47,7 @@ export function addMenuDishesTypeApi(data) {
 // 菜品种类-修改 areaId typeId typeName
 export function editMenuDishesTypeApi(data) {
     return request({
-      url: '/smart-canteen/api/v1/menudishestype/edit',
+      url: '/smart-canteen/menu_material/updateMenuDishesType',
       method: 'post',
       headers: {
           "merchant-id":"378915229716713472",
@@ -56,14 +56,14 @@ export function editMenuDishesTypeApi(data) {
     })
 }
 // 菜品种类-删除  typeId
-export function removeMenuDishesTypeApi(typeId) {
+export function removeMenuDishesTypeApi(data) {
     return request({
-      url: '/smart-canteen/api/v1/menudishestype/remove/'+typeId,
+      url: '/smart-canteen/menu_material/delMenuDishesType',
       method: 'post',
       headers: {
           "merchant-id":"378915229716713472",
       },
-    //   data: data
+      data: data
     })
 }
  
diff --git a/src/views/accountCenter/account/consume/index.vue b/src/views/accountCenter/account/consume/index.vue
new file mode 100644
index 00000000..a49ee5ee
--- /dev/null
+++ b/src/views/accountCenter/account/consume/index.vue
@@ -0,0 +1,312 @@
+<template>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+        <el-form-item label="日期时间">
+            <el-date-picker
+                v-model="dateRange"
+                type="datetimerange"
+                align="right"
+                unlink-panels
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                format="yyyy-MM-dd HH:mm:ss" style="width: 400px"
+                :default-time="['00:00:00', '23:59:59']"
+                :picker-options="pickerOptions" >
+            </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="时间类型" prop="timeType">
+            <el-select v-model="queryParams.timeType" style="width: 240px" clearable> 
+                <el-option label="下单时间" :value="1"></el-option>
+                <el-option label="支付时间" :value="2"></el-option> 
+            </el-select>   
+        </el-form-item> -->
+        <el-form-item label="关键字"> 
+            <el-input v-model="queryParams.searchValue" placeholder="请输入关键字" maxlength="20" clearable style="width: 240px"/>
+        </el-form-item>
+        <el-form-item label="所属组织" prop="deptIdList">  
+            <el-cascader v-model="queryParams.deptIdList"
+            :options="deptOptions" :filterable="true" style="width: 240px" :show-all-levels="false"
+            :props="{ 
+                multiple: true,
+                emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
+                checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
+                value:'id',label:'label' 
+            }" clearable collapse-tags>
+            </el-cascader> 
+        </el-form-item>
+        <el-form-item label="用户类别">
+            <el-select v-model="queryParams.userType" style="width: 220px" clearable> 
+                <el-option
+                    v-for="dict in dict.type.sys_user_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="Number(dict.value)"
+                    />
+            </el-select>   
+        </el-form-item>
+        <!-- <el-form-item label="交易类型" prop="flowTypeList">
+            <el-select v-model="queryParams.flowTypeList" multiple style="width: 240px" clearable> 
+                <el-option label="消费" :value="110"></el-option>
+                <el-option label="消费补扣" :value="120"></el-option> 
+                <el-option label="消费退款" :value="130"></el-option> 
+            </el-select>   
+        </el-form-item>
+        <el-form-item label="钱包类型" prop="accWalletIdList">
+            <el-select v-model="queryParams.accWalletIdList" multiple style="width: 240px" clearable> 
+                <el-option label="个人钱包" value="1"></el-option>
+                <el-option label="补贴钱包" value="2"></el-option>
+                <el-option label="红包" value="4"></el-option> 
+            </el-select>   
+        </el-form-item>
+        <el-form-item label="是否在线" prop="ifOnlineList">
+            <el-select v-model="queryParams.ifOnlineList" multiple style="width: 240px" clearable> 
+                <el-option label="是" value="1"></el-option>
+                <el-option label="否" value="2"></el-option> 
+            </el-select>   
+        </el-form-item> -->   
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="tableListData" height="800" ref="multipleTable" :row-key="(row)=>{return row.orderId}"> 
+        <el-table-column label="序号" align="center" width="80" type="index" fixed="left">
+                <template slot-scope="scope">
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                </template>
+        </el-table-column>
+        <el-table-column label="账户交易号" align="center" prop="tradeId" :show-overflow-tooltip="true" width="180"/>
+        <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="100"/>
+        <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="100"/>
+        <!-- <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" width="120"/> -->
+        <el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true"/> 
+        <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="payTime" :show-overflow-tooltip="true"/>
+        <el-table-column label="下单时间" align="center" prop="orderTime" :show-overflow-tooltip="true"/>
+        <el-table-column label="交易类型" align="center" prop="tradeType" :show-overflow-tooltip="true" width="100">
+          <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="walletId" :show-overflow-tooltip="true" width="100">
+            <template slot-scope="scope">
+                <span v-if="scope.row.walletId==1">个人钱包</span>
+                <span v-if="scope.row.walletId==2">补贴钱包</span>
+                <span v-if="scope.row.walletId==4">红包</span>
+            </template> 
+        </el-table-column>
+        <el-table-column label="变动金额" align="center" prop="amount" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+                <span>{{ (scope.row.amount/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>
+  
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      /> 
+    </div>
+  </template>
+  
+  <script>
+  import { deptTreeSelect } from '@/api/system/user' 
+  import { accountFlowPageApi } from "@/api/accountCenter/consume";
+  export default {
+    name: "",
+    dicts: ['sys_user_type'], 
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        //表格数据
+        tableListData: [], 
+        // 是否显示弹出层
+        open: false, 
+        dateRange:this.defaultDateRange(),
+        pickerOptions: {
+          shortcuts: [{
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date(new Date().toLocaleDateString());
+              end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
+              const start = new Date((new Date().toLocaleDateString()));
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ 
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date(new Date().toLocaleDateString());
+              end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
+              const start = new Date((new Date().toLocaleDateString()));
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit('pick', [start, end]);
+            }
+          }, {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date(new Date().toLocaleDateString());
+              end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
+              const start = new Date((new Date().toLocaleDateString()));
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit('pick', [start, end]);
+            }
+          }]
+        },
+        deptOptions:[],//组织树 
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          // timeType:2,  
+          searchValue:null, 
+          deptIdList:[],
+          userType:null, 
+          // flowTypeList:[], 
+          // accWalletIdList:[], 
+          // ifOnlineList:[],  
+        },
+      };
+    },
+    created() {  
+        this.getDeptTree(); 
+        this.getList()
+    },
+    methods: { 
+        /** 查询部门下拉树结构 */
+        getDeptTree() {
+            deptTreeSelect().then((response) => {
+                this.deptOptions = this.filterTree(response.data)
+            })
+        },
+        filterTree(nodes) {
+            return nodes
+                .map((node) => {
+                    if (node.children) {
+                        node.children = this.filterTree(node.children)
+                    }
+                    return node
+                })
+                .filter((node) => node.status !== '1')
+        }, 
+ 
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams = {
+            pageNum: 1,
+            pageSize: 10,
+            // timeType:2,  
+            searchValue:null, 
+            deptIdList:[],
+            userType:null, 
+
+            // flowTypeList:[], 
+            // accWalletIdList:[], 
+            // ifOnlineList:[],  
+            }
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        /** 查询列表 */
+        getList() {
+            this.loading = true;
+            console.log(this.dateRange) 
+            let param = { 
+                ...this.queryParams, 
+                "tradeType":110,
+                "startDateTime":this.formatDate(this.dateRange[0]),
+                "endDateTime":this.formatDate(this.dateRange[1])
+            }
+            accountFlowPageApi(param).then(response => {
+                this.tableListData = response.rows;
+                this.total = Number(response.total);
+                this.loading = false;
+            });
+        },
+        defaultDateRange() {
+          const end = new Date(new Date().toLocaleDateString());
+          end.setTime(end.getTime() + 24 * 60 * 60 * 1000 - 1);
+          const start = new Date((new Date().toLocaleDateString()));
+          start.setTime(start.getTime());
+  
+          this.start = parseInt(start.getTime() / 1000)
+          this.end = parseInt(end.getTime() / 1000)
+          return [start, end]
+        }, 
+        //日期
+        formatDate(date) {
+            // 格式化为 YYYY-MM-DD
+            date = new Date(date)
+            const year = date.getFullYear();
+            const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从0开始
+            const day = String(date.getDate()).padStart(2, '0');
+            const hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+            const minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+            const seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        } 
+    }
+  };
+  </script>
+  <style scoped>
+    .remind-question{
+      width: 100%;
+      height: 50px;
+      font-size: 22px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .remind-title{
+      width: 100%;
+      height: 40px;
+      font-size: 16px;
+      font-weight: bold;
+      color: #000;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/accountCenter/butie/butie/index.vue b/src/views/accountCenter/butie/butie/index.vue
index e50a7d97..7c89d1fa 100644
--- a/src/views/accountCenter/butie/butie/index.vue
+++ b/src/views/accountCenter/butie/butie/index.vue
@@ -294,10 +294,10 @@
       <el-dialog title="批量补贴预览" :visible.sync="openResult" width="800px" append-to-body>
         <div>总人数： {{resultData.totalUserSum || '--' }} ， 补贴人数：{{resultData.validCount || '--' }}， 补贴总额：{{(resultData.validTotalAmount/100) || '--' }}， 无效人数：{{resultData.invalidCount || '--'}}</div>
         <el-table :data="resultData.errVOList" height="300">
-            <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
-            <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
-            <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" /> 
+            <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
+            <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
+            <el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" /> 
             <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"/>
@@ -308,7 +308,7 @@
                     <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
                 </template> 
             </el-table-column>
-            <el-table-column label="失败原因" align="center" prop="errMsg" :show-overflow-tooltip="true"/>
+            <el-table-column label="失败原因" align="center" prop="errorMessage" :show-overflow-tooltip="true"/>
         </el-table> 
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="openResult=false" v-if="resultData.validUserIdList&&resultData.validUserIdList.length==0">确 定</el-button>
@@ -481,10 +481,10 @@
       <el-dialog title="批量补贴清空预览" :visible.sync="openResult2" width="800px" append-to-body>
         <div>总人数： {{resultData2.totalUserSum || '--' }} ， 清空补贴人数：{{resultData2.validCount || '--' }}， 补贴总额：{{(resultData2.validTotalAmount/100).toFixed(2) || '--' }}， 无效人数：{{resultData2.invalidCount || '--'}}</div>
         <el-table :data="resultData2.errVOList" height="300">
-            <el-table-column label="用户编号" align="center" prop="custNum" :show-overflow-tooltip="true"  />
-            <el-table-column label="用户姓名" align="center" prop="custName" :show-overflow-tooltip="true" />
-            <el-table-column label="用户手机号" align="center" prop="mobile" :show-overflow-tooltip="true" />
-            <el-table-column label="所属组织" align="center" prop="orgFullName" :show-overflow-tooltip="true" /> 
+            <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  />
+            <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
+            <el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" />
+            <el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" /> 
             <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"/>
@@ -495,7 +495,7 @@
                     <span>{{ (scope.row.amount/100).toFixed(2) }}</span>
                 </template> 
             </el-table-column>
-            <el-table-column label="失败原因" align="center" prop="errMsg" :show-overflow-tooltip="true"/>
+            <el-table-column label="失败原因" align="center" prop="errorMessage" :show-overflow-tooltip="true"/>
         </el-table> 
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="openResult2=false" v-if="resultData2.validUserIdList&&resultData2.validUserIdList.length==0">确 定</el-button>
diff --git a/src/views/accountCenter/cardManage/cardList/index.vue b/src/views/accountCenter/cardManage/cardList/index.vue
index 1543e21a..817acc34 100644
--- a/src/views/accountCenter/cardManage/cardList/index.vue
+++ b/src/views/accountCenter/cardManage/cardList/index.vue
@@ -3,6 +3,9 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> 
         <el-form-item label="物理卡号" prop="serialNum">
             <el-input v-model="queryParams.serialNum" placeholder="请输入物理卡号" maxlength="20" clearable style="width: 240px"/>
+        </el-form-item>
+        <el-form-item label="用户编号" prop="userId">
+            <el-input v-model="queryParams.userId" placeholder="请输入用户编号" maxlength="20" clearable style="width: 240px"/>
         </el-form-item> 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -19,8 +22,8 @@
                 <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" fixed="left"/>
-        <!-- <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/> -->
+        <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"/>
+        <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120"/>
         <el-table-column label="物理卡号" align="center" prop="serialNum" :show-overflow-tooltip="true"/>
         <!-- <el-table-column label="卡类别" align="center" prop="cardType" :show-overflow-tooltip="true" width="120"></el-table-column> -->
         <el-table-column label="卡状态" align="center" prop="cardStatus" :show-overflow-tooltip="true">
@@ -100,7 +103,7 @@
   
   <script>
   import { deptTreeSelect } from '@/api/system/user'
-  import { accCardListApi,accCardChangeApi,accCardLossApi,accCardRelieveApi } from "@/api/accountCenter/card";
+  import { accCardListApi,accCardChangeApi,accCardRefundApi,accCardLossApi,accCardRelieveApi } from "@/api/accountCenter/card";
   
   export default {
     name: "",
@@ -131,10 +134,11 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          accStatusList:[], 
-          deptIdList:[],   
+          // accStatusList:[], 
+          // deptIdList:[],   
           serialNum:null,
-          walletType:null, 
+          userId:null,
+          // walletType:null, 
         },
         openCard:false,//发卡弹窗
         cardForm:{
@@ -187,6 +191,7 @@
               "pageNum": this.queryParams.pageNum, 
               "pageSize": this.queryParams.pageSize,
               "serialNum": this.queryParams.serialNum,
+              "userId": this.queryParams.userId,
             //   "accStatusList": this.queryParams.accStatusList,
             //   "deptIdList": this.queryParams.deptIdList,   
             //   "walletType": this.queryParams.walletType, 
@@ -227,7 +232,7 @@
         /** 退卡按钮操作 */
         handleReturn(row) {  
             this.$modal.confirm('是否确认退卡？').then(function() {
-                return  accCardChangeApi({"accId":row.accId});
+                return  accCardRefundApi({"accId":row.accId});
             }).then(() => {
                 this.getList();
                 this.$modal.msgSuccess("退卡成功");
diff --git a/src/views/accountCenter/cardManage/cardRecord/index.vue b/src/views/accountCenter/cardManage/cardRecord/index.vue
index c4323df5..f75b699c 100644
--- a/src/views/accountCenter/cardManage/cardRecord/index.vue
+++ b/src/views/accountCenter/cardManage/cardRecord/index.vue
@@ -18,6 +18,9 @@
             <el-form-item label="物理卡号" prop="serialNum">
                 <el-input v-model="queryParams1.serialNum" placeholder="请输入物理卡号" maxlength="20" clearable style="width: 240px"/>
             </el-form-item>
+            <el-form-item label="用户编号" prop="userId">
+                <el-input v-model="queryParams1.userId" placeholder="请输入用户编号" maxlength="20" clearable style="width: 240px"/>
+            </el-form-item> 
             <el-form-item label="操作员">
                 <el-input v-model="queryParams1.createBy" placeholder="请输入操作员" maxlength="20" clearable style="width: 240px"/>
             </el-form-item> 
@@ -37,18 +40,9 @@
                     <span v-else>{{ (queryParams1.pageNum - 1) * queryParams1.pageSize + scope.$index+1 }}</span>
                 </template> 
             </el-table-column>
-            
-            <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"  width="120"/>
+            <el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true"/>
+            <el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120"/>
             <el-table-column label="物理卡号" align="center" prop="serialNum" :show-overflow-tooltip="true"/>
-            <!-- <el-table-column label="卡状态" align="center" prop="cardStatus" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                    <span v-if="scope.row.cardStatus==1">正常</span>
-                    <span v-if="scope.row.cardStatus==4">挂失</span>
-                    <span v-if="scope.row.cardStatus==5">发卡</span>
-                    <span v-if="scope.row.cardStatus==6">退卡</span>
-                    <span v-if="scope.row.cardStatus==7">已过期</span>
-                </template>
-            </el-table-column> -->
             <el-table-column label="押金" align="center" prop="deposit" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <span>{{ (Number(scope.row.deposit)/100).toFixed(2) }}</span>
@@ -58,8 +52,14 @@
                 <template slot-scope="scope">
                     <span>{{ (Number(scope.row.productCost)/100).toFixed(2) }}</span>
                 </template> 
+            </el-table-column> 
+            <el-table-column label="操作类型" align="center" prop="recordType" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.recordType==1">发卡</span>
+                    <span v-if="scope.row.recordType==2">退卡</span>
+                    <span v-if="scope.row.recordType==3">换卡</span> 
+                </template>
             </el-table-column>
-            
             <el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true"/> 
             <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true"/> 
             <!-- <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width">
@@ -136,6 +136,7 @@
           pageNum: 1,
           pageSize: 10, 
           serialNum:null,    
+          userId:null,    
           createBy:null, 
         },    // 总条数
         total1: 0,
diff --git a/src/views/base/canteenStall/area/index.vue b/src/views/base/canteenStall/area/index.vue
index 62d3ca09..b84e6ec3 100644
--- a/src/views/base/canteenStall/area/index.vue
+++ b/src/views/base/canteenStall/area/index.vue
@@ -61,7 +61,7 @@
                     size="mini"
                     icon="el-icon-delete"
                     style="color: #f56c6c"
-                    v-if="data.parentId != '-1'"
+                    v-if="data.parentId != '0'"
                     @click.stop="() => removeTreeNode(data)"
                   >
                   </el-button>
diff --git a/src/views/base/mobile/evaManeager/index.vue b/src/views/base/mobile/evaManeager/index.vue
index 8438581f..58bcb9f0 100644
--- a/src/views/base/mobile/evaManeager/index.vue
+++ b/src/views/base/mobile/evaManeager/index.vue
@@ -174,7 +174,7 @@
                 <el-table v-loading="loading" :data="tableListData2" height="550"> 
                     <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="stname" :show-overflow-tooltip="true"/> 
+                    <el-table-column label="所属档口" align="center" prop="shopstallName" :show-overflow-tooltip="true"/> 
                     <el-table-column label="意见和建议" align="center" prop="proposal" :show-overflow-tooltip="true"/>
                     <el-table-column label="用户姓名" align="center" prop="createBy" :show-overflow-tooltip="true"/>
                     <el-table-column label="评价日期" align="center" prop="evaluateDate" :show-overflow-tooltip="true"/>
@@ -657,8 +657,8 @@
                 stallId:this.queryParams2.stallId, 
                 startDate:this.formatDate(this.dateRange[0]),
                 endDate:this.formatDate(this.dateRange[1]),
-                current: this.queryParams2.pageNum, 
-                size: this.queryParams2.pageSize,   
+                pageNum: this.queryParams2.pageNum, 
+                pageSize: this.queryParams2.pageSize,   
             }
             getCanteenEvaluatePageApi(param).then(response => {
                 this.tableListData2 = response.rows;
diff --git a/src/views/device/doubleScreen/index.vue b/src/views/device/doubleScreen/index.vue
index d897e205..4dc24195 100644
--- a/src/views/device/doubleScreen/index.vue
+++ b/src/views/device/doubleScreen/index.vue
@@ -515,9 +515,9 @@
                     this.stallOptions2=response.rows||[]
                 });
                 this.baseForm = Object.assign({}, row)
-                this.$set(this.baseForm,"areaId",Number(row.areaId))
-                this.$set(this.baseForm,"canteenId",Number(row.canteenId))
-                this.$set(this.baseForm,"stallId",Number(row.stallId))
+                this.$set(this.baseForm,"areaId",row.areaId)
+                this.$set(this.baseForm,"canteenId",row.canteenId)
+                this.$set(this.baseForm,"stallId",row.stallId)
                 // this.$set(this,"metadata",row.deviceMetadata)
                 this.title = "修改"; 
             },
@@ -542,7 +542,7 @@
                 this.$set(this.baseForm,"canteenId",e)
                 this.$refs['baseForm'].clearValidate(['canteenId']);
                 let param= {
-                    canteenIdList:[e]
+                    canteenId:e
                 }
                 getStallByCanteenApi(param).then((response) => {
                     this.stallOptions2=response.rows||[]
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index 7243b5dc..7b4d8d0c 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -1072,7 +1072,7 @@
   import Treeselect from "@riophae/vue-treeselect";
   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 { menuDishesTypeAllListApi,addMenuDishesTypeApi,editMenuDishesTypeApi,removeMenuDishesTypeApi} 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"; 
@@ -1293,7 +1293,7 @@
         this.$modal
           .confirm("是否确认删除数据项？")
           .then(function () {
-            return removeMenuDishesTypeApi(data.typeId);
+            return removeMenuDishesTypeApi({typeId:data.typeId});
           })
           .then(() => {
             this.$modal.msgSuccess("删除成功");
diff --git a/src/views/dish/material/components/MaterialDialog.vue b/src/views/dish/material/components/MaterialDialog.vue
index e9940274..08020695 100644
--- a/src/views/dish/material/components/MaterialDialog.vue
+++ b/src/views/dish/material/components/MaterialDialog.vue
@@ -259,7 +259,7 @@
                     <el-form-item :label="item.label" :prop="'menuMaterialNutritionDTO.' + item.prop">
                       <el-input
                         v-model="form.menuMaterialNutritionDTO[item.prop]"
-                        :placeholder="'请输入' + item.label"
+                        :placeholder="'请输入' + item.label" disabled
                         @input="handleNumericInput('menuMaterialNutritionDTO.' + item.prop, $event)"
                         @blur="formatNumericValue('menuMaterialNutritionDTO.' + item.prop)"
                       >
@@ -540,8 +540,42 @@ export default {
     chosenNutrition(){
       console.log("选中营养信息",this.form.nutritionId) 
       getNutrition({nutritionId: this.form.nutritionId}).then((response) => {
+        if(response.data){
+          this.form.menuMaterialNutritionDTO = response.data
+        }else{
+          this.form.menuMaterialNutritionDTO = {
+            edible: '',//可食部分(g/100g)
+            water: '',//水分(g/100g)
+            calories: '',//热量(千卡/100g)
+            protein: '',//蛋白质(g/100g) 
+            fat: '',//脂肪(g/100g)
+            carbohydrate: '',//碳水化合物(g/100g)
+            dietaryFiber: '',//膳食纤维(g/100g)
+            cholesterol: '',//胆固醇(mg/100g)
+            ash: '',//灰分(g/100g)
+            vitaminA: '',//维生素a(μg/100g)
 
-        this.form.menuMaterialNutritionDTO = response.data
+            carotene: '',//胡萝卜素(μg/100g)
+            retinol: '',//视黄醇(μg/100g)
+            thiamine: '',//硫胺素(mg/100g)
+            riboflavin: '',//核黄素(mg/100g)
+            niacin: '',//烟酸/尼克酸(mg/100g)
+            vitaminC: '',//维生素c(mg/100g)
+            vitaminE: '',//维生素e(g/100g)
+            calcium: '',//钙(mg/100g)
+            phosphorus: '',//磷(mg/100g)
+            kalium: '',//钾(mg/100g)
+
+            sodium: '',//钠(mg/100g)
+            magnesium: '',//镁(mg/100g)
+            iron: '',//铁(mg/100g)
+            zinc: '',//锌(mg/100g)
+            selenium: '',//硒(μg/100g)
+            cuprum: '',//铜(mg/100g) 
+            manganese: '',//锰(mg/100g)
+            iodine: ''
+          }
+        } 
       });
     },
 
diff --git a/src/views/dish/menu/detail.vue b/src/views/dish/menu/detail.vue
index 2157e347..5625beac 100644
--- a/src/views/dish/menu/detail.vue
+++ b/src/views/dish/menu/detail.vue
@@ -221,7 +221,7 @@
             <el-form :model="dialogQueryParams" ref="dialogQueryParams" size="mini" :inline="true" label-width="80px">
                 <el-form-item label="所属区域" prop="areaId">
                     <el-cascader v-model="dialogQueryParams.areaId"
-                        :options="treeAreaOptions" :filterable="true" style="width: 100%;" :show-all-levels="false"
+                        :options="treeAreaOptions" :filterable="true" style="width: 100%;" :show-all-levels="false" disabled
                         :props="{  
                         emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
                         checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
@@ -230,7 +230,7 @@
                     </el-cascader>
                 </el-form-item>
                 <el-form-item label="所属食堂" prop="canteenId">
-                    <el-select v-model="dialogQueryParams.canteenId" clearable placeholder="请选择所属食堂" style="width: 100%;" @change="handleCanteenChange2">
+                    <el-select v-model="dialogQueryParams.canteenId" clearable placeholder="请选择所属食堂" disabled style="width: 100%;" @change="handleCanteenChange2">
                         <el-option v-for="item in canteenOptions2"
                             :key="item.canteenId"
                             :label="item.canteenName"
@@ -1444,6 +1444,15 @@ export default {
                 applyDate:null,
                 applyWeek:null,
             }
+            this.dialogQueryParams.areaId = this.baseInfo.areaId;
+            this.handleAreaChange2()
+            setTimeout(()=>{
+                this.dialogQueryParams.canteenId = this.baseInfo.canteenId;
+                this.handleCanteenChange2()
+            },200) 
+            setTimeout(()=>{
+                this.dialogQueryParams.stallId = this.baseInfo.stallId;
+            },400)
             this.$set(this.dialogQueryParams,"applyWeek",1)
             this.dialogDetailList = [
                 {
@@ -1472,8 +1481,9 @@ export default {
                     dishesList:[]
                 }
             ]
-
+            
             this.openCopyMenu = true
+            
         },
         //确认复制
         confirmCopyMenu(){
diff --git a/src/views/index.vue b/src/views/index.vue
index da69c889..d4596178 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>博诺思后台管理框架</h2>
+        <h2>国网安徽经研院绿智食堂</h2>
         <p>
           <b>当前版本:</b> <span>v{{ version }}</span>
         </p>
diff --git a/src/views/login.vue b/src/views/login.vue
index 36b1d2b8..4013ceff 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">博诺思后台管理系统</h3>
+      <h3 class="title">国网安徽经研院绿智食堂</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
diff --git a/src/views/login1.vue b/src/views/login1.vue
index c3e5fa31..9d1c0a95 100644
--- a/src/views/login1.vue
+++ b/src/views/login1.vue
@@ -3,7 +3,7 @@
     <div class="login">
       <div class="login-form">
         <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-          <h3 class="title">博诺思后台管理系统</h3>
+          <h3 class="title">国网安徽经研院绿智食堂</h3>
           <template v-if="loginMethod === 'password'">
             <el-form-item prop="username">
               <el-input
diff --git a/src/views/register.vue b/src/views/register.vue
index 819a715a..ed2b271f 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">博诺思后台管理系统</h3>
+      <h3 class="title">国网安徽经研院绿智食堂</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
diff --git a/src/views/register1.vue b/src/views/register1.vue
index 1cc83335..2148cd25 100644
--- a/src/views/register1.vue
+++ b/src/views/register1.vue
@@ -2,7 +2,7 @@
   <div class="container">
     <div class="register">
       <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-        <h3 class="title">博诺思后台管理系统</h3>
+        <h3 class="title">国网安徽经研院绿智食堂</h3>
 
         <el-form-item prop="nickName">
           <el-input v-model="registerForm.nickName" type="text" auto-complete="off" placeholder="请输入姓名">