|
@@ -1061,6 +1061,7 @@ export default {
|
|
|
this.topfor = this.$store.getters.topinfo;
|
|
|
this.checkfor = this.$store.getters.checkinfo;
|
|
|
this.newStudentfor = this.$store.getters.newStudentinfo
|
|
|
+
|
|
|
this.$nextTick(res => {
|
|
|
|
|
|
|
|
@@ -1659,10 +1660,21 @@ export default {
|
|
|
if (item.mode.isGROUP) {
|
|
|
item.chiosetype = 'GROUP'
|
|
|
item.checked = true
|
|
|
- } else {
|
|
|
-
|
|
|
+ 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
|
|
|
}
|
|
|
})
|
|
|
+ row.markList.forEach(item => {
|
|
|
+ item.checked = true
|
|
|
+ })
|
|
|
+ console.log(row.markList)
|
|
|
},
|
|
|
onAuxiliarie (item) {
|
|
|
// 辅件切换状态
|
|
@@ -1700,10 +1712,17 @@ export default {
|
|
|
let mgs = this.lookPreviewRow.yuji;
|
|
|
let coursePrice = Number(mgs)
|
|
|
let csi = this.checkfor;
|
|
|
+ let newStudent = this.newStudentfor
|
|
|
// 加上判断是否有课程信息
|
|
|
if (mgs) {
|
|
|
console.log(csi)
|
|
|
- // amount += parseFloat(mgs);
|
|
|
+ // amount += parseFloat(mgs);s
|
|
|
+ const sbaseInfo = newStudent.baseInfo
|
|
|
+ if (sbaseInfo.ischeck) {
|
|
|
+ const value = Number(parseFloat(sbaseInfo.nowValue ? sbaseInfo.nowValue : 0))
|
|
|
+ marketPrice += value;
|
|
|
+ amount += Number(parseFloat(sbaseInfo.value ? sbaseInfo.value : 0))
|
|
|
+ }
|
|
|
const allInfo = csi.allInfo
|
|
|
if (allInfo.ischeck) {
|
|
|
const value = Number(parseFloat(allInfo.value ? allInfo.value : 0))
|