From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 dc6119c..c549076 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
@@ -19,7 +19,7 @@
<body>
<div class="ibox-content" id="app" v-cloak>
<form class="form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
+ onsubmit="javascript:return false;">
<input autocomplete="off" type="hidden" v-model="projService.id">
<div class="form-group">
@@ -263,7 +263,7 @@
//处理空对象和时间
let projService = data.mapInfo.projService;
-
+ console.log(projService);
let serviceItems = projService.serviceItems;
//转换床位时间格式
@@ -347,6 +347,7 @@
var params = {
id: projService.id,
+ state : projService.state,
totalTime: projService.totalTime,
remark: projService.remark,
bedId: projService.bedId,
@@ -450,12 +451,12 @@
});
}
,
- getFreedBeautyd: function (index) {
+ getFreedBeautyd: function () {
console.log("获取美疗师");
let _this = this;
let projService = _this.projService;
- let beStates = projService.serviceItems[index];
-
+ let beStates = projService.serviceItems[0];
+ console.log(beStates);
if (beStates == null || MTools.isBlank(beStates.beginTimeForm) || MTools.isBlank(beStates.endTimeForm ) ){
return;
}
--
Gitblit v1.9.1