Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

体验单也需要生成食谱计划

Browse Source 
Merge pull request  from 德仔/develop
This commit is contained in:
德仔 2021-05-29 11:42:03 +08:00 committed by Gitee
commit 87e38a5366
2 changed files with 3 additions and 2 deletions
stdiet-custom/src/main/java/com/stdiet/custom/service/impl
SysRecipesPlanServiceImpl.java
stdiet-ui/src/components/RecipesPlanDrawer
index.vue

3
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java

@ -171,7 +171,8 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
}
//判断是否提成单，拆分单中的副单，体验单,定金单
if (sysOrder.getAfterSaleCommissOrder().intValue() == 1 || ("1".equals(sysOrder.getOrderType()) && sysOrder.getMainOrderId().intValue() != 0) ||
"2".equals(sysOrder.getOrderType()) || "1".equals(sysOrder.getOrderMoneyType()) || sysOrder.getCounted() == 1) {
// "2".equals(sysOrder.getOrderType()) || // 体验单也需要生成计划 2021.05.29
"1".equals(sysOrder.getOrderMoneyType()) || sysOrder.getCounted() == 1) {
System.out.println("---------------------" + sysOrder.getOrderId() + "不生成食谱------------------------");
continue;
}

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

@ -70,7 +70,7 @@
{{ `第${scope.row.startNumDay} 至 ${scope.row.endNumDay}天` }}
</template>
</el-table-column>
<el-table-column label="日期" align="center">
<el-table-column label="日期" align="center" width="200">
<template slot-scope="scope">
{{ `${scope.row.startDate} 至 ${scope.row.endDate}` }}
</template>