From 0f449ae06f3627036c2da1c60bc0200e1d1b3ee8 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 11 Jun 2025 16:22:31 +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/views/base/canteenStall/canteen/index.vue            | 9 +++++++++
 src/views/base/canteenStall/stall/index.vue              | 9 +++++++++
 src/views/dish/dish/index.vue                            | 4 ++--
 src/views/dish/menu/detail.vue                           | 8 ++++----
 src/views/dish/menu/edit.vue                             | 8 ++++----
 src/views/dish/menu/index.vue                            | 2 +-
 .../shopMaterial/components/MaterialDialog.vue           | 4 ++--
 src/views/superstore/super/index.vue                     | 9 ++++-----
 src/views/system/user/index.vue                          | 9 +++++++++
 9 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/views/base/canteenStall/canteen/index.vue b/src/views/base/canteenStall/canteen/index.vue
index 9ef786e2..55dec066 100644
--- a/src/views/base/canteenStall/canteen/index.vue
+++ b/src/views/base/canteenStall/canteen/index.vue
@@ -175,6 +175,7 @@
                           accept=".png, .jpg, .jpeg"
                           :on-success="handleAvatarSuccess"
                           :class="{ disabled: uploadDisabled }"
+                          :before-upload="handleBeforeUpload"
                           :on-preview="handlePictureCardPreview"
                           :on-remove="handleRemove"
                       >
@@ -440,6 +441,14 @@
                 this.$modal.msgError(error)
             })
         },
+        // 上传之前
+        handleBeforeUpload(file) { 
+            const isLt = file.size / 1024 / 1024 < 5
+            if (!isLt) {
+                this.$modal.msgError(`图片大小不能超过 5 MB`)
+                return false
+            }
+        },
         handleAvatarSuccess(res, file) {
             console.log('success')
         },
diff --git a/src/views/base/canteenStall/stall/index.vue b/src/views/base/canteenStall/stall/index.vue
index f875d689..d0bbccd5 100644
--- a/src/views/base/canteenStall/stall/index.vue
+++ b/src/views/base/canteenStall/stall/index.vue
@@ -200,6 +200,7 @@
                         list-type="picture-card"
                         accept=".png, .jpg, .jpeg"
                         :on-success="handleAvatarSuccess"
+                        :before-upload="handleBeforeUpload"
                         :class="{ disabled: uploadDisabled }"
                         :on-preview="handlePictureCardPreview"
                         :on-remove="handleRemove"
@@ -724,6 +725,14 @@ export default {
       handleExceed(files, fileList) {
           this.$message.warning('最多只可以上传一张图片')
       },
+      // 上传之前
+      handleBeforeUpload(file) { 
+          const isLt = file.size / 1024 / 1024 < 5
+          if (!isLt) {
+              this.$modal.msgError(`图片大小不能超过 5 MB`)
+              return false
+          }
+      },
       handleRemove(file, fileList) {
           let sum = 0
           this.checkUrlNameList.forEach((item, index) => {
diff --git a/src/views/dish/dish/index.vue b/src/views/dish/dish/index.vue
index 05e280c1..cf97f894 100644
--- a/src/views/dish/dish/index.vue
+++ b/src/views/dish/dish/index.vue
@@ -366,7 +366,7 @@
                   <el-form-item label="菜品价格" prop="price" v-if="baseForm.sizeType==1">
                     <el-input
                       v-model="baseForm.price"
-                      placeholder="请输入菜品价格" maxlength="10"
+                      placeholder="请输入菜品价格" maxlength="9"
                       @input="handleNumericInput('price', $event)"
                       @blur="formatNumericValue('price')"
                     >
@@ -377,7 +377,7 @@
                 <el-col :span="12">
                   <el-form-item label="成本价" prop="materialCost" v-if="baseForm.sizeType==1">
                     <el-input
-                      v-model="baseForm.materialCost" maxlength="10"
+                      v-model="baseForm.materialCost" maxlength="9"
                       placeholder="请输入成本价" disabled
                       @input="handleNumericInput('materialCost', $event)"
                       @blur="formatNumericValue('materialCost')"
diff --git a/src/views/dish/menu/detail.vue b/src/views/dish/menu/detail.vue
index 5da1f655..a129f25b 100644
--- a/src/views/dish/menu/detail.vue
+++ b/src/views/dish/menu/detail.vue
@@ -182,22 +182,22 @@
                         </el-table-column>
                         <el-table-column label="当餐售价" align="center" prop="price">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.price" placeholder="请输入" maxlength="30" clearable @input="(v)=>(scope.row.price=v.replace(/[^\d.]/g,''))"/>
+                                <el-input  v-model="scope.row.price" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.price=v.replace(/[^\d.]/g,''))"/>
                             </template>
                         </el-table-column>
                         <el-table-column label="当餐优惠价" align="center" prop="salePrice">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.salePrice" placeholder="请输入" maxlength="30" clearable @input="(v)=>(scope.row.salePrice=v.replace(/[^\d.]/g,''))"/>
+                                <el-input  v-model="scope.row.salePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.salePrice=v.replace(/[^\d.]/g,''))"/>
                             </template>
                         </el-table-column>
                         <el-table-column label="最大供应量" align="center" prop="supplyNum">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.supplyNum" placeholder="请输入" maxlength="30" clearable @input="(v)=>(scope.row.supplyNum=v.replace(/[^\d]/g,''))"/>
+                                <el-input  v-model="scope.row.supplyNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.supplyNum=v.replace(/[^\d]/g,''))"/>
                             </template>
                         </el-table-column>
                         <el-table-column label="每人限购数" align="center" prop="limitNum">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.limitNum" placeholder="请输入" maxlength="30" clearable @input="(v)=>(scope.row.limitNum=v.replace(/[^\d]/g,''))"/>
+                                <el-input  v-model="scope.row.limitNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.limitNum=v.replace(/[^\d]/g,''))"/>
                             </template>
                         </el-table-column>
                         <el-table-column label="移动端推荐" align="center" prop="recommendFlag">
diff --git a/src/views/dish/menu/edit.vue b/src/views/dish/menu/edit.vue
index 48b83731..2c87ddfb 100644
--- a/src/views/dish/menu/edit.vue
+++ b/src/views/dish/menu/edit.vue
@@ -182,22 +182,22 @@
                         </el-table-column>
                         <el-table-column label="当餐售价" align="center" prop="price">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.price" placeholder="请输入" maxlength="30" clearable @input="(v)=>(scope.row.price=v.replace(/[^\d.]/g,''))"/>
+                                <el-input  v-model="scope.row.price" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.price=v.replace(/[^\d.]/g,''))"/>
                             </template>
                         </el-table-column>
                         <el-table-column label="当餐优惠价" align="center" prop="salePrice">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.salePrice" placeholder="请输入" maxlength="30" clearable @input="(v)=>(scope.row.salePrice=v.replace(/[^\d.]/g,''))"/>
+                                <el-input  v-model="scope.row.salePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.salePrice=v.replace(/[^\d.]/g,''))"/>
                             </template>
                         </el-table-column>
                         <el-table-column label="最大供应量" align="center" prop="supplyNum">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.supplyNum" placeholder="请输入" maxlength="30" clearable @input="(v)=>(scope.row.supplyNum=v.replace(/[^\d]/g,''))"/>
+                                <el-input  v-model="scope.row.supplyNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.supplyNum=v.replace(/[^\d]/g,''))"/>
                             </template>
                         </el-table-column>
                         <el-table-column label="每人限购数" align="center" prop="limitNum">
                             <template slot-scope="scope">
-                                <el-input  v-model="scope.row.limitNum" placeholder="请输入" maxlength="30" clearable @input="(v)=>(scope.row.limitNum=v.replace(/[^\d]/g,''))"/>
+                                <el-input  v-model="scope.row.limitNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.limitNum=v.replace(/[^\d]/g,''))"/>
                             </template>
                         </el-table-column>
                         <el-table-column label="移动端推荐" align="center" prop="recommendFlag">
diff --git a/src/views/dish/menu/index.vue b/src/views/dish/menu/index.vue
index 67715e89..ff4da623 100644
--- a/src/views/dish/menu/index.vue
+++ b/src/views/dish/menu/index.vue
@@ -552,7 +552,7 @@
                 canteenId:row.canteenId,
                 stallId:row.stallId,
             }
-            this.$router.push({ path: "/device/doubleScreen",query: obj });
+            this.$router.push({ path: "/canteen/device/canteenDevices",query: obj });
         },
         /** 删除按钮操作 */
         handleDelete(row) {
diff --git a/src/views/superstore/shopMaterial/components/MaterialDialog.vue b/src/views/superstore/shopMaterial/components/MaterialDialog.vue
index 753988ec..296deccb 100644
--- a/src/views/superstore/shopMaterial/components/MaterialDialog.vue
+++ b/src/views/superstore/shopMaterial/components/MaterialDialog.vue
@@ -80,7 +80,7 @@
               <el-form-item label="商品进价" prop="unitPrice">
                 <el-input
                   v-model="form.unitPrice"
-                  placeholder="请输入商品进价"
+                  placeholder="请输入商品进价" maxlength="8"
                   @input="handleNumericInput('unitPrice', $event)"
                   @blur="formatNumericValue('unitPrice')"
                 >
@@ -93,7 +93,7 @@
                 <el-input
                   v-model="form.salePrice"
                   placeholder="请输入零售价"
-                  maxlength="20"
+                  maxlength="8"
                   @input="handleNumericInput('salePrice', $event)"
                   @blur="formatNumericValue('salePrice')"
                 />
diff --git a/src/views/superstore/super/index.vue b/src/views/superstore/super/index.vue
index bd207591..3761d7b8 100644
--- a/src/views/superstore/super/index.vue
+++ b/src/views/superstore/super/index.vue
@@ -975,8 +975,7 @@
                 "areaId": "",
                 "ifRelateDrp": 2,
                 "imgUrl": "",
-            }
-            this.baseForm = {};
+            } 
             this.resetForm("baseForm");
         },
         /** 修改按钮操作 */
@@ -1172,10 +1171,10 @@
         // 节点单击事件 - 左侧树
         async handleNodeClick(data, node) {
           console.log(data)
-          // this.handleQuery();
+          // this.handleShopQuery();
         },
         handleCheckChange(data, checked, indeterminate) {
-          this.handleQuery();
+          this.handleShopQuery();
         },
         /* 树节点增加 */
         appendTreeNode(data) {
@@ -1369,7 +1368,7 @@
 
         /** 商品新增 */
         handleShopAdd() {
-            this.reset();
+            // this.reset();
             this.openAddProduct = true;
             this.titleAddProduct = "新增-超市商品";
             this.getAddShopList();
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4f42d094..e77fe515 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -620,6 +620,7 @@
                             list-type="picture-card"
                             accept=".png, .jpg, .jpeg"
                             :on-success="handleAvatarSuccess"
+                            :before-upload="handleBeforeUpload"
                             :class="{ disabled: uploadDisabled }"
                             :on-preview="handlePictureCardPreview"
                             :on-remove="handleRemove"
@@ -1421,6 +1422,14 @@ export default {
         handleAvatarSuccess(res, file) {
             console.log('success')
         },
+        // 上传之前
+        handleBeforeUpload(file) { 
+            const isLt = file.size / 1024 / 1024 < 5
+            if (!isLt) {
+                this.$modal.msgError(`图片大小不能超过 5 MB`)
+                return false
+            }
+        },
         handleExceed(files, fileList) {
             this.$message.warning('最多只可以上传一张图片')
         },