From 455cc51f1734ba3e9d59b2b2fab5f94453c00c20 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Sat, 29 May 2021 11:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E5=8D=95=E4=B9=9F=E9=9C=80?=
=?UTF-8?q?=E8=A6=81=E7=94=9F=E6=88=90=E9=A3=9F=E8=B0=B1=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java | 3 ++-
stdiet-ui/src/components/RecipesPlanDrawer/index.vue | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
index a386f35c0..ab5a41633 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java
+++ b/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;
}
diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
index 682a58ccd..45498bca8 100644
--- a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue
+++ b/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>