modify

Helius

2021-03-30 114fb1706a7683bc6eedc7753ae62e6694e7ee97

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

@@ -290,7 +290,7 @@
                    <el-table-column
                            label="小计">
                        <template slot-scope="scope">
                            {{scope.row.zkPrice * scope.row.count }}
                            {{(scope.row.zkPrice * scope.row.count).toFixed(2) }}
                        </template>
                    </el-table-column>

@@ -354,7 +354,7 @@

                            <li>订单总金额：{{order.total}}</li>

                            <li>整单折扣：<span class="arrears" v-if="order.zkTotal != null">{{order.total - order.zkTotal}}</span></li>
                            <li>整单折扣：<span class="arrears" v-if="order.zkTotal != null">{{(order.total - order.zkTotal).toFixed(2)}}</span></li>
<!--                            <li v-if="order.arrears>0">订单欠款：<span class="arrears">{{order.arrears}}</span></li>-->
<!--                            <li v-if="order.arrears<0">找零：<span class="arrears">{{order.arrears}}</span></li>-->
                        </ul>
@@ -886,18 +886,18 @@
                        callback: function (data) {
                            let order = data.rows[0];
                            console.log("order", order);
                            _this.order.zkTotal = order.zkTotal;
                            _this.order.total = order.total;
                            _this.order.zkTotal = order.zkTotal.toFixed(2);
                            _this.order.total = order.total.toFixed(2);

                            //支付金额计算
                            _this.order.items.forEach(item => {
                                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);

                                _this.achieveList.forEach(achieve=>{