From a56551a91812ec1f620d49c7e6e06f9f15eabdbb Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 12 Jan 2021 17:39:29 +0800
Subject: [PATCH] 1、修改服务单看板时间查询了未确认的和已取消的bug 2、跟进记录根据时间倒序排序

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 61ce44a..b1e8763 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -776,7 +776,9 @@
                     _this.achieveList.forEach(achieve => {
                         for (let i = 0; i < _this.order.items.length; i++) {
                             let item = _this.order.items[i];
-                            item.achaeveList = [];
+                            if (!item.achaeveList){
+                                item.achaeveList = [];
+                            }
                             if (item.uuid == achieve.orderItem.uuid) {
                                 let achieveNew = {
                                     beaultId: achieve.saleId,

--
Gitblit v1.9.1