Merge branch 'score_shop'

wzy

2022-10-07 46110cd69b178a03fed0633d45e6ca5265de630d

 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;
                            }