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
e25b7e29
Commit
e25b7e29
authored
Nov 25, 2021
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
3fb650bc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
36 deletions
+74
-36
sale-form.vue
src/components/sale/sale-form.vue
+6
-2
saleTask.vue
src/pages/sale/saleTask.vue
+68
-34
No files found.
src/components/sale/sale-form.vue
View file @
e25b7e29
...
@@ -134,7 +134,7 @@
...
@@ -134,7 +134,7 @@
<thead>
<thead>
<tr
style=
"height:60px;"
>
<tr
style=
"height:60px;"
>
<td
colspan=
"5"
style=
"text-align:right;"
>
<td
colspan=
"5"
style=
"text-align:right;"
>
<q-btn
color=
"accent"
size=
"sm"
icon=
"add"
label=
"新增
优惠
"
@
click=
"addCourse()"
/>
<q-btn
color=
"accent"
size=
"sm"
icon=
"add"
label=
"新增
任务
"
@
click=
"addCourse()"
/>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -158,7 +158,7 @@
...
@@ -158,7 +158,7 @@
<tbody
v-for=
"(sItem, sIndex) in objOption.DetailsList"
:key=
"sIndex"
>
<tbody
v-for=
"(sItem, sIndex) in objOption.DetailsList"
:key=
"sIndex"
>
<tr>
<tr>
<td
style=
"height:50px"
>
<td
style=
"height:50px"
>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"Name"
v-model=
"sItem.TaskType"
<q-select
filled
stack-label
option-value=
"Id"
@
input=
"clearTarget(sItem)"
option-label=
"Name"
v-model=
"sItem.TaskType"
ref=
"PriceDiscountType_Id"
:options=
"taskTypeData"
label=
"任务类型"
style=
"width:160px"
dense
ref=
"PriceDiscountType_Id"
:options=
"taskTypeData"
label=
"任务类型"
style=
"width:160px"
dense
emit-value
map-options
/>
emit-value
map-options
/>
</td>
</td>
...
@@ -427,6 +427,10 @@
...
@@ -427,6 +427,10 @@
getChild
(
cateObj
,
index
)
{
getChild
(
cateObj
,
index
)
{
this
.
objOption
.
DetailsList
[
index
].
TargetIdList
=
cateObj
.
split
(
','
);
this
.
objOption
.
DetailsList
[
index
].
TargetIdList
=
cateObj
.
split
(
','
);
},
},
//清除
clearTarget
(
item
){
item
.
TargetIdList
=
[];
}
},
},
}
}
...
...
src/pages/sale/saleTask.vue
View file @
e25b7e29
...
@@ -25,39 +25,46 @@
...
@@ -25,39 +25,46 @@
</div>
</div>
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-TaskType=
"props"
>
<
template
v-slot:body-cell-DetailsList=
"props"
>
<q-td
:props=
"props"
style=
"padding-right: 0px"
>
<q-td
auto-width
:props=
"props"
>
<div
v-for=
"(x,index) in props.value"
:key=
"index"
>
<template
v-if=
"props.row.DetailsList"
>
<div
class=
"border-bottom"
>
<template
v-if=
"props.row.DetailsList.length==1"
>
{{
x
.
TaskTypeName
}}
{{
props
.
row
.
DetailsList
[
0
].
TargetName
}}
</div>
</div>
</q-td>
</
template
>
</
template
>
<
template
v-if=
"props.row.DetailsList.length>1"
>
<
template
v-slot:body-cell-TaskConditions=
"props"
>
{{
props
.
row
.
DetailsList
[
0
].
TargetName
}}
:
<q-td
:props=
"props"
style=
"padding-right: 0px"
>
<span
class=
"otherTask"
>
<div
v-for=
"(x,index) in props.value"
:key=
"index"
>
{{
props
.
row
.
DetailsList
.
length
}}
<template
v-if=
"x.TargetList.length>0"
>
<q-popup-proxy>
<div
class=
"border-bottom"
>
<q-banner>
<span
v-for=
"(sItem,sIndex) in x.TargetList"
:key=
"sIndex"
>
<table
class=
"saleTaskTable"
style=
"border-collapse:collapse;"
>
{{
sItem
.
TargetName
}}
<span
v-if=
"sIndex!=x.TargetList.length-1"
>
,
</span>
<tr>
<th>
课程名称
</th>
</tr>
<tr
v-for=
"(sItem,sIndex) in props.row.DetailsList"
:key=
"sIndex"
style=
"border-bottom:1px dashed #d1d1d1;"
>
<td>
{{
sItem
.
TargetName
}}
</td>
</tr>
</table>
</q-banner>
</q-popup-proxy>
</span>
</span>
</div>
</
template
>
</
template
>
<
template
v-if=
"props.row.DetailsList.length==0"
>
</div
>
无
</q-td>
</template>
</template>
<
template
v-slot:body-cell-CompleteType=
"props"
>
<q-td
:props=
"props"
style=
"padding-right: 0px"
>
<div
v-for=
"(x,index) in props.value"
:key=
"index"
>
<div
class=
"border-bottom"
>
{{
x
.
TaskFinishType
==
1
?
'人数'
:
'成交金额'
}}
</div>
</div>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-CompleteValue=
"props"
>
<q-td
:props=
"props"
style=
"padding-right: 0px"
>
<div
v-for=
"(x,index) in props.value"
:key=
"index"
>
<div
class=
"border-bottom"
>
{{
x
.
TaskFinishValue
}}
</div>
</div>
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-optioned=
"props"
>
<
template
v-slot:body-cell-optioned=
"props"
>
<q-td>
<q-td>
<q-btn
flat
size=
"xs"
icon=
"edit"
color=
"accent"
style=
"font-weight:400"
label=
"编辑"
<q-btn
flat
size=
"xs"
icon=
"edit"
color=
"accent"
style=
"font-weight:400"
label=
"编辑"
...
@@ -115,10 +122,32 @@
...
@@ -115,10 +122,32 @@
align
:
'left'
,
align
:
'left'
,
},
},
{
{
name
:
'DetailsList'
,
name
:
'TaskType'
,
label
:
'关联其他课程'
,
label
:
'任务类型'
,
field
:
'DetailsList'
,
required
:
true
,
align
:
'left'
,
align
:
"left"
,
field
:
(
row
)
=>
row
.
DetailsList
},
{
name
:
'TaskConditions'
,
label
:
'任务条件'
,
required
:
true
,
align
:
"left"
,
field
:
(
row
)
=>
row
.
DetailsList
},
{
name
:
'CompleteType'
,
label
:
'完成类型'
,
required
:
true
,
align
:
"left"
,
field
:
(
row
)
=>
row
.
DetailsList
},
{
name
:
'CompleteValue'
,
label
:
'完成值'
,
required
:
true
,
align
:
"left"
,
field
:
(
row
)
=>
row
.
DetailsList
},
},
{
{
name
:
'CreateByName'
,
name
:
'CreateByName'
,
...
@@ -250,5 +279,10 @@
...
@@ -250,5 +279,10 @@
height
:
40px
;
height
:
40px
;
background-color
:
rgb
(
238
,
238
,
239
);
background-color
:
rgb
(
238
,
238
,
239
);
}
}
.border-bottom
{
border-bottom
:
1px
dashed
#eee
;
padding-bottom
:
5px
;
margin-bottom
:
5px
;
}
</
style
>
</
style
>
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