blame | history | patch | commit | commitdiff | ignore whitespace
jyy
2021-06-09 ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c 
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html


@@ -118,8 +118,8 @@


        }


    </style>


</head>


<body>


<div class="ibox-content" id="app" v-cloak>


<body  >


<div  id="app" v-cloak>






    <el-row>


@@ -237,6 +237,18 @@


                        </template>


                    </el-table-column>


                </el-table>




                <el-row style="text-align: center; margin-top: 10px;">


                    <el-pagination


                            @size-change="handleSizeChange"


                            @current-change="handleCurrentChange"


                            :current-page="page.currentPage"


                            :page-sizes="[10, 20, 30, 50]"


                            :page-size="page.pageSize"


                            layout="total, prev, pager, next, jumper"


                            :total="page.total">


                    </el-pagination>


                </el-row>


                <el-row class="btn-box">


                    <el-button size="mini" type="danger" @click="closeXm()">关闭</el-button>


                    <el-button size="mini" type="primary" @click="chouseGoods()">确认</el-button>


@@ -347,7 +359,7 @@


                </el-table>




            </el-row>


            <el-row class="mt-20 vertical">


            <el-row class=" vertical">


                <el-col :span="10" class="money-box">


                    <div>


                        <ul>


@@ -648,7 +660,7 @@


            shopInfo: {},






            tableHeight: 500,


            tableHeight:  'calc(100vh - 300px)',




            /*****搜索表格数据*********/


            //搜索关键词


@@ -659,6 +671,11 @@


            searchTableData: [],


            //表格加载效果


            loading: false,


            page : {


                currentPage : 1,


                pageSize : 10,


                total : 0


            },


            /******搜索表格数据END********/




            dialogSettleVisible : false,


@@ -928,10 +945,10 @@


                                let count = parseFloat(item.count);


                                let zkPrice = parseFloat(item.zkPrice);




                                if (optionType != 1) {


                                // if (optionType != 1) {


                                    //直接修改支付金额不重置支付金额


                                    item.payMoney = zkPrice * count;


                                }


                                // }


                                _this.order.payMoney += parseFloat(item.payMoney);




                                //重新计算业绩金额


@@ -1174,6 +1191,9 @@


             */


            searchGoods() {


                let _this = this;


                var currentPage = this.page.currentPage;


                var pageSize = this.page.pageSize;


                var offset = (currentPage - 1) * pageSize;


                if (this.queryKey && this.queryKey.trim().length > 0) {


                    this.showSearchTable = true;


                    this.loading = true;


@@ -1181,10 +1201,11 @@


                        app: _this,


                        contentType: 'application/x-www-form-urlencoded',


                        //TODO 优化下拉加载


                        data: {name: _this.queryKey, limit: 10000},


                        data: {name: _this.queryKey, limit: pageSize, offset : offset},


                        url: basePath + "/admin/shoppinggoods/showList",


                        callback: function (data) {


                            _this.searchTableData = data.rows;


                            _this.page.total = data.total;


                            _this.loading = false;


                        }


                    });


@@ -1192,8 +1213,14 @@


                    this.showSearchTable = false;


                }


            },






            handleSizeChange(val) {


                this.page.pageSize = val;


                this.searchGoods();


            },


            handleCurrentChange(val) {


                this.page.currentPage = val;


                this.searchGoods();


            },


            remoteMethod(query) {


                if (query !== '') {


                    this.vipLoading = true;