提交代码

src/api/recipe/recipeSetting.js

@@ -8,6 +8,15 @@ export function getRecipeType() {
   })
 }
 
+//获取菜谱列表
+export function getRecipeList() {
+  return request({
+    url: '/recipeWeek/getRecipeList',
+    method: 'get',
+  })
+}
+
+
 //根据星期获取菜谱
 export function getRecipeByWeek(week) {
   return request({
@@ -15,10 +24,8 @@ export function getRecipeByWeek(week) {
     method: 'get',
   })
 }
-//根据星期获取菜谱
+//根据星期更新菜谱
 export function updateRecipeWeek(week,data) {
-  console.log(week)
-  console.log(data)
   return request({
     url: '/recipeWeek/updateRecipeWeek/'+week,
     method: 'post',

src/views/recipe/recipeSetting/index.vue

@@ -74,7 +74,13 @@
   </div>
 </template>
 <script>
-  import {getRecipeType,getRecipeByWeek,updateRecipeWeek} from "@/api/recipe/recipeSetting";
+  import {
+    getRecipeType,
+    getRecipeByWeek,
+    updateRecipeWeek,
+    getRecipeList
+  }
+  from "@/api/recipe/recipeSetting";
   export default {
     //页签缓存页面的name要和路由中的那么要相同，才能缓存，
     //如果是自定义菜单，则页面的name和菜单管理中路由地址要相同，才model能页签缓存
@@ -148,7 +154,8 @@
       };
     },
     created() {
-      this.getRecipeType()
+      this.getRecipeType();
+      this.getRecipeList();
       //this.getList();
     },
     methods: {
@@ -166,6 +173,13 @@
           }
         })
       },
+      //获取菜谱列表
+      getRecipeList(){
+        getRecipeList().then(response=>{
+          //菜谱列表
+          this.recipeWeek = response.rows;
+        })
+      },
       // 取消按钮
       cancel() {
         this.open = false;

src/views/system/user/index.vue

@@ -112,15 +112,15 @@
               v-hasPermi="['system:user:remove']"
             >删除</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="info"-->
+<!--              icon="el-icon-upload2"-->
+<!--              size="mini"-->
+<!--              @click="handleImport"-->
+<!--              v-hasPermi="['system:user:import']"-->
+<!--            >导入</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button
               type="warning"