Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!223 食谱制作菜品选择增加食材条件筛选

Browse Source 
Merge pull request !223 from 德仔/develop
This commit is contained in:
德仔 2021-04-27 17:39:02 +08:00 committed by Gitee
commit 409c1e582f
7 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java
View File

@ -95,4 +95,6 @@ public class SysDishes {
private String physical;
private String igdName;
}

3
stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml
View File

@ -53,6 +53,9 @@
<if test="physical != null and physical != ''">
and id in(SELECT DISTINCT(dishes_id) FROM sys_dishes_rec WHERE physical_signs_id = #{physical})
</if>
<if test="igdName != null and igdName != ''">
and id in(SELECT DISTINCT(dishes_id) FROM sys_dishes_ingredient WHERE name like concat('%', #{igdName}, '%'))
</if>
<if test="bigClass != null">and big_class = #{bigClass}</if>
<if test="smallClass != null">and small_class = #{smallClass}</if>
<if test="reviewStatus != null and type != ''">and review_status = #{reviewStatus}</if>

3
stdiet-ui/package.json
View File

@ -74,7 +74,8 @@
"vue-scrollto": "^2.20.0",
"vue-splitpane": "1.0.4",
"vuedraggable": "2.20.0",
"vuex": "3.1.0"
"vuex": "3.1.0",
"wangeditor": "^4.6.16"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.4",

6
stdiet-ui/src/views/custom/dishes/EditDishesDrawer/index.vue
View File

@ -16,7 +16,11 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="审核状态" prop="reviewStatus">
<el-form-item
label="审核状态"
prop="reviewStatus"
v-hasPermi="['custom:dishes:review']"
>
<el-select
v-model="form.reviewStatus"
placeholder="请选择审核状态"

6
stdiet-ui/src/views/custom/ingredient/index.vue
View File

@ -376,7 +376,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审核状态" prop="reviewStatus">
<el-form-item
label="审核状态"
prop="reviewStatus"
v-hasPermi="['custom:ingredient:review']"
>
<el-select
style="position: absolute"
v-model="form.reviewStatus"

27
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue
View File

@ -8,7 +8,7 @@
label-width="68px"
@submit.native.prevent
>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="菜品名称" prop="name">
<el-input
v-model="queryParams.name"
@ -19,7 +19,18 @@
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="包含食材" prop="physical">
<el-input
v-model="queryParams.igdName"
placeholder="请输入食材名称"
clearable
size="mini"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="菜品种类" prop="dishClass">
<el-cascader
filterable
@ -33,7 +44,7 @@
></el-cascader>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="菜品类型" prop="type">
<el-select
:disabled="lockType"
@ -52,7 +63,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="推荐体征" prop="physical">
<el-cascader
:disabled="lockType"
@ -92,10 +103,7 @@
<el-table-column label="菜品名称" align="center" prop="name" />
<el-table-column label="菜品种类" align="center" prop="bigClass">
<template slot-scope="scope">
<AutoHideMessage
:data="dishClassFormat(scope.row)"
:maxLength="10"
></AutoHideMessage>
<AutoHideMessage :data="dishClassFormat(scope.row)" :maxLength="10" />
</template>
</el-table-column>
<el-table-column label="菜品类型" align="center" prop="type">
@ -152,6 +160,7 @@ export default {
pageSize: 10,
name: null,
type: null,
igdName: null,
smallClass: null,
bigClass: null,
reviewStatus: "yes",
@ -232,6 +241,7 @@ export default {
pageSize: 10,
name: null,
type: null,
igdName: null,
reviewStatus: "yes",
};
this.dishesList = [];
@ -245,6 +255,7 @@ export default {
this.getList({});
},
resetQuery() {
this.clean();
this.resetForm("queryForm");
this.dishClassQueryParam = [];
this.handleQuery();

2
stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue
View File

@ -7,7 +7,7 @@
:wrapperClosable="false"
class="add_dishes_drawer_wrapper"
direction="ltr"
size="40%"
size="45%"
>
<div class="content_wrapper">
<div class="content_detail">