|
@@ -671,7 +671,8 @@
|
|
|
<div class="lineWrap">
|
|
|
<div class="item"></div>
|
|
|
<div class="item">
|
|
|
- <el-checkbox v-model.trim="item.mode.isGROUP"></el-checkbox>团购
|
|
|
+ <el-checkbox v-model.trim="item.mode.isGROUP"
|
|
|
+ :disabled="item.id==-1"></el-checkbox>团购
|
|
|
</div>
|
|
|
<div class="item">
|
|
|
<el-input style="width:80%"
|
|
@@ -701,7 +702,8 @@
|
|
|
<div class="lineWrap">
|
|
|
<div class="item"></div>
|
|
|
<div class="item">
|
|
|
- <el-checkbox v-model.trim="item.mode.isLEASE"></el-checkbox>租赁
|
|
|
+ <el-checkbox v-model.trim="item.mode.isLEASE"
|
|
|
+ :disabled="item.id==-1"></el-checkbox>租赁
|
|
|
</div>
|
|
|
<div class="item">
|
|
|
<el-input style="width:80%"
|
|
@@ -731,7 +733,8 @@
|
|
|
<div class="lineWrap">
|
|
|
<div class="item"></div>
|
|
|
<div class="item">
|
|
|
- <el-checkbox v-model.trim="item.mode.isFREE"></el-checkbox>免费
|
|
|
+ <el-checkbox v-model.trim="item.mode.isFREE"
|
|
|
+ :disabled="item.id==-1"></el-checkbox>免费
|
|
|
</div>
|
|
|
<div class="item">
|
|
|
<el-input style="width:80%"
|
|
@@ -1379,6 +1382,9 @@ export default {
|
|
|
let depositFee, price;
|
|
|
let coursePurchaseTypeJson = null;
|
|
|
active.fangshi.forEach(fs => {
|
|
|
+ if (fs.id == -1) {
|
|
|
+ return
|
|
|
+ }
|
|
|
if (fs.id == zl) {
|
|
|
depositFee = fs.mode.depositFee;
|
|
|
price = fs.mode.price;
|
|
@@ -1691,8 +1697,38 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ }
|
|
|
+ let flag = true;
|
|
|
+ row.fangshi.forEach(item => {
|
|
|
+ if (item.id == -1) {
|
|
|
+ flag = false;
|
|
|
+ }
|
|
|
+ })
|
|
|
+ if (flag) {
|
|
|
+ row.fangshi.push({
|
|
|
+ checked: false,
|
|
|
+ id: -1,
|
|
|
+ mode: {
|
|
|
+ isFREE: false,
|
|
|
+ isGROUP: false,
|
|
|
+ isLEASE: false,
|
|
|
+ isNull: true,
|
|
|
+ yuji: 0,
|
|
|
+ FREE: 0,
|
|
|
+ GROUP: 0,
|
|
|
+ LEASE: 0,
|
|
|
+ courseGroup: 0,
|
|
|
+ courseLease: 0,
|
|
|
+ depositFee: 0,
|
|
|
+ marketPrice: 0,
|
|
|
+ price: 0
|
|
|
+ },
|
|
|
+ shopName: "自备"
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
+
|
|
|
this.editSound = row;
|
|
|
this.reductionVisible = true;
|
|
|
},
|
|
@@ -1736,23 +1772,44 @@ export default {
|
|
|
this.calcPrice()
|
|
|
},
|
|
|
setChioseMusic (row) {
|
|
|
+ // 多个乐器得比较乐器费用
|
|
|
+
|
|
|
let flag = true;
|
|
|
+ row.fangshi.sort((a, b) => {
|
|
|
+ return b.mode.price - a.mode.price
|
|
|
+ })
|
|
|
+ let groupList = []
|
|
|
+ let leaseList = []
|
|
|
+ console.log(row)
|
|
|
row.fangshi.forEach(item => {
|
|
|
if (item.id == -1) {
|
|
|
flag = false;
|
|
|
}
|
|
|
if (item.mode.isGROUP) {
|
|
|
- item.chiosetype = 'GROUP'
|
|
|
- item.checked = true
|
|
|
- return
|
|
|
- } else if (item.mode.isLEASE) {
|
|
|
- item.chiosetype = 'isLEASE'
|
|
|
- item.checked = true
|
|
|
- return
|
|
|
- } else if (item.mode.isFREE) {
|
|
|
- item.chiosetype = 'isFREE'
|
|
|
- item.checked = true
|
|
|
- return
|
|
|
+ groupList.push(item)
|
|
|
+ }
|
|
|
+ if (item.mode.isLEASE) {
|
|
|
+ leaseList.push(item)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ let item = null
|
|
|
+ if (groupList.length > 0) {
|
|
|
+ // 勾选团购
|
|
|
+ groupList[0].chiosetype = 'GROUP'
|
|
|
+ groupList[0].checked = true
|
|
|
+ item = groupList[0]
|
|
|
+ } else if (leaseList.length > 0) {
|
|
|
+ leaseList[0].chiosetype = 'isLEASE'
|
|
|
+ leaseList[0].checked = true
|
|
|
+ item = leaseList[0]
|
|
|
+ } else {
|
|
|
+ row.fangshi[0].checked = true;
|
|
|
+ row.fangshi[0].chiosetype = 'isFREE'
|
|
|
+ item = row.fangshi[0]
|
|
|
+ }
|
|
|
+ row.fangshi.forEach((some, index) => {
|
|
|
+ if (item.id == some.id) {
|
|
|
+ row.fangshi[index] = item;
|
|
|
}
|
|
|
})
|
|
|
row.markList.forEach(item => {
|
|
@@ -1906,7 +1963,7 @@ export default {
|
|
|
} else {
|
|
|
//团购
|
|
|
amount += parseFloat(item.mode.price);
|
|
|
- couponPrice += parseFloat(item.mode.GROUP);
|
|
|
+ couponPrice = parseFloat(item.mode.GROUP);
|
|
|
courseCouponPrice = parseFloat(item.mode.courseGroup)
|
|
|
marketPrice += parseFloat(item.mode.marketPrice)
|
|
|
}
|