blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-01-29 ac61bdd7a7f4834d35bf42a06bc766981f50211e 
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html


@@ -149,7 +149,7 @@


                    <el-row style="padding: 10px 20px;">


                        <p>余额：<span v-if="vipInfo.balance != null">{{vipInfo.balance}}元</span></p>


                        <p>积分：<span v-if="vipInfo.pointAll != null">{{vipInfo.pointAll}}</span></p>


                        <p>累计消费金额：<span v-if="vipInfo.totalMoney != null">{{vipInfo.totalMoney}} 元</span></p>


                        <p>累计消费金额：<span v-if="vipInfo.totalMoney != null">{{vipInfo.totalMoney.toFixed(2)}} 元</span></p>


                        <p>累计消费次数：<span v-if="vipInfo.totalTimes != null">{{vipInfo.totalTimes}} 次</span></p>


                        <p>上次消费时间：<span v-if="vipInfo.payTime">{{vipInfo.payTime}}</span></p>


                    </el-row>


@@ -177,10 +177,7 @@


                    <el-row style="padding: 10px 0;">


                        <h4>消费门店</h4>


                        <el-row style="text-align: center">


                            <el-col :span="10" v-for="item in vipInfo.shopNames">


                                <el-avatar size="small" :src="circleUrl"></el-avatar>


                                <span class="col-style">{{item}}</span>


                            </el-col>


                                <el-tag v-for="item in vipInfo.shopNames" >{{item}}</el-tag>


                        </el-row>


                    </el-row>


                </el-row>


@@ -260,6 +257,7 @@


                                        <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>


                                        <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>


                                        <el-button matrix:btn="vipInfo-cardEdit" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>


                                        <el-button type="text"  @click="openOrder(scope.$index, scope.row)" size="small">订单</el-button>


                                        <el-button  type="text" size="small" @click="openProjUseFlow(scope.$index, scope.row)">操作记录</el-button>


                                    </template>


                                </el-table-column>


@@ -296,6 +294,7 @@


                                        <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效' && scope.row.taocanId == null" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>


                                        <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结' && scope.row.taocanId == null" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>


                                        <el-button matrix:btn="vipInfo-cardEdit" v-if="scope.row.taocanId == null" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>


                                        <el-button type="text" v-if="scope.row.orderId != null"  @click="openOrder(scope.$index, scope.row)" size="small">订单</el-button>


                                        <el-button  type="text" size="small" @click="openProjUseFlow(scope.$index, scope.row)">操作记录</el-button>


                                    </template>


                                </el-table-column>


@@ -336,10 +335,6 @@


                                        label="状态">


                                </el-table-column>


                                <el-table-column


                                        prop="isVipCar"


                                        label="是否是会籍卡"  :formatter="cardIsVipFormatter">


                                </el-table-column>


                                <el-table-column


                                        prop="isOver"


                                        label="是否使用完成" :formatter="cardIsOrderFormatter">


                                </el-table-column>


@@ -353,10 +348,11 @@


                                </el-table-column>


                                <el-table-column label="操作" fixed="right" width="160">


                                    <template slot-scope="scope">


                                        <el-button matrix:btn="vipInfo-youxiao" v-if="scope.row.status!='有效'" type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>


                                        <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效'" type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>


                                        <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结'" type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>


                                        <el-button matrix:btn="vipInfo-youxiao" v-if="scope.row.status!='有效' && scope.row.isVipCar =='N' " type="text" size="small" @click="tabProjValid(scope.$index, scope.row)">有效</el-button>


                                        <el-button matrix:btn="vipInfo-wuxiao" v-if="scope.row.status!='无效' && scope.row.isVipCar =='N'  " type="text" size="small" @click="tabProjInvalid(scope.$index, scope.row)">无效</el-button>


                                        <el-button matrix:btn="vipInfo-dongjie" v-if="scope.row.status!='冻结' && scope.row.isVipCar =='N' " type="text" size="small" @click="tabProjCold(scope.$index, scope.row)">冻结</el-button>


                                        <el-button matrix:btn="vipInfo-cardEdit" type="text" size="small" @click="tabProjEdit(scope.$index, scope.row)">编辑</el-button>


                                        <el-button type="text"  v-if="scope.row.isVipCar =='N'"  @click="openOrder(scope.$index, scope.row)" size="small">订单</el-button>


                                        <el-button  type="text" size="small" @click="openMoneyCardUseFlow(scope.$index, scope.row)">操作记录</el-button>


                                    </template>


                                </el-table-column>


@@ -720,6 +716,15 @@


            }


        },


        methods : {


            //打开订单详情页面


            openOrder(index,row){


                layer.full(layer.open({


                    type : 2,


                    title : "订单详情",


                    maxmin : true,


                    content : [ basePath + '/admin/order/orderItem?id=' + row.orderId ]


                }));


            },


            querySearch(queryString, cb) {


                $.AjaxProxy({


                    p: {


@@ -772,7 +777,7 @@


                            _this.vipInfo.shopNames = shopNames;


                        }


                    }




                    _this.vipInfo.payTime = moment(_this.vipInfo.payTime).format("YYYY-MM-DD HH:mm:ss")


                    _this.tags.tags = data.labels;


                    _this.projTableQueryFn();


                    _this.serviceOrderTableQueryFn();


@@ -1074,8 +1079,8 @@


                params.state = serviceOrderTab.state;


                params.vipId = _this.vipInfo.id;


                if (serviceOrderTab.selectTime) {


                    params.beginTime = moment(serviceOrderTab.selectTime[0]).format("YYYY-MM-DD HH:mm");


                    params.closureTime = moment(serviceOrderTab.selectTime[1]).format("YYYY-MM-DD HH:mm");


                    params.beginTime = serviceOrderTab.selectTime?moment(serviceOrderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"):'';


                    params.closureTime = serviceOrderTab.selectTime?moment(serviceOrderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"):'';


                }


                $.AjaxProxy({


                    p:params


@@ -1157,8 +1162,8 @@


                params.statu = orderTab.state;


                params.vipId = _this.vipInfo.id;


                if (orderTab.selectTime) {


                    params.beginTimeVo = moment(orderTab.selectTime[0]).format("YYYY-MM-DD HH:mm");


                    params.endTimeVo = moment(orderTab.selectTime[1]).format("YYYY-MM-DD HH:mm");


                    params.beginTimeVo = orderTab.selectTime?moment(orderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"):'';


                    params.endTimeVo = orderTab.selectTime?moment(orderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"):'';


                }


                $.AjaxProxy({


                    p:params


@@ -1232,8 +1237,8 @@


                params.offset = (page.currentPage - 1) * page.pageSize;


                params.userId = _this.vipInfo.id;


                if (skinTab.selectTime) {


                    params.beginTime = moment(skinTab.selectTime[0]).format("YYYY-MM-DD");


                    params.endTime = moment(skinTab.selectTime[1]).format("YYYY-MM-DD");


                    params.beginTime = skinTab.selectTime?moment(skinTab.selectTime[0]).format("YYYY-MM-DD"):'';


                    params.endTime = skinTab.selectTime?moment(skinTab.selectTime[1]).format("YYYY-MM-DD"):'';


                }


                $.AjaxProxy({


                    p:params


@@ -1371,10 +1376,10 @@


            /********** 顶部按钮 start **********/




            dateFormat(row, column) {


                return moment(column.yyTime).format("YYYY-MM-DD HH:mm");


                return moment(row.yyTime).format("YYYY-MM-DD HH:mm");


            },


            oderTimeFormat(row, column) {


                return moment(column.orderTime).format("YYYY-MM-DD HH:mm:ss");


                return moment(row.orderTime).format("YYYY-MM-DD HH:mm:ss");


            },


        }


    });