食谱制作状态

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesServiceImpl.java

@@ -54,8 +54,8 @@ public class SysRecipesServiceImpl implements ISysRecipesService {
             // 更新食谱计划
             SysRecipesPlan sysRecipesPlan = new SysRecipesPlan();
             sysRecipesPlan.setId(sysRecipes.getPlanId());
+            sysRecipesPlan.setReviewStatus(3);// 设置制作中
             sysRecipesPlan.setRecipesId(sysRecipes.getId());
-            sysRecipesPlan.setReviewStatus(1);
             sysRecipesPlanMapper.updateSysRecipesPlan(sysRecipesPlan);
         }
 

stdiet-ui/src/components/BodySignView/index.vue

@@ -104,8 +104,9 @@ export default {
       [{ title: "方便沟通时间", value: "connectTime" }],
     ];
     if (this.dev) {
-      basicInfo.splice(3, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
+      basicInfo.splice(3, 0, [{ title: "蛋白范围", value: "recProtein" }]);
-      basicInfo.splice(4, 0, [
+      basicInfo.splice(4, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
+      basicInfo.splice(5, 0, [
         { title: "不运动总热量", value: "notSportHeat" },
       ]);
       basicInfo.splice(basicInfo.length, 0, [

stdiet-ui/src/components/HealthyView/index.vue

@@ -90,11 +90,12 @@ export default {
       [{ title: "地域", value: "position" }],
     ];
     if (this.dev) {
-      basicInfo.splice(3, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
+      basicInfo.splice(3, 0, [{ title: "推荐蛋白范围", value: "recProtein" }]);
-      basicInfo.splice(4, 0, [
+      basicInfo.splice(4, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
+      basicInfo.splice(5, 0, [
         { title: "不运动总热量", value: "notSportHeat" },
       ]);
-      basicInfo.splice(6, 0, [{ title: "备注", value: "remark" }]);
+      basicInfo.splice(basicInfo.length, 0, [{ title: "备注", value: "remark" }]);
     }
 
     return {

stdiet-ui/src/components/RecipesPlanDrawer/index.vue

@@ -60,24 +60,9 @@
       <el-table :data="planList" v-loading="planLoading" height="80%">
         <el-table-column label="审核状态" align="center" width="80">
           <template slot-scope="scope">
-            <el-tag
+            <el-tag :type="getReviewType(scope.row.reviewStatus)">
-              :type="
+              {{ getReviewStatusName(scope.row.reviewStatus) }}
-                scope.row.reviewStatus === 0
+            </el-tag>
-                  ? 'info'
-                  : scope.row.reviewStatus === 2
-                  ? 'success'
-                  : 'danger'
-              "
-              >{{
-                `${
-                  scope.row.reviewStatus === 0
-                    ? "未制作"
-                    : scope.row.reviewStatus === 2
-                    ? "已审核"
-                    : "未审核"
-                }`
-              }}</el-tag
-            >
           </template>
         </el-table-column>
         <el-table-column label="计划" align="center">
@@ -226,6 +211,32 @@ export default {
       };
       this.resetForm("form");
     },
+    getReviewStatusName(status) {
+      switch (status) {
+        case 1:
+          return "未审核";
+        case 2:
+          return "已审核";
+        case 3:
+          return "制作中";
+        case 0:
+        default:
+          return "未制作";
+      }
+    },
+    getReviewType(status) {
+      switch (status) {
+        case 1:
+          return "danger";
+        case 2:
+          return "success";
+        case 3:
+          return "";
+        case 0:
+        default:
+          return "info";
+      }
+    },
     handleOnClosed() {
       this.data = undefined;
       this.cusOutId = "";

stdiet-ui/src/store/modules/recipes.js

@@ -302,7 +302,7 @@ const actions = {
       const recipesId = result.data;
       if (!payload.planId) {
         // 非保存模板
-        commit("updateStateData", { recipesId });
+        commit("updateStateData", { recipesId, reviewStatus: 3 });
         dispatch("getRecipesInfo", { recipesId });
       }
       payload.callback &&

stdiet-ui/src/utils/healthyData.js

@@ -482,6 +482,8 @@ export function dealHealthy(customerHealthy) {
   customerHealthy.notSportHeat = (customerHealthy.basicBMR * 1.3).toFixed(1);
   customerHealthy.basicBMR += "千卡";
   customerHealthy.notSportHeat += "千卡";
+  const lowRecProtein = customerHealthy.tall - 105;
+  customerHealthy.recProtein = `${lowRecProtein * 0.8} - ${lowRecProtein * 1.5}`;
 
   needAttrName.forEach(name => {
     if (customerHealthy.hasOwnProperty(name)) {

stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue

@@ -37,37 +37,43 @@
             />
           </el-select>
         </span>
-        <el-button size="mini" v-if="!recipesId" @click="handleOnBack"
+        <el-button size="mini" v-if="!recipesId" @click="handleOnBack">
-          >返回</el-button
+          返回
-        >
+        </el-button>
         <el-popover
           placement="bottom"
           trigger="click"
-          title="修改审核状态"
+          title="修改食谱状态"
           style="margin-right: 12px"
-          v-hasPermi="['recipes:plan:review']"
         >
           <div>
             <el-button
               size="mini"
               type="success"
+              v-hasPermi="['recipes:plan:review']"
               @click="hanldeOnReveiwChange(2)"
-              >审核通过</el-button
+              >已审核</el-button
             >
             <el-button
               size="mini"
               type="danger"
               @click="hanldeOnReveiwChange(1)"
-              >未审核通过</el-button
+              >未审核</el-button
+            >
+            <el-button
+              size="mini"
+              type="primary"
+              @click="hanldeOnReveiwChange(3)"
+              >制作中</el-button
             >
           </div>
           <el-button
             slot="reference"
             size="mini"
-            v-if="reviewStatus"
+            v-if="!!recipesId"
-            :type="reviewStatus === 1 ? 'danger' : 'success'"
+            :type="getReviewType(reviewStatus)"
           >
-            {{ reviewStatus === 1 ? "未审核" : "已审核" }}
+            {{ getReviewStatusName(reviewStatus) }}
           </el-button>
         </el-popover>
         <el-button
@@ -157,6 +163,32 @@ export default {
         }
       });
     },
+    getReviewStatusName(status) {
+      switch (status) {
+        case 1:
+          return "未审核";
+        case 2:
+          return "已审核";
+        case 3:
+          return "制作中";
+        case 0:
+        default:
+          return "未制作";
+      }
+    },
+    getReviewType(status) {
+      switch (status) {
+        case 1:
+          return "danger";
+        case 2:
+          return "success";
+        case 3:
+          return "primary";
+        case 0:
+        default:
+          return "info";
+      }
+    },
     ...mapActions(["saveRecipes", "updateReviewStatus"]),
     ...mapMutations(["updateStateData", "updateFontSize", "toggleLeftShow"]),
   },

stdiet-ui/src/views/custom/recipesBuild/VerifyView/index.vue

@@ -3,10 +3,12 @@
     <div>忌口</div>
     <div class="content">
       <span
-        class="item"
+        :class="`item ${
+          selectedNotRec.includes(item.name) ? 'selected_item' : ''
+        } `"
         v-for="item in verifyNotRecData"
         :key="item.name"
-        @click="handleOnClick(item.data)"
+        @click="handleOnClick(item)"
         >{{ item.name }}</span
       >
     </div>
@@ -18,14 +20,38 @@ const { mapActions, mapState, mapGetters } = createNamespacedHelpers("recipes");
 export default {
   name: "VerifyView",
   data() {
-    return {};
+    return {
+      selectedNotRec: [],
+    };
   },
   computed: {
     ...mapGetters(["verifyNotRecData"]),
   },
   methods: {
     handleOnClick(data) {
-      console.log({ data, verifyNotRecData: this.verifyNotRecData });
+      if (this.selectedNotRec.some((str) => data.name === str)) {
+        this.selectedNotRec = this.selectedNotRec.filter(
+          (str) => str !== data.name
+        );
+      } else {
+        this.selectedNotRec.push(data.name);
+        this.selectedNotRec = JSON.parse(JSON.stringify(this.selectedNotRec));
+      }
+
+      const notRecIgds = this.selectedNotRec.reduce((arr, cur) => {
+        this.verifyNotRecData[cur].data.forEach((obj) => {
+          if (!arr.includes(obj.igdId)) {
+            arr.push(obj.igdId);
+          }
+        });
+        return arr;
+      }, []);
+
+      console.log({
+        data,
+        notRecIgds,
+        verifyNotRecData: this.verifyNotRecData,
+      });
     },
   },
 };
@@ -44,12 +70,21 @@ export default {
       border: 1px solid #8c8c8c;
       padding: 3px 8px;
       word-break: normal;
+      transition: all 0.3s;
 
       &:hover {
-        color: #d96969;
+        color: white;
+        background: #d96969;
         border-color: #d96969;
       }
     }
+
+    .selected_item {
+      color: white;
+      background: #d96969;
+      border-color: #d96969;
+      font-weight: bold;
+    }
   }
 }
 </style>

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

@@ -108,24 +108,9 @@
     <el-table v-loading="loading" :data="recipesPlanList">
       <el-table-column label="审核状态" align="center" width="100">
         <template slot-scope="scope">
-          <el-tag
+          <el-tag :type="getReviewType(scope.row.reviewStatus)">
-            :type="
+            {{ getReviewStatusName(scope.row.reviewStatus) }}
-              !scope.row.reviewStatus
+          </el-tag>
-                ? 'info'
-                : scope.row.reviewStatus === 1
-                ? 'danger'
-                : 'success'
-            "
-            >{{
-              `${
-                !scope.row.reviewStatus
-                  ? "未制作"
-                  : scope.row.reviewStatus == 1
-                  ? "未审核"
-                  : "已审核"
-              }`
-            }}</el-tag
-          >
         </template>
       </el-table-column>
       <el-table-column label="客户姓名" align="center" prop="customer" />
@@ -338,6 +323,32 @@ export default {
       };
       this.resetForm("form");
     },
+    getReviewStatusName(status) {
+      switch (status) {
+        case 1:
+          return "未审核";
+        case 2:
+          return "已审核";
+        case 3:
+          return "制作中";
+        case 0:
+        default:
+          return "未制作";
+      }
+    },
+    getReviewType(status) {
+      switch (status) {
+        case 1:
+          return "danger";
+        case 2:
+          return "success";
+        case 3:
+          return "";
+        case 0:
+        default:
+          return "info";
+      }
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

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

@@ -87,24 +87,9 @@
     <el-table v-loading="loading" :data="recipesTemplateList">
       <el-table-column label="审核状态" align="center" width="120">
         <template slot-scope="scope">
-          <el-tag
+          <el-tag :type="getReviewType(scope.row.reviewStatus)">
-            :type="
+            {{ getReviewStatusName(scope.row.reviewStatus) }}
-              !scope.row.reviewStatus
+          </el-tag>
-                ? 'info'
-                : scope.row.reviewStatus === 1
-                ? 'danger'
-                : 'success'
-            "
-            >{{
-              `${
-                !scope.row.reviewStatus
-                  ? "未制作"
-                  : scope.row.reviewStatus == 1
-                  ? "未审核"
-                  : "已审核"
-              }`
-            }}</el-tag
-          >
         </template>
       </el-table-column>
       <el-table-column
@@ -299,6 +284,32 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    getReviewStatusName(status) {
+      switch (status) {
+        case 1:
+          return "未审核";
+        case 2:
+          return "已审核";
+        case 3:
+          return "制作中";
+        case 0:
+        default:
+          return "未制作";
+      }
+    },
+    getReviewType(status) {
+      switch (status) {
+        case 1:
+          return "danger";
+        case 2:
+          return "success";
+        case 3:
+          return "";
+        case 0:
+        default:
+          return "info";
+      }
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;