Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

stdiet-ui/src/views/custom/recipesBuild/RecommendView/TemplateView/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="template_view_wrapper">
     <div class="header">
-      <div style="fontWeight: bold">选择模板</div>
+      <div style="fontweight: bold">选择模板</div>
       <el-button size="mini" @click="handleOnBackClick">返回</el-button>
     </div>
     <div class="content">
@@ -131,7 +131,9 @@ export default {
     },
     getList() {
       this.loading = true;
-      listRecipesTemplate(this.queryParams).then((res) => {
+      const params = JSON.parse(JSON.stringify(this.queryParams));
+      params.keys = (params.name || "").split(" ");
+      listRecipesTemplate(params).then((res) => {
         if (res.code === 200) {
           this.dataList = res.rows;
           this.total = res.total;

stdiet-ui/src/views/custom/recipesPlan/index.vue

@@ -12,6 +12,7 @@
           placeholder="请输入客户姓名或手机号"
           clearable
           size="small"
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="日期" prop="planStartDateScope">

stdiet-ui/src/views/custom/recipesTemplate/index.vue

@@ -269,7 +269,9 @@ export default {
     /** 查询食谱计划列表 */
     getList() {
       this.loading = true;
-      listRecipesTemplate(this.queryParams).then((response) => {
+      const params = JSON.parse(JSON.stringify(this.queryParams));
+      params.keys = params.name ? params.name.split(" ") : null;
+      listRecipesTemplate(params).then((response) => {
         this.recipesTemplateList = response.rows;
         this.total = response.total;
         this.loading = false;

stdiet-ui/src/views/system/user/index.vue

@@ -10,6 +10,7 @@
             clearable
             size="small"
             prefix-icon="el-icon-search"
+            @keyup.enter.native="handleQuery"
             style="margin-bottom: 20px"
           />
         </div>