Skip to content

C
confucius
Commit a13da573 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

parents 8d1bda1d 6aec69cb
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 59 deletions
src/components/course/classmate-form.vue
View file @ a13da573
......@@ -149,7 +149,7 @@
<div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_Inner" v-if="subItem.ClassName">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
......@@ -163,7 +163,7 @@
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
......@@ -190,7 +190,7 @@
<div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_Inner" v-if="subItem.ClassName">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
......@@ -204,7 +204,7 @@
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
......@@ -216,8 +216,6 @@
<td>
<div class="plan_ClassDate">{{dataList.wednesdayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.wednesdayList[index].SubList&&dataList.wednesdayList[index].SubList.length>0">
<!-- <el-collapse-item v-for="(subItem,subIndex) in dataList.wednesdayList[index].SubList" :key="subIndex"
:title="'老师：'+subItem.TeacherName+' 教室：'+subItem.RoomName" :name="subIndex"> -->
<el-collapse-item v-for="(subItem,subIndex) in dataList.wednesdayList[index].SubList" :key="subIndex"
:name="subIndex">
<template slot="title">
......@@ -233,7 +231,7 @@
<div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_Inner" v-if="subItem.ClassName">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
......@@ -247,7 +245,7 @@
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
......@@ -268,13 +266,16 @@
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
<span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span>[{{subItem.RoomName}}]</span>
  <q-tooltip :offset="[10, 10]" v-if="subItem.ClassType==2">
   试听课
  </q-tooltip>
</div>
</template>
<div class="plan_Inner">
<div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_Inner" v-if="subItem.ClassName">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
......@@ -288,7 +289,7 @@
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
......@@ -315,7 +316,7 @@
<div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_Inner" v-if="subItem.ClassName">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
......@@ -329,7 +330,7 @@
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
......@@ -356,7 +357,7 @@
<div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_Inner" v-if="subItem.ClassName">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
......@@ -370,7 +371,7 @@
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
......@@ -397,7 +398,7 @@
<div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_Inner" v-if="subItem.ClassName">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
......@@ -411,7 +412,7 @@
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
......
src/pages/activity/payment.vue
View file @ a13da573
......@@ -140,7 +140,7 @@
<div class="page-body paymentDetail">
<div class="page-search items-center">
<div class="p_titleList">
<div class="p_title">
<q-btn color="accent" size="sm" class="q-mr-sm" label="返回" @click="goBack" />
活动收支</div>
......@@ -190,7 +190,7 @@
<div class="pay_Inner">应收=订单应收总额，实收=订单 实收总额</div>
</div>
</div>
<div class="col paymentList">
<div class="col paymentList">
<div class="pay_topList">
<img src="../../assets/images/myimg/bjsr.png" alt="" />
<span class="pay_Title">活动支出</span>
......@@ -300,8 +300,8 @@
<q-btn label="新增收款" color="accent q-px-md" size="sm" style="font-weight:400 !important;"
@click="goShoukuan(1)" />
</div>
<div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#02C499;"></span>活动收入
<div class="pay_TopTitle" style="margin:30px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#02C499;"></span>其他收入
</div>
<table class="payTable">
<tr>
......@@ -314,12 +314,12 @@
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<tr v-if="dataList && dataList.FiniceReciveList==0">
<tr v-if="dataList && dataList.OtherFiniceReciveList==0">
<td :colspan="8" align="center">暂无数据</td>
</tr>
<tr v-for="(item,index) in dataList.FiniceReciveList" :key="index">
<tr v-for="(item,index) in dataList.OtherFiniceReciveList" :key="index">
<td>
<span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
<span class="finince_Order">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td style="text-align:left;">
......@@ -351,8 +351,8 @@
</td>
</tr>
</table>
<div class="pay_TopTitle" style="margin:30px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#02C499;"></span>其他收入
<div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#02C499;"></span>活动收入
</div>
<table class="payTable">
<tr>
......@@ -365,12 +365,12 @@
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<tr v-if="dataList && dataList.OtherFiniceReciveList==0">
<tr v-if="dataList && dataList.FiniceReciveList==0">
<td :colspan="8" align="center">暂无数据</td>
</tr>
<tr v-for="(item,index) in dataList.OtherFiniceReciveList" :key="index">
<tr v-for="(item,index) in dataList.FiniceReciveList" :key="index">
<td>
<span class="finince_Order">{{item.FrID}}</span>
<span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td style="text-align:left;">
......@@ -408,8 +408,9 @@
<q-btn label="新增付款" color="accent q-px-md" size="sm" style="font-weight:400 !important;"
@click="goShoukuan(2)" />
</div>
<div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#02C499;"></span>活动支出
<span class="Pay_Line" style="background-color:#F28C1D;"></span>其他支出
</div>
<table class="payTable">
<tr>
......@@ -422,25 +423,25 @@
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<tr v-if="dataList && dataList.FinicePayList==0">
<tr v-if="dataList && dataList.OtherFinicePayList==0">
<td :colspan="8" align="center">暂无数据</td>
</tr>
<tr v-for="(item,index) in dataList.FinicePayList" :key="index">
<tr v-for="(item,index) in dataList.OtherFinicePayList" :key="index">
<td>
<span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td style="text-align:left;">
<div v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}<span class="TB_Rate"> 币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins orangeStyle">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins orangeStyle">-{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate" style="margin-left:10px;">汇率：{{childItem.Rate}}</span>
</div>
</td>
<td>
<div class="financeYing">
应收：{{item.Money}}<br />
实收：{{item.PayMoney}}
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</div>
</td>
<td>{{item.TradeDate}}</td>
......@@ -460,7 +461,7 @@
</tr>
</table>
<div class="pay_TopTitle" style="margin:15px 0 15px 20px;font-size:12px;">
<span class="Pay_Line" style="background-color:#F28C1D;"></span>其他支出
<span class="Pay_Line" style="background-color:#02C499;"></span>活动支出
</div>
<table class="payTable">
<tr>
......@@ -473,25 +474,25 @@
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<tr v-if="dataList && dataList.OtherFinicePayList==0">
<tr v-if="dataList && dataList.FinicePayList==0">
<td :colspan="8" align="center">暂无数据</td>
</tr>
<tr v-for="(item,index) in dataList.OtherFinicePayList" :key="index">
<tr v-for="(item,index) in dataList.FinicePayList" :key="index">
<td>
<span class="finince_Order" @click="goOrderDetail('FinancialDocumentsDetail',item)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td style="text-align:left;">
<div v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}<span class="TB_Rate">币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins orangeStyle">-{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
支付方式：{{childItem.Alias}}<span class="TB_Rate"> 币种：{{childItem.CurrencyName}}</span>
<span class="Team_Coins orangeStyle">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate" style="margin-left:10px;">汇率：{{childItem.Rate}}</span>
</div>
</td>
<td>
<div class="financeYing">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
应收：{{item.Money}}<br />
实收：{{item.PayMoney}}
</div>
</td>
<td>{{item.TradeDate}}</td>
......@@ -520,7 +521,7 @@
data() {
return {
dataList: {
ClassInfo:{}
ClassInfo: {}
}, //数据
msg: {
Id: 0,
......@@ -536,17 +537,17 @@
methods: {
getData() {
this.loading = true;
this.apipostDS("/api/Education/GetActivityBalanceSheet",this.msg,(res)=>{
this.loading = false
if(res.data.resultCode===1){
this.dataList = res.data.data;
console.log(500,this.dataList)
}
})
this.apipostDS("/api/Education/GetActivityBalanceSheet", this.msg, (res) => {
this.loading = false
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(500, this.dataList)
}
})
},
//减法 得实收
getShiShou(num1, num2) {
if (num1!=='' && num2!=='') {
if (num1 !== '' && num2 !== '') {
return parseInt(num1) - parseInt(num2);
} else {
return 0;
......@@ -573,8 +574,8 @@
// Obj: {},
// SourceID: 0,
// TCIDList: TCIDARR,
OtherType:41,
ReFinanceId :this.msg.Id
OtherType: 41,
ReFinanceId: this.msg.Id
}
this.$router.push({
path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
......@@ -590,9 +591,9 @@
});
},
goBack(){
this.$router.go(-1)
} ,
goBack() {
this.$router.go(-1)
},
}
}
......
src/pages/sale/visitorRegistrat.vue
View file @ a13da573
......@@ -200,11 +200,11 @@
},
resetSearch() {
this.msg.pageIndex = 1;
this.getVisitoryPage();
this.getList();
},
changePage() {
changePage(val) {
this.msg.pageIndex = val;
this.getVisitoryPage();
this.getList();
},
//过滤备注显示
getRemarks(remark) {
......
src/pages/studyAbroad/supplier.vue
View file @ a13da573
......@@ -23,6 +23,13 @@
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增供应商" @click="EditSupplier(null)" />
</div>
</template>
<template v-slot:body-cell-Name="props">
<q-td>
<div style="min-width: 150px;word-break: break-word;white-space: normal;">
{{props.row.Name}}
</div>
</q-td>
</template>
<template v-slot:body-cell-ContractUrl="props">
<q-td>
<template v-if="props.row.ContractUrl&&props.row.ContractUrl!=''">
......
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