diff --git a/src/views/dish/menu/detail.vue b/src/views/dish/menu/detail.vue index 06137b62..bb9ee24f 100644 --- a/src/views/dish/menu/detail.vue +++ b/src/views/dish/menu/detail.vue @@ -104,7 +104,7 @@ - +
已选菜品数量:{{dishesList.length}}
@@ -654,8 +654,7 @@ export default { if(index==-1){ this.dishesTypeList.push({typeId:dish.typeId,typeName:dish.typeName}) } - }) - console.log(this.dishesTypeList) + }) this.choseDishesType(this.dishesTypeList[0]) this.getDishesPage() this.openDishes=true @@ -686,14 +685,15 @@ export default { }, //点击左侧待选菜品 chosenDishes(obj){ - console.log(obj) - obj.salePrice=0; - obj.supplyNum=999; - obj.restrictNum=999; //判断是否为新菜品类型 let index = this.dishesList.findIndex(v=>v.dishesId==obj.dishesId) if(index==-1){ - this.dishesList.push(obj) + let dish = Object.assign({}, obj) + this.$set(dish,'price',Number(dish.price/100)) + this.$set(dish,'salePrice',Number(dish.salePrice/100)||0) + this.$set(dish,'supplyNum',dish.supplyNum||99999) + this.$set(dish,'restrictNum',dish.restrictNum||99999) + this.dishesList.push(dish) //反显选中样式 this.dishesPageList.forEach(item=>{ if(obj.dishesId==item.dishesId){ @@ -719,7 +719,6 @@ export default { }, //选中菜品类型-更新右侧表格数据 choseDishesType(item){ - console.log(item) this.dishesType = item.typeId; this.dishesTableList = [] this.dishesList.forEach(dish=>{ @@ -727,7 +726,6 @@ export default { this.dishesTableList.push(dish) } }) - console.log(this.dishesTableList) }, //弹窗右侧表格删除菜谱 handleDelDishes(item){ @@ -756,16 +754,13 @@ export default { }) }).catch(() => {}); }, - // 提交按钮 confirmSubmit(){ this.$refs["baseInfo"].validate(valid => { - if (valid) { - console.log(this.baseInfo) + if (valid) { let param = this.baseInfo - if(this.baseInfo.recipeType==1){ - console.log(this.dateRangeList) - param.recipeDateList = this.dateRangeList + if(this.baseInfo.recipeType==1){ + param.recipeDateList = this.dateRangeList; } if(this.baseInfo.recipeType==2){ param.recipeDateList = [{ @@ -774,16 +769,27 @@ export default { }] } if(this.baseInfo.recipeType==3){ - console.log(this.weekDateList) param.recipeDateList = this.weekDateList } - console.log(param) + param.recipeDateList.forEach(item=>{ + item.detailList.forEach(subItem=>{ + subItem.dishesList.forEach(dishItem=>{ + dishItem.price = Number(dishItem.price*100) + dishItem.salePrice = Number(dishItem.salePrice*100) + }) + }) + }) addMenuRecipeApi(param).then((response) => { this.jumpList() }); } }); }, + + + + + //日期 formatDate(date) { // 格式化为 YYYY-MM-DD diff --git a/src/views/dish/menu/edit.vue b/src/views/dish/menu/edit.vue index 314caf11..9979b6a9 100644 --- a/src/views/dish/menu/edit.vue +++ b/src/views/dish/menu/edit.vue @@ -430,7 +430,7 @@ export default { this.baseInfo = JSON.parse(this.$route.query.pageJson) this.baseInfo.recipeType = this.baseInfo.recipeType+'' this.initEditDetail() - } + } }, methods: { //菜谱编辑 @@ -497,7 +497,11 @@ export default { for (let i = 0; i < response.length; i++) { this.detailList.forEach(item=>{ if(item.mealtimeType==response[i].mealtimeType){ - item.dishesList = response[i].dishesList + item.dishesList = response[i].dishesList; + item.dishesList.forEach(dish=>{ + this.$set(dish,'price',Number(dish.price/100)) + this.$set(dish,'salePrice',Number(dish.salePrice/100)||0) + }) } }) } @@ -517,6 +521,10 @@ export default { this.detailList.forEach(item=>{ if(item.mealtimeType==response[i].mealtimeType){ item.dishesList = response[i].dishesList + item.dishesList.forEach(dish=>{ + this.$set(dish,'price',Number(dish.price/100)) + this.$set(dish,'salePrice',Number(dish.salePrice/100)||0) + }) } }) } @@ -536,6 +544,10 @@ export default { this.detailList.forEach(item=>{ if(item.mealtimeType==response[i].mealtimeType){ item.dishesList = response[i].dishesList + item.dishesList.forEach(dish=>{ + this.$set(dish,'price',Number(dish.price/100)) + this.$set(dish,'salePrice',Number(dish.salePrice/100)||0) + }) } }) } @@ -782,8 +794,7 @@ export default { if(index==-1){ this.dishesTypeList.push({typeId:dish.typeId,typeName:dish.typeName}) } - }) - console.log(this.dishesTypeList) + }) this.choseDishesType(this.dishesTypeList[0]) this.getDishesPage() this.openDishes=true @@ -814,14 +825,15 @@ export default { }, //点击左侧待选菜品 chosenDishes(obj){ - console.log(obj) - obj.salePrice=0; - obj.supplyNum=999; - obj.restrictNum=999; //判断是否为新菜品类型 let index = this.dishesList.findIndex(v=>v.dishesId==obj.dishesId) if(index==-1){ - this.dishesList.push(obj) + let dish = Object.assign({}, obj) + this.$set(dish,'price',Number(dish.price/100)) + this.$set(dish,'salePrice',Number(dish.salePrice/100)||0) + this.$set(dish,'supplyNum',dish.supplyNum||99999) + this.$set(dish,'restrictNum',dish.restrictNum||99999) + this.dishesList.push(dish) //反显选中样式 this.dishesPageList.forEach(item=>{ if(obj.dishesId==item.dishesId){ @@ -888,10 +900,9 @@ export default { confirmSubmit(){ this.$refs["baseInfo"].validate(valid => { if (valid) { - console.log(this.baseInfo) + let param = this.baseInfo if(this.baseInfo.recipeType==1){ - console.log(this.dateRangeList) param.recipeDateList = this.dateRangeList } if(this.baseInfo.recipeType==2){ @@ -904,7 +915,14 @@ export default { console.log(this.weekDateList) param.recipeDateList = this.weekDateList } - console.log(param) + param.recipeDateList.forEach(item=>{ + item.detailList.forEach(subItem=>{ + subItem.dishesList.forEach(dishItem=>{ + dishItem.price = Number(dishItem.price*100) + dishItem.salePrice = Number(dishItem.salePrice*100) + }) + }) + }) addMenuRecipeApi(param).then((response) => { this.jumpList() });