From 16da0ad1fda1dffa3019425a6887d38ed4217f44 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 10 Jan 2021 14:26:02 +0800
Subject: [PATCH] Merge branch 'api' into order_reform
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html | 256 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 187 insertions(+), 69 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
index 1797130..3e244bf 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
@@ -24,88 +24,209 @@
.ibox-content {
background-color: rgba(240, 242, 245, 1);
}
+ label {
+ width: 100%;
+ margin: 5px 0 !important;
+ }
</style>
</head>
<div class="ibox-content" id="app">
<el-container>
- <el-header style="height: 210px; background-color: white; margin: 15px;">
- <el-row style="line-height: 60px; padding-top: 20px;">
- <el-col :span="1" style="font-size: 40px; color:#409EFF;">
- <i class="el-icon-s-order" type="primary"></i>
- </el-col>
- <el-col :span="10">
- <h1 style="line-height: 60px; margin: 0 0;">订单号：{{order.orderNo}}</h1>
- </el-col>
- <el-col :span="5" style="float: right; margin-right: 10px;">
- <el-button type="info" @click="printf">打印</el-button>
- <el-button type="danger" @click="toBack">返回</el-button>
+ <el-aside style="width: 300px; background-color: white; padding: 10px;">
+ <el-row style="border-bottom: #E4E7ED 1px solid;">
+ <el-col :span="20" style="padding: 10px;">
+ <el-row type="flex" align="middle">
+ <el-col :span="7">
+ <el-avatar :size="60" :src="circleUrl"></el-avatar>
+ </el-col>
+ <el-col :span="10" style="margin-left: 10px;">
+ <label>于谦(vip-3)</label>
+ <label>A00344</label>
+ </el-col>
+ </el-row>
+ <el-row style="line-height: 20px;">
+ <label>订单号: <span>S1234567890</span></label>
+ <label>下单顾问: <span>娟姐</span></label>
+ <label>消费门店: <span>星海店</span></label>
+ <label>订单时间: <span>2020-10-10 12:12</span></label>
+ <label>备 注: <span>这是一个好订单</span></label>
+ </el-row>
</el-col>
</el-row>
- <el-row class="order-info" type="flex" justify="space-around" style="height: 150px; padding: 30px 30px;">
- <el-col :span="5">
- <p>顾问姓名：{{order.staffName}}</p>
- <p>会员姓名：{{order.vipName}}</p>
- <p>会员编号：{{order.vipNo}}</p>
- </el-col>
- <el-col :span="5">
- <p>卡支付：{{order.cardPay}}</p>
- <p>现金支付：{{order.cashPay}}</p>
- <p>备注：{{order.remark}}</p>
- </el-col>
- <el-col :span="10">
- <el-col :span="6">
- <p>欠款总额</p>
- <h2>¥ {{order.arrears}}</h2>
- </el-col>
- <el-col :span="6">
- <p>折后总额</p>
- <h2>¥ {{order.zkTotal}}</h2>
- </el-col>
- <el-col :span="6">
- <p>订单总额</p>
- <h2>¥ {{order.total}}</h2>
- </el-col>
+ <el-row style="padding: 10px; border-bottom: #E4E7ED 1px solid;">
+ <el-col :span="24">
+ <el-row>
+ <el-col :span="6" style="text-align: right;">
+ <label>总金额</label>
+ <label>整单折扣</label>
+ <label style="font-size: 14px;">应收金额</label>
+ <label>欠款</label>
+ <label>已还</label>
+ <label>退款</label>
+ </el-col>
+ <el-col :span="14" style="text-align: right;">
+ <label>¥ 92</label>
+ <label>¥ -12</label>
+ <label>¥ 80</label>
+ <label>¥ 30</label>
+ <label>¥ 30</label>
+ <label>¥ 20</label>
+ </el-col>
+ </el-row>
</el-col>
</el-row>
- </el-header>
- <el-main style="background-color: white; margin: 15px; padding: 20px 30px;">
+ <el-row style="padding: 10px; border-bottom: #E4E7ED 1px solid;">
+ <el-col :span="24">
+ <el-row>
+ <h3>收款明细</h3>
+ </el-row>
+ <el-row>
+ <el-col :span="6" style="text-align: right;">
+ <label>微信</label>
+ <label>支付宝</label>
+ <label>银行卡</label>
+ <label>欠款</label>
+ </el-col>
+ <el-col :span="14" style="text-align: right;">
+ <label>¥ 92</label>
+ <label>¥ 12</label>
+ <label>¥ 80</label>
+ <label>¥ 20</label>
+ </el-col>
+ </el-row>
+ </el-col>
+ </el-row>
+ <el-row type="flex" justify="center" style="margin: 20px;">
+ <el-button size="medium" type="primary">打印</el-button>
+ </el-row>
+ </el-aside>
+ <el-main style="background-color: white; margin-right: 15px; margin-left: 15px; padding: 20px 30px;">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="商品" name="goods">
- <el-table :data="orderData"
+ <el-tab-pane label="订单明细" name="first">
+ <el-row>
+ <el-button size="medium" type="primary">退款</el-button>
+ </el-row>
+ <el-table
+ :data="orderItems"
style="width: 100%">
<el-table-column
- prop="shoppingGoods.name"
- label="商品名称"
- width="300">
+ type="index"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ prop="goodsNo"
+ label="产品编号"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="goodsName"
+ label="产品名称"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="goodsType"
+ label="产品类型">
</el-table-column>
<el-table-column
prop="price"
- label="单价"
- width="80">
+ label="单价">
</el-table-column>
<el-table-column
prop="count"
- label="购买数量">
+ label="数量">
</el-table-column>
<el-table-column
prop="zkPrice"
- label="折后金额">
+ label="折扣单价">
</el-table-column>
<el-table-column
- prop="cardPay"
- label="卡付款">
- </el-table-column>
- <el-table-column
- prop="cashPay"
- label="现金付款">
- </el-table-column>
- <el-table-column
- prop="arrears"
- label="欠款">
+ prop="zkTotal"
+ label="小计">
</el-table-column>
</el-table>
</el-tab-pane>
- <el-tab-pane label="业绩" name="yj">业绩</el-tab-pane>
+ <el-tab-pane label="业绩设置" name="second">
+ <el-table
+ :data="achieveItems"
+ style="width: 100%">
+ <el-table-column
+ type="index"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ prop="goodsNo"
+ label="产品编号"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="goodsName"
+ label="产品名称"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="goodsType"
+ label="收款">
+ </el-table-column>
+ <el-table-column
+ prop="price"
+ label="业绩类型">
+ </el-table-column>
+ <el-table-column
+ prop="count"
+ label="业绩">
+ </el-table-column>
+ <el-table-column
+ prop="zkPrice"
+ label="提成">
+ </el-table-column>
+ <el-table-column
+ prop="zkTotal"
+ label="员工">
+ </el-table-column>
+ <el-table-column label="操作">
+ <template slot-scope="scope">
+ <el-button type="text" size="small">分享</el-button>
+ <el-button type="text" size="small">删除</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="交易流水" name="third">
+ <el-table
+ :data="flowItems"
+ style="width: 100%">
+ <el-table-column
+ type="index"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ prop="orderNo"
+ label="订单号"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="flowContent"
+ label="交易内容"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="flowType"
+ label="交易类型">
+ </el-table-column>
+ <el-table-column
+ prop="amount"
+ label="交易金额">
+ </el-table-column>
+ <el-table-column
+ prop="payMethod"
+ label="支付方式">
+ </el-table-column>
+ <el-table-column
+ prop="flowNo"
+ label="流水号">
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
</el-tabs>
</el-main>
</el-container>
@@ -122,22 +243,16 @@
var app = new Vue({
el : "#app",
data : {
- activeName : "goods",
- order : "",
- orderItems : "",
- cards : "",
- orderData : []
+ activeName : "first",
+ circleUrl : "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+ orderItems : [],
+ achieveItems : [],
+ flowItems : [],
+
},
created : function() {
- this.order = /*[[${order}]]*/
- this.orderItems = /*[[${orderItems}]]*/
- this.cards = /*[[${cards}]]*/
-
- this.orderData = this.order.items;
},
methods : {
- handleClick(tab, event) {
- },
printf() {
var id = 1;
layer.open({
@@ -148,6 +263,9 @@
content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
});
},
+ handleClick() {
+
+ },
toBack() {
MTools.closeForm();
},
--
Gitblit v1.9.1