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
4e1bae44
Commit
4e1bae44
authored
Jul 14, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
069f2dbb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
104 additions
and
77 deletions
+104
-77
changebill-form.vue
src/components/sale/changebill-form.vue
+103
-76
billquery.vue
src/pages/user/billquery.vue
+1
-1
No files found.
src/components/sale/changebill-form.vue
View file @
4e1bae44
...
@@ -182,8 +182,7 @@
...
@@ -182,8 +182,7 @@
</div>
</div>
<q-table
no-data-label=
"暂无相关数据"
flat
style=
"width:100%;"
v-if=
"dataList&&dataList.length>0"
<q-table
no-data-label=
"暂无相关数据"
flat
style=
"width:100%;"
v-if=
"dataList&&dataList.length>0"
:pagination=
"pages"
class=
"sticky-column-table no-bottom-table"
separator=
"none"
:pagination=
"pages"
class=
"sticky-column-table no-bottom-table"
separator=
"none"
:data=
"dataList"
:data=
"dataList"
:columns=
"setingObj.DataObj.ChangeType==1?columns:columns2"
>
:columns=
"setingObj.DataObj.ChangeType==1?columns:columns2"
>
<template
v-slot:body-cell-PlanTimeList=
"props"
>
<template
v-slot:body-cell-PlanTimeList=
"props"
>
<q-td
:props=
"props"
>
<q-td
:props=
"props"
>
...
@@ -199,12 +198,14 @@
...
@@ -199,12 +198,14 @@
</
template
>
</
template
>
<
template
v-slot:body-cell-ClassRoomName=
"props"
>
<
template
v-slot:body-cell-ClassRoomName=
"props"
>
<q-td
:prop=
"props"
>
<q-td
:prop=
"props"
>
<span
:class=
"
{'BillredClass':setingObj.DataObj.ChangeType==3
&&
setingObj.DataObj.MoveType==1}">
{{
props
.
row
.
ClassRoomName
}}
</span>
<span
:class=
"
{'BillredClass':setingObj.DataObj.ChangeType==3
&&
setingObj.DataObj.MoveType==1}">
{{
props
.
row
.
ClassRoomName
}}
</span>
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-TeacherName=
"props"
>
<
template
v-slot:body-cell-TeacherName=
"props"
>
<q-td
:prop=
"props"
>
<q-td
:prop=
"props"
>
<span
:class=
"
{'BillredClass':setingObj.DataObj.ChangeType==2
&&
setingObj.DataObj.MoveType==1}">
{{
props
.
row
.
TeacherName
}}
</span>
<span
:class=
"
{'BillredClass':setingObj.DataObj.ChangeType==2
&&
setingObj.DataObj.MoveType==1}">
{{
props
.
row
.
TeacherName
}}
</span>
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-PlanTimeList2=
"props"
>
<
template
v-slot:body-cell-PlanTimeList2=
"props"
>
...
@@ -216,7 +217,10 @@
...
@@ -216,7 +217,10 @@
</q-td>
</q-td>
</
template
>
</
template
>
</q-table>
</q-table>
<
template
v-if=
"setingObj.DataObj.ChangeType==1&&setingObj.DataObj.MoveType==2"
>
<!--全局调整-->
<
template
v-if=
"setingObj.DataObj.MoveType==2"
>
<!--全局调整课程-->
<template
v-if=
"setingObj.DataObj.ChangeType==1"
>
<div
class=
"row backInfo_One"
>
<div
class=
"row backInfo_One"
>
<div
class=
"col EmpList"
>
<div
class=
"col EmpList"
>
<div
class=
"normalName"
>
开班时间
</div>
<div
class=
"normalName"
>
开班时间
</div>
...
@@ -287,6 +291,29 @@
...
@@ -287,6 +291,29 @@
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
</
template
>
<!--全局调整老师-->
<
template
v-if=
"setingObj.DataObj.ChangeType==2"
>
<div
class=
"row backInfo_One"
>
<div
class=
"col EmpList"
>
<div
class=
"normalName"
>
变更后老师:
</div>
<div
class=
"normalInner"
>
{{
setingObj
.
DataObj
.
AllChangePlanModel
.
TeacherName
}}
</div>
</div>
</div>
</
template
>
<!--全局调整教室-->
<
template
v-if=
"setingObj.DataObj.ChangeType==3"
>
<div
class=
"row backInfo_One"
>
<div
class=
"col EmpList"
>
<div
class=
"normalName"
>
变更后教室:
</div>
<div
class=
"normalInner"
>
{{
setingObj
.
DataObj
.
AllChangePlanModel
.
ClassRoomName
}}
</div>
</div>
</div>
</
template
>
</template>
<!--固定日期调整-->
<
template
v-if=
"setingObj.DataObj.MoveType==1"
>
</
template
>
</
template
>
<div
class=
"replayReason"
>
<div
class=
"replayReason"
>
<div
class=
"replay_Title"
>
变更原因
</div>
<div
class=
"replay_Title"
>
变更原因
</div>
...
@@ -463,7 +490,7 @@
...
@@ -463,7 +490,7 @@
pages
:
{
pages
:
{
rowsPerPage
:
100000
rowsPerPage
:
100000
},
},
dataList
:[]
dataList
:
[]
}
}
},
},
created
()
{
created
()
{
...
@@ -476,20 +503,20 @@
...
@@ -476,20 +503,20 @@
if
(
this
.
setingObj
.
DataObj
.
ChangeType
==
1
)
{
if
(
this
.
setingObj
.
DataObj
.
ChangeType
==
1
)
{
this
.
changeTitle
=
'课程时间变更'
this
.
changeTitle
=
'课程时间变更'
if
(
this
.
setingObj
.
DataObj
.
MoveType
==
1
)
{
if
(
this
.
setingObj
.
DataObj
.
MoveType
==
1
)
{
this
.
dataList
=
[];
this
.
dataList
=
[];
if
(
this
.
setingObj
.
DataObj
.
OldChangePlanItemList
&&
this
.
setingObj
.
DataObj
.
NewChangePlanItemList
)
{
if
(
this
.
setingObj
.
DataObj
.
OldChangePlanItemList
&&
this
.
setingObj
.
DataObj
.
NewChangePlanItemList
)
{
this
.
setingObj
.
DataObj
.
OldChangePlanItemList
.
forEach
((
x
,
index
)
=>
{
this
.
setingObj
.
DataObj
.
OldChangePlanItemList
.
forEach
((
x
,
index
)
=>
{
var
obj
=
{
var
obj
=
{
ClassRoomName
:
x
.
ClassRoomName
,
ClassRoomName
:
x
.
ClassRoomName
,
ClassDateStr
:
x
.
ClassDateStr
,
ClassDateStr
:
x
.
ClassDateStr
,
TeacherName
:
x
.
TeacherName
,
TeacherName
:
x
.
TeacherName
,
PlanTimeList
:
x
.
PlanTimeList
,
PlanTimeList
:
x
.
PlanTimeList
,
ClassDate2
:
this
.
setingObj
.
DataObj
.
NewChangePlanItemList
[
index
].
ClassDateStr
,
ClassDate2
:
this
.
setingObj
.
DataObj
.
NewChangePlanItemList
[
index
].
ClassDateStr
,
PlanTimeList2
:
this
.
setingObj
.
DataObj
.
NewChangePlanItemList
[
index
].
PlanTimeList
PlanTimeList2
:
this
.
setingObj
.
DataObj
.
NewChangePlanItemList
[
index
].
PlanTimeList
}
}
this
.
dataList
.
push
(
obj
);
this
.
dataList
.
push
(
obj
);
})
})
console
.
log
(
this
.
dataList
,
'datraList'
);
console
.
log
(
this
.
dataList
,
'datraList'
);
}
}
}
}
}
}
...
...
src/pages/user/billquery.vue
View file @
4e1bae44
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
<div
class=
"page-search row items-center"
>
<div
class=
"page-search row items-center"
>
<div
class=
"col row wrap q-col-gutter-md"
>
<div
class=
"col row wrap q-col-gutter-md"
>
<div
class=
"col-3"
>
<div
class=
"col-3"
>
<q-input
@
change=
"resetSearch"
clearable
filled
v-model=
"msg.Id"
label=
"单据编号
"
/>
<q-input
clearable
filled
v-model=
"msg.Id"
label=
"单据编号"
@
input=
"resetSearch
"
/>
</div>
</div>
<div
class=
"col-3"
>
<div
class=
"col-3"
>
<q-select
@
input=
"resetSearch"
clearable
filled
v-model=
"msg.VerifyStatus"
:options=
"ShowOpts"
emit-value
<q-select
@
input=
"resetSearch"
clearable
filled
v-model=
"msg.VerifyStatus"
:options=
"ShowOpts"
emit-value
...
...
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