From d524c2c3f60032916218a638ee5fa610cd2a330c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jun 2022 17:02:37 +0800
Subject: [PATCH] Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

---
 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