From ea865027c9e115057644f59747f3bed2a8a963e6 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 15:15:28 +0800
Subject: [PATCH] Merge branch 'master' into feature/订单服务单代码改造
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
index 5723d51..d6a8eff 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
@@ -450,7 +450,12 @@
},
url: basePath + '/admin/bedInfo/showFreedBed',
callback: function (data) {
- _this.beds = data.rows;
+ if(data.rows.length > 0){
+ _this.beds = data.rows;
+ }else{
+ _this.beds = data.rows;
+ _this.projService.bedId = '';
+ }
}
});
}
--
Gitblit v1.9.1