From 1f536fefc3628c21af7f2c65bf895091ccbd5532 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 22 Dec 2020 00:31:09 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form-bak.html | 159 ++++++++++++++++++++++++++
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html | 163 ++++++--------------------
2 files changed, 197 insertions(+), 125 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form-bak.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form-bak.html
new file mode 100644
index 0000000..b80d7fa
--- /dev/null
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form-bak.html
@@ -0,0 +1,159 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml">
+<head>
+ <meta charset="utf-8">
+ <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+ <meta name="renderer" content="webkit|ie-comp|ie-stand">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport"
+ content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+ <meta http-equiv="Cache-Control" content="no-siteapp"/>
+ <LINK rel="Bookmark" href="../images/favicon.ico">
+ <!-- 本框架基本脚本和样式 -->
+ <script type="text/javascript"
+ th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
+ <script type="text/javascript"
+ th:src="@{/js/systools/MBase.js}"></script>
+</head>
+<body>
+<div class="ibox-content">
+
+ <form class="form-horizontal" id="dataform"
+ onsubmit="javascripr:return false;">
+ <div class="panel panel-default">
+ <div class="panel-heading"><strong th:text="'服务单金额:'+${obj.money}"></strong></div>
+ <table class="table table-bordered table-striped "
+ style="width: 100%;" id="mgrid">
+ <thead>
+ <tr>
+ <th>项目名称</th>
+ <th width="50px">服务时长</th>
+ <th>服务时间</th>
+ <th width="300px">美疗师</th>
+ <th width="100px">提成</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr th:each="item,st:${obj.serviceItems}">
+ <th th:text="${item.projInfo?.name}"></th>
+ <th th:text="${item.projInfo?.timeLength+'分钟'}"></th>
+ <th>
+ <span th:text="${#dates.format(item.beginTime, 'yyyy-MM-dd HH:mm')}"></span>
+ ——
+ <span th:text="${#dates.format(item.endTime, 'yyyy-MM-dd HH:mm')}"></span>
+ </th>
+ <th th:text="${item.beautiStaffInfo?.suName}"></th>
+ <th th:text="${item.extract}"></th>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div style="border-radius:5px; background:#F5F5F5;padding:10px 0;">
+ <div class="form-group">
+ <div class="col-sm-11 ">
+ <div class="row">
+ <label class="col-sm-1 control-label">会员姓名</label>
+ <div class="col-sm-2 ">
+ <p class="form-control-static" th:text="${obj?.vipInfo.vipName }"></p>
+ </div>
+ <div class="col-sm-5 ">
+ <label class="col-sm-3 control-label">会员编号</label>
+ <div class="col-sm-9">
+ <p class="form-control-static" th:text="${obj?.vipInfo.vipNo }"></p>
+ </div>
+ </div>
+ <div class="col-sm-4 ">
+ <label class="col-sm-5 control-label">会员手机 </label>
+ <div class="col-sm-7">
+ <p class="form-control-static" th:text="${obj?.vipInfo.phone }"></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-11 ">
+ <div class="row">
+ <label class="col-sm-1 control-label">床位安排</label>
+ <div class="col-sm-2 ">
+ <p th:each="item:${cw}" th:if="${obj.bedId eq item.id }" class="form-control-static"
+ th:text="${item.bedName }"></p>
+ </div>
+ <div class="col-sm-5 ">
+ <label class="col-sm-3 control-label">服务时间</label>
+ <div class="col-sm-9">
+ <p class="form-control-static">
+ <span th:text="${#dates.format(obj.bedState?.startTime, 'yyyy-MM-dd HH:mm')}"></span>
+ ——
+ <span th:text="${#dates.format(obj.bedState?.endTime, 'yyyy-MM-dd HH:mm')}"></span>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="form-group">
+ <div class="col-sm-11 ">
+ <div class="row">
+ <label class="col-sm-1 control-label">预约时间 </label>
+ <div class="col-sm-2">
+ <p class="form-control-static">
+ <span th:text="${#dates.format(obj.yyTime, 'yyyy-MM-dd HH:mm')}"></span>
+ </p>
+ </div>
+ <div class="col-sm-5 ">
+ <label class="col-sm-3 control-label">配料师</label>
+ <div class="col-sm-10" th:each="item:${yls}" th:if="${obj.doctorId eq item.id }">
+ <p class="form-control-static" th:text="${item.staffName }"></p>
+ </div>
+ </div>
+ <div class="col-sm-4 ">
+ <label class="col-sm-5 control-label">备注 </label>
+ <div class="col-sm-7">
+ <p class="form-control-static" th:text="${obj?.remark }"></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-11 ">
+ <div class="row">
+ <label class="col-sm-1 control-label">备注 </label>
+ <div class="col-sm-10">
+ <p class="form-control-static" th:text="${obj?.remark }"></p>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <input autocomplete="off" type="hidden" id="serviceId" th:value="${obj.id}">
+ <div class="form-group ">
+ <div class="col-sm-12 text-center">
+ <a href="javascript:;" onclick="print()" class="btn btn-success radius">打印</a>
+ <button onclick="MTools.closeForm()" class="btn btn-danger radius" type="button">关闭</button>
+ </div>
+ </div>
+ </form>
+</div>
+<script type="text/javascript" th:src="@{/js/plugin/LodopFuncs.js}"></script>
+<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
+<script type="text/javascript">
+ function print() {
+ var id = $("#serviceId").val();
+ layer.open({
+ type: 2,
+ title: "打印服务单",
+ area: ['250px', '550px'],
+ maxmin: true,
+ content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
+ });
+ }
+
+
+</script>
+</body>
+</html>
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 b80d7fa..353e8cc 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
@@ -10,138 +10,51 @@
<meta http-equiv="Cache-Control" content="no-siteapp"/>
<LINK rel="Bookmark" href="../images/favicon.ico">
<!-- 本框架基本脚本和样式 -->
- <script type="text/javascript"
- th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
- <script type="text/javascript"
- th:src="@{/js/systools/MBase.js}"></script>
+ <script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script>
+ <script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script>
+ <script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>
+ <script type="text/javascript" th:src="@{/js/systools/MBase.js}"></script>
+ <script type="text/javascript" th:src="@{/js/function/vip.js}"></script>
+ <link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}">
+
+ <script type="text/javascript" th:src="@{/js/function/vip.js}"></script>
+ <script type="text/javascript" th:src="@{/js/function/meiduCommon.js}"></script>
</head>
+<style>
+ .ibox-content {
+ background-color: rgba(240, 242, 245, 1);
+ }
+</style>
<body>
-<div class="ibox-content">
+<div class="ibox-content" id="app">
+ <el-container>
+ <el-header style="background-color: white; margin: 15px; line-height: 60px">
+ <el-row style="line-height: 60px;">
+ <el-col :span="10">
+ <h1>订单号：1234567890</h1>
+ </el-col>
+ <el-col :span="10"></el-col>
+ </el-row>
+ </el-header>
+ <el-main>
- <form class="form-horizontal" id="dataform"
- onsubmit="javascripr:return false;">
- <div class="panel panel-default">
- <div class="panel-heading"><strong th:text="'服务单金额:'+${obj.money}"></strong></div>
- <table class="table table-bordered table-striped "
- style="width: 100%;" id="mgrid">
- <thead>
- <tr>
- <th>项目名称</th>
- <th width="50px">服务时长</th>
- <th>服务时间</th>
- <th width="300px">美疗师</th>
- <th width="100px">提成</th>
- </tr>
- </thead>
- <tbody>
- <tr th:each="item,st:${obj.serviceItems}">
- <th th:text="${item.projInfo?.name}"></th>
- <th th:text="${item.projInfo?.timeLength+'分钟'}"></th>
- <th>
- <span th:text="${#dates.format(item.beginTime, 'yyyy-MM-dd HH:mm')}"></span>
- ——
- <span th:text="${#dates.format(item.endTime, 'yyyy-MM-dd HH:mm')}"></span>
- </th>
- <th th:text="${item.beautiStaffInfo?.suName}"></th>
- <th th:text="${item.extract}"></th>
- </tr>
- </tbody>
- </table>
- </div>
- <div style="border-radius:5px; background:#F5F5F5;padding:10px 0;">
- <div class="form-group">
- <div class="col-sm-11 ">
- <div class="row">
- <label class="col-sm-1 control-label">会员姓名</label>
- <div class="col-sm-2 ">
- <p class="form-control-static" th:text="${obj?.vipInfo.vipName }"></p>
- </div>
- <div class="col-sm-5 ">
- <label class="col-sm-3 control-label">会员编号</label>
- <div class="col-sm-9">
- <p class="form-control-static" th:text="${obj?.vipInfo.vipNo }"></p>
- </div>
- </div>
- <div class="col-sm-4 ">
- <label class="col-sm-5 control-label">会员手机 </label>
- <div class="col-sm-7">
- <p class="form-control-static" th:text="${obj?.vipInfo.phone }"></p>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-sm-11 ">
- <div class="row">
- <label class="col-sm-1 control-label">床位安排</label>
- <div class="col-sm-2 ">
- <p th:each="item:${cw}" th:if="${obj.bedId eq item.id }" class="form-control-static"
- th:text="${item.bedName }"></p>
- </div>
- <div class="col-sm-5 ">
- <label class="col-sm-3 control-label">服务时间</label>
- <div class="col-sm-9">
- <p class="form-control-static">
- <span th:text="${#dates.format(obj.bedState?.startTime, 'yyyy-MM-dd HH:mm')}"></span>
- ——
- <span th:text="${#dates.format(obj.bedState?.endTime, 'yyyy-MM-dd HH:mm')}"></span>
- </p>
- </div>
- </div>
- </div>
- </div>
- </div>
-
-
- <div class="form-group">
- <div class="col-sm-11 ">
- <div class="row">
- <label class="col-sm-1 control-label">预约时间 </label>
- <div class="col-sm-2">
- <p class="form-control-static">
- <span th:text="${#dates.format(obj.yyTime, 'yyyy-MM-dd HH:mm')}"></span>
- </p>
- </div>
- <div class="col-sm-5 ">
- <label class="col-sm-3 control-label">配料师</label>
- <div class="col-sm-10" th:each="item:${yls}" th:if="${obj.doctorId eq item.id }">
- <p class="form-control-static" th:text="${item.staffName }"></p>
- </div>
- </div>
- <div class="col-sm-4 ">
- <label class="col-sm-5 control-label">备注 </label>
- <div class="col-sm-7">
- <p class="form-control-static" th:text="${obj?.remark }"></p>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="form-group">
- <div class="col-sm-11 ">
- <div class="row">
- <label class="col-sm-1 control-label">备注 </label>
- <div class="col-sm-10">
- <p class="form-control-static" th:text="${obj?.remark }"></p>
- </div>
-
- </div>
- </div>
- </div>
- </div>
- <input autocomplete="off" type="hidden" id="serviceId" th:value="${obj.id}">
- <div class="form-group ">
- <div class="col-sm-12 text-center">
- <a href="javascript:;" onclick="print()" class="btn btn-success radius">打印</a>
- <button onclick="MTools.closeForm()" class="btn btn-danger radius" type="button">关闭</button>
- </div>
- </div>
- </form>
+ </el-main>
+ </el-container>
</div>
<script type="text/javascript" th:src="@{/js/plugin/LodopFuncs.js}"></script>
+<script type="text/javascript" th:src="@{/js/systools/AjaxProxyVue.js}"></script>
+<script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
+<script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script>
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
<script type="text/javascript">
+
+ var app = new Vue({
+ el : "#app",
+ data : {},
+ created :function () {},
+ methods : {},
+ });
+
function print() {
var id = $("#serviceId").val();
layer.open({
--
Gitblit v1.9.1