From 51b1242dc2f55276b65f287974e7f86dcab8c74d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:56:27 +0800
Subject: [PATCH] 修改商品查询bug1
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html
index d7a795e..f76a2a6 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html
@@ -38,7 +38,10 @@
<i class="el-icon-s-order" type="primary"></i>
</el-col>
<el-col :span="10">
- <h1 style="line-height: 60px; margin: 0 0;">服务单号：{{serviceOrderInfo.serviceNo}}</h1>
+ <h1 style="line-height: 60px; margin: 0 0;display: inline-block">服务单号：{{serviceOrderInfo.serviceNo}}</h1>
+ </el-col>
+ <el-col :span="5">
+ <h1 style="line-height: 60px; margin: 0 0;display: inline-block"><span style="color: #cf2d27;float: right ">￥{{serviceOrderInfo.money}}</span></h1>
</el-col>
<el-col :span="5" style="float: right; margin-right: 10px;">
<el-button type="info" @click="printf">打印</el-button>
@@ -48,7 +51,7 @@
</el-row>
<el-row class="order-info" type="flex" justify="space-around" style="height: 150px; padding: 30px 30px;">
<el-col :span="5">
- <p>会员姓名：{{serviceOrderInfo.vipInfo.staffName}}</p>
+ <p>会员姓名：{{serviceOrderInfo.vipInfo.vipName}}</p>
<p>会员电话：{{serviceOrderInfo.vipInfo.phone}}</p>
</el-col>
<el-col :span="5">
@@ -60,7 +63,7 @@
<p>预约时间：{{dateFormat(serviceOrderInfo.yyTime)}}</p>
</el-col>
<el-col :span="3">
- <p>配料师：{{pylFormat()}}</p>
+ <p>配料师：{{serviceOrderInfo.plsName}}</p>
<p>备注：{{serviceOrderInfo.remark}}</p>
</el-col>
</el-row>
@@ -73,7 +76,17 @@
<el-table-column
prop="projInfo.name"
label="商品名称"
- width="280">
+ width="400">
+ </el-table-column>
+ <el-table-column
+ :formatter="hkPrice"
+ label="划扣金额"
+ width="100">
+ </el-table-column>
+ <el-table-column
+ prop="count"
+ label="次数"
+ width="100">
</el-table-column>
<el-table-column
prop="projInfo.timeLength"
@@ -81,7 +94,6 @@
width="200">
</el-table-column>
<el-table-column
- prop="address"
label="服务时间" :formatter="serviceTime">
</el-table-column>
<el-table-column
@@ -145,20 +157,7 @@
}
}
},
- pylFormat() {
- if (!this.plsList) {
- return;
- }
- var plsList = this.plsList;
- var doctorId = this.serviceOrderInfo.doctorId;
-
- for(var i = 0; i < plsList.length; i++) {
- if (plsList[i].id = doctorId) {
- return plsList[i].staffName;
- }
- }
- },
printf() {
var id = this.serviceOrderInfo.id;
layer.open({
@@ -173,12 +172,18 @@
MTools.closeForm();
},
serviceTime(row, column) {
- if (!column.bedState) {
- return "-";
- }
- var startTime = moment(column.bedState.startTime).format("YYYY-MM-DD HH:mm");
- var endTime = moment(column.bedState.endTime).format("YYYY-MM-DD HH:mm");
- return startTime + "-" + endTime;
+ console.log(column);
+ console.log(row);
+ // if (!column.bedState) {
+ // return "-";
+ // }
+ var startTime = this.dateFormat(row.beginTime);
+ var endTime = this.dateFormat(row.endTime);
+ return startTime + " - " + endTime;
+ },
+ hkPrice(row, column) {
+ console.log(row);
+ return row.projUse.price * row.count ;
}
},
});
--
Gitblit v1.9.1