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/products/goods-form.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
index b5d53b3..225ed3c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html
@@ -1568,7 +1568,7 @@
                         if (valid) {
 
 
-                            if ( _this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && !_this.form.carUseCount) {
+                            if ( _this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && _this.form.isInfinite == 'N' && !_this.form.carUseCount) {
                                 this.$message.error('请输入套餐最大使用次数!');
                               _this.submiting = false;
                                 return false;

--
Gitblit v1.9.1