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