Merge branch 'score_shop'

wzy

2022-10-07 46110cd69b178a03fed0633d45e6ca5265de630d

 zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html

@@ -222,14 +222,25 @@
                    <el-col :span="10">
                        <el-form-item label="充值卡使用范围" label-width="150px" prop="isCourse">
                            <el-radio-group v-model="form.carIsAll">
                                <el-radio label="是">所有产品</el-radio>
                                <el-radio label="否">部分产品（设置部分产品则充值卡内的金额只能消费指定范围的产品）</el-radio>
                                <el-radio label="是" value="是">所有产品</el-radio>
                                <el-radio label="否" value="是">部分产品（设置部分产品则充值卡内的金额只能消费指定范围的产品）</el-radio>
                            </el-radio-group>
                        </el-form-item>
                    </el-col>
                    <el-col :offset="2" :span="10">
                        <el-form-item label-width="120px" label="最大使用次数">
                            <el-input v-model="form.carUseCount"></el-input>
                        </el-form-item>
                    </el-col>
                </el-row>

                <el-row>
                    <el-col :span="10">
                        <el-form-item label="是否合作项目">
                            <el-radio-group v-model="form.isCooperate">
                                <el-radio label="2">否</el-radio>
                                <el-radio label="1">是</el-radio>
                            </el-radio-group>
                        </el-form-item>
                    </el-col>
                </el-row>
@@ -1011,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>
@@ -1145,6 +1156,7 @@
            //表单数据
            form: {
                isPresent: '否',
                isCooperate: '2',
                staus: '上架',
                //产品组合
                assembleGoods: [],
@@ -1169,14 +1181,7 @@
                name: [{required: true, message: '请输入商品名称', trigger: 'blur'}],
                code: [{required: true, message: '请输入商品编码', trigger: 'blur'}],
                cateId: [{required: true, message: '请选择商品分类', trigger: 'blur'}],
                goodsSortId: [{required: true, message: '请选择库存分类', trigger: 'blur'}],
                unit: [{required: true, message: '请填写规格', trigger: 'change'}],
                volume: [{required: true, message: '请填写容量', trigger: 'blur'}],
                measure: [{required: true, message: '请填写单位', trigger: 'change'}],
                isCourse: [{required: true, message: '请选择套餐类型', trigger: 'change'}],
                sealPice: [{required: true, message: '请填写售价', trigger: 'blur'}],
                timeLength: [{required: true, message: '请填写服务时长', trigger: 'blur'}],
                isNum : [{ type : 'number', message: '请输入数字', trigger: 'blur' }],
            },

        },
@@ -1596,14 +1601,20 @@
                if (this.validFormData()) {

                    this.$refs[formName].validate((valid) => {

                        console.log(valid);
                        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;
                            }


@@ -1691,7 +1702,7 @@
                        _this.userAdbleEdit();

                        //如果是总产品加载总部分类信息
                        _this.getShoppinggoodscategory(1);
                        // _this.getShoppinggoodscategory(1);
                        _this.getGoodstype(1);
                    }
                });