diff --git a/stdiet-ui/src/components/AutoHideInfo/index.vue b/stdiet-ui/src/components/AutoHideInfo/index.vue index 20457e1f4..b2b4aa2af 100644 --- a/stdiet-ui/src/components/AutoHideInfo/index.vue +++ b/stdiet-ui/src/components/AutoHideInfo/index.vue @@ -3,9 +3,14 @@
{{ item }}
-
-
...
- +
+
...
+
{{ item }}
详情
@@ -14,37 +19,39 @@ diff --git a/stdiet-ui/src/components/ContractDrawer/index.vue b/stdiet-ui/src/components/ContractDrawer/index.vue index 0a5c5e96a..4085e88b2 100644 --- a/stdiet-ui/src/components/ContractDrawer/index.vue +++ b/stdiet-ui/src/components/ContractDrawer/index.vue @@ -4,6 +4,7 @@ :title="title" :close-on-press-escape="false" :visible.sync="visible" + :wrapperClosable="false" @closed="handleOnClosed" size="40%" > @@ -22,22 +23,48 @@ - - + + - + - + @@ -48,15 +75,15 @@ type="text" icon="el-icon-view" @click="handleOnDetailClick(scope.row)" - >详情 + >详情 查看 + >查看 删除 + >删除 @@ -78,23 +105,23 @@
diff --git a/stdiet-ui/src/components/OrderDrawer/index.vue b/stdiet-ui/src/components/OrderDrawer/index.vue index 1bb84e301..b2df91de2 100644 --- a/stdiet-ui/src/components/OrderDrawer/index.vue +++ b/stdiet-ui/src/components/OrderDrawer/index.vue @@ -4,6 +4,7 @@ :title="title" :close-on-press-escape="false" :visible.sync="visible" + :wrapperClosable="false" @closed="handleOnClosed" size="40%" > diff --git a/stdiet-ui/src/store/modules/recipes.js b/stdiet-ui/src/store/modules/recipes.js index e0ef51672..ce6983729 100644 --- a/stdiet-ui/src/store/modules/recipes.js +++ b/stdiet-ui/src/store/modules/recipes.js @@ -12,6 +12,7 @@ const oriState = { recipesData: [], cusUnitOptions: [], cusWeightOptions: [], + dishesTypeOptions: [], typeOptions: [], currentDay: -1 }; @@ -23,36 +24,29 @@ const mutations = { }, setRecipesData(state, payload) { state.recipesData = payload.recipesData; - console.log(payload.recipesData); + // console.log(payload.recipesData); }, - updateRecipesDishesWeight(state, payload) { + updateRecipesDishesDetail(state, payload) { const tarDishes = state.recipesData[payload.num].dishes.find( obj => obj.id === payload.dishesId ); if (tarDishes) { const tarIgd = tarDishes.igdList.find(obj => obj.id === payload.igdId); if (tarIgd) { - tarIgd.weight = payload.weight; + payload.weight && (tarIgd.weight = payload.weight); + payload.cusWeight && (tarIgd.cusWeight = payload.cusWeight); + payload.cusUnit && (tarIgd.cusUnit = payload.cusUnit); } } }, - updateRecipesDishesCustomWeight(state, payload) { - const tarDishes = state.recipesData[payload.num].dishes.find( - obj => obj.id === payload.dishesId - ); - if (tarDishes) { - const tarIgd = tarDishes.igdList.find(obj => obj.id === payload.igdId); - if (tarIgd) { - tarIgd.cusWeight = payload.cusWeight; - tarIgd.cusUnit = payload.cusUnit; - } - } + addRecipesDishes(state, payload) { + + state.recipesData[payload.num].dishes.push(payload.data); }, updateOptions(state, payload) { - payload.cusUnitOptions && (state.cusUnitOptions = payload.cusUnitOptions); - payload.cusWeightOptions && - (state.cusWeightOptions = payload.cusWeightOptions); - payload.typeOptions && (state.typeOptions = payload.typeOptions); + Object.keys(payload).forEach(key => { + state[key] = payload[key]; + }); }, setCurrentDay(state, payload) { state.currentDay = @@ -88,6 +82,9 @@ const actions = { getDicts("cus_dishes_type").then(response => { commit("updateOptions", { typeOptions: response.data }); }); + getDicts("cus_dishes_type").then(response => { + commit("updateOptions", { dishesTypeOptions: response.data }); + }); // 健康数据 const healthyDataResult = await getCustomerPhysicalSignsByCusId( diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js index daca800c2..9023a81a1 100644 --- a/stdiet-ui/src/utils/healthyData.js +++ b/stdiet-ui/src/utils/healthyData.js @@ -384,7 +384,8 @@ export const yesNoName = [ "longEatDrugFlag", "allergyFlag", "smokeFlag", - "secondSmoke" + "secondSmoke", + "sleepDrugFlag" ]; export const dictName = [ @@ -550,7 +551,7 @@ export function dealHealthy(customerHealthy) { customerHealthy.getupTime += "点"; } if (customerHealthy.hasOwnProperty("signList")) { - customerHealthy.signStr = customerHealthy.signList + customerHealthy.signStr = (customerHealthy.signList || []) .map(obj => obj.name) .join(","); } diff --git a/stdiet-ui/src/views/custom/dishes/index.vue b/stdiet-ui/src/views/custom/dishes/index.vue index 35330533b..e7121530b 100644 --- a/stdiet-ui/src/views/custom/dishes/index.vue +++ b/stdiet-ui/src/views/custom/dishes/index.vue @@ -162,9 +162,9 @@
diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/ConfigDishes.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/ConfigDishes.vue new file mode 100644 index 000000000..c64c2f311 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/ConfigDishes.vue @@ -0,0 +1,165 @@ + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue new file mode 100644 index 000000000..348ae2f45 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/SelectDishes.vue @@ -0,0 +1,172 @@ + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue new file mode 100644 index 000000000..93899f9a0 --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/AddDishesDrawer/index.vue @@ -0,0 +1,166 @@ + + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue index ac198febf..925ab22c0 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesCom/index.vue @@ -11,31 +11,26 @@ currentDay + 1 === num ? '1px solid #d96969' : 'none' }`" > - + + - +