Merge branch 'ty_urgent' into api

Helius

2020-12-23 844e37605b65a2a3d95b466d663d91ac8584350c

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

@@ -10,120 +10,150 @@
    <meta http-equiv="Cache-Control" content="no-siteapp"/>
    <LINK rel="Bookmark" href="../images/favicon.ico">
    <!-- 本框架基本脚本和样式 -->
    <script type="text/javascript"
            th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
    <script type="text/javascript"
            th:src="@{/js/systools/MBase.js}"></script>
    <script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
    <script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
    <script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>
    <script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>
    <script type="text/javascript" th:src="@{/js/function/vip.js}"></script>
    <link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}">

    <script type="text/javascript" th:src="@{/js/function/vip.js}"></script>
    <script type="text/javascript" th:src="@{/js/function/meiduCommon.js}"></script>
    <title></title>
    <style>
        .ibox-content {
            background-color: rgba(240, 242, 245, 1);
        }
    </style>
</head>

<div class="panel-body">
    <div class="form-group">
        <label class="col-sm-2 control-label">订单号</label>
        <div class="col-sm-4">
            <span class="form-control-static" th:text="${order.orderNo}"></span>
        </div>

        <label class="col-sm-2 control-label">订单总价</label>
        <div class="col-sm-4">
            <span class="form-control-static" id="total" th:text="${order.total}"></span>
        </div>
    </div>
    <br>
    <div class="form-group">
        <label class="col-sm-2 control-label">客户编号</label>
        <div class="col-sm-4">
            <span class="form-control-static" th:text="${order.vipNo}"></span>
        </div>
        <label class="col-sm-2 control-label">客户姓名</label>
        <div class="col-sm-4">
            <span class="form-control-static" th:text="${order.vipName}"></span>
        </div>
    </div>
    <br>
    <div class="form-group">
        <label class="col-sm-2 control-label">现金支付金额</label>
        <div class="col-sm-4">
            <span class="form-control-static">[[${order.cashPay}]]</span>
        </div>
        <label class="col-sm-2 control-label">卡支付金额</label>
        <div class="col-sm-4">
            <span class="form-control-static" id="total">[[${order.cardPay}]]</span>
        </div>
    </div>
    <br>
    <div class="form-group">
        <label class="col-sm-2 control-label">欠款</label>
        <div class="col-sm-4">
            <span class="form-control-static">[[${order.arrears}]]</span>
        </div>
        <label class="col-sm-2 control-label">折后价</label>
        <div class="col-sm-4">
            <span class="form-control-static" id="zkTotal" th:text="${order.zkTotal}"></span>
        </div>
    </div>
    <br>
    <div class="form-group">
        <label class="col-sm-2 control-label">顾问姓名</label>
        <div class="col-sm-4">
            <span class="form-control-static" th:text="${order.staffName}"></span>
        </div>
        <label class="col-sm-2 control-label">备注</label>
        <div class="col-sm-4">
            <span class="form-control-static" th:text="${order.remark}"></span>
        </div>
    </div>

<div class="ibox-content" id="app">
    <el-container>
        <el-header style="height: 210px; background-color: white; margin: 15px;">
            <el-row style="line-height: 60px; padding-top: 20px;">
                <el-col :span="1" style="font-size: 40px; color:#409EFF;">
                    <i class="el-icon-s-order" type="primary"></i>
                </el-col>
                <el-col :span="10">
                    <h1 style="line-height: 60px; margin: 0 0;">订单号：{{order.orderNo}}</h1>
                </el-col>
                <el-col :span="5" style="float: right; margin-right: 10px;">
                    <el-button type="info" @click="printf">打印</el-button>
                    <el-button type="danger" @click="toBack">返回</el-button>
                </el-col>
            </el-row>
            <el-row class="order-info" type="flex" justify="space-around"  style="height: 150px; padding: 30px 30px;">
                <el-col :span="5">
                    <p>顾问姓名：{{order.staffName}}</p>
                    <p>会员姓名：{{order.vipName}}</p>
                    <p>会员编号：{{order.vipNo}}</p>
                </el-col>
                <el-col :span="5">
                    <p>卡支付：{{order.cardPay}}</p>
                    <p>现金支付：{{order.cashPay}}</p>
                    <p>备注：{{order.remark}}</p>
                </el-col>
                <el-col :span="10">
                    <el-col :span="6">
                        <p>欠款总额</p>
                        <h2>¥ {{order.arrears}}</h2>
                    </el-col>
                    <el-col :span="6">
                        <p>折后总额</p>
                        <h2>¥ {{order.zkTotal}}</h2>
                    </el-col>
                    <el-col :span="6">
                        <p>订单总额</p>
                        <h2>¥ {{order.total}}</h2>
                    </el-col>
                </el-col>
            </el-row>
        </el-header>
        <el-main style="background-color: white; margin: 15px; padding: 20px 30px;">
            <el-tabs v-model="activeName" @tab-click="handleClick">
                <el-tab-pane label="商品" name="goods">
                    <el-table :data="orderData"
                            style="width: 100%">
                        <el-table-column
                                prop="shoppingGoods.name"
                                label="商品名称"
                                width="300">
                        </el-table-column>
                        <el-table-column
                                prop="price"
                                label="单价"
                                width="80">
                        </el-table-column>
                        <el-table-column
                                prop="count"
                                label="购买数量">
                        </el-table-column>
                        <el-table-column
                                prop="zkPrice"
                                label="折后金额">
                        </el-table-column>
                        <el-table-column
                                prop="cardPay"
                                label="卡付款">
                        </el-table-column>
                        <el-table-column
                                prop="cashPay"
                                label="现金付款">
                        </el-table-column>
                        <el-table-column
                                prop="arrears"
                                label="欠款">
                        </el-table-column>
                    </el-table>
                </el-tab-pane>
                <el-tab-pane label="业绩" name="yj">业绩</el-tab-pane>
            </el-tabs>
        </el-main>
    </el-container>
</div>


<div class="col-sm-12 form-group">
    <div class="panel-body">
        <table class="table table-striped table-condensed  table-hover">
            <thead>
            <tr>
                <th>序号</th>
                <th>商品名称</th>
                <th>单价</th>
                <th>购买数量</th>
                <th>折扣单价</th>
                <th>卡付款</th>
                <th>现金付款</th>
                <th>欠款</th>
            </tr>
            </thead>
            <tbody id="tbody">
            <tr th:each="item,count:${order.items }">
                <td th:text="${count.index}+1"></td>
                <td><span th:text=" ${item.shoppingGoods.name }"></span>

                    <span th:if="${item.isFree eq '是' }" th:text="赠"></span>
                </td>
                <td th:text="${item.price }"></td>
                <td th:text="${item.count}"></td>
                <td th:text="${item.zkPrice}"></td>
                <td>[[${item.cardPay}]]</td>
                <td>[[${item.cashPay}]]</td>
                <td>[[${item.arrears}]]</td>
            </tr>
            </tbody>
        </table>
    </div>
    <div class="form-group ">
        <div class="col-sm-12 text-center">
            <a href="javascript:;" onclick="print()" class="btn btn-success radius">打印</a> &nbsp;&nbsp;&nbsp;&nbsp;
            <button onclick="MTools.closeForm()" class="btn btn-danger radius" type="button">取消</button>
        </div>
    </div>
    </div>
</div>
<input autocomplete="off"   type="hidden" id="orderId" th:value="${order.id}">
</body>


<script type="text/javascript" th:src="@{/js/plugin/LodopFuncs.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/AjaxProxyVue.js}"></script>
<script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
<script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script type="text/javascript">
<script type="text/javascript"  th:inline="javascript">
    //<![CDATA[
    var app = new Vue({
        el : "#app",
        data : {
            activeName : "goods",
            order : "",
            orderItems : "",
            cards : "",
            orderData : []
        },
        created : function() {
            this.order = /*[[${order}]]*/
            this.orderItems = /*[[${orderItems}]]*/
            this.cards = /*[[${cards}]]*/

            this.orderData = this.order.items;
        },
        methods : {
            handleClick(tab, event) {
            },
            printf() {
                var id = 1;
                layer.open({
                    type: 2,
                    title: "打印服务单",
                    area: ['250px', '550px'],
                    maxmin: true,
                    content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
                });
            },
            toBack() {
                MTools.closeForm();
            },
        }
    });
    //]]>
    function print() {
        var id=$("#orderId").val();
        layer.open({