!116 修复食谱制作问题

Merge pull request !116 from 德仔/develop

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

@@ -670,7 +670,7 @@ export default {
       }
     },
     handleOrderTypeChange() {
-      console.log(this.form.orderTypeList);
+      // console.log(this.form.orderTypeList);
     },
   },
   watch: {

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

@@ -170,7 +170,7 @@ export default {
           }
           return arr;
         }, []);
-        console.log(this.orderList);
+        // console.log(this.orderList);
 
         this.visible = true;
       });

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

@@ -569,7 +569,7 @@ export default {
       };
       // console.log(this.form);
       this.resetForm("form");
-      console.log("--"+obj.orderType);
+      // console.log("--"+obj.orderType);
       this.onSaleShow = this.form.orderType == "2";
       this.afterSaleNutriAssShow = this.form.orderType != "2" && this.form.afterSaleCommissOrder == 0;
       this.planOperatorShow = this.form.afterSaleCommissOrder == 0;

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

@@ -33,7 +33,7 @@ const oriState = {
   templateInfo: undefined,
   copyData: undefined,
   canCopyMenuTypes: [],
-  fontSize: 12
+  fontSize: parseInt(localStorage.getItem("fontSize")) || 12
 };
 
 const mutations = {
@@ -45,6 +45,7 @@ const mutations = {
     );
     if (tarDishes) {
       if (actionType === "replace") {
+        tarDishes.remark = "";
         // 替换菜品,修改类型
         Object.keys(payload.data).forEach(key => {
           tarDishes[key] = payload.data[key];
@@ -69,6 +70,7 @@ const mutations = {
   },
   updateFontSize(state, payload) {
     state.fontSize = payload.fontSize;
+    localStorage.setItem("fontSize", payload.fontSize);
   },
   addRecipesDishes(state, payload) {
     state.recipesData[payload.num].dishes.push(payload.data);
@@ -299,7 +301,7 @@ const actions = {
     // console.log(params);
   },
   async addDishes({ commit, state }, payload) {
-    console.log(payload);
+    // console.log(payload);
     const tarDishesList = state.recipesData[payload.num].dishes.filter(
       obj => obj.type === payload.data.type
     );
@@ -366,6 +368,7 @@ const actions = {
           params.remark = payload.remark;
         } else if (actionType === "replace") {
           params.dishesId = payload.data.dishesId;
+          params.remark = "";
           params.detail = payload.data.igdList.map(igd => ({
             id: igd.id,
             weight: igd.weight,

stdiet-ui/src/views/custom/foodHeatStatistics/investigate/index.vue

@@ -247,7 +247,7 @@
            }
         });
         this.ingredientArray.splice(tagIndex, 1);
-        console.log( JSON.stringify(this.ingredientArray))
+        // console.log( JSON.stringify(this.ingredientArray))
       }
     },
     created() {

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

@@ -636,7 +636,7 @@ export default {
         this.searchOrderTypeArray != null
           ? encodeURIComponent(JSON.stringify(this.searchOrderTypeArray))
           : null;
-      console.log(this.queryParams.searchOrderTypeArray);
+      // console.log(this.queryParams.searchOrderTypeArray);
       //this.dealOrderTypeArray();
       listOrder(this.addDateRange(this.queryParams, this.daterange)).then(
         (response) => {

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

@@ -142,6 +142,8 @@ export default {
       loading: false,
       mFontSize: 12,
       fontSizeOpts: [
+        { value: 8, label: "8" },
+        { value: 10, label: "10" },
         { value: 12, label: "12" },
         { value: 14, label: "14" },
         { value: 16, label: "16" },
@@ -149,17 +151,25 @@ export default {
       ],
     };
   },
+  mounted() {
+    // this.mFontSize = parseInt(localStorage.getItem("fontSize")) || 12;
+    // this.updateFontSize({fontSize:})
+  },
   updated() {
     // console.log(this.data);
+    if (this.fontSize !== this.mFontSize) {
+      this.mFontSize = this.fontSize;
+      // console.log(this.fontSize);
+    }
   },
   props: ["collapse", "data"],
   computed: {
     ...mapState(["recipesId", "reviewStatus", "healthyData", "fontSize"]),
   },
   watch: {
-    fontSize(val) {
+    // fontSize(val) {
-      this.mFontSize = val;
+    //   this.mFontSize = val;
-    },
+    // },
   },
   methods: {
     handleOnSizeChange(fontSize) {

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

@@ -401,12 +401,18 @@ export default {
           }
           return arr;
         }, []);
-      console.log(mData);
+      // console.log(mData);
 
       return mData;
     },
     ...mapGetters(["typeDict"]),
-    ...mapState(["currentDay", "copyData", "fontSize", "canCopyMenuTypes"]),
+    ...mapState([
+      "currentDay",
+      "copyData",
+      "fontSize",
+      "canCopyMenuTypes",
+      "recipesId",
+    ]),
   },
   methods: {
     cellClassName({ row, column, rowIndex, columnIndex }) {
@@ -470,9 +476,17 @@ export default {
     handleOnPaste(type) {
       // console.log(this.copyData);
       if (this.copyData) {
+        const data = {
+          ...this.copyData,
+          type,
+        };
+        if (!this.recipesId) {
+          // 未生成食谱时拷贝
+          data.id = new Date().getTime();
+        }
         this.addDishes({
           num: this.num,
-          data: { ...this.copyData, type },
+          data,
         }).catch((err) => {
           this.$message.error(err);
         });
@@ -624,6 +638,12 @@ export default {
   color: #595959;
 }
 
+.recipes_cell_8 {
+  font-size: 8px;
+}
+.recipes_cell_10 {
+  font-size: 10px;
+}
 .recipes_cell_12 {
   font-size: 12px;
 }

stdiet-ui/src/views/custom/recipesShow/PlanDrawer/ShoppingPlanDrawer/index.vue

@@ -147,7 +147,7 @@ export default {
         },
         {}
       );
-      console.log(this.shoppingCart);
+      // console.log(this.shoppingCart);
     },
     handleOnBackClick() {
       this.visible = false;