Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-3
Overview
Overview
Details
Activity
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
office
haoban-3
Commits
41ded704
Commit
41ded704
authored
Jun 30, 2022
by
caoyanzhi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bugfix/迭代bug'
parents
fd50a24b
da3f76f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
memberGroupList.vue
src/views/apps/customerApp/memberGroupList.vue
+2
-2
taskDetail.vue
src/views/salesleads/trafficTask/taskDetail.vue
+2
-2
No files found.
src/views/apps/customerApp/memberGroupList.vue
View file @
41ded704
...
@@ -53,9 +53,9 @@
...
@@ -53,9 +53,9 @@
<el-table-column
prop=
""
label=
"状态"
show-overflow-tooltip
>
<el-table-column
prop=
""
label=
"状态"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
effectiveStatus
==
'1'
?
'有效'
:
'失效'
}}
</
template
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
effectiveStatus
==
'1'
?
'有效'
:
'失效'
}}
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
""
label=
"覆盖人数"
show-overflow-tooltip
>
<
!-- <
el-table-column prop="" label="覆盖人数" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.memberCount || 0 }}人</template>
<template slot-scope="scope">{{ scope.row.memberCount || 0 }}人</template>
</el-table-column>
</el-table-column>
-->
<el-table-column
prop=
""
label=
"到期时间"
show-overflow-tooltip
>
<el-table-column
prop=
""
label=
"到期时间"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
class=
"line-18"
>
{{
scope
.
row
.
effectiveDate
|
timeStampToYmd
}}
</div>
<div
class=
"line-18"
>
{{
scope
.
row
.
effectiveDate
|
timeStampToYmd
}}
</div>
...
...
src/views/salesleads/trafficTask/taskDetail.vue
View file @
41ded704
...
@@ -388,8 +388,8 @@ export default {
...
@@ -388,8 +388,8 @@ export default {
title
:
this
.
conditionObj
.
title
title
:
this
.
conditionObj
.
title
};
};
if
(
Array
.
isArray
(
this
.
conditionObj
.
date
)
&&
this
.
conditionObj
.
date
.
length
==
2
)
{
if
(
Array
.
isArray
(
this
.
conditionObj
.
date
)
&&
this
.
conditionObj
.
date
.
length
==
2
)
{
para
.
createTimeStart
=
`
${
this
.
conditionObj
.
date
[
0
]}
00:00:00`
;
para
.
createTimeStart
=
this
.
conditionObj
.
date
[
0
]
;
para
.
createTimeEnd
=
`
${
this
.
conditionObj
.
date
[
1
]}
23:59:59`
;
para
.
createTimeEnd
=
this
.
conditionObj
.
date
[
1
]
;
}
}
postExcel
(
'/haoban-app-tel-task-three-web/task/export-store-view-clerk-list'
,
para
)
postExcel
(
'/haoban-app-tel-task-three-web/task/export-store-view-clerk-list'
,
para
)
.
then
(
res
=>
{
.
then
(
res
=>
{
...
...
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