From 8243c06e629d79bba0388e6fb4f0e1ae70281ded Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Mar 2022 12:30:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into feature/订单服务单代码改造

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
index 2e3cc8b..f496dba 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
+++ b/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';

--
Gitblit v1.9.1