Commit b88e412c authored by zhengke's avatar zhengke

修改

parent dcac0eb9
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
.box-businessModel { .box-businessModel {
cursor: pointer; cursor: pointer;
width: 209px; // width: 209px;
width: 314px;
height: 198px; height: 198px;
background: #f9f9f9; background: #f9f9f9;
border-radius: 5px; border-radius: 5px;
......
...@@ -41,10 +41,16 @@ ...@@ -41,10 +41,16 @@
separator="none" :data="dataList" :columns="columns" row-key=""> separator="none" :data="dataList" :columns="columns" row-key="">
<template v-slot:body-cell-OrderMoney="props"> <template v-slot:body-cell-OrderMoney="props">
<q-td> <q-td>
<span class="com_CanClick" v-if="isChinese(props.row.DateStr)" @click="goDetails(props.row.DateStr)">{{props.row.OrderMoney}}</span> <span class="com_CanClick" v-if="isChinese(props.row.DateStr)" @click="goDetails(props.row.DateStr,1)">{{props.row.OrderMoney}}</span>
<span v-else>{{props.row.OrderMoney}}</span> <span v-else>{{props.row.OrderMoney}}</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-StudyOrderMoney="props">
<q-td>
<span class="com_CanClick" v-if="isChinese(props.row.DateStr)" @click="goDetails(props.row.DateStr,2)">{{props.row.StudyOrderMoney}}</span>
<span v-else>{{props.row.StudyOrderMoney}}</span>
</q-td>
</template>
<template v-slot:bottom> <template v-slot:bottom>
</template> </template>
</q-table> </q-table>
...@@ -302,8 +308,7 @@ ...@@ -302,8 +308,7 @@
return true return true
} }
}, },
goDetails(dateStr){ goDetails(dateStr,type){
console.log(this.myDate,'mydate');
let year = '' let year = ''
if(this.myDate){ if(this.myDate){
year = this.myDate.split('-')[0] year = this.myDate.split('-')[0]
...@@ -312,7 +317,11 @@ ...@@ -312,7 +317,11 @@
const obj = { const obj = {
NewDate: NewDate NewDate: NewDate
}; };
this.OpenNewUrl("/sale/orderStatistics", obj); if(type==1){
this.OpenNewUrl("/sale/orderStatistics", obj);
}else{
this.OpenNewUrl("/sale/studyOrderStatistics", obj);
}
}, },
//下载数据 //下载数据
downloadStudentStatic() { downloadStudentStatic() {
......
...@@ -273,7 +273,8 @@ ...@@ -273,7 +273,8 @@
this.msg.ClassName = decodeURI(this.$route.query.ClassName); this.msg.ClassName = decodeURI(this.$route.query.ClassName);
} }
if (this.$route.query.NewDate) { if (this.$route.query.NewDate) {
this.msg.StartTime = this.$route.query.NewDate this.msg.StartTime = this.$route.query.NewDate;
this.msg.EndTime = this.$route.query.NewDate
} }
this.queryCourseSubject(); this.queryCourseSubject();
this.getOrderState(); this.getOrderState();
......
...@@ -182,6 +182,11 @@ ...@@ -182,6 +182,11 @@
if (this.$route.query.OrderId) { if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId; this.msg.OrderId = this.$route.query.OrderId;
} }
if (this.$route.query.NewDate) {
this.dateList[0] = this.$route.query.NewDate;
this.dateList[1] = this.$route.query.NewDate;
}
let userinfo = this.getLocalStorage(); let userinfo = this.getLocalStorage();
userinfo.ActionMenuList.map(x=>{//判断权限 userinfo.ActionMenuList.map(x=>{//判断权限
if(x.FunctionCode == "SA_Order_confirm"){//留学和就业订单确认按钮 if(x.FunctionCode == "SA_Order_confirm"){//留学和就业订单确认按钮
......
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