From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 43e23bb..4ee39fd 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
@@ -48,7 +48,8 @@
</div>
<label class="col-md-1 control-label">服务时长</label>
<div class="col-md-3">
- <el-input @change="changeYyTime()" v-model="projService.totalTime"></el-input>
+<!-- <el-input @change="changeYyTime()" v-model="projService.totalTime"></el-input>-->
+ <label class="control-label">{{projService.totalTime}}</label>
</div>
</div>
<div class="form-group">
@@ -105,7 +106,7 @@
<table class="table table-bordered">
<tr>
<th>项目名称</th>
- <th width="50px">服务时长</th>
+ <th width="100px">服务时长(分钟)</th>
<th>服务时间</th>
<th width="300px">美疗师</th>
<th style="width: 100px;">提成</th>
@@ -113,7 +114,7 @@
<tr v-for="(item,index) in projService.serviceItems">
<td>{{item.projInfo.name}}</td>
- <td>{{item.projInfo.timeLength}}(分钟)</td>
+ <td><el-input @change="changeTimeLength" v-model="item.projInfo.timeLength"></el-input></td>
<td>
<div style="display: flex;">
@@ -323,6 +324,7 @@
endTime: endTime,
staffId: beStates.staffId,
extract: beStates.extract,
+ excTime : beStates.projInfo.timeLength,
id: beStates.id,
});
@@ -357,7 +359,13 @@
_this.closeFram();
}
});
- parent.myGrid.serchData();
+ if (parent.myGrid) {
+ parent.myGrid.serchData();
+ }
+
+ if (parent.app) {
+ parent.app.serviceOrderQuery();
+ }
}
});
}
@@ -459,9 +467,17 @@
});
- }
- ,
+ },
+ changeTimeLength:function() {
+ let _this = this;
+ var totalTime = 0;
+ _this.projService.serviceItems.forEach(item => {
+ totalTime += parseInt(item.projInfo.timeLength);
+ });
+ _this.projService.totalTime = totalTime;
+ _this.changeYyTime();
+ }
},
filters:
--
Gitblit v1.9.1