Merge branch 'developer'

935090232@qq.com

2022-02-24 8c6026959d3006bbf9dce3f3c9311e70a02b80c1

 zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html

@@ -30,7 +30,7 @@
        <h1   style="text-align: center;font-size:18px;margin: 20px auto;">
            {{projService.shopName}}
        </h1>
        <table style="width: 100%; font-size:10px;line-height: 20px;">
        <table style="width: 100%; font-size:10px;">

            <tr>
                <td colspan="2">
@@ -53,7 +53,7 @@
                </td>
            </tr>
        </table>
        <table style="width: 80%;font-size:10px;margin-top: 20px;text-align: left">
        <table style="width: 80%;font-size:10px;margin-top: 10px;text-align: left; margin-bottom: 5px;">
            <tr>
                <th style="text-align: left;"  colspan="4">产品</th>
            </tr>
@@ -70,12 +70,12 @@
                <tr  >
                    <td>{{item.count }}</td>
                    <td>{{item.projUse.price }}</td>
                    <td >{{item.projUse.surplusCount }}</td>
                    <td >{{item.projUse.remainCount == null ? "-" : item.projUse.remainCount}}</td>
                    <td>{{item.beautiStaffInfo?item.beautiStaffInfo.suName:''}}</td>
                </tr>
            </template>
        </table>
        <table style="width: 100%;font-size: 10px;line-height: 30px;">
        <table style="width: 100%;font-size: 10px; margin-bottom: 5px;">
            <tr>
                <td>
                    <b>本次划扣:</b> <span >{{projService.money}}</span>