From d55f8c5277630965f4e7a1e5aba6e4919a1fb4b0 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Mon, 16 Jun 2025 16:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E6=A3=80=E9=A3=9F=E5=A0=82=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                        |  6 ++++++
 src/views/canteen/carte/index.vue                  |  2 +-
 src/views/canteen/pointsDistribution/index.vue     |  2 +-
 .../canteen/pointsDistribution/personalSubsidy.vue |  9 ++++++---
 src/views/canteen/publishMenu/index.vue            | 14 ++++++--------
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main.js b/src/main.js
index 1d86d51e..51f72981 100644
--- a/src/main.js
+++ b/src/main.js
@@ -67,6 +67,12 @@ Vue.use(plugins)
 Vue.use(VueMeta)
 DictData.install()
 
+// ============ 运检站食堂项目 ============
+import request from '@/utils/request'
+window.axios = request
+
+
+// ============ 运检站食堂项目end ============
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
diff --git a/src/views/canteen/carte/index.vue b/src/views/canteen/carte/index.vue
index 50af2559..9e3b4e7c 100644
--- a/src/views/canteen/carte/index.vue
+++ b/src/views/canteen/carte/index.vue
@@ -391,9 +391,9 @@ export default {
               this.activeTab = 'list';
               this.activeLabel = '菜谱添加';
               this.getList();
+              this.reset();
             }
           });
-          this.reset();
         }
       });
     },
diff --git a/src/views/canteen/pointsDistribution/index.vue b/src/views/canteen/pointsDistribution/index.vue
index eebcdbf0..3615ff38 100644
--- a/src/views/canteen/pointsDistribution/index.vue
+++ b/src/views/canteen/pointsDistribution/index.vue
@@ -71,6 +71,6 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 
 </style>
diff --git a/src/views/canteen/pointsDistribution/personalSubsidy.vue b/src/views/canteen/pointsDistribution/personalSubsidy.vue
index c073ba25..25b1c67e 100644
--- a/src/views/canteen/pointsDistribution/personalSubsidy.vue
+++ b/src/views/canteen/pointsDistribution/personalSubsidy.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" >
     <!--    个人积分补贴  -->
     <el-form ref="form" :model="form" :rules="rules" label-width="100px" style="width: 600px">
 
@@ -129,6 +129,9 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+.app-container{
+  height: 70vh !important;
+  overflow: visible;
+}
 </style>
diff --git a/src/views/canteen/publishMenu/index.vue b/src/views/canteen/publishMenu/index.vue
index e7d65335..bc21aeea 100644
--- a/src/views/canteen/publishMenu/index.vue
+++ b/src/views/canteen/publishMenu/index.vue
@@ -381,16 +381,12 @@ export default {
           this.$message.error('数量限制不能为0');
           return
         }*/
-        if (this.form.quantityRestriction === '无限制') {
+        if (this.form.quantityRestriction === '无限制' || this.form.quantityRestriction === '') {
           this.form.quantityRestriction = null;
         }
         if (valid) {
-          this.form.quantityRestriction = this.form.quantityRestriction ? this.form.quantityRestriction : 0;
-          if (this.form.quantityRestriction === 0 || !this.form.quantityRestriction || this.form.quantityRestriction === null) {
-            this.form.unlimited = true;
-          } else {
-            this.form.unlimited = false;
-          }
+          // this.form.quantityRestriction = this.form.quantityRestriction ? this.form.quantityRestriction : 0;
+          this.form.unlimited = this.form.quantityRestriction === null;
           const formObj = this.form
           formObj.createBy = null
           if (this.form.id != null) {
@@ -398,6 +394,7 @@ export default {
               if (res.code === 200) {
                 this.$message.success("修改成功");
                 this.$refs.menuList.getList();
+                this.resetForm();
               } else {
                 this.$message.error(res.msg);
               }
@@ -407,12 +404,13 @@ export default {
               if (res.code === 200) {
                 this.$message.success("新增成功");
                 this.$refs.menuList.getList();
+                this.resetForm();
               } else {
                 this.$message.error(res.msg);
               }
             })
           }
-          this.resetForm();
+
 /*
           this.$nextTick(() => {
             this.$refs.menuList.getList();