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

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

@@ -413,7 +413,7 @@ export default {
     });
     this.getDicts("cus_account").then((response) => {
       this.accountIdOptions = response.data;
-      console.log(response.data);
+      // console.log(response.data);
       this.accountIdOptions.splice(0, 0, {
         dictLabel: "无",
         dictValue: "0",
@@ -559,7 +559,7 @@ export default {
         accountId,
         ...obj,
       };
-      console.log(this.form);
+      // console.log(this.form);
       this.resetForm("form");
     },
     handleOnClosed() {
@@ -600,7 +600,7 @@ export default {
   watch: {
     // 监听收款账号的变化
     "form.accountId": function (newVal, oldVal) {
-      console.log("updte");
+      // console.log("updte");
       this.initPlanningAndOperation();
     },
   },

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

@@ -130,7 +130,7 @@ export default {
       // 健康评估标题
       healthyTitleData:[
         [
-          ["创建时间","客户姓名","手机号"],["调理项目","性别","年龄"],["身高(厘米)","体重(斤)","位置"]
+          ["创建时间","客户姓名","手机号"],["调理项目","性别","年龄"],["身高(厘米)","体重(斤)","地域"]
         ],
         [
           ["减脂经历","减脂遇到的困难","减脂是否反弹"],["是否意识到生活习惯是减脂关键","",""]
@@ -177,7 +177,7 @@ export default {
         [
           ["breakfastType","breakfastFood","lunchType"],["dinner","vegetableRate","commonMeat"],
           ["dinnerTime","supperNum","supperFood"],["dietHotAndCold","dietFlavor","vegetablesNum"],
-          ["vegetablesRateType","fruitsNum","fruitsTime"],["fruitsRate","riceNum","riceNum"],
+          ["vegetablesRateType","fruitsNum","fruitsTime"],["fruitsRate","riceNum","riceFull"],
           ["eatingSpeed","makeFoodType","snacks"],
           ["healthProductsFlag","healthProductsBrand","healthProductsName"],
           ["healthProductsWeekRate","dishesIngredient",""]

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

@@ -0,0 +1,87 @@
+<template>
+  <div class="main">
+    <div class="aspect">指标</div>
+    <div class="recipes">
+      <el-table :data="mData" border :span-method="spanMethod" size="mini">
+        <el-table-column :label="`${name}第${num}天`"></el-table-column>
+        <el-table-column label="菜品" prop="name"></el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: "RecipesCom",
+  props: {
+    data: {
+      type: Array,
+      default: [],
+      required: true,
+    },
+    name: {
+      type: String,
+      default: "",
+    },
+    num: {
+      type: Number,
+      default: 0,
+    },
+  },
+  components: {},
+  mounted() {
+    // console.log(this.data);
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    mData() {
+      if (!this.data.dishes) {
+        return [];
+      }
+
+      const mData = this.data.dishes.reduce((arr, cur) => {
+        if (cur.id > 0) {
+          cur.igdList.forEach((igd) => {
+            if (igd.id > 0) {
+              const tarDetail = cur.detail.find((det) => det.id == igd.id);
+              arr.push({
+                id: cur.id,
+                name: cur.name,
+                type: cur.type,
+                isMain: cur.isMain,
+                methods: cur.methods,
+                igdId: igd.id,
+                igdName: igd.name,
+                proteinRatio: igd.proteinRatio,
+                fatRatio: igd.fatRatio,
+                carbonRatio: igd.carbonRatio,
+                rec: igd.rec,
+                notRec: igd.notRec,
+                weight: tarDetail ? tarDetail.weight : igd.weight,
+                cusWeight: tarDetail ? tarDetail.cus_weight : igd.cusWeight,
+                cusUnit: tarDetail ? tarDetail.cus_unit : igd.cusUnit,
+              });
+            }
+          });
+        }
+        return arr;
+      }, []);
+      // console.log(mData);
+      return mData;
+    },
+  },
+  methods: {
+    spanMethod({ row, column, rowIndex, columnIndex }) {},
+  },
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.main {
+  .aspect {
+  }
+
+  .recipies {
+  }
+}
+</style>

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

@@ -35,7 +35,7 @@ export default {
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      console.log(themeCluster, originalCluster)
+      // console.log(themeCluster, originalCluster)
 
       const $message = this.$message({
         message: '  Compiling the theme',