Skip to content

C
confucius
Commit 46c55fb4 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 20acf0c7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2836 additions and 2936 deletions
src/components/school/student/monthStatisticslist.vue
View file @ 46c55fb4
......@@ -59,6 +59,7 @@
cursor: pointer;
color: #2961FE;
}
</style>
<template>
<div class="monthStatisticslist">
......@@ -187,11 +188,8 @@
}
return managerName;
},
//点击学生姓名弹出
getStuRight(obj) {
console.log("我进来啦",obj);
if (obj) {
this.stuOption = obj;
this.BelongType = 3;
......@@ -205,4 +203,5 @@
},
}
};
</script>
src/components/school/student/studentStudyAddForm.vue
View file @ 46c55fb4
......@@ -14,12 +14,16 @@
<div class="q-mt-xs row q-col-gutter-md">
<p>其他 <i class="el-icon-plus text-blue cursor-pointer" @click="SetStudentStudyOther"></i></p>
</div>
<div class="q-mt-xs row q-col-gutter-md" v-if='SaveMsg.Other&& SaveMsg.Other.length>0' v-for=" ( itemOther, indexOther ) in SaveMsg.Other " :key="indexOther">
<el-input class="col-6" placeholder="请输入" filled v-model="itemOther.Name" autofocus/>
<el-input class="col-4" placeholder="请输入" filled v-model="itemOther.Score" type="number" autofocus/>
<i class="el-icon-delete text-blue cursor-pointer col-2" @click="DelStudentStudyOther(indexOther)" style="margin-top:11px;"></i>
<template v-if='SaveMsg.Other&& SaveMsg.Other.length>0'>
<div class="q-mt-xs row q-col-gutter-md" v-for=" ( itemOther, indexOther ) in SaveMsg.Other "
:key="indexOther">
<q-input class="col-6" placeholder="请输入项目名称" filled v-model="itemOther.Name" autofocus :dense="true" />
<q-input class="col-4" placeholder="请输入得分" filled v-model="itemOther.Score" type="number" :dense="true"
autofocus />
<i class="el-icon-delete text-blue cursor-pointer col-2" @click="DelStudentStudyOther(indexOther)"
style="margin-top:11px;"></i>
</div>
</template>
</template>
<template v-if="saveObj==3">
<div class="q-mt-xs row q-col-gutter-md">
......@@ -45,7 +49,6 @@
meta: {
title: "学员考试信息"
},
components: {},
props: {
saveObj: {
......@@ -63,52 +66,51 @@
//客户对象
SaveMsg: {
CourseId: 0,
StuId:0,
GuestId:0,
ClassScrollType:0,
OrderId:0,
StudyID:0,
Words:'',
Practice:'',
ReadingAloud:'',
Other:[],
ChapterId:0,
StudyType:0,
Remarks:'',
StudyValue:'',
StuId: 0,
GuestId: 0,
ClassScrollType: 0,
OrderId: 0,
StudyID: 0,
Words: '',
Practice: '',
ReadingAloud: '',
Other: [],
ChapterId: 0,
StudyType: 0,
Remarks: '',
StudyValue: '',
},
nowOther:{
Name:"",
Score:"",
nowOther: {
Name: "",
Score: "",
},
};
},
created() {
},
created() {},
mounted() {},
methods: {
SetStudentStudyOther(){
SetStudentStudyOther() {
this.SaveMsg.Other.push(JSON.parse(JSON.stringify(this.nowOther)))
},
DelStudentStudyOther(indexOther){
if( this.SaveMsg.Other&& this.SaveMsg.Other.length>0){
DelStudentStudyOther(indexOther) {
if (this.SaveMsg.Other && this.SaveMsg.Other.length > 0) {
this.SaveMsg.Other.splice(indexOther, 1);
}
},
//保存信息
SaveStudentStudy(){
this.SaveMsg.CourseId=this.BaseInfo.CourseId,
this.SaveMsg.StuId=this.BaseInfo.StuId,
this.SaveMsg.GuestId=this.BaseInfo.GuestId,
this.SaveMsg.OrderId=this.BaseInfo.OrderId;
if(this.saveObj==3){
this.SaveMsg.Words=0;
this.SaveMsg.Practice=0;
this.SaveMsg.ReadingAloud=0;
this.SaveMsg.ChapterId=0;
this.SaveMsg.Other='';
SaveStudentStudy() {
this.SaveMsg.CourseId = this.BaseInfo.CourseId;
this.SaveMsg.StuId = this.BaseInfo.StuId;
this.SaveMsg.GuestId = this.BaseInfo.GuestId;
this.SaveMsg.OrderId = this.BaseInfo.OrderId;
if (this.saveObj == 3) {
this.SaveMsg.Words = 0;
this.SaveMsg.Practice = 0;
this.SaveMsg.ReadingAloud = 0;
this.SaveMsg.ChapterId = 0;
this.SaveMsg.Other = '';
}
this.SaveMsg.StudyType=this.saveObj;
this.SaveMsg.StudyType = this.saveObj;
SetStuStudyInfo(this.SaveMsg).then(res => {
if (res.Code == 1) {
this.$q.notify({
......@@ -125,36 +127,32 @@
.catch(() => {
this.loading = false;
});
// this.SaveMsg.Remarks=this.obj.Remarks,
// this.SaveMsg.StudyValue=this.obj.StudyValue,
},
closeSaveForm() {
this.$emit("close");
this.persistent = false;
},
clearSaveMsg(){
this.SaveMsg.CourseId= 0,
this.SaveMsg.StuId=0,
this.SaveMsg.GuestId=0,
this.SaveMsg.ClassScrollType=0,
this.SaveMsg.OrderId=0,
this.SaveMsg.StudyID=0,
this.SaveMsg.Words=0,
this.SaveMsg.Practice=0,
this.SaveMsg.ReadingAloud=0,
this.SaveMsg.Other=[],
this.SaveMsg.ChapterId=0,
this.SaveMsg.StudyType=0,
this.SaveMsg.Remarks='',
this.SaveMsg.StudyValue=''
clearSaveMsg() {
this.SaveMsg.CourseId = 0;
this.SaveMsg.StuId = 0;
this.SaveMsg.GuestId = 0;
this.SaveMsg.ClassScrollType = 0;
this.SaveMsg.OrderId = 0;
this.SaveMsg.StudyID = 0;
this.SaveMsg.Words = 0;
this.SaveMsg.Practice = 0;
this.SaveMsg.ReadingAloud = 0;
this.SaveMsg.Other = [];
this.SaveMsg.ChapterId = 0;
this.SaveMsg.StudyType = 0;
this.SaveMsg.Remarks = '';
this.SaveMsg.StudyValue = '';
},
closeForm() {
this.clearSaveMsg();
this.$emit("close");
},
}
};
</script>
src/components/school/student/stufollowlistNew.vue
View file @ 46c55fb4
......@@ -171,7 +171,7 @@
<td>
{{ item.CreateByName?item.CreateByName:'-' }}
</td>
<td >
<td>
<div class="text-blue cursor-pointer" @click="getStudentStudy(item)">
学习情况
</div>
......@@ -216,7 +216,7 @@
</div>
</div>
<div style="width:100%;margin-bottom:15px;" v-if="customObj.EditType==3">
<div style="width:13%;display:inline-block;vertical-align:top;">基本<br/>情况：</div>
<div style="width:13%;display:inline-block;vertical-align:top;">基本<br />情况：</div>
<div style="width:86%;display:inline-block;">
<UeEditor v-model="customObj.Remark" class="q-pb-sm" :config="config"></UeEditor>
</div>
......@@ -342,8 +342,8 @@
var qObj = {
StuId: obj.StuId,
StuName: obj.StuName,
GuestId:obj.GuestId,
CourseRateName:obj.CourseRateName,
GuestId: obj.GuestId,
CourseRateName: obj.CourseRateName,
};
this.OpenNewUrl('/teacher/studentStudy', qObj)
},
......
src/layouts/MainLayout.vue
View file @ 46c55fb4
This diff is collapsed.
src/pages/financial/Kingdee/currency.vue
View file @ 46c55fb4
......@@ -55,8 +55,8 @@
text-align: right;
}
</style>
<template>
</style>
<template>
<div class="flexOne currentManage page-body" style="position: relative;">
<div class="query-box" style="border-bottom:0">
<ul>
......@@ -73,9 +73,8 @@
</div>
<div class="cm_content _scrollbar"
style="position: absolute;top:83px;bottom: 20px;left: 15px;right:15px;overflow-y: scroll;">
<table class="po_content singeRowTable"
style="border:1px solid #E6E6E6;" cellspacing="0"
cellpadding="0" v-loading="loading">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading="loading">
<tr>
<th>币种名称</th>
<th>汇率类型</th>
......@@ -117,7 +116,8 @@
<el-col :span="5">
<el-form-item label="币种类型" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' @change="getType">
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name">
</el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -141,8 +141,8 @@
</div>
</div>
</template>
<script>
</template>
<script>
import bankForm from './suject/bank'
import cashForm from './suject/cash'
import costForm from './suject/cost'
......@@ -207,7 +207,7 @@
},
dataList: [],
loading: false,
currencyTypeList:[]
currencyTypeList: []
}
},
created() {
......@@ -218,7 +218,7 @@
},
methods: {
Delete(item){
Delete(item) {
let _this = this
let msg = {
Id: item.Id
......@@ -231,8 +231,8 @@
ok: "确定",
cancel: "取消",
}).onOk(() => {
this.apipost('Financial_post_DelKingdeeCurrency',msg, res => {
if(res.data.resultCode == 1) {
this.apipost('Financial_post_DelKingdeeCurrency', msg, res => {
if (res.data.resultCode == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
......@@ -252,9 +252,9 @@
});
},
// 获取币种名称
getType(ID){
this.currencyTypeList.forEach(item=>{
if(item.ID==ID){
getType(ID) {
this.currencyTypeList.forEach(item => {
if (item.ID == ID) {
this.addMsg.CurrencyName = item.Name
}
})
......@@ -325,11 +325,10 @@
},
clickEdit(item) {
this.addShow = false
if(item){
if (item) {
this.text = '编辑金蝶币种'
console.log(item)
this.addMsg = JSON.parse(JSON.stringify(item))
}else{
} else {
this.text = '新增金蝶币种'
}
this.addShow = true
......@@ -348,5 +347,4 @@
},
}
</script>
\ No newline at end of file
</script>
src/pages/financial/Kingdee/project.vue
View file @ 46c55fb4
<style scoped>
@import "../css/cssReset.css";
.suject-title-box {
border-bottom: 1px solid #dedede;
}
......@@ -74,9 +75,8 @@
</div>
<div class="cm_content _scrollbar"
style="position: absolute;top:83px;bottom: 20px;left: 15px;right:15px;overflow-y: scroll;">
<table class="po_content singeRowTable"
style="border:1px solid #E6E6E6;" cellspacing="0"
cellpadding="0" v-loading="loading">
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading="loading">
<tr>
<th width="260px">校区/公司名称</th>
<th>项目名称</th>
......@@ -119,7 +119,8 @@
<el-col :span="8">
<el-form-item label="校区" prop="BranchId">
<el-select filterable v-model='addMsg.BranchId' @change="getType">
<el-option v-for="item in CompanyList" :key="item.SId" :value="item.SId" :label="item.SName"></el-option>
<el-option v-for="item in CompanyList" :key="item.SId" :value="item.SId" :label="item.SName">
</el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -189,7 +190,7 @@
},
dataList: [],
loading: false,
CompanyList:[]
CompanyList: []
}
},
created() {
......@@ -200,7 +201,7 @@
},
methods: {
Delete(item){
Delete(item) {
let _this = this
let msg = {
Id: item.Id
......@@ -213,8 +214,8 @@
ok: "确定",
cancel: "取消",
}).onOk(() => {
this.apipost('Financial_post_DelKingdeeItem',msg, res => {
if(res.data.resultCode == 1) {
this.apipost('Financial_post_DelKingdeeItem', msg, res => {
if (res.data.resultCode == 1) {
this.$q.notify({
icon: 'iconfont icon-chenggong',
color: 'accent',
......@@ -233,7 +234,7 @@
});
},
getBranchList() {//获取校区
getBranchList() { //获取校区
getSchoolDropdown({}).then(res => {
this.CompanyList = res.Data;
// var obj = {
......@@ -246,9 +247,9 @@
})
},
// 获取金蝶项目名称
getType(ID){
this.CompanyList.forEach(item=>{
if(item.SId==ID){
getType(ID) {
this.CompanyList.forEach(item => {
if (item.SId == ID) {
this.addMsg.BranchName = item.SName
}
})
......@@ -304,11 +305,10 @@
},
clickEdit(item) {
this.addShow = false
if(item){
if (item) {
this.text = '编辑金蝶项目'
console.log(item)
this.addMsg = JSON.parse(JSON.stringify(item))
}else{
} else {
this.text = '新增金蝶项目'
}
this.addShow = true
......
src/pages/financial/Language/languageDetailList.vue
View file @ 46c55fb4
<style>
.baseSet_Title {
.baseSet_Title {
width: 120px !important;
padding: 18px 0 0 16px;
text-align: right;
}
}
.userCommissionDetails .border-bottom {
.userCommissionDetails .border-bottom {
/* border-bottom: 1px dashed #EEE; */
padding-bottom: 5px;
margin-bottom: 5px;
}
}
.userCommissionDetails .text-bottom {
.userCommissionDetails .text-bottom {
height: 32px;
line-height: 32px;
margin-bottom: 10px;
}
}
.userCommissionDetails ._icon_btn i.icon-sousuo {
.userCommissionDetails ._icon_btn i.icon-sousuo {
background-color: #47bf8c;
}
}
.userCommissionDetails ._icon_btn i {
.userCommissionDetails ._icon_btn i {
width: 30px;
height: 30px;
display: inline-block;
......@@ -32,12 +32,13 @@
margin-right: 10px;
cursor: pointer;
outline: none;
}
}
.userCommissionDetails .el-table td,
.el-table th {
.userCommissionDetails .el-table td,
.el-table th {
padding: 5px 0;
}
}
</style>
<template>
<div class="page-body userCommissionDetails">
......@@ -48,9 +49,9 @@
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select @input="getList" filled stack-label option-value="Id" option-label="EmployeeName" use-input input-debounce="0"
v-model="msg.UserId" :options="PersionList" label="销售" :dense="false"
emit-value map-options @filter="filterFn2">
<q-select @input="getList" filled stack-label option-value="Id" option-label="EmployeeName" use-input
input-debounce="0" v-model="msg.UserId" :options="PersionList" label="销售" :dense="false" emit-value
map-options @filter="filterFn2">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
......@@ -66,34 +67,26 @@
</div>
</div>
<template>
<el-table
ref="filterTable"
:data="tableData"
v-loading="loading"
:header-cell-style="{ backgroundColor: '#f5f6f7', color: '#a8a8b3' }"
border
style="width: 100%"
>
<el-table ref="filterTable" :data="tableData" v-loading="loading"
:header-cell-style="{ backgroundColor: '#f5f6f7', color: '#a8a8b3' }" border style="width: 100%">
<el-table-column prop="SchoolName" width="130" label="校区"></el-table-column>
        <el-table-column prop="DeptName" width="100" label="部门"></el-table-column>
        <el-table-column prop="DeptName" width="100" label="部门"></el-table-column>
 <el-table-column prop="AccountName" width="100"  label="销售"></el-table-column>
       <el-table-column prop="OrderId" width="80" label="订单号">
       <el-table-column prop="OrderId" width="80" label="订单号">
<template slot-scope="scope">
<div
style="cursor: pointer;text-decoration: underline;"
@click="goUrlorderList('/sale/orderStatistics',scope.row)"
>{{ scope.row.OrderId }}</div>
<div style="cursor: pointer;text-decoration: underline;"
@click="goUrlorderList('/sale/orderStatistics',scope.row)">{{ scope.row.OrderId }}</div>
</template>
</el-table-column>
<el-table-column prop="OrderGuestNum" width="80" label="订单人数"></el-table-column>
        <el-table-column prop="OrderIncom" width="85" label="订单实收"></el-table-column>
        <el-table-column prop="OrderIncom" width="85" label="订单实收"></el-table-column>
<el-table-column prop="OrderMoney" width="85" label="提成金额">
<template slot-scope="scope">
<div style="color: rgb(233, 82, 82);">{{ scope.row.OrderMoney }}</div>
</template>
</el-table-column>
  <el-table-column prop="ClassName" width="180" label="班级"></el-table-column>
        <el-table-column prop="ClassGuestNum" width="80" label="班级人数"></el-table-column>
        <el-table-column prop="ClassGuestNum" width="80" label="班级人数"></el-table-column>
<el-table-column prop="Periods" width="80" label="期数"></el-table-column>
<el-table-column prop="Remarks" width="" label="备注"></el-table-column>
</el-table>
......@@ -101,21 +94,23 @@
</div>
</template>
<script>
import { date } from 'quasar'
import {
import {
date
} from 'quasar'
import {
GetClassTypePageList,
} from '../../../api/system/index';
import {
} from '../../../api/system/index';
import {
GetLanguagePeriodDetails,
getSellAchievementsChangeLog
} from '../../../api/finance/index'
import {
} from '../../../api/finance/index'
import {
queryEmployee
} from '../../../api/users/user'
import {
} from '../../../api/users/user'
import {
getClassDropDownList,
} from "../../../api/school/index";
export default {
} from "../../../api/school/index";
export default {
meta: {
title: "员工提成明细列表"
},
......@@ -140,12 +135,12 @@ export default {
department: [],
ClassList: [],
allClassList: [],
ChangeLog:'',
ChangeLog: '',
PersionList: [], //员工列表
AllemployeeList: [], //所有员工
}
},
created() { },
created() {},
mounted() {
if (this.$route.query && this.$route.query.userId) {
this.msg.UserId = Number(this.$route.query.userId)
......@@ -180,34 +175,11 @@ export default {
SchoolName: '合计',
OrderMoney: 0,
}
console.log("obj",obj);
this.tableData.forEach((x) => {
obj.OrderMoney += x.OrderMoney
})
console.log("obj",obj);
this.tableData.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;
// },
//选择班级
setClass(item) {
this.isShowClass = true;
......@@ -222,7 +194,6 @@ export default {
ClassName: '不限'
}
jsonData.unshift(obj)
if (jsonData && jsonData.length > 0) {
this.ClassList = JSON.parse(JSON.stringify(jsonData));
this.allClassList = JSON.parse(JSON.stringify(jsonData));;
......@@ -302,32 +273,32 @@ export default {
goreturn() {
this.$router.go(-1);
},
goUrlorderList(path, row) {//订单跳转
if(row.OrderId!=-1){
goUrlorderList(path, row) { //订单跳转
if (row.OrderId != -1) {
this.OpenNewUrl(path, {
OrderId: row.OrderId,
// EnterID:row.UserId
});
}else{
} else {
// row.IsDept==2
let newDate = row.Periods.split('-')
let MonthDayNum = new Date(newDate[0], newDate[1], 0).getDate(); //计算当月的天数
this.OpenNewUrl(path, {
OrderId: row.OrderId,
startTime: row.Periods+'-01',
endTime: row.Periods+'-'+MonthDayNum,
startTime: row.Periods + '-01',
endTime: row.Periods + '-' + MonthDayNum,
createBy: row.UserId
});
}
},
goUrlclass(path, Names) {//班级
goUrlclass(path, Names) { //班级
let Name = encodeURI(Names)
this.OpenNewUrl(path, {
ClassName: Name,
});
},
goUrlkehao(path, row) {//跳转到学生课耗
goUrlkehao(path, row) { //跳转到学生课耗
let StartMonth = ''
let EndMonth = ''
if (row.IsFirstCommission == 1) {
......@@ -350,7 +321,7 @@ export default {
comefrom: 1,
});
},
getmingxi(row){//明细
getmingxi(row) { //明细
getSellAchievementsChangeLog({
OrderId: row.OrderId,
UserId: row.UserId,
......@@ -364,9 +335,10 @@ export default {
}
},
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
@import url('~assets/css/table.sass')
</style>
src/pages/financial/financalDocument/RecPayDetail.vue
View file @ 46c55fb4
......@@ -475,9 +475,11 @@
._TCIDAndTCNUMList {
display: flex;
}
.caoz i{
.caoz i {
margin-bottom: 5px;
}
</style>
<template>
......@@ -487,9 +489,8 @@
<el-row style="padding:15px 20px 0 0;">
<el-col :span="6">
<el-form-item label="交易日期：">
<el-date-picker class="h34" v-model="transactionDate"
@change="timeAdd(3)" type="daterange" :picker-options="pickerOptions"
value-format="yyyy-MM-dd">
<el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
:picker-options="pickerOptions" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -504,7 +505,9 @@
</el-col>
</el-row>
</el-form>
<div style="display: inline-block;padding: 0 5px;height: 42px;line-height: 40px;font-weight: bold;font-size: 14px;border-radius: 4px;box-sizing: border-box;white-space: nowrap;margin: 0px 0px 4px 28px;"><span >
<div
style="display: inline-block;padding: 0 5px;height: 42px;line-height: 40px;font-weight: bold;font-size: 14px;border-radius: 4px;box-sizing: border-box;white-space: nowrap;margin: 0px 0px 4px 28px;">
<span>
总收入：</span> <span style="color:red;">{{DataList.Income}}</span> <span style="padding-left:20px;">
总支出：</span><span style="color:red;">{{DataList.Expenditure}}</span></div>
<ul class="clearfix">
......@@ -520,10 +523,11 @@
<div v-if="DataList.Result.length>0" v-for="(item,index) in DataList.Result" :index="index">
<div style="text-align:center;height:50px;padding-top:20px;font-weight:bold;"><span>{{item.Alias}}</span>
<span>{{item.BankNo}}</span><span style="padding-left:20px;">收入：{{item.Income}}</span><span style="padding-left:20px;">支出{{item.Expenditure}}</span>
<span>{{item.BankNo}}</span><span style="padding-left:20px;">收入：{{item.Income}}</span><span
style="padding-left:20px;">支出{{item.Expenditure}}</span>
</div>
<el-table :data="item.FinanceList" border style="width: 100%;font-size: 12px">
<el-table-column prop="CreateDate"label="交易日期" width="150">
<el-table-column prop="CreateDate" label="交易日期" width="150">
<template slot-scope="scope">
<span>{{scope.row.CreateDate}}</span>
</template>
......@@ -538,12 +542,12 @@
<span v-if="scope.row.Type==2"> {{scope.row.Money}}</span>
</template>
</el-table-column>
<el-table-column prop="RemitterName" label="对方单位" >
<el-table-column prop="RemitterName" label="对方单位">
<template slot-scope="scope">
<span> {{scope.row.RemitterName}}</span>
</template>
</el-table-column>
<el-table-column prop="RemitterName" label="对方账号" >
<el-table-column prop="RemitterName" label="对方账号">
<template slot-scope="scope">
<span> {{scope.row.CardNum}}</span>
</template>
......@@ -573,7 +577,8 @@
</el-table-column>
</el-table>
</div>
<div style="width: 100%;height: 50px;line-height: 50px;text-align: center;" v-if="DataList.Result!=null&&DataList.Result.length==0">暂无数据</div>
<div style="width: 100%;height: 50px;line-height: 50px;text-align: center;"
v-if="DataList.Result!=null&&DataList.Result.length==0">暂无数据</div>
</div>
</div>
</template>
......@@ -596,7 +601,7 @@
import {
getSchoolDropdown
} from '../../../api/school/index'
import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
export default {
data() {
......@@ -604,7 +609,10 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
selectDate: '',
// 日期时间范围在一个月以内
pickerOptions: {
onPick: ({ maxDate, minDate }) => {
onPick: ({
maxDate,
minDate
}) => {
this.selectDate = minDate.getTime()
if (maxDate) {
this.selectDate = ''
......@@ -626,8 +634,8 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
searchList: [],
widthSon: '700px',
colorSon: "#f5f5f5",
Finance_InvoiceUpdate:false,
Finance_ExpenseType:false,
Finance_InvoiceUpdate: false,
Finance_ExpenseType: false,
msg: {
FrID: '',
sDate: '',
......@@ -738,13 +746,13 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
SName: "",
Status: '-1'
},
modifydjfp:{
modifydjfp: {
},
xgfpBox:false,
getInvoiceList:[],
costmode:false,//费用类型的修改弹窗
trabeList:[],//修改费用类型的下啦数据
xgfpBox: false,
getInvoiceList: [],
costmode: false, //费用类型的修改弹窗
trabeList: [], //修改费用类型的下啦数据
}
},
created() {
......@@ -792,10 +800,10 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
let ActionMenuList = JSON.parse(localStorageData).data.ActionMenuList
if (ActionMenuList && ActionMenuList.length > 0) {
ActionMenuList.forEach(x => {
if (x.FunctionCode == 'Finance_InvoiceUpdate') {//发票修改权限
if (x.FunctionCode == 'Finance_InvoiceUpdate') { //发票修改权限
this.Finance_InvoiceUpdate = true
}
if(x.FunctionCode == 'Finance_ExpenseType'){//费用类型修改权限
if (x.FunctionCode == 'Finance_ExpenseType') { //费用类型修改权限
this.Finance_ExpenseType = true
}
})
......@@ -880,11 +888,9 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
if (!this.msg.KJCostTypeId) this.msg.KJCostTypeId = 0;
if (!this.msg.IsSelectKJSetCostType) this.msg.IsSelectKJSetCostType = 0;
this.loading = true;
console.log("进方法啦");
this.apipost('Financial_post_GetEduALLPageList', this.msg, res => {
if (res.data.resultCode == 1) {
this.DataList = res.data.data;
console.log("this.DataList",this.DataList);
let userInfo = this.getLocalStorage();
this.loading = false;
} else {
......@@ -916,7 +922,6 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
mathMoney(n) { // 数字转中文大写 1
this.ChineseStr = this.$commonUtils.changeMoneyToChinese(n)
},
timeAdd(t) { // 日期格式
if (t == 3) { //交易日期
if (!this.transactionDate) {
......@@ -924,7 +929,6 @@ import treeItemVue from 'src/components/common/tree-table/tree-item.vue';
this.msg.eTradeDate = '';
return
}
console.log("this.transactionDate",this.transactionDate);
this.msg.sTradeDate = this.transactionDate[0];
this.msg.eTradeDate = this.transactionDate[1];
}
......
src/pages/sale/monthStatistics.vue
View file @ 46c55fb4
......@@ -47,6 +47,7 @@
height: 40px;
background-color: rgb(238, 238, 239);
}
</style>
<template>
<div class="page-body studentTracking">
......@@ -66,7 +67,7 @@
<div class="col-2" style="width: 13%">
<q-field filled dense>
<el-date-picker v-model="msg.StartTime" type="month" value-format="yyyy-MM" placeholder="订单日期" size="small"
style="width: 100%" @change="resetSearch" clear-icon="iconfont icon-guanbi" >
style="width: 100%" @change="resetSearch" clear-icon="iconfont icon-guanbi">
</el-date-picker>
</q-field>
</div>
......@@ -104,7 +105,8 @@
<span>{{dataList.totalPriceXia}}</span>
</div>
<div v-if="dataList.sourceList&&dataList.sourceList.length>0" v-for=" ( itemSource , indexSource ) in dataList.sourceList " :key="indexSource">
<div v-if="dataList.sourceList&&dataList.sourceList.length>0"
v-for=" ( itemSource , indexSource ) in dataList.sourceList " :key="indexSource">
<div class="col stics">
<span class="stics-name">{{itemSource.CreateTypeStr}}</span>
......@@ -116,8 +118,8 @@
</div>
<div style="width: 100%;margin-top: 20px">
<monthStatisticslist :dataObj="dataList" @success="refreshPage"
:loading="loading" ref="monthStatisticslist"></monthStatisticslist>
<monthStatisticslist :dataObj="dataList" @success="refreshPage" :loading="loading" ref="monthStatisticslist">
</monthStatisticslist>
</div>
</div>
......@@ -177,7 +179,7 @@
let firstDay = new Date();
var year = firstDay.getFullYear(); //年
var month = firstDay.getMonth() + 1; //月
this.msg.StartTime=year + '-' + month;
this.msg.StartTime = year + '-' + month;
},
......@@ -235,16 +237,13 @@
getList() {
this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg))
GetStudentMonthList(msg).then(res => {
this.loading = false;
console.log("res.Data",res.Data.list);
this.dataList = res.Data;
})
.catch(() => {
this.loading = false;
});
},
//获取客户类型
getCustomTypeList() {
......@@ -273,9 +272,11 @@
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
<style scoped>
/deep/.el-input__inner,
......@@ -302,4 +303,5 @@
.roatImg {
transform: rotate(180deg);
}
</style>
src/pages/school/sysuser.vue
View file @ 46c55fb4
......@@ -552,12 +552,10 @@
this.orderHandoverMsg.UserId = row.EmAccountId
this.orderIsDetails = true
},
// 协助老师交接
teacherHandover(row) {
console.log("row", row);
this.teacherHandoverMsg.UserId = row.EmAccountId;
this.teacherHandoverMsg.EmployeeName=row.EmployeeName;
this.teacherHandoverMsg.EmployeeName = row.EmployeeName;
this.teacherIsDetails = true
},
saveOrderHandoverInfo() { //保存
......@@ -639,7 +637,6 @@
UserId: this.teacherHandoverMsg.UserId,
ReceiveId: this.teacherHandoverMsg.ReceiveId
}
console.log("开始保存咔咔咔咔咔咔");
SetUserLeaveTearchCareOf(msg).then(res => {
if (res.Code == 1)
this.$q.notify({
......
src/pages/teacher/studentStudy.vue
View file @ 46c55fb4
......@@ -53,14 +53,12 @@
<div class="page-body studentTracking">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<p style="margin-bottom:10px;"> 学生姓名：<strong style="color:red;">{{this.$route.query.StuName}}</strong></p>
<q-select dense filled option-value="CourseId" option-label="CourseName" v-model="msg.CourseId"
:options="allCourseList" emit-value map-options label="课程名称"
@update:model-value="getCourseId" @input="refreshPage" />
:options="allCourseList" emit-value map-options label="课程名称" @update:model-value="getCourseId"
@input="refreshPage" />
</div>
</div>
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增考试" @click="AddExam(2)" />
<q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增月度总结" @click="AddExam(3)" />
......@@ -70,12 +68,13 @@
<el-tab-pane label="月度总结" name="second"></el-tab-pane>
</el-tabs>
<div style="width: 100%;margin-top: 20px" v-if="activeName=='first'">
<stufollowlist :dataObj="dataList" :CourseRateName="CourseRateName" :BaseInfo="msg" @success="refreshPage" :titlelist="titlelist"
:loading="loading" ref="stuFollowList" :AuthObj="AuthObj"></stufollowlist>
<stufollowlist :dataObj="dataList" :CourseRateName="CourseRateName" :BaseInfo="msg" @success="refreshPage"
:titlelist="titlelist" :loading="loading" ref="stuFollowList" :AuthObj="AuthObj"></stufollowlist>
</div>
<div style="width: 100%;margin-top: 20px" v-if="activeName=='second'">
<studentStudylMonthlist :dataObj="dataList" :CourseRateName="CourseRateName" :BaseInfo="msg" @success="refreshPage" :titlelist="titlelist"
:loading="loading" ref="studentStudylMonthlist" :AuthObj="AuthObj"></studentStudylMonthlist>
<studentStudylMonthlist :dataObj="dataList" :CourseRateName="CourseRateName" :BaseInfo="msg"
@success="refreshPage" :titlelist="titlelist" :loading="loading" ref="studentStudylMonthlist"
:AuthObj="AuthObj"></studentStudylMonthlist>
</div>
<q-dialog persistent v-model="isShowManagerForm">
<studentStudyAddForm :saveObj="managerOption" :BaseInfo="msg" @close="closeStuForm" @success="refreshPage">
......@@ -93,22 +92,13 @@
queryStuOrderPage, //学员订单分页列表
} from '../../api/customerstudent/customerstudent';
import {
EduDownLoad
} from "../../api/common/common";
import {
GetStudentAdvisorConfigList,
} from "../../api/customerstudent/customerstudent";
import stufollowlist from "../../components/school/student/studentStudylist";
import studentStudylMonthlist from "../../components/school/student/studentStudylMonthlist";
import studentStudyAddForm from "../../components/school/student/studentStudyAddForm";
import {
mapState
} from "vuex";
export default {
meta: {
title: "学员学校情况"
title: "学员学习情况"
},
props: {},
components: {
......@@ -123,20 +113,20 @@
IsLeave: 1,
titlelist: [],
msg: {
CourseId: 0, //课程 "StuId":1746,"CourseId":322,"GuestId":1162,"ClassScrollType":2
StuId:0,
GuestId:0,
ClassScrollType:0,
OrderId:0,
CourseId: 0,
StuId: 0,
GuestId: 0,
ClassScrollType: 0,
OrderId: 0,
},
loading: false,
isShowManagerForm:false,
isShowManagerForm: false,
dataList: null, //列表数据
managerOption: 0,
PageCount: 0,
CourseRateName: '',
allCourseList: [], //课程
myCourseList:[],
myCourseList: [],
customMsg: {
pageIndex: 1,
pageSize: 10000,
......@@ -157,54 +147,37 @@
}
if (this.$route.query.ClassScrollType) {
this.msg.ClassScrollType = this.customMsg.ClassScrollType = parseInt(this.$route.query.ClassScrollType)
} if (this.$route.query.CourseRateName) {
}
if (this.$route.query.CourseRateName) {
this.CourseRateName = this.$route.query.CourseRateName
}
}
this.getCourseList(); //获取课程下拉
},
computed: mapState({
//是否有下载权限
isHaveDownLoad(state) {
if (state.user.userInfo && state.user.userInfo.ActionMenuList && state.user.userInfo.ActionMenuList.length >
0) {
let action = state.user.userInfo.ActionMenuList.find(x => {
if (x.FunctionCode == "studentTracking_download") {
return x;
}
});
return action && action.FunctionCode;
}
return false;
}
}),
mounted() {
},
mounted() {},
methods: {
handleClick(tab, event) {
this.refreshPage()
},
AddExam(type) {
this.isShowManagerForm = true;
this.managerOption=type;
this.managerOption = type;
},
//关闭表单
closeStuForm() {
this.isShowManagerForm = false;
},
getCourseId(val){
for(let i =0;i<this.allCourseList.length;i++){
if(this.allCourseList[i].CourseId==val){
this.msg.ClassScrollType=this.allCourseList[i].ClassScrollType
this.msg.OrderId=this.allCourseList[i].OrderId
getCourseId(val) {
for (let i = 0; i < this.allCourseList.length; i++) {
if (this.allCourseList[i].CourseId == val) {
this.msg.ClassScrollType = this.allCourseList[i].ClassScrollType
this.msg.OrderId = this.allCourseList[i].OrderId
}
}
console.log("我进来了哈哈哈哈1");
this.refreshPage()
},
//刷新页面
refreshPage() {
console.log("我进来了哈哈哈哈21");
this.getList()
},
//获取课程
......@@ -214,10 +187,10 @@
let data = res.Data.PageData
this.allCourseList = JSON.parse(JSON.stringify(data));
this.myCourseList = JSON.parse(JSON.stringify(data));
if(this.allCourseList&&this.allCourseList.length>0){
this.msg.CourseId=this.allCourseList[0].CourseId
this.msg.ClassScrollType=this.allCourseList[0].ClassScrollType
this.msg.OrderId=this.allCourseList[0].OrderId
if (this.allCourseList && this.allCourseList.length > 0) {
this.msg.CourseId = this.allCourseList[0].CourseId
this.msg.ClassScrollType = this.allCourseList[0].ClassScrollType
this.msg.OrderId = this.allCourseList[0].OrderId
this.getList(); //获取列表
}
}
......@@ -226,7 +199,7 @@
getList() {
this.loading = true;
let msg = JSON.parse(JSON.stringify(this.msg))
if(this.activeName=='first'){
if (this.activeName == 'first') {
GetStuStudyList(this.msg).then(res => {
this.loading = false;
var pageData = JSON.parse(JSON.stringify(res.Data));
......@@ -235,8 +208,7 @@
.catch(() => {
this.loading = false;
});
}
else if(this.activeName=='second'){
} else if (this.activeName == 'second') {
GetStuStudyMonthList(this.msg).then(res => {
this.loading = false;
var pageData = JSON.parse(JSON.stringify(res.Data));
......
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