From 9c791d431038fe79a111805762ee2f42c96b51c5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 17:03:15 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html |   17 +++++++++++------
 1 files changed, 11 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 dc6119c..5723d51 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">
@@ -112,6 +112,8 @@
                                 <table class="table table-bordered">
                                     <tr>
                                         <th>项目名称</th>
+                                        <th>次数</th>
+                                        <th>划扣金额</th>
                                         <th width="100px">服务时长(分钟)</th>
                                         <th>服务时间</th>
                                         <th width="300px">美疗师</th>
@@ -120,7 +122,9 @@
                                     </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>
@@ -263,7 +267,7 @@
 
                         //处理空对象和时间
                         let projService = data.mapInfo.projService;
-
+                        console.log(projService);
                         let serviceItems = projService.serviceItems;
 
                         //转换床位时间格式
@@ -347,6 +351,7 @@
 
                 var params = {
                     id: projService.id,
+                    state : projService.state,
                     totalTime: projService.totalTime,
                     remark: projService.remark,
                     bedId: projService.bedId,
@@ -450,12 +455,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