新增赠送项目是否计算消耗控制

jyy

2021-06-12 393d296e43f0e5f11e524cab5446bcd3eee94e89

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

@@ -111,6 +111,7 @@
            <th data-field="money">消耗金额</th>
            <th data-field="createTime" data-sortable="true" data-formatter="MGrid.getTime">下单时间</th>
            <th data-field="yyTime" data-sortable="true" data-formatter="MGrid.getTime">预约时间</th>
            <th data-field="consumeTime" data-sortable="true" data-formatter="MGrid.getTime">划扣时间</th>
            <th data-field="totalTime" data-sortable="true">服务时长</th>
            <th data-field="isOverTime" data-formatter="overTime">超时时间</th>
            <th data-field="createStaffName">下单顾问</th>
@@ -186,11 +187,13 @@
                break;
            case '需配料':
                html +=btns[3].replace('VALUE',value);
                html += btns[2].replace('VALUE',value);
                break;
            case '配料完成':
                break;
            case '服务完成':
                html +=btns[4].replace('VALUE',value);
                html += btns[2].replace('VALUE',value);
                break;
        }
        html += btns[5].replace('VALUE',value);