修复bug

jyy

2021-07-13 a24cea1b37de9ae98d7f25c13b60eecd0280f534

修复bug

 zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml

@@ -429,7 +429,7 @@
            <if test="isPresent != null and isPresent !='' ">
                is_present = #{isPresent},
            </if>
            <if test="isOnce != null and isOnce !='' ">
            <if test="isOnce != null  ">
                is_once = #{isOnce},
            </if>
            <if test="salePlatform != null and salePlatform !='' ">
@@ -447,13 +447,13 @@
            </if>

            <if
                test="(carMaxSaleCount != null and carMaxSaleCount !='') or carMaxSaleCount==0">
                test="carMaxSaleCount != null">
                car_max_sale_count = #{carMaxSaleCount},
            </if>
            <if test="carIsAll != null and carIsAll !='' ">
                car_is_all = #{carIsAll},
            </if>
            <if test="(carUseCount != null and carUseCount !='') or carUseCount==0 ">
            <if test="carUseCount != null ">
                car_use_count = #{carUseCount},
            </if>
            <if test="isVipCar != null and isVipCar !='' ">

 zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml

@@ -131,8 +131,8 @@
            a.count,
            a.proj_id,
            b.su_name,
            c.name as goods_name,
            c.seal_pice as goods_seal_pice,
            d.proj_name as goods_name,
            d.price as goods_seal_pice,
            c.TIME_LENGTH as goods_time_length,
            d.id as pu_id,
            d.SURPLUS_COUNT as pu_SURPLUS_COUNT,

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml

@@ -328,9 +328,7 @@
            <if test="record.vipId != null and record.vipId !='' ">
                and a.VIP_ID   = #{record.vipId}
            </if>
            <if test="record.isOverTime != null  and record.serviceNo !=''   ">
                and a.IS_OVERTIME  > #{record.isOverTime}
            </if>

            <if test="record.serviceNo != null and record.serviceNo !='' ">
                and a.SERVICE_NO  like CONCAT('%',#{record.serviceNo},'%')
            </if>

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html

@@ -38,10 +38,7 @@
                <input autocomplete="off"   name="closureTime" type="text"
                       class="form-control datetimepicker" id="endTime">
            </div>
            <div class="form-group mr-20">
                <label >超时时长 > </label>
                <input autocomplete="off"   name="isOverTime" type="text" class="form-control" placeholder="单位分钟"  id="isOverTime">
            </div>

            <div class="form-group mr-20">
                <label >所属门店</label>
                <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"

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

@@ -222,8 +222,8 @@
                    <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>
@@ -1169,14 +1169,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,7 +1589,7 @@
                if (this.validFormData()) {

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

                        console.log(valid);
                        if (valid) {



 zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html

@@ -31,10 +31,7 @@
                <label>客户姓名</label>
                <input autocomplete="off"   name="vipName" id="vipName" type="text" class="form-control" >
            </div>
            <div class="form-group mr-20">
                <label >超时时长 > </label>
                <input autocomplete="off"   name="isOverTime" type="text" class="form-control" placeholder="单位分钟"  id="isOverTime">
            </div>

            <div class="form-group mr-20">
                <label >所属门店</label>
                <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"