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
7b28c60e
Commit
7b28c60e
authored
Jul 21, 2022
by
crushh
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/act-code' of
http://git.gicdev.com/office/haoban-3
into feature/act-code
parents
9c19264e
1c9a2bfe
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
act-code-table.vue
...leads/actCodeManage/staffActCode/views/act-code-table.vue
+4
-4
batchAddCode.vue
...esleads/actCodeManage/staffActCode/views/batchAddCode.vue
+2
-2
dataDetail.vue
src/views/salesleads/components/dataDetail.vue
+1
-1
No files found.
src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue
View file @
7b28c60e
...
@@ -79,10 +79,10 @@
...
@@ -79,10 +79,10 @@
<p>
{{
row
.
addNumT
?
row
.
addNumT
:
'--'
}}
</p>
<p>
{{
row
.
addNumT
?
row
.
addNumT
:
'--'
}}
</p>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"关联导购"
width=
"1
2
0"
show-overflow-tooltip
>
<el-table-column
label=
"关联导购"
width=
"1
3
0"
show-overflow-tooltip
>
<
template
slot-scope=
"{ row }"
>
<
template
slot-scope=
"{ row }"
>
<p>
{{
row
.
clerkName
?
row
.
clerkName
:
'--'
}}
</p>
<p>
{{
row
.
clerkName
?
row
.
clerkName
:
'--'
}}
</p>
<p
class=
"ft-12 phone"
>
{{
row
.
clerkCode
?
row
.
clerkCode
:
'--'
}}
</p>
<p
class=
"ft-12 phone
overflow-ellipsis
"
>
{{
row
.
clerkCode
?
row
.
clerkCode
:
'--'
}}
</p>
<p
v-if=
"row.clerkList && row.clerkList.length > 0"
>
<p
v-if=
"row.clerkList && row.clerkList.length > 0"
>
<el-popover
width=
"200"
trigger=
"click"
>
<el-popover
width=
"200"
trigger=
"click"
>
<ul
class=
"userMember-ul"
>
<ul
class=
"userMember-ul"
>
...
@@ -284,8 +284,8 @@ export default {
...
@@ -284,8 +284,8 @@ export default {
}).
then
(()
=>
{
}).
then
(()
=>
{
deleteRequest
(
'/haoban-manage3-web/hm/qrcode/del'
,
{
hmId
:
row
.
hmId
}).
then
(
res
=>
{
deleteRequest
(
'/haoban-manage3-web/hm/qrcode/del'
,
{
hmId
:
row
.
hmId
}).
then
(
res
=>
{
if
(
res
.
data
.
code
==
0
)
{
if
(
res
.
data
.
code
==
0
)
{
//
this.getTableList();
this
.
getTableList
();
this
.
$router
.
go
(
0
);
//
this.$router.go(0);
}
}
});
});
});
});
...
...
src/views/salesleads/actCodeManage/staffActCode/views/batchAddCode.vue
View file @
7b28c60e
...
@@ -31,7 +31,7 @@ export default {
...
@@ -31,7 +31,7 @@ export default {
components
:
{
setActCode
,
SelectClerk
},
components
:
{
setActCode
,
SelectClerk
},
data
()
{
data
()
{
return
{
return
{
hmMemberNum
:
1
,
hmMemberNum
:
0
,
form
:
{
form
:
{
hmType
:
1
,
hmType
:
1
,
// name: '',
// name: '',
...
@@ -58,7 +58,7 @@ export default {
...
@@ -58,7 +58,7 @@ export default {
getClerkNum
()
{
getClerkNum
()
{
getRequest
(
'/haoban-manage3-web/hm/qrcode/getAddCount'
,
{}).
then
(
res
=>
{
getRequest
(
'/haoban-manage3-web/hm/qrcode/getAddCount'
,
{}).
then
(
res
=>
{
if
(
res
.
data
.
code
==
0
)
{
if
(
res
.
data
.
code
==
0
)
{
this
.
hmMemberNum
=
res
.
data
.
result
||
1
;
this
.
hmMemberNum
=
res
.
data
.
result
||
0
;
}
}
});
});
},
},
...
...
src/views/salesleads/components/dataDetail.vue
View file @
7b28c60e
...
@@ -107,7 +107,7 @@ export default {
...
@@ -107,7 +107,7 @@ export default {
start
=
new
Date
(
`
${
start
.
getFullYear
()}
-
${
start
.
getMonth
()
+
1
}
-
${
start
.
getDate
()}
`
);
start
=
new
Date
(
`
${
start
.
getFullYear
()}
-
${
start
.
getMonth
()
+
1
}
-
${
start
.
getDate
()}
`
);
let
start2
=
new
Date
(
pickerMinDate
);
let
start2
=
new
Date
(
pickerMinDate
);
let
end
=
new
Date
();
let
end
=
new
Date
();
end
=
new
Date
(
`
${
end
.
getFullYear
()}
-
${
end
.
getMonth
()
+
1
}
-
${
end
.
getDate
()
}
23:59:59
`
);
end
=
new
Date
(
`
${
end
.
getFullYear
()}
-
${
end
.
getMonth
()
+
1
}
-
${
end
.
getDate
()
+
1
}
`
);
let
end2
=
new
Date
(
pickerMinDate
);
let
end2
=
new
Date
(
pickerMinDate
);
if
(
pickerMinDate
)
{
if
(
pickerMinDate
)
{
start
=
start
.
setFullYear
(
start
.
getFullYear
()
-
2
);
start
=
start
.
setFullYear
(
start
.
getFullYear
()
-
2
);
...
...
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