Commit 14160e5f by kyle

修改学制之后内页增加对应的数量

parent 9ef23f3d
...@@ -95,8 +95,8 @@ ...@@ -95,8 +95,8 @@
</li> </li>
<li v-for="item in schoolingLists" :key="item.value"> <li v-for="item in schoolingLists" :key="item.value">
<div>{{item.text}}</div> <div>{{item.text}}</div>
<div><input class="uni-input" maxlength="1" type="number" placeholder="最高不超过10" v-model="item.commonYears"/></div> <div><input class="uni-input" maxlength="1" type="number" placeholder="最高不超过10" v-model="item.commonYears" @blur="updateSchoolingLists(item)"/></div>
<div><input class="uni-input" maxlength="10" type="digit" v-model="item.publicTuition"/></div> <div><input class="uni-input" maxlength="10" type="digit" v-model="item.publicTuition" @blur="updateSchoolingLists(item)"/></div>
<div><view class="settingButton" @click="settingYBY(item)">逐年设定</view></div> <div><view class="settingButton" @click="settingYBY(item)">逐年设定</view></div>
</li> </li>
</ul> </ul>
...@@ -211,36 +211,41 @@ ...@@ -211,36 +211,41 @@
getClassesInfo(val){ getClassesInfo(val){
if(val){ if(val){
const value = this.flatEduGradeLists.filter(item=>item.educationNo==val)[0].value; const value = this.flatEduGradeLists.filter(item=>item.educationNo==val)[0].value;
const schooling = value.split('-')[0]; if(value){
const grade = value.split('-')[1]; const schooling = value.split('-')[0];
let schoolingName = ''; const grade = value.split('-')[1];
switch(schooling){ let schoolingName = '';
case '1': switch(schooling){
schoolingName = '幼儿园'; case '1':
break; schoolingName = '幼儿园';
case '2': break;
schoolingName = '小学'; case '2':
break; schoolingName = '小学';
case '3': break;
schoolingName = '初中'; case '3':
break; schoolingName = '初中';
case '4': break;
schoolingName = '高中'; case '4':
break; schoolingName = '高中';
case '5': break;
schoolingName = '大学'; case '5':
break; schoolingName = '大学';
case '6': break;
schoolingName = '硕士'; case '6':
break; schoolingName = '硕士';
case '7': break;
schoolingName = '博士'; case '7':
break; schoolingName = '博士';
default: break;
schoolingName = '幼儿园'; default:
break; schoolingName = '幼儿园';
break;
}
return (schoolingName + grade + '年级');
}else{
return val;
} }
return (schoolingName + grade + '年级');
} }
}, },
getFollowData(e){ getFollowData(e){
...@@ -281,7 +286,7 @@ ...@@ -281,7 +286,7 @@
boundaryGap: false, boundaryGap: false,
axisLabel:{ axisLabel:{
interval:0, interval:0,
rotate:0 rotate:60
}, },
textStyle:{ textStyle:{
fontSize:10 fontSize:10
...@@ -310,7 +315,7 @@ ...@@ -310,7 +315,7 @@
emphasis: { emphasis: {
focus: 'series' focus: 'series'
}, },
data:this.accountBalanceEnd data:this.accountBalanceEnd,
}, },
{ {
name: '学费现金流', name: '学费现金流',
...@@ -328,7 +333,7 @@ ...@@ -328,7 +333,7 @@
emphasis: { emphasis: {
focus: 'series' focus: 'series'
}, },
data:this.currentYearExpenditure data:this.currentYearExpenditure,
} }
] ]
}; };
...@@ -341,12 +346,25 @@ ...@@ -341,12 +346,25 @@
this.settingYBYFlag = true; this.settingYBYFlag = true;
this.settingItem = item; this.settingItem = item;
}, },
updateSchoolingLists(val){
if(Number(val.commonYears) != val.children.length){
if(Number(val.commonYears) > 0){
const arr = [];
for(let i=0;i< Number(val.commonYears);i++){
arr.push({text:`${i+1}年级`,value:`${val.value}-${i+1}`,tuition:null})
}
val.children = arr;
}
}
if(val.publicTuition){
val.children[0].tuition = val.publicTuition;
}
},
closeDialog(){ closeDialog(){
this.settingYBYFlag = false; this.settingYBYFlag = false;
}, },
confirmOption(){ confirmOption(){
this.settingYBYFlag = false; this.settingYBYFlag = false;
console.log(this.settingItem)
}, },
objFlat(Data){ objFlat(Data){
// 对象数组拍平 // 对象数组拍平
...@@ -426,13 +444,15 @@ ...@@ -426,13 +444,15 @@
for(let i=0;i<result.length;i++){ for(let i=0;i<result.length;i++){
this.currentYearExpenditure.push(Math.abs(result[i]['currentYearExpenditure'])); this.currentYearExpenditure.push(Math.abs(result[i]['currentYearExpenditure']));
this.accountBalanceEnd.push(result[i]['accountBalanceEnd']); this.accountBalanceEnd.push(result[i]['accountBalanceEnd']);
this.xAxisLists.push(result[i]['planyear']) this.xAxisLists.push(result[i]['educationNo'] ? this.getClassesInfo(result[i]['educationNo']) : result[i]['planyear'])
} }
setTimeout(()=>{this.drawLine()},0) setTimeout(()=>{this.drawLine()},0)
}else{ }else{
this.currentYearExpenditure = []; this.currentYearExpenditure = [];
this.accountBalanceEnd = []; this.accountBalanceEnd = [];
this.xAxisLists = []; this.xAxisLists = [];
common.errorDialog(2,res['message']);
return false;
} }
}) })
}, },
...@@ -460,7 +480,6 @@ ...@@ -460,7 +480,6 @@
this.flatEduGradeLists.map((val,idx)=>{ this.flatEduGradeLists.map((val,idx)=>{
val['educationNo'] = idx + 1; val['educationNo'] = idx + 1;
}); });
console.log(this.flatEduGradeLists)
}, },
components:{ components:{
follow, follow,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment