From 4ece659308844cbe73053d3dd2a6f777f218eb13 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 11 Jan 2021 16:45:57 +0800 Subject: [PATCH] modify --- zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html | 100 +++++++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 46 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 d10a5cd..3965187 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 @@ -40,14 +40,14 @@ <el-avatar :size="60" :src="circleUrl"></el-avatar> </el-col> <el-col :span="15" style="margin-left: 10px;"> - <label>{{vipInfo.vipName}}({{vipInfo.vipLevel.levelName}})</label> + <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>{{order.orderNo}}</span></label> <label>下单顾问: <span>{{order.staffName}}</span></label> - <label>消费门店: <span>{{order.shopName}}</span></label> + <label>消费门店: <span>{{order.shopShortName}}</span></label> <label>订单时间: <span>{{order.orderTime}}</span></label> <label>备 注: <span>{{order.remark}}</span></label> </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,9 +133,7 @@ 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> @@ -164,23 +156,23 @@ width="180"> </el-table-column> <el-table-column - prop="goodsType" + prop="zkTotal" label="收款"> </el-table-column> <el-table-column - prop="price" + prop="achieveType" label="业绩类型"> </el-table-column> <el-table-column - prop="count" + prop="achieve" label="业绩"> </el-table-column> <el-table-column - prop="zkPrice" + prop="commission" label="提成"> </el-table-column> <el-table-column - prop="zkTotal" + prop="staffId" label="员工"> </el-table-column> <el-table-column label="操作"> @@ -207,7 +199,7 @@ <el-table-column prop="flowContent" label="交易内容" - width="180"> + width="300"> </el-table-column> <el-table-column prop="flowType" @@ -250,24 +242,52 @@ orderItems : [], achieveItems : [], flowItems : [], + payMethodItems : [], }, created : function() { this.vipInfo = /*[[${vipInfo}]]*/ this.order = /*[[${order}]]*/ + this.orderItems = /*[[${orderItems}]]*/ + this.payMethodItems = /*[[${payMethods}]]*/ + this.achieveItems = /*[[${achieveList}]]*/ + this.flowItems = this.order.flows; this.order.orderTime = moment(this.order.orderTime).format("YYYY-MM-DD HH:mm"); - console.log(this.vipInfo); - console.log(this.order); + + 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; + } + } + console.log(this.orderItems); + this.order.arrears = arrears; + this.order.refund = refund; + this.order.repay = repay; }, methods : { + calOrderTotalFormatter(row, column) { + return row.count * row.price; + }, 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() { @@ -279,17 +299,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