Skip to content

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

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

parents 96af337f 9ffe7fd7
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 48 deletions
src/components/course/classlog-form.vue
View file @ 5952691b
<style>
.classLog {
margin: 0 20px;
height: 600px;
padding-bottom:70px;
overflow: auto;
}
......@@ -46,6 +46,8 @@
</q-timeline-entry>
</template>
</q-timeline>
<q-pagination class="full-width justify-start" v-model="msg.PageIndex" color="primary" :max="pageCount"
:input="true" @input="changePage" />
</div>
</template>
<script>
......@@ -66,11 +68,12 @@
return {
msg: {
PageIndex: 1,
PageSize: 12,
PageSize: 6,
School_Id: 0,
ClassId: 0
},
dataList: [],
pageCount:0
}
},
created() {},
......@@ -84,9 +87,15 @@
queryClassLogPageList(this.msg).then(res => {
if (res.Code == 1) {
this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount;
}
})
},
//翻页
changePage(val) {
this.msg.PageIndex = val;
this.getClassLog()
}
},
watch: {
setingObj: function (val, oldval) {
......
src/components/course/record-form.vue
View file @ 5952691b
......@@ -107,7 +107,7 @@
emit-value map-options />
</div>
</div>
<div>
<div style="padding-bottom:50px;">
<template v-if="checkType==1">
<q-table :pagination="msg" no-data-label="暂无相关数据" flat class="sticky-column-table" separator="none"
:data="dataList" :columns="columns">
......
src/components/sale/orderlist.vue
View file @ 5952691b
......@@ -161,16 +161,12 @@
</div>
</td>
<td style="border:none">
<!--没有总经理修改订单权限-->
<template v-if="isEditOrder">
</template>
<template v-else>
<!--销售自己修改订单-->
<template v-if="AuthorityObj.isShowEdit">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
<template v-if="isEditOrder||AuthorityObj.isShowEdit">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="editOrder(item)" />
</template>
</template>
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list>
<q-item clickable v-close-popup>
......
src/pages/financial/CommissionDetail.vue
View file @ 5952691b
......@@ -37,7 +37,7 @@
<div class="page-body CommissionDetail">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<!-- <div class="col-3">
<q-select filled stack-label use-input input-debounce="0" option-value="ClassId" clearable @input="getList"
option-label="ClassName" v-model="msg.ClassId" :options="ClassList" label="班级" :dense="false"
emit-value map-options @filter="filterFn">
......@@ -52,7 +52,7 @@
</div>
<div class="col-3">
<q-input filled v-model="msg.OrderId" @keyup.enter.native="getList()" label="订单号" />
</div>
</div> -->
</div>
</div>
<template >
......@@ -61,9 +61,9 @@
:data="tableData"
border
style="width: 100%">
<el-table-column prop="SchoolName" label="校区" ></el-table-column>
<el-table-column prop="DeptName" label="部门" ></el-table-column>
<el-table-column prop="UserName" label="用户" > </el-table-column>
<el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="UserName" label="用户" :filters='UserNamelist' :filter-method="filterHandler"> </el-table-column>
<el-table-column prop="StudentCount" label="学生数量" sortable :sort-method="StudentCount"> </el-table-column>
<el-table-column prop="CurrentPeriodMoney" label="提成金额" sortable :sort-method="CurrentPeriodMoney"> </el-table-column>
<el-table-column prop="CurrentExtraMoney" label="奖励金额" sortable :sort-method="CurrentExtraMoney"> </el-table-column>
......@@ -118,7 +118,10 @@
department:[],
ClassList:[],
allClassList:[],
see_tcdetailed:false
see_tcdetailed:false,
SchoolNamelist:[],
DeptNamelist:[],
UserNamelist:[],
}
},
created() {
......@@ -148,10 +151,30 @@
this.loading = true;
getSellCommissionUserList(this.msg).then(res => {
if (res.Code == 1) {
this.tableData = res.Data
this.tableData = res.Data;
this.SchoolNamelist = [];
this.DeptNamelist = [];
this.UserNamelist = [];
this.tableData.forEach(x=>{
let obj = {text: x.SchoolName, value: x.SchoolName}
let obj2 = {text: x.DeptName, value: x.DeptName}
let obj3 = {text: x.UserName, value: x.UserName}
this.SchoolNamelist.push(obj)
this.DeptNamelist.push(obj2)
this.UserNamelist.push(obj3)
})
this.SchoolNamelist = this.unique(this.SchoolNamelist)
this.DeptNamelist = this.unique(this.DeptNamelist)
this.UserNamelist = this.unique(this.UserNamelist)
}
})
},
unique(arr,Name){//数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
);
},
//选择班级
setClass(item) {
this.isShowClass = true;
......
src/pages/financial/cycleOrderList.vue
View file @ 5952691b
......@@ -48,9 +48,9 @@
:data="tableData"
border
style="width: 100%">
<el-table-column prop="SchoolName" label="校区" ></el-table-column>
<el-table-column prop="DeptName" label="部门" ></el-table-column>
<el-table-column prop="UserName" label="用户" > </el-table-column>
<el-table-column prop="SchoolName" label="校区" :filters='SchoolNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="DeptName" label="部门" :filters='DeptNamelist' :filter-method="filterHandler"></el-table-column>
<el-table-column prop="UserName" label="用户" :filters='UserNamelist' :filter-method="filterHandler"> </el-table-column>
<el-table-column width='170' prop="ClassName" label="班级信息" >
<template slot-scope="scope">
<div>{{scope.row.ClassName}} {{scope.row.ClassTypeName}}<span style="color: #409EFF;" v-if='scope.row.IsContinueClass==1'>(续)</span></div>
......@@ -59,13 +59,13 @@
</el-table-column>
<el-table-column prop="OrderId" label="订单号" >
<template slot-scope="scope">
<div style="cursor: pointer;text-decoration: underline;" @click='goorderUrl(scope.row.OrderId)'>{{scope.row.OrderId}} </div>
<div style="cursor: pointer;" >{{scope.row.OrderId}} </div>
</template>
</el-table-column>
<el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息">
<template slot-scope="scope">
<div>应发:{{scope.row.TotalCommissionMoney}}</div>
<div style="color: rgb(255, 156, 0);">应发:{{scope.row.TotalCommissionMoney}}</div>
<div>额外奖励:{{scope.row.OtherMoney}}</div>
<div>额外扣除:{{scope.row.BackMoney}}</div>
<div>累计已发:{{scope.row.GiveOutMoney}}</div>
......@@ -86,16 +86,22 @@
</el-table-column>
<el-table-column width='160' prop="CurrentPeriodMoney" label="当期发放信息">
<template slot-scope="scope">
<div>应发:{{scope.row.CurrentPeriodMoney}}</div>
<div style="color: rgb(255, 156, 0);">应发:{{scope.row.CurrentPeriodMoney}}</div>
<div>额外奖励:{{scope.row.CurrentExtraMoney}}</div>
<div>抵扣:{{scope.row.DeductionMoney}}</div>
<div>奖励抵扣:{{scope.row.DeductionExtraMoney}}</div>
</template>
</el-table-column>
<el-table-column prop="YFMoney" label="最终发放"> </el-table-column>
<el-table-column prop="YFMoney" label="最终发放">
<template slot-scope="scope">
<div style="color: rgb(233, 82, 82);">{{scope.row.YFMoney}}</div>
</template>
</el-table-column>
<el-table-column width='85' prop="Periods" label="期数"> </el-table-column>
<el-table-column prop="Remark" label="备注"> </el-table-column>
<el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
</el-table>
</template>
......@@ -135,6 +141,10 @@
department:[],
ClassList:[],
allClassList:[],
SchoolNamelist:[],
DeptNamelist:[],
UserNamelist:[],
}
},
created() {},
......@@ -154,9 +164,29 @@
getSellCommissionForOrderList(this.msg).then(res => {
if (res.Code == 1) {
this.tableData = res.Data
this.SchoolNamelist = [];
this.DeptNamelist = [];
this.UserNamelist = [];
this.tableData.forEach(x=>{
let obj = {text: x.SchoolName, value: x.SchoolName}
let obj2 = {text: x.DeptName, value: x.DeptName}
let obj3 = {text: x.UserName, value: x.UserName}
this.SchoolNamelist.push(obj)
this.DeptNamelist.push(obj2)
this.UserNamelist.push(obj3)
})
this.SchoolNamelist = this.unique(this.SchoolNamelist)
this.DeptNamelist = this.unique(this.DeptNamelist)
this.UserNamelist = this.unique(this.UserNamelist)
}
})
},
unique(arr,Name){//数组去重
const res = new Map();
return arr.filter(
(list) => !res.has(list.text) && res.set(list.text, 1)
);
},
//选择班级
setClass(item) {
this.isShowClass = true;
......@@ -203,6 +233,7 @@
console.log(a,b)
return a.StudentCount - b.StudentCount;
},
},
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ 5952691b
......@@ -825,6 +825,8 @@
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材采购:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==33"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 教育耗材出库:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==39"
@click="goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"> 销售提成:{{GetDetail.ReFinanceId}}</span>
<span class="fr" style="text-decoration: underline;cursor: pointer;" v-if="GetDetail.OtherType==17"
......@@ -2153,6 +2155,8 @@
tempStr = '/financial/financalDocument/SuppliesProcurementDetail?id='+ID;
}else if(OtherType==33){
tempStr = '/financial/financalDocument/InAndOutDdetails?id='+ID;
}else if(OtherType==39){
tempStr = '/financial/CommissionDetail?id='+ID;
}
this.$router.push({
......
src/pages/financial/salesCommission.vue
View file @ 5952691b
......@@ -109,7 +109,7 @@
</el-table>
<div style="margin-top: 10px;text-align: center;">
<el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper" :current-page.sync="msg.PageSize"
<el-pagination background @current-change="handleCurrentChanges" layout="total,prev, pager, next, jumper" :current-page.sync="msg.PageIndex"
:page-size="msg.PageSize" :total='total'>
</el-pagination>
</div>
......@@ -144,7 +144,7 @@
//列表数据参数
msg: {
PageIndex: 1,
PageSize: 20,
PageSize: 15,
Name:'',
SchoolId:'-1'
},
......@@ -236,20 +236,20 @@
generalFinancacls(item) {
if(this.msg.SchoolId == -1){
if(item.SumPrice>0){
this.tishi(item.SumPrice)
this.tishi(item.SumPrice,item.Id)
}else{
this.$message.error('提成总金额为0')
}
}else{
if(item.SchooldCommission>0){
this.goaddFinancial(item.SchooldCommission)
this.goaddFinancial(item.SchooldCommission,item.Id)
}else{
this.$message.error('校区提成总金额为0')
}
}
},
goaddFinancial(Money){
goaddFinancial(Money,Id){
let School_Id = 0;
let obj = {
......@@ -258,6 +258,9 @@
CurrencyId: 21,
XSTC: 1,
School_Id:this.msg.SchoolId == -1?0:this.msg.SchoolId,
OtherType:39,
ReFinanceId:Id,
ReFinanceId2:this.msg.SchoolId
}
let query = {
blank: "y",
......@@ -274,7 +277,7 @@
query
});
},
tishi(Money){
tishi(Money,Id){
let that = this
this.$q.dialog({
title: "销售制单",
......@@ -290,7 +293,7 @@
focus: true
}
}).onOk(() => {
this.goaddFinancial(Money)
this.goaddFinancial(Money,Id)
});
},
handleCurrentChanges(val){
......
src/pages/financial/userCommissionDetails.vue
View file @ 5952691b
......@@ -78,7 +78,7 @@
</el-table-column>
<el-table-column width='130' prop="TotalCommissionMoney" label="订单发放信息">
<template slot-scope="scope">
<div>应发:{{scope.row.TotalCommissionMoney}}</div>
<div style="color: rgb(255, 156, 0);">应发:{{scope.row.TotalCommissionMoney}}</div>
<div>额外奖励:{{scope.row.OtherMoney}}</div>
<div>额外扣除:{{scope.row.BackMoney}}</div>
<div>累计已发:{{scope.row.GiveOutMoney}}</div>
......@@ -99,16 +99,20 @@
</el-table-column>
<el-table-column width='160' prop="CurrentPeriodMoney" label="当期发放信息">
<template slot-scope="scope">
<div>应发:{{scope.row.CurrentPeriodMoney}}</div>
<div style="color: rgb(255, 156, 0);">应发:{{scope.row.CurrentPeriodMoney}}</div>
<div>额外奖励:{{scope.row.CurrentExtraMoney}}</div>
<div>抵扣:{{scope.row.DeductionMoney}}</div>
<div>奖励抵扣:{{scope.row.DeductionExtraMoney}}</div>
</template>
</el-table-column>
<el-table-column prop="YFMoney" label="最终发放"> </el-table-column>
<el-table-column prop="YFMoney" label="最终发放">
<template slot-scope="scope">
<div style="color: rgb(233, 82, 82);">{{scope.row.YFMoney}}</div>
</template>
</el-table-column>
<el-table-column width='85' prop="Periods" label="期数"> </el-table-column>
<el-table-column prop="Remark" label="备注"> </el-table-column>
<el-table-column prop="Remark" width='160' label="备注"> </el-table-column>
</el-table>
</template>
......
src/pages/sale/studentList.vue
View file @ 5952691b
......@@ -22,14 +22,14 @@
<div style="color:red;" v-if="props.row.IsChaBan==1">
插班报入
<q-tooltip :offset="[10, 10]">
              开始课时:{{props.row.StartClassHours}}<br  />
              课程: {{props.row.CourseName}}<br  />
              生效日期: {{props.row.EffectTime}}<br  />
              生效状态: {{props.row.EffectStatusStr}}<br  />
              <template v-if="props.row.UpOrderId&&props.row.UpOrderId>0">
                前置订单: {{props.row.UpOrderId}}<br  />
              </template>
            </q-tooltip>
              开始课时:{{props.row.StartClassHours}}<br  />
              课程: {{props.row.CourseName}}<br  />
              生效日期: {{props.row.EffectTime}}<br  />
              生效状态: {{props.row.EffectStatusStr}}<br  />
              <template v-if="props.row.UpOrderId&&props.row.UpOrderId>0">
                前置订单: {{props.row.UpOrderId}}<br  />
              </template>
            </q-tooltip>
</div>
</span>
</q-td>
......@@ -76,7 +76,7 @@
</q-input>
<q-input clearable filled class="col-6 q-pb-lg q-pr-lg" maxlength="5" v-model="addMsg.TotalHours"
label="总课时" :rules="[val => !!val || 'TotalHours']" @keyup.native="checkInteger(addMsg,'TotalHours')" />
label="总课时" :rules="[val => !!val || '请填写总课时']" @keyup.native="checkInteger(addMsg,'TotalHours')" />
<q-input clearable filled class="col-6 q-pb-lg" ref="Mobile" maxlength="20" v-model="addMsg.Mobile"
label="电话" :rules="[val => !!val || '电话']" />
<q-select class="col-6 q-pb-lg q-pr-lg" option-value="Name" ref="Basics" standout="bg-primary text-white"
......@@ -172,6 +172,7 @@
getOrderSourceEnumList, //来源枚举
setOrderGuestInfo, //保存
delOrderGuestInfo, //删除
GetSelectClassOrderList,
} from '../../api/sale/sale'
import {
UploadSelfFile,
......@@ -329,6 +330,7 @@
GLList: [], //学习目的列表
OFList: [], //客人来源列表
isShowBtn: true, //默认显示新增名单
CourseClassHourse: 0, //课时
//表格可见列
visibleColumns: [
......@@ -363,15 +365,30 @@
];
}
this.visibleColumns.push('optioned');
this.getOrderInfo();
this.getGuestBasics()
this.getGuestEducation()
this.getGuestLearning()
this.getGuestSource()
this.getGuestSource();
},
mounted() {
this.getGuestPage();
},
methods: {
getOrderInfo() {
var qMsg = {
ClassId: this.msg.ClassId,
OrderId: this.msg.OrderId
}
GetSelectClassOrderList(qMsg).then(res => {
if (res.Code == 1) {
var tempData = res.Data;
if (tempData && tempData.length == 1) {
this.CourseClassHourse = tempData[0].ClassHours - tempData[0].StartClassHours
}
}
})
},
//日语基础枚举
getGuestBasics() {
getGuestBasicsEnumList({}).then(res => {
......@@ -499,6 +516,7 @@
VolunteerMajor: "", //志愿专业
Price: 0, //价格
StudyRemark: "", //留学就业备注
TotalHours:this.CourseClassHourse,
}
},
//新增学员弹窗
......@@ -523,7 +541,6 @@
this.addMsg.IDCard = item.IDCard;
this.addMsg.Domicile = item.Domicile;
this.addMsg.ContactAddress = item.ContactAddress;
this.addMsg.SourceId = this.$route.query.SourceId;
this.addMsg.GraduatedSchool = item.GraduatedSchool;
this.addMsg.GraduatedMajor = item.GraduatedMajor;
......
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