From 40d3aef316ed7803c051368d606abd973e85ce46 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 11 Jan 2021 22:10:02 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 3a9153b..df3b253 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
@@ -205,7 +205,7 @@
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
- <el-button type="primary"
+ <el-button type="primary" v-if="scope.row.isShare"
size="mini"
@click="delAchieve(scope.$index, scope.row)">删除
</el-button>
@@ -298,14 +298,7 @@
this.achieveItems = /*[[${achieveList}]]*/
this.flowItems = this.order.flows;
- var achieveDel = false;
- if (this.achieveItems.length > 1) {
- achieveDel = true;
- }
- this.achieveItems.forEach(item=>{
- item.achieve = item.consume + item.cardCash;
- item.isShare = achieveDel;
- })
+ this.checkAchieveIsDel(this.achieveItems);
this.order.orderTime = moment(this.order.orderTime).format("YYYY-MM-DD HH:mm");
var arrears = 0;
@@ -350,6 +343,20 @@
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 = this.order.id;
layer.open({
@@ -359,12 +366,6 @@
maxmin: true,
content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + id]
});
- },
- checkAchieveIsDel(items) {
- var orderItems = [];
- for(var i = 0; i < items.length; i++) {
- var item = items[i];
- }
},
handleClick() {
--
Gitblit v1.9.1