Skip to content

C
confucius
Commit 2d9cb5bd authored by 黄奎's avatar 黄奎
Browse files
Options

修改页面跳转

parent 5772e3e6
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 167 deletions
src/components/sale/myOrder-form.vue
View file @ 2d9cb5bd
......@@ -169,8 +169,7 @@
@click="goEduReceiptInfo(item.Id)">{{item.Id}}</span>
</template>
</div>
<span slot="reference" class="pri_Color"
v-if="(props.row.BackClassList&&props.row.BackClassList.length>0)||(props.row.StopClassList&&props.row.StopClassList.length>0)
<span slot="reference" class="pri_Color" v-if="(props.row.BackClassList&&props.row.BackClassList.length>0)||(props.row.StopClassList&&props.row.StopClassList.length>0)
||(props.row.InvitationClassList&&props.row.InvitationClassList.length>0)||(props.row.OrderTransClassList&&props.row.OrderTransClassList.length>0)
||(props.row.OrderSplitClassList&&props.row.OrderSplitClassList.length>0)">查看单据</span>
</el-popover>
......@@ -265,7 +264,7 @@
</q-td>
</template>
<template v-slot:body-cell-CostTypeList="props">
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si" >
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si">
<span
style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</q-td>
......@@ -283,9 +282,7 @@
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</div>
<div v-else style="min-height: 48px;"></div>
<div v-else style="min-height: 48px;"></div>
</q-td>
</template>
<template v-slot:body-cell-zhaungt="props">
......@@ -399,10 +396,12 @@
</template>
</q-table>
<!--成本单-->
<div class="row " style="align-items: center;margin: 20px 0;" v-if="saveObj.OrderType==2 || saveObj.ClassScrollType == 2">
<div class="row " style="align-items: center;margin: 20px 0;"
v-if="saveObj.OrderType==2 || saveObj.ClassScrollType == 2">
<div style="width: 3px;height: 15px;background: #3FC4FF;margin-right: 10px"></div>成本单
</div>
<q-table v-if="saveObj.OrderType==2 || saveObj.OrderType===1 || saveObj.ClassScrollType == 2" :pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat
<q-table v-if="saveObj.OrderType==2 || saveObj.OrderType===1 || saveObj.ClassScrollType == 2"
:pagination="financiaMsg" style="padding-bottom:80px;" :loading="floading" no-data-label="暂无相关数据" flat
class="sticky-tow-column-table" :hide-pagination="true" :data="dataListCB" :columns="receiptColumns"
row-key="name">
<template v-slot:body-cell-FrID="props">
......@@ -411,7 +410,7 @@
</q-td>
</template>
<template v-slot:body-cell-CostTypeList="props">
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si">
<q-td :props="props" v-for="(s,si) in props.row.CostTypeList" :key="si">
<span v-if="s&& s!=''"
style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;">{{s}}</span>
</q-td>
......@@ -428,11 +427,8 @@
</p>
<p style="color:#333333">{{tw.BankNo}}</p>
</div>
</div>
<div v-else style="min-height: 48px;"></div>
</q-td>
</template>
<template v-slot:body-cell-zhaungt="props">
......@@ -472,8 +468,6 @@
</q-td>
</template>
</q-table>
</div>
<div v-if="tab==5" style="padding: 10px 20px">
<div class="q-px-lg q-pb-md" style="padding-bottom: 50px;">
......@@ -704,7 +698,7 @@
},
dataList: [],
dataListP: [],
dataListCB:[],
dataListCB: [],
floading: false,
LogLoading: false,
GetFinancLogList: [],
......@@ -825,23 +819,23 @@
this.dataList = data;
this.getfinanciaALLPageList(2, TCID, OrderID)
} else {
if(this.saveObj.OrderType==1 && this.saveObj.ClassScrollType == 1){
if (this.saveObj.OrderType == 1 && this.saveObj.ClassScrollType == 1) {
this.dataListP = data;
}else if(this.saveObj.OrderType==2 || this.saveObj.ClassScrollType == 2){//等于留学的时候 成本单据
} else if (this.saveObj.OrderType == 2 || this.saveObj.ClassScrollType == 2) { //等于留学的时候 成本单据
this.dataListCB = []
this.dataListP = []
data.forEach(x=>{
if(x.OtherType==45||x.OtherType==33){
data.forEach(x => {
if (x.OtherType == 45 || x.OtherType == 33) {
this.dataListCB.push(x)
}else{
} else {
this.dataListP.push(x)
}
})
if(this.dataListCB && this.dataListCB.length>0){
if (this.dataListCB && this.dataListCB.length > 0) {
this.getAskfor()
}
}
this.floading = false
}
......@@ -851,61 +845,59 @@
}
}, err => {})
},
getAskfor(){
getAskfor() {
let obj = {
FrID:'汇总',
CostTypeList:[''],
TradeWayList:[],
Money: 0,
PayMoney: 0,
Fee: 0,
TradeDate:'',
EmName:'',
}
this.dataListCB.forEach((x) => {
if (x.Money) {
obj.Money = this.accAdd(x.Money, obj.Money)
};
if (x.PayMoney) {
obj.PayMoney = this.accAdd(x.PayMoney, obj.PayMoney)
};
if (x.Fee) {
obj.Fee = this.accAdd(x.Fee, obj.Fee)
};
})
this.dataListCB.push(obj)
FrID: '汇总',
CostTypeList: [''],
TradeWayList: [],
Money: 0,
PayMoney: 0,
Fee: 0,
TradeDate: '',
EmName: '',
}
this.dataListCB.forEach((x) => {
if (x.Money) {
obj.Money = this.accAdd(x.Money, obj.Money)
};
if (x.PayMoney) {
obj.PayMoney = this.accAdd(x.PayMoney, obj.PayMoney)
};
if (x.Fee) {
obj.Fee = this.accAdd(x.Fee, obj.Fee)
};
})
this.dataListCB.push(obj)
},
accAdd(arg1, arg2) { //js 加法精确计算
var r1, r2, m;
try {
r1 = arg1.toString().split(".")[1].length;
} catch (e) {
r1 = 0;
}
try {
r2 = arg2.toString().split(".")[1].length;
} catch (e) {
r2 = 0;
}
m = Math.pow(10, Math.max(r1, r2));
return (arg1 * m + arg2 * m) / m;
},
var r1, r2, m;
try {
r1 = arg1.toString().split(".")[1].length;
} catch (e) {
r1 = 0;
}
try {
r2 = arg2.toString().split(".")[1].length;
} catch (e) {
r2 = 0;
}
m = Math.pow(10, Math.max(r1, r2));
return (arg1 * m + arg2 * m) / m;
},
goUrl(path, rowData, ) {
this.$router.push({
path: '/financial/financalDocument/' + path,
query: {
"id": rowData.FrID,
blank: 'y',
tab: '单据详情'
}
})
var newpath = '/financial/financalDocument/' + path;
var query = {
"id": rowData.FrID,
blank: 'y',
tab: '单据详情'
};
this.OpenNewUrl(newpath, query);
// this.$router.push({
// path: '/financial/financalDocument/' + path,
// query: query
// })
},
//返回2位小数
getTwoWei(num) {
......
src/components/sale/orderlist.vue
View file @ 2d9cb5bd
......@@ -687,9 +687,10 @@
</tr>
</table>
</div>
<q-btn v-if="!IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
<q-btn v-if="IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1,'原路')" label="确定原路退款"
<q-btn v-if="!IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 1)"
label="制单" style="min-width:70px;float:right;margin-top:10px" />
<q-btn v-if="IsRefund" color="accent" size="sm" class="q-mr-md"
@click="chanceType(item, 1,'原路')" label="确定原路退款"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
......@@ -759,9 +760,10 @@
</tr>
</table>
</div>
<q-btn v-if="!IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2)" label="制单"
style="min-width:70px;float:right;margin-top:10px" />
<q-btn v-if="IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2,'学费退回')" label="确定转账退款"
<q-btn v-if="!IsRefund" color="accent" size="sm" class="q-mr-md" @click="chanceType(item, 2)"
label="制单" style="min-width:70px;float:right;margin-top:10px" />
<q-btn v-if="IsRefund" color="accent" size="sm" class="q-mr-md"
@click="chanceType(item, 2,'学费退回')" label="确定转账退款"
style="min-width:70px;float:right;margin-top:10px" />
</q-banner>
</q-popup-proxy>
......@@ -1440,7 +1442,7 @@
},
mounted() {},
methods: {
clickRefund(type){
clickRefund(type) {
this.IsRefund = type
this.showChooseStudent = true
},
......@@ -1827,7 +1829,7 @@
});
},
//财务单据
chanceType(obj, type,name) {
chanceType(obj, type, name) {
let TCIDARR = [];
if (obj && obj.OrderType == 2) {
//留学就业订单
......@@ -1910,13 +1912,15 @@
orderObj: JSON.stringify(orderObj),
tradeWay: obj.tradeWay,
GuestId: guestId,
searchTitle: name?name:''
searchTitle: name ? name : ''
}
this.IsRefund = 0
this.$router.push({
path: "/financial/financalDocument/ChoiceAddFinancialDocuments",
query
});
var newUrlPath = "/financial/financalDocument/ChoiceAddFinancialDocuments";
this.OpenNewUrl(newUrlPath, query);
// this.$router.push({
// path: newUrlPath,
// query
// });
},
chanceType_lx(obj) {
//留学的时 成本制单
......@@ -1958,18 +1962,21 @@
//默认取第一个人的 （现基本都是单人订单 如果有多人订单 需调整）
guestId = obj.GuestList[0].Id;
}
this.$router.push({
path: "/financial/financalDocument/ChoiceAddFinancialDocuments",
query: {
Type: 2,
companyID: obj.ClassSchoolId,
path: "",
blank: "y",
orderObj: JSON.stringify(orderObj),
tradeWay: obj.tradeWay,
GuestId: guestId
}
});
var newUrlPath = "/financial/financalDocument/ChoiceAddFinancialDocuments";
var query = {
Type: 2,
companyID: obj.ClassSchoolId,
path: "",
blank: "y",
orderObj: JSON.stringify(orderObj),
tradeWay: obj.tradeWay,
GuestId: guestId
}
this.OpenNewUrl(newUrlPath, query);
// this.$router.push({
// path: newUrlPath,
// query: query
// });
},
//打开班级详情组件
getClassInfo(obj) {
......
src/components/school/student/class-record.vue
View file @ 2d9cb5bd
......@@ -10,7 +10,6 @@
color: #3470ff;
font-weight: 700;
}
.record_cala_Num {
height: 20px;
padding-left: 14px;
......@@ -23,7 +22,7 @@
margin-top: -10px;
}
.record_cala_Num>span {
.record_cala_Num>span {
min-width: 24px;
height: 24px;
padding: 4px;
......@@ -33,7 +32,7 @@
border-radius: 20px;
}
.record_cala_Num>span>i {
.record_cala_Num>span>i {
min-width: 16px;
height: 16px;
padding: 0 2px;
......@@ -47,65 +46,64 @@
text-align: center;
font-style: normal;
}
</style>
<template>
<div>
<div>
<q-tabs v-model="ckedTab" @input="getTabcheck()" dense align="left" class="text-teal" style="margin-bottom:20px;">
<q-tab v-for="(item,index) in dataList" :key="index" :name="index"
:label="item.CourseName+'('+item.OrderId+')'" />
</q-tabs>
<q-tabs v-model="ckedTab" @input="getTabcheck()" dense align="left" class="text-teal" style="margin-bottom:20px;">
<q-tab v-for="(item,index) in dataList" :key="index" :name="index" :label="item.CourseName+'('+item.OrderId+')'" />
</q-tabs>
</div>
<div class="record_Main">
<div style="display:flex;justify-content:space-between;align-items:center;">
<div>课程进度：{{CourseChapterNo}}/{{TotalChapterNo}}</div>
<div>
<q-select dense filled v-model="Status" @input="getStatus" style="width:160px;margin-right:10px;"
:options="StatusList" option-label="Name" option-value="Id" emit-value map-options label="状态" />
<q-select dense filled v-model="Status" @input="getStatus" style="width:160px;margin-right:10px;" :options="StatusList" option-label="Name" option-value="Id"
emit-value map-options label="状态" />
</div>
</div>
<div>
<el-table :data="chapterList" v-loading="loading" ref="table" :height="tableHeight" style="width: 100%;">
<el-table-column prop="ChapterNo" label="章节" width="300">
<template slot-scope="scope">
<div style="display: inline-block;">
<div class="flex q-ml-md">
<div class="record_cala_Num">
<span>
<i>{{ scope.row.ChapterNo }}</i>
</span>
</div>
<div style="margin-left: 36px;width:240px;" class="ellipsis">
{{ scope.row.ChapterName }}
<el-table :data="chapterList" v-loading="loading" ref="table" :height="tableHeight" style="width: 100%;">
<el-table-column prop="ChapterNo" label="章节" width="300">
<template slot-scope="scope">
<div style="display: inline-block;">
<div class="flex q-ml-md">
<div class="record_cala_Num">
<span>
<i>{{ scope.row.ChapterNo }}</i>
</span>
</div>
<div style="margin-left: 36px;width:240px;" class="ellipsis">
{{ scope.row.ChapterName }}
</div>
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="AgainNum" label="进度" width="100">
<template slot-scope="scope">
{{scope.row.CourseRateName}}({{scope.row.ChapterGradeNo}})
<div v-if="scope.row.ClassDate" style="font-size:13px; line-height: 13px">{{scope.row.ClassDate}}</div>
</template>
</el-table-column>
<el-table-column prop="State" label="状态" width="70">
<template slot-scope="scope">
<div v-if="scope.row.State == 1">
<span class="text-warning" v-if="scope.row.AppointState==1">待确认</span>
<span class="text-info" v-if="scope.row.AppointState==2">待上课</span>
<span class="text-positive" v-if="scope.row.AppointState==3">已上课</span>
</div>
<div class="text-warning" v-if="scope.row.State == 2">补课</div>
<div class="text-negative" v-if="scope.row.State == 3">缺课</div>
</template>
</el-table-column>
<el-table-column prop="AgainNum" label="重学" width="60">
<template slot-scope="scope">
{{scope.row.AgainNum}}
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column prop="AgainNum" label="进度" width="100">
<template slot-scope="scope">
{{scope.row.CourseRateName}}({{scope.row.ChapterGradeNo}})
<div v-if="scope.row.ClassDate" style="font-size:13px; line-height: 13px">{{scope.row.ClassDate}}</div>
</template>
</el-table-column>
<el-table-column prop="State" label="状态" width="70">
<template slot-scope="scope">
<div v-if="scope.row.State == 1">
<span class="text-warning" v-if="scope.row.AppointState==1">待确认</span>
<span class="text-info" v-if="scope.row.AppointState==2">待上课</span>
<span class="text-positive" v-if="scope.row.AppointState==3">已上课</span>
</div>
<div class="text-warning" v-if="scope.row.State == 2">补课</div>
<div class="text-negative" v-if="scope.row.State == 3">缺课</div>
</template>
</el-table-column>
<el-table-column prop="AgainNum" label="重学" width="60">
<template slot-scope="scope">
{{scope.row.AgainNum}}
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
......@@ -131,7 +129,7 @@
StatusList: [{
Name: '全部',
Id: 0
}, {
},{
Name: '正常上课',
Id: 1
}, {
......@@ -143,14 +141,14 @@
}],
dataList: [],
loading: false,
Status: 0, //状态
Status:0,//状态
msg: {
StuId: ''
},
chapterList: [], //章节
ckedTab: 0,
CourseChapterNo: 0, //当前进度
TotalChapterNo: 0, //总进度
chapterList:[], //章节
ckedTab:0,
CourseChapterNo:0, //当前进度
TotalChapterNo:0, //总进度
tableHeight: 200,
};
},
......@@ -172,30 +170,30 @@
this.loading = false;
if (res.Code == 1) {
this.dataList = res.Data;
if (this.dataList.length > 0) {
this.chapterList = this.dataList[0].ChapterList;
this.CourseChapterNo = this.dataList[0].CourseChapterNo;
this.TotalChapterNo = this.dataList[0].TotalChapterNo;
if(this.dataList.length>0){
this.chapterList = this.dataList[0].ChapterList;
this.CourseChapterNo = this.dataList[0].CourseChapterNo;
this.TotalChapterNo = this.dataList[0].TotalChapterNo;
}
}
});
},
getTabcheck() {
getTabcheck(){
this.chapterList = this.dataList[this.ckedTab].ChapterList;
this.CourseChapterNo = this.dataList[this.ckedTab].CourseChapterNo;
this.TotalChapterNo = this.dataList[this.ckedTab].TotalChapterNo;
},
//根据状态过滤
getStatus() {
getStatus(){
let dataArray = [];
if (this.Status == 0) {
dataArray = this.dataList[this.ckedTab].ChapterList;
} else {
this.dataList[this.ckedTab].ChapterList.forEach(x => {
if (x.State == this.Status) {
dataArray.push(x);
}
})
if(this.Status==0){
dataArray = this.dataList[this.ckedTab].ChapterList;
}else{
this.dataList[this.ckedTab].ChapterList.forEach(x=>{
if(x.State==this.Status){
dataArray.push(x);
}
})
}
this.chapterList = dataArray;
}
......
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