合并服务单订单改造分支

Helius

2022-05-24 560228ac3c15cccce0b2a5994d44e4e81b5b3b73

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

@@ -212,8 +212,10 @@
                                    label="单价">
                            </el-table-column>
                            <el-table-column
                                    prop="count"
                                    label="可退数量">
                                <template slot-scope="scope">
                                  {{scope.row.count- scope.row.refundCount}}
                                </template>
                            </el-table-column>
                            <el-table-column label="退款单价">
                                <template slot-scope="scope">
@@ -683,7 +685,7 @@
                                }
                            }

                            item.achaeveList = achieveList;
                            item.achieveList = achieveList;
                        }
                        if (item.returnStore) {
                            item.isReturnStore = 'Y';