From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 59504c6..aece23b 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
@@ -76,17 +76,22 @@
<el-table-column
prop="projInfo.name"
label="商品名称"
- width="280">
+ width="400">
+ </el-table-column>
+ <el-table-column
+ prop="projUse.source"
+ label="来源"
+ width="400">
</el-table-column>
<el-table-column
:formatter="hkPrice"
label="划扣金额"
- width="200">
+ width="100">
</el-table-column>
<el-table-column
prop="count"
label="次数"
- width="200">
+ width="100">
</el-table-column>
<el-table-column
prop="projInfo.timeLength"
@@ -110,6 +115,16 @@
</el-tab-pane>
</el-tabs>
</el-main>
+ <el-footer style="margin: 15px; padding: 20px 50px;">
+ <el-row type="flex">
+ <el-col :span="5">
+ <h1>客户签名：</h1>
+ </el-col>
+ <el-col :span="10">
+ <img v-if="imageUrlTitle" :src="imageUrlTitle" style="max-width: 200px;">
+ </el-col>
+ </el-row>
+ </el-footer>
</el-container>
</div>
<script type="text/javascript" th:src="@{/js/plugin/LodopFuncs.js}"></script>
@@ -123,6 +138,7 @@
el : "#app",
data : {
serviceOrderInfo : "",
+ imageUrlTitle : "",
tabName : "serviceOrder",
tableData : [],
bedList : [],
@@ -131,6 +147,7 @@
created :function () {
this.bedList = /*[[${cw}]]*/
this.serviceOrderInfo = /*[[${obj}]]*/
+ this.imageUrlTitle = this.serviceOrderInfo.signPic;
this.tableData = this.serviceOrderInfo.serviceItems;
this.plsList = /*[[${yls}]]*/
console.log(this.plsList);
@@ -165,18 +182,16 @@
title: "打印服务单",
area: ['250px', '550px'],
maxmin: true,
- content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
+ content: [basePath + '/admin/projService/printOrder?id=' + id]
});
},
toBack() {
MTools.closeForm();
},
serviceTime(row, column) {
- console.log(column);
- console.log(row);
- // if (!column.bedState) {
- // return "-";
- // }
+ if (!row.beginTime) {
+ return "-";
+ }
var startTime = this.dateFormat(row.beginTime);
var endTime = this.dateFormat(row.endTime);
return startTime + " - " + endTime;
@@ -196,7 +211,7 @@
title: "打印服务单",
area: ['250px', '550px'],
maxmin: true,
- content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
+ content: [basePath + '/admin/projService/printOrder?id=' + id]
});
}
--
Gitblit v1.9.1