From 0a6c8dbb6e6e2991890b38648a9acc55df87b9d8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 18:30:08 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' of http://120.27.238.55:7000/r/beauty-erp into feature/订单服务单代码改造
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html | 17 +++++++++++++++--
1 files changed, 15 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 93b3a8e..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
@@ -112,14 +112,19 @@
<table class="table table-bordered">
<tr>
<th>项目名称</th>
+ <th>次数</th>
+ <th>划扣金额</th>
<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>
<td>
@@ -155,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"
@@ -442,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