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 | 13 +++++++++++--
1 files changed, 11 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 ab2f950..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
@@ -117,11 +117,12 @@
<th width="100px">服务时长(分钟)</th>
<th>服务时间</th>
<th width="300px">美疗师</th>
+ <th style="width: 100px;">提成</th>
<th>操作</th>
</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>
@@ -159,6 +160,9 @@
:value="item.suId">
</el-option>
</el-select>
+ </td>
+ <td>
+ <el-input v-model="item.extract"></el-input>
</td>
<td>
<el-button size="mini" type="danger"
@@ -446,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