Merge branch 'score_shop' into api_score_meger

jyy

2021-07-31 78472da3395d1db45b6a76688c72a2c2a372c47a

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -175,6 +175,15 @@
                </el-col>
            </el-row>
            <el-row class="vertical  ">
                 <el-select v-model="goodsType" placeholder="商品类型" style="width: 120px" >
                    <el-option
                            v-for="item in goodsTypeList"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value"
                    >
                    </el-option>
                </el-select>
                <el-input class="searchInput" @input="searchGoods()" v-model="queryKey"
                          placeholder="搜索添加产品"></el-input>
                <el-button @click="searchGoods()" type="primary">搜索</el-button>
@@ -582,7 +591,8 @@
    var app = new Vue({
        el: '#app',
        data: {

            goodsType:"",
            goodsTypeList:[{value:"",label:"全部"},{value:"套餐",label:"套餐"},{value:"项目",label:"项目"},{value:"充值卡",label:"充值卡"}],
            //业绩设置框
            drawer: false,
            direction: 'rtl',
@@ -1219,7 +1229,7 @@
                        app: _this,
                        contentType: 'application/x-www-form-urlencoded',
                        //TODO 优化下拉加载
                        data: {name: _this.queryKey, limit: pageSize, offset : offset},
                        data: {name: _this.queryKey,goodType:_this.goodsType , limit: pageSize, offset : offset},
                        url: basePath + "/admin/shoppinggoods/showList",
                        callback: function (data) {
                            _this.searchTableData = data.rows;