From e8fdea8b78c0307850e0b78b367bed8586d34679 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Thu, 10 Jul 2025 09:38:33 +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

---
 src/utils/request.js                          |  2 +-
 .../canteen/base/canteenStall/area/index.vue  |  2 +-
 src/views/canteen/dish/menu/index.vue         |  1 -
 .../canteen/reportCenter/accountSum/index.vue |  7 ++++++-
 .../inComeSum/psnPaymentSum/index.vue         |  6 ++++++
 .../reportCenter/rechargeSumByAcc/index.vue   |  6 ++++++
 .../reportCenter/tradedDetail/index.vue       |  7 ++++++-
 .../kitchen/environment/alarmRecord/index.vue |  1 +
 .../environment/environmentMonitor/index.vue  |  2 +-
 .../wasteManage/wasteGarbage/index.vue        | 21 +++++++++----------
 10 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 542114f5..a14a700d 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -129,7 +129,7 @@ service.interceptors.response.use(res => {
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
       Message({ message: msg, type: 'error' })
-      return Promise.reject(new Error(msg))
+      return Promise.reject(msg)
     } else if (code === 601) {
       Message({ message: msg, type: 'warning' })
       return Promise.reject('error')
diff --git a/src/views/canteen/base/canteenStall/area/index.vue b/src/views/canteen/base/canteenStall/area/index.vue
index 4920051f..4a861629 100644
--- a/src/views/canteen/base/canteenStall/area/index.vue
+++ b/src/views/canteen/base/canteenStall/area/index.vue
@@ -436,7 +436,7 @@
                 ...this.form
             }
             if(param.contactTel&&param.contactTel!=""){
-              param.contactTel = encryptWithSM4(this.baseForm.contactTel) 
+              param.contactTel = encryptWithSM4(this.form.contactTel) 
             } 
             if (param.areaId != undefined) {  
                 updateAreaApi(param).then((response) => {
diff --git a/src/views/canteen/dish/menu/index.vue b/src/views/canteen/dish/menu/index.vue
index 87e54e16..fb94a743 100644
--- a/src/views/canteen/dish/menu/index.vue
+++ b/src/views/canteen/dish/menu/index.vue
@@ -666,7 +666,6 @@
                 this.$modal.msgError(res.msg);
               }
           }).catch((error) => {
-
               this.$modal.msgError(error)
           })
         },
diff --git a/src/views/canteen/reportCenter/accountSum/index.vue b/src/views/canteen/reportCenter/accountSum/index.vue
index e3cf9415..e8a8ab80 100644
--- a/src/views/canteen/reportCenter/accountSum/index.vue
+++ b/src/views/canteen/reportCenter/accountSum/index.vue
@@ -107,7 +107,7 @@
   <script>
   import { deptTreeSelect } from '@/api/system/user'
   import { accInfoPageApi, accInfoSumPageApi} from "@/api/accountCenter/manager";
-  
+  import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
   export default {//账户汇总
     name: "",
     dicts: ['sys_user_type'],
@@ -188,6 +188,11 @@
             accInfoPageApi(param).then(response => {
                 this.tableListData = response.rows;
                 this.total = Number(response.total);
+                this.tableListData.forEach(item=>{
+                    if(item.phoneNumber&&item.phoneNumber!=""){
+                        this.$set(item,"phoneNumber",decryptWithSM4(item.phoneNumber))
+                    }
+                }) 
                 accInfoSumPageApi(param).then(response => {
                   this.tableListData.push(response.data)   
                 }); 
diff --git a/src/views/canteen/reportCenter/inComeSum/psnPaymentSum/index.vue b/src/views/canteen/reportCenter/inComeSum/psnPaymentSum/index.vue
index 2e1c5eb6..1e46ae73 100644
--- a/src/views/canteen/reportCenter/inComeSum/psnPaymentSum/index.vue
+++ b/src/views/canteen/reportCenter/inComeSum/psnPaymentSum/index.vue
@@ -151,6 +151,7 @@
 <script>
 import { deptTreeSelect } from '@/api/system/user' 
 import { reportUserIncomeListApi } from "@/api/reportCenter/index";
+import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
 export default {//交易流水
   name: "",
   dicts: ['sys_user_type'], 
@@ -272,6 +273,11 @@ export default {//交易流水
           reportUserIncomeListApi(param).then(response => {
               this.tableListData = response.rows;
               this.total = Number(response.total);
+              this.tableListData.forEach(item=>{
+                  if(item.phonenumber&&item.phonenumber!=""){
+                      this.$set(item,"phonenumber",decryptWithSM4(item.phonenumber))
+                  }
+              }) 
               this.loading = false;
           });
       },
diff --git a/src/views/canteen/reportCenter/rechargeSumByAcc/index.vue b/src/views/canteen/reportCenter/rechargeSumByAcc/index.vue
index 4373c53d..77c3c1b6 100644
--- a/src/views/canteen/reportCenter/rechargeSumByAcc/index.vue
+++ b/src/views/canteen/reportCenter/rechargeSumByAcc/index.vue
@@ -105,6 +105,7 @@
   import { deptTreeSelect } from '@/api/system/user' 
   import { repealSubsidyRechargeApi,batchRepealSubsidyRechargeApi,accSubsidyRepealPageApi,accSubsidyHandReceivePageApi,accSubsidyHandReceiveBatchGrantApi,batchAccSubsidyRepealApi } from "@/api/accountCenter/butie";
   import { accInfoWalletHistoryApi } from "@/api/accountCenter/traderecords";
+import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
   export default {
     name: "",
     dicts: ['sys_user_type'], 
@@ -226,6 +227,11 @@
             accInfoWalletHistoryApi(param).then(response => {
                 this.tableListData1 = response.rows;
                 this.total1 = Number(response.total);
+                this.tableListData1.forEach(item=>{
+                    if(item.phoneNumber&&item.phoneNumber!=""){
+                        this.$set(item,"phoneNumber",decryptWithSM4(item.phoneNumber))
+                    }
+                }) 
                 // if(this.tableListData1.length>0){
                 //     this.tableListData1.push(response.data.sumVO)   
                 // }
diff --git a/src/views/canteen/reportCenter/tradedDetail/index.vue b/src/views/canteen/reportCenter/tradedDetail/index.vue
index 98a3325f..a4cac449 100644
--- a/src/views/canteen/reportCenter/tradedDetail/index.vue
+++ b/src/views/canteen/reportCenter/tradedDetail/index.vue
@@ -110,6 +110,7 @@
   <script>
   import { deptTreeSelect } from '@/api/system/user'
   import { reportTradFlowListApi,getHealthInfoPageApi } from "@/api/reportCenter/index";
+  import { decryptWithSM4,encryptWithSM4 } from '@/utils/sm';
   export default {//交易流水
     name: "",
     dicts: ['sys_user_type'],
@@ -231,7 +232,11 @@
             console.log("param",param);
             reportTradFlowListApi(param).then(response => {
                 this.tableListData = response.rows;
-                console.log("this.tableListData",this.tableListData);
+                this.tableListData.forEach(item=>{
+                    if(item.phonenumber&&item.phonenumber!=""){
+                        this.$set(item,"phonenumber",decryptWithSM4(item.phonenumber))
+                    }
+                }) 
                 this.total = Number(response.total);
                 this.loading = false;
             });
diff --git a/src/views/kitchen/environment/alarmRecord/index.vue b/src/views/kitchen/environment/alarmRecord/index.vue
index 1e7f2b3e..7e0b3148 100644
--- a/src/views/kitchen/environment/alarmRecord/index.vue
+++ b/src/views/kitchen/environment/alarmRecord/index.vue
@@ -121,6 +121,7 @@ export default {
             "pageNum": this.queryParams.pageNum, 
             "pageSize": this.queryParams.pageSize,
             "deviceType": null,
+            "onlyWarn":1
           }
           if(this.activeName==1){
             param.deviceType = null;
diff --git a/src/views/kitchen/environment/environmentMonitor/index.vue b/src/views/kitchen/environment/environmentMonitor/index.vue
index 41af9f4f..7d5a51a7 100644
--- a/src/views/kitchen/environment/environmentMonitor/index.vue
+++ b/src/views/kitchen/environment/environmentMonitor/index.vue
@@ -116,7 +116,7 @@ export default {
             "envSensorResultTypeList": this.queryParams.envSensorResultTypeList, 
             "deviceCategory": 5, 
             "pageNum": this.queryParams.pageNum, 
-            "pageSize": this.queryParams.pageSize,  
+            "pageSize": this.queryParams.pageSize,
           }
           getKitchenDeviceSensorRecordListApi(param).then(response => {
               this.tableListData = response.rows;
diff --git a/src/views/kitchen/wasteManage/wasteGarbage/index.vue b/src/views/kitchen/wasteManage/wasteGarbage/index.vue
index 63eb50f4..7b281830 100644
--- a/src/views/kitchen/wasteManage/wasteGarbage/index.vue
+++ b/src/views/kitchen/wasteManage/wasteGarbage/index.vue
@@ -180,7 +180,7 @@
                 <el-form-item label="重量(Kg):" prop="weight">
                     <el-input v-model="form.weight"
                         placeholder="请输入重量"
-                        maxlength="10" @input="(v)=>(form.weight=v.replace(/[^\d]/g,''))"
+                        maxlength="4" @input="(v)=>(form.weight=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"
                     />
                 </el-form-item>
             </el-col> 
@@ -195,7 +195,7 @@
             </el-col>
             <el-col :span="12">
                 <el-form-item label="售卖金额(元):" prop="saleAmount" v-if="form.dealType==3">
-                    <el-input v-model="form.saleAmount" placeholder="请输入售卖金额" maxlength="10" 
+                    <el-input v-model="form.saleAmount" placeholder="请输入售卖金额" maxlength="6" 
                       @input="(v)=>(form.saleAmount=v.replace(/^(\d+)(\.\d{0,2})?.*$/, '$1$2'))"/>
                 </el-form-item>
             </el-col>
@@ -479,21 +479,20 @@ export default {
                   editKitchenWasteDealApi(this.form).then(response => {
                       this.$modal.msgSuccess("修改成功");
                       this.open = false;
-                      this.getList();
-                      setTimeout(()=>{
-                        this.loadingBtn = false;
-                      },1000) 
+                      this.getList(); 
                   });
+                  setTimeout(()=>{
+                    this.loadingBtn = false;
+                  },1000) 
               } else {
                   addKitchenWasteDealApi(this.form).then(response => {
                       this.$modal.msgSuccess("新增成功");
                       this.open = false;
-                      this.getList();
-                      this.loadingBtn = false;
-                      setTimeout(()=>{
-                        this.loadingBtn = false;
-                      },1000) 
+                      this.getList(); 
                   });
+                  setTimeout(()=>{
+                    this.loadingBtn = false;
+                  },1000) 
               }
             }
           });