From 15e19113558e46aaf8f7263a66730fc01aadf603 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 10:25:20 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html | 210 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 157 insertions(+), 53 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 3e244bf..663b815 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
@@ -39,17 +39,17 @@
<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 :span="15" style="margin-left: 10px;">
+ <label>{{vipInfo.vipName}}({{vipInfo.vipLevel == null ? '' : vipInfo.vipLevel.levelName}})</label>
+ <label>{{vipInfo.vipNo}}</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>
+ <label>订单号: <span>{{order.orderNo}}</span></label>
+ <label>下单顾问: <span>{{order.staffName}}</span></label>
+ <label>消费门店: <span>{{order.shopShortName}}</span></label>
+ <label>订单时间: <span>{{order.orderTime}}</span></label>
+ <label>备 注: <span>{{order.remark}}</span></label>
</el-row>
</el-col>
</el-row>
@@ -65,12 +65,12 @@
<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>
+ <label>¥ {{order.total}}</label>
+ <label>¥ {{order.zkTotal - order.total}}</label>
+ <label>¥ {{order.zkTotal}}</label>
+ <label>¥ {{order.arrears}}</label>
+ <label>¥ {{order.repay}}</label>
+ <label>¥ {{order.refund}}</label>
</el-col>
</el-row>
</el-col>
@@ -82,16 +82,10 @@
</el-row>
<el-row>
<el-col :span="6" style="text-align: right;">
- <label>微信</label>
- <label>支付宝</label>
- <label>银行卡</label>
- <label>欠款</label>
+ <label v-for="(item, index) in payMethodItems">{{item.payMethod}}</label>
</el-col>
<el-col :span="14" style="text-align: right;">
- <label>¥ 92</label>
- <label>¥ 12</label>
- <label>¥ 80</label>
- <label>¥ 20</label>
+ <label v-for="(item, index) in payMethodItems">¥ {{item.amount}}</label>
</el-col>
</el-row>
</el-col>
@@ -114,17 +108,17 @@
width="50">
</el-table-column>
<el-table-column
- prop="goodsNo"
+ prop="shoppingGoods.code"
label="产品编号"
- width="180">
+ width="100">
</el-table-column>
<el-table-column
- prop="goodsName"
+ prop="shoppingGoods.name"
label="产品名称"
- width="180">
+ width="280">
</el-table-column>
<el-table-column
- prop="goodsType"
+ prop="shoppingGoods.goodType"
label="产品类型">
</el-table-column>
<el-table-column
@@ -139,13 +133,14 @@
prop="zkPrice"
label="折扣单价">
</el-table-column>
- <el-table-column
- prop="zkTotal"
- label="小计">
+ <el-table-column label="小计" :formatter="calOrderTotalFormatter">
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="业绩设置" name="second">
+ <el-row>
+ <el-button size="mini" type="primary" @click="saveAchieve">保存</el-button>
+ </el-row>
<el-table
:data="achieveItems"
style="width: 100%">
@@ -164,29 +159,60 @@
width="180">
</el-table-column>
<el-table-column
- prop="goodsType"
+ prop="zkTotal"
label="收款">
</el-table-column>
<el-table-column
- prop="price"
+ prop="t3"
label="业绩类型">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.t3" placeholder="请选择业绩类型">
+ <el-option
+ v-for="item in achieveTypeList"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+ </template>
</el-table-column>
<el-table-column
- prop="count"
+ prop="achieve"
label="业绩">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.achieve"></el-input>
+ </template>
</el-table-column>
<el-table-column
- prop="zkPrice"
+ prop="projPercentage"
label="提成">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.projPercentage"></el-input>
+ </template>
</el-table-column>
<el-table-column
- prop="zkTotal"
label="员工">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.beaultId" placeholder="请选择员工">
+ <el-option
+ v-for="item in userList"
+ :key="item.suId"
+ :label="item.suName"
+ :value="item.suId">
+ </el-option>
+ </el-select>
+ </template>
</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>
+ <el-button type="primary" v-if="scope.row.isShare"
+ size="mini"
+ @click="delAchieve(scope.$index, scope.row)">删除
+ </el-button>
+ <el-tooltip content="分享业绩" placement="top">
+ <el-button @click="shareAchieve(scope.$index, scope.row)" icon="el-icon-share"
+ size="mini" type="primary"></el-button>
+ </el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -207,7 +233,7 @@
<el-table-column
prop="flowContent"
label="交易内容"
- width="180">
+ width="300">
</el-table-column>
<el-table-column
prop="flowType"
@@ -243,24 +269,114 @@
var app = new Vue({
el : "#app",
data : {
- activeName : "first",
+ vipInfo : "",
+ order : "",
+ activeName : "second",
circleUrl : "https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png",
+ userList : [],
+ achieveTypeList : [
+ {
+ "key" : "现金业绩",
+ "value" : "现金业绩"
+ },{
+ "key" : "划扣业绩",
+ "value" : "划扣业绩"
+ },
+ ],
orderItems : [],
achieveItems : [],
flowItems : [],
+ payMethodItems : [],
},
created : function() {
+ let _this = this;
+ this.vipInfo = /*[[${vipInfo}]]*/
+ this.order = /*[[${order}]]*/
+ this.orderItems = /*[[${orderItems}]]*/
+ this.payMethodItems = /*[[${payMethods}]]*/
+ this.achieveItems = /*[[${achieveList}]]*/
+ this.flowItems = this.order.flows;
+
+ this.checkAchieveIsDel(this.achieveItems);
+ this.order.orderTime = moment(this.order.orderTime).format("YYYY-MM-DD HH:mm");
+
+ var arrears = 0;
+ var refund = 0;
+ var repay = 0;
+ for(var i = 0; i < this.flowItems.length; i++) {
+ var item = this.flowItems[i];
+ if (item.payMethod === '欠款') {
+ arrears += item.amount;
+ }
+
+ if (item.flowType === '还款') {
+ repay += item.amount;
+ }
+
+ if (item.flowType === '退款') {
+ refund += item.amount;
+ }
+ }
+ this.order.arrears = arrears;
+ this.order.refund = refund;
+ this.order.repay = repay;
+
+ //获取用户列表
+ AjaxProxy.requst({
+ app: _this,
+ url: basePath + '/admin/shopAll',
+ callback: function (data) {
+ _this.userList = data.rows;
+ }
+ });
+
},
methods : {
+ calOrderTotalFormatter(row, column) {
+ return row.count * row.price;
+ },
+ saveAchieve() {
+ let _this = this;
+ AjaxProxy.requst({
+ app: _this,
+ data: _this.achieveItems,
+ contentType: 'application/json',
+ url: basePath + '/admin/achieve/add',
+ callback: function (data) {
+ _this.$message.success(data.info);
+ }
+ });
+ },
+ shareAchieve(index, row) {
+ var row2 = JSON.parse(JSON.stringify(row));
+ this.achieveItems.push(row2);
+ },
+ delAchieve(index, row) {
+ this.achieveItems.splice(index, 1);
+ },
+ checkAchieveIsDel(items) {
+ var achieveIds = [];
+ for(var i = 0; i < items.length; i++) {
+ var item = items[i];
+ if(achieveIds.indexOf(item.orderItemId) === -1) {
+ achieveIds.push(item.orderItemId);
+ item.isShare = false;
+ } else {
+ item.isShare = true;
+ }
+
+ item.achieve = item.consume + item.cardCash;
+ }
+ },
printf() {
- var id = 1;
+ var id = this.order.id;
layer.open({
type: 2,
title: "打印服务单",
area: ['250px', '550px'],
maxmin: true,
- content: [basePath + '/admin/redirect/hive/beautySalon/print-service?id=' + id]
+ content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + id]
});
},
handleClick() {
@@ -272,17 +388,5 @@
}
});
//]]>
- function print() {
- var id=$("#orderId").val();
- layer.open({
- type: 2,
- title: "打印订单",
- area: ['250px', '550px'],
- maxmin: true,
- content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + id]
- });
- };
-
-
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1