From 39a5520c112081aff9f55ad13c1b4b53e4136a87 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Oct 2022 15:05:43 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 82445c2..a97efed 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
@@ -1022,8 +1022,8 @@
<script type="text/javascript" th:src="@{/js/systools/AjaxProxyVue.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
<script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script>
-<script src="https://cdn.jsdelivr.net/npm/@riophae/vue-treeselect@^0.4.0/dist/vue-treeselect.umd.min.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@riophae/vue-treeselect@^0.4.0/dist/vue-treeselect.min.css">
+<script th:src="@{/plugin/vue-treeselect/vue-treeselect.umd.min.js}"></script>
+<link rel="stylesheet" th:href="@{/plugin/vue-treeselect/vue-treeselect.min.css}">
<script>
@@ -1605,10 +1605,16 @@
if (valid) {
- if ( _this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && _this.form.isInfinite == 'N' && !_this.form.carUseCount) {
- this.$message.error('请输入套餐最大使用次数！');
- _this.submiting = false;
- return false;
+ if ( _this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && _this.form.isInfinite == 'N') {
+ if (!_this.form.carUseCount) {
+ this.$message.error('请输入套餐最大使用次数！');
+ _this.submiting = false;
+ return false;
+ }
+ }
+
+ if (_this.form.goodType == '套餐' && _this.form.isCourse == 'Y' && _this.form.isInfinite == 'Y') {
+ _this.form.carUseCount = 999;
}
@@ -1696,7 +1702,7 @@
_this.userAdbleEdit();
//如果是总产品加载总部分类信息
- _this.getShoppinggoodscategory(1);
+ // _this.getShoppinggoodscategory(1);
_this.getGoodstype(1);
}
});
--
Gitblit v1.9.1