From 1c538f36affa979e585a9a0b5a7739cdc36a14d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 01 Apr 2022 14:32:48 +0800
Subject: [PATCH] 取消订单的状态判断

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 a01f2d8..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
@@ -122,7 +122,7 @@
                                     </tr>
 
                                     <tr v-for="(item,index) in projService.serviceItems">
-                                        <td>{{item.projInfo.name}}</td>
+                                        <td>{{item.projInfo.name}}【{{item.projUse.source}}】</td>
                                         <td>{{item.count}}</td>
                                         <td>{{item.projUse.price * item.count}}</td>
                                         <td><el-input @change="changeTimeLength" v-model="item.projInfo.timeLength"></el-input></td>
@@ -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