From d7d233e0974e52772a714023bbaeb8b4eb2db001 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jan 2021 18:14:27 +0800
Subject: [PATCH] modify order-form
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 162 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 115 insertions(+), 47 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index b1890a5..69e9692 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -75,6 +75,20 @@
.arrears {
color: #E6A23C;
}
+
+ .paymethod ul {
+ padding: 0;
+ margin: 0;
+ height: 50px;
+ }
+ .paymethod ul li {
+ padding: 10px;
+ margin: 5px;
+ list-style:none;
+ float: left;
+ display: block;
+ border: #0e9aef 1px solid;
+ }
</style>
</head>
<body>
@@ -247,51 +261,51 @@
</template>
</el-table-column>
<el-table-column
- label="应付">
+ label="小计">
<template slot-scope="scope">
{{scope.row.zkPrice * scope.row.count }}
</template>
</el-table-column>
- <el-table-column
- label="实付">
- <template slot-scope="scope">
- <el-input @change="calculationTotal(1)" v-model="scope.row.payMoney"></el-input>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- label="实付">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-input @change="calculationTotal(1)" v-model="scope.row.payMoney"></el-input>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
- <el-table-column
- label="支付方式"
- width="130">
- <template slot-scope="scope">
- <el-select @change="changePayMethod(scope.row)" v-model="scope.row.payMethod"
- placeholder="请选择支付方式">
- <el-option
- v-for="item in payMethods"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- label="支付方式"-->
+<!-- width="130">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-select @change="changePayMethod(scope.row)" v-model="scope.row.payMethod"-->
+<!-- placeholder="请选择支付方式">-->
+<!-- <el-option-->
+<!-- v-for="item in payMethods"-->
+<!-- :key="item.value"-->
+<!-- :label="item.label"-->
+<!-- :value="item.value"-->
+<!-- :disabled="item.disabled">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
- <el-table-column
- label="会员卡">
- <template slot-scope="scope">
- <el-select :disabled="scope.row.payMethod!='会员卡'" v-model="scope.row.payMethodDetail"
- placeholder="请选择支付卡">
- <el-option
- v-for="item in moneyCards"
- :key="item.id"
- :label="item.showLable"
- :value="item.id">
- </el-option>
- </el-select>
- </template>
- </el-table-column>
+<!-- <el-table-column-->
+<!-- label="会员卡">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-select :disabled="scope.row.payMethod!='会员卡'" v-model="scope.row.payMethodDetail"-->
+<!-- placeholder="请选择支付卡">-->
+<!-- <el-option-->
+<!-- v-for="item in moneyCards"-->
+<!-- :key="item.id"-->
+<!-- :label="item.showLable"-->
+<!-- :value="item.id">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column
prop="address"
label="操作">
@@ -313,8 +327,9 @@
<li>订单总金额：{{order.total}}</li>
- <li v-if="order.arrears>0">订单欠款：<span class="arrears">{{order.arrears}}</span></li>
- <li v-if="order.arrears<0">找零：<span class="arrears">{{order.arrears}}</span></li>
+ <li>整单折扣：<span class="arrears">{{order.total - order.zkTotal}}</span></li>
+<!-- <li v-if="order.arrears>0">订单欠款：<span class="arrears">{{order.arrears}}</span></li>-->
+<!-- <li v-if="order.arrears<0">找零：<span class="arrears">{{order.arrears}}</span></li>-->
</ul>
</div>
<div class="money">
@@ -327,7 +342,8 @@
<el-button type="primary" @click="submitOrder(2)">挂单</el-button>
<el-button type="primary" @click="print()">打印</el-button>
<el-button type="primary" @click="drawer = true">业绩设置</el-button>
- <el-button type="success" @click="confirmSubmit()" class="bigbtn"> 结算</el-button>
+ <!-- <el-button type="success" @click="confirmSubmit()" class="bigbtn"> 结算</el-button>-->
+ <el-button type="success" @click="dialogSettleVisible = true" class="bigbtn">收款</el-button>
</el-col>
</el-row>
@@ -411,6 +427,49 @@
</el-row>
</el-drawer>
+ <el-dialog title="收款" :visible.sync="dialogSettleVisible">
+ <el-row type="flex" align="middle" style="padding: 10px 0;">
+ <el-col :span="5" style="text-align: center;">应收</el-col>
+ <el-col :span="10" style="text-align: center; line-height: 50px;"><span style="color: red;">¥ 80</span></el-col>
+ </el-row>
+
+ <el-row type="flex" align="middle" style="padding: 10px 0;">
+ <el-col :span="5" style="text-align: center;">收款方式</el-col>
+ <el-col class="paymethod" :span="15">
+ <ul style="border: #0c7cb5 1px dashed;">
+ <li>现金支付</li>
+ <li>微信</li>
+ <li>支付宝</li>
+ <li>银行卡支付</li>
+ <li>团购</li>
+ </ul>
+
+ <ul>
+ <li>会员储值卡</li>
+ <li>欠款</li>
+ </ul>
+ </el-col>
+ </el-row>
+
+ <el-row type="flex" align="middle" style="padding: 10px 0;">
+ <el-col :span="5" style="text-align: center;">支付金额</el-col>
+ <el-col :span="15">
+ <el-row style="line-height: 50px;">
+ <el-col :span="5" style="text-align: right; padding-right: 10px;">微信支付</el-col>
+ <el-col :span="8"><el-input></el-input></el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="5" style="text-align: right; padding-right: 10px;">储值卡</el-col>
+ <el-col :span="8"><el-input></el-input></el-col>
+ <el-col :span="5" style="margin-left: 10px;">余额：<span class="arrears">¥ 1000</span></el-col>
+ </el-row>
+ <el-row style="line-height: 50px;">
+ <el-col :span="5" style="text-align: right; padding-right: 10px;">欠款</el-col>
+ <el-col :span="8"><el-input></el-input></el-col>
+ </el-row>
+ </el-col>
+ </el-row>
+ </el-dialog>
</div>
</body>
@@ -495,6 +554,7 @@
loading: false,
/******搜索表格数据END********/
+ dialogSettleVisible : true,
},
@@ -566,7 +626,7 @@
//获取用户列表
AjaxProxy.requst({
app: _this,
- url: basePath + '/admin/getShopStaffByRoleName?roleName=美疗师',
+ url: basePath + '/admin/shopAll',
callback: function (data) {
_this.userList = data.rows;
}
@@ -776,13 +836,15 @@
_this.achieveList.forEach(achieve => {
for (let i = 0; i < _this.order.items.length; i++) {
let item = _this.order.items[i];
- item.achieveList = [];
+ if (!item.achaeveList){
+ item.achaeveList = [];
+ }
if (item.uuid == achieve.orderItem.uuid) {
let achieveNew = {
beaultId: achieve.saleId,
t1: achieve.achieveMoney
};
- item.achieveList.push(achieveNew);
+ item.achaeveList.push(achieveNew);
break;
}
}
@@ -818,7 +880,13 @@
} else {
_this.$message.success(data.info);
}
- parent.myGrid.serchData();
+ if(parent.myGrid) {
+ parent.myGrid.serchData();
+ }
+
+ if (parent.app) {
+ parent.app.orderQuery();
+ }
}
});
}
@@ -888,9 +956,9 @@
*/
chouseGoods() {
let _this = this;
- this.multipleSelection.forEach(item => {
- _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
- });
+ // this.multipleSelection.forEach(item => {
+ // _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
+ // });
this.closeXm();
this.calculationTotal();
},
--
Gitblit v1.9.1