|
@@ -94,11 +94,22 @@
|
|
|
kitGroupPurchaseTypeFormater[changeInfo.kitGroupPurchaseType]
|
|
|
}}</span>
|
|
|
</el-form-item>
|
|
|
- <!-- <el-form-item label="分部分润金额" prop="musicalGoods" v-if="form.musicalGoods&&musicalGoodsById[form.musicalGoods]&&form.type=='GROUP'">
|
|
|
- <el-input :value=" musicalGoodsById[form.musicalGoods].organShareProfit" disabled>
|
|
|
+ <el-form-item
|
|
|
+ label="分部分润金额"
|
|
|
+ prop="musicalGoods"
|
|
|
+ v-if="
|
|
|
+ form.musicalGoods &&
|
|
|
+ musicalGoodsById[form.musicalGoods] &&
|
|
|
+ form.type == 'GROUP'
|
|
|
+ "
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="changeCourseFee"
|
|
|
+ disabled
|
|
|
+ >
|
|
|
<template slot="append">元</template>
|
|
|
</el-input>
|
|
|
- </el-form-item> -->
|
|
|
+ </el-form-item>
|
|
|
<template>
|
|
|
<!-- v-show="
|
|
|
(courseViewType == 2 && form.musicalGoods == 'OWNED') ||
|
|
@@ -216,13 +227,13 @@ const formatAllGoods = (data, kitGroupPurchaseType) => {
|
|
|
|
|
|
if (data) {
|
|
|
const { musicGroupSubjectGoodsGroupList } = data;
|
|
|
-// 乐器还是辅件
|
|
|
-/**
|
|
|
- * {
|
|
|
- * ACCESSORIES:[],
|
|
|
- * INSTRUMENT:[]
|
|
|
- * }
|
|
|
- */
|
|
|
+ // 乐器还是辅件
|
|
|
+ /**
|
|
|
+ * {
|
|
|
+ * ACCESSORIES:[],
|
|
|
+ * INSTRUMENT:[]
|
|
|
+ * }
|
|
|
+ */
|
|
|
const types = {};
|
|
|
for (const item of musicGroupSubjectGoodsGroupList) {
|
|
|
if (!types[item.type]) {
|
|
@@ -256,7 +267,6 @@ const formatAllGoods = (data, kitGroupPurchaseType) => {
|
|
|
: kitGroupPurchaseType === "LEASE"
|
|
|
? item.depositFee
|
|
|
: item.price,
|
|
|
-
|
|
|
};
|
|
|
|
|
|
musicalGoods.push(_item);
|
|
@@ -335,6 +345,7 @@ export default {
|
|
|
originalCourseFee: 0,
|
|
|
musicGroupSubjectPlanFee: 0,
|
|
|
musicalPrice: 0,
|
|
|
+ changeCourseFee: 0,
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
@@ -388,20 +399,39 @@ export default {
|
|
|
return items || "未选择教辅";
|
|
|
},
|
|
|
editSpread() {
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ console.log(this.form.type,'editSpread','type')
|
|
|
+ })
|
|
|
+
|
|
|
const data = this.changeInfo || {};
|
|
|
const payed =
|
|
|
(data.originalAccessoriesPrice || 0) +
|
|
|
(data.originalCourseFee || 0) +
|
|
|
(data.originalMusicalPrice || 0);
|
|
|
- return (
|
|
|
+ return this.changeInfo.kitGroupPurchaseType =='GROUP'?(
|
|
|
(data.changeMusicalPrice || 0) +
|
|
|
(data.changeAccessoriesPrice || 0) +
|
|
|
(data.changeCourseFee || 0) -
|
|
|
payed
|
|
|
+ ):(
|
|
|
+ (data.changeMusicalPrice || 0) +
|
|
|
+ (data.changeAccessoriesPrice || 0)
|
|
|
+ -
|
|
|
+ payed
|
|
|
);
|
|
|
},
|
|
|
spread() {
|
|
|
- const money = this.numFormat(
|
|
|
+ const money = this.form.type =='GROUP'? this.numFormat(
|
|
|
+ this.musicalPrice +
|
|
|
+ this.selectAccessoriesMoney +
|
|
|
+ this.changeCourseFee+
|
|
|
+ this.musicGroupSubjectPlanFee -
|
|
|
+ this.originalAccessoriesPrice -
|
|
|
+ this.originalMusicalPrice -
|
|
|
+ this.originalCourseFee -
|
|
|
+ this.coursePurchaseTypeJsonTypePrice -
|
|
|
+ this.kitGroupPurchaseTypePrice
|
|
|
+ ):this.numFormat(
|
|
|
this.musicalPrice +
|
|
|
this.selectAccessoriesMoney +
|
|
|
this.musicGroupSubjectPlanFee -
|
|
@@ -440,9 +470,10 @@ export default {
|
|
|
const setRes = (res) => {
|
|
|
const { data } = res;
|
|
|
this.item = data || {};
|
|
|
- console.log(data,'fetchDetail')
|
|
|
+ console.log(data, "fetchDetail");
|
|
|
if (data) {
|
|
|
this.$set(this.form, "type", this.item.kitGroupPurchaseType);
|
|
|
+ console.log(this.form.type,'fetchDetail')
|
|
|
this.originalAccessoriesPrice = data.originalAccessoriesPrice;
|
|
|
this.originalMusicalPrice = data.originalMusicalPrice;
|
|
|
this.originalCourseFee = data.originalCourseFee;
|
|
@@ -451,6 +482,7 @@ export default {
|
|
|
this.originalAccessoriesGoods = (data.originalAccessoriesGoods || [])
|
|
|
.map((item) => item.name)
|
|
|
.join();
|
|
|
+ this.changeCourseFee = data.changeCourseFee
|
|
|
}
|
|
|
};
|
|
|
if (this.detail.subjectChange) {
|
|
@@ -517,6 +549,7 @@ export default {
|
|
|
this.coursePurchaseTypeJsonTypePrice = this.numFormat(
|
|
|
item.coursePurchaseTypeJsonTypePrice
|
|
|
);
|
|
|
+ this.changeCourseFee = this.numFormat(item.organShareProfit);
|
|
|
this.types = item.kitGroupPurchaseTypeJsonParse;
|
|
|
} else {
|
|
|
this.musicalPrice = 0;
|
|
@@ -565,10 +598,7 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
subjectChangeAdd({
|
|
|
- changeCourseFee: this.numFormat(
|
|
|
- this.musicGroupSubjectPlanFee -
|
|
|
- this.coursePurchaseTypeJsonTypePrice
|
|
|
- ),
|
|
|
+ changeCourseFee: this.numFormat(this.changeCourseFee),
|
|
|
changeAccessories: this.selectAccessories.join(",") || null,
|
|
|
changeAccessoriesPrice: this.numFormat(this.selectAccessoriesMoney),
|
|
|
changeMusicalPrice: this.numFormat(this.musicalPrice),
|