modify

Helius

2020-12-14 cc78ea9e77300dfcb9eb7a9dc397c81548d695fb

modify

 zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java

@@ -429,6 +429,8 @@
     */
    private Date invalidTime;

    private String isInfinite;

    /**
     * 支付方式 1-充值本金 2-赠送金额 3-积分
     */
@@ -442,6 +444,14 @@
        this.payMethods = payMethods;
    }

    public String getIsInfinite() {
        return isInfinite;
    }

    public void setIsInfinite(String isInfinite) {
        this.isInfinite = isInfinite;
    }

    public Integer getBuyDateNum() {
        return buyDateNum;
    }

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

@@ -190,8 +190,16 @@
                            </el-radio-group>
                        </el-form-item>
                    </el-col>
                    <el-col :offset="2" :span="10">
                        <el-form-item prop="carUseCount" label-width="120px" label="最大使用次数" v-if="form.isCourse=='Y'">
                    <el-col :offset="2" :span="3">
                        <el-form-item label="是否无限次数" v-if="form.isCourse=='Y'">
                            <el-radio-group v-model="form.isInfinite">
                                <el-radio label="N">否</el-radio>
                                <el-radio label="Y">是</el-radio>
                            </el-radio-group>
                        </el-form-item>
                    </el-col>
                    <el-col :offset="1" :span="5">
                        <el-form-item prop="carUseCount" label-width="120px" label="最大使用次数" v-if="form.isCourse=='Y' && form.isInfinite=='N'">
                            <el-input v-model="form.carUseCount"></el-input>
                        </el-form-item>
                    </el-col>
@@ -1132,6 +1140,7 @@
                cardAssembles: [],
                //充值卡绑定产品分类
                isCourse: 'N',
                isInfinite : 'N',
                carIsAll: '否',
                useDateNum : '',
                buyDateNum : '',