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
c9503aa5
Commit
c9503aa5
authored
Jul 20, 2022
by
huaying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 标签已删除状态
parent
2a2ec648
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
10 deletions
+30
-10
act-code-table.vue
...leads/actCodeManage/staffActCode/views/act-code-table.vue
+3
-3
act-code-set.vue
src/views/salesleads/components/act-code-set.vue
+27
-7
No files found.
src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue
View file @
c9503aa5
...
@@ -230,10 +230,10 @@ export default {
...
@@ -230,10 +230,10 @@ export default {
{
{
text
:
'编辑'
,
text
:
'编辑'
,
visible
:
row
=>
{
visible
:
row
=>
{
if
(
row
.
hmType
==
2
||
row
.
statusFlag
!=
2
)
{
if
(
row
.
statusFlag
==
2
)
{
return
true
;
}
else
{
return
false
;
return
false
;
}
else
{
return
true
;
}
}
},
},
handler
:
row
=>
{
handler
:
row
=>
{
...
...
src/views/salesleads/components/act-code-set.vue
View file @
c9503aa5
...
@@ -15,10 +15,13 @@
...
@@ -15,10 +15,13 @@
<el-switch
v-model=
"form.passFlag"
class=
"mr15"
></el-switch>
<el-switch
v-model=
"form.passFlag"
class=
"mr15"
></el-switch>
<span
class=
"tabs"
>
开启后,客户添加该企业微信时,无需好友验证,将会自动添加成功
</span>
<span
class=
"tabs"
>
开启后,客户添加该企业微信时,无需好友验证,将会自动添加成功
</span>
</el-form-item>
</el-form-item>
<el-form-item
label=
"活码标签"
prop=
"memberLabelId"
>
<el-form-item
label=
"活码标签"
prop=
"memberLabelId"
class=
"memberTag-form-item"
>
<el-button
v-if=
"!form.memberLabelId"
plain
class=
"ylbtn"
@
click=
"tagsDialogVisible = true"
><i
class=
"iconfont-components3 icon-cp-PlusOutlined addPic"
></i>
添加标签
</el-button>
<el-button
v-if=
"!form.memberLabelId"
plain
class=
"ylbtn"
@
click=
"tagsDialogVisible = true"
><i
class=
"iconfont-components3 icon-cp-PlusOutlined addPic"
></i>
添加标签
</el-button>
<el-tag
v-else
closable
@
close=
"handleTagCloseTag"
>
{{
form
.
memberLabelName
}}
</el-tag>
<!--
<el-tag
v-else
closable
@
close=
"handleTagCloseTag"
>
{{
form
.
memberLabelName
}}
</el-tag>
-->
<dm-memberTag-group
:visiable
.
sync=
"tagsDialogVisible"
projectName=
"haobao-3"
@
save=
"saveTagPop"
></dm-memberTag-group>
<el-tooltip
:disabled=
"form.memberLabelStatus != 0"
content=
"已删除"
placement=
"top"
v-else
>
<el-tag
closable
@
close=
"handleTagCloseTag"
:type=
"isEdit && form.memberLabelStatus == 0 ? 'warning' : ''"
>
{{
form
.
memberLabelName
}}
</el-tag>
</el-tooltip>
<dm-memberTag-group
isHb
:visiable
.
sync=
"tagsDialogVisible"
projectName=
"haobao-3"
@
save=
"saveTagPop"
></dm-memberTag-group>
</el-form-item>
</el-form-item>
<dm-sub-title
text=
"欢迎语设置"
type=
"line"
class=
"mt40b20"
/>
<dm-sub-title
text=
"欢迎语设置"
type=
"line"
class=
"mt40b20"
/>
<welcomeItem
@
getWelcomeId=
"getWelcomeId"
:welcomeIdP=
"form.welcomeId"
ref=
"welcomeItem"
></welcomeItem>
<welcomeItem
@
getWelcomeId=
"getWelcomeId"
:welcomeIdP=
"form.welcomeId"
ref=
"welcomeItem"
></welcomeItem>
...
@@ -64,10 +67,11 @@ export default {
...
@@ -64,10 +67,11 @@ export default {
passFlag
:
true
,
// 1自动通过 0否
passFlag
:
true
,
// 1自动通过 0否
memberLabelId
:
''
,
//会员活动标签id
memberLabelId
:
''
,
//会员活动标签id
memberLabelName
:
''
,
memberLabelName
:
''
,
welcomeId
:
''
// 欢迎语id
welcomeId
:
''
,
// 欢迎语id
// clerkIdList: '', // 选择导购id
// clerkIdList: '', // 选择导购id
// storeId: '' //门店id
// storeId: '' //门店id
// hmUserNum: null //多人活码人数
// hmUserNum: null //多人活码人数
memberLabelStatus
:
-
1
},
},
rules
:
{
rules
:
{
hmGroupId
:
[{
required
:
true
,
message
:
'请选择活码分组'
,
trigger
:
'blur'
}]
hmGroupId
:
[{
required
:
true
,
message
:
'请选择活码分组'
,
trigger
:
'blur'
}]
...
@@ -86,7 +90,6 @@ export default {
...
@@ -86,7 +90,6 @@ export default {
},
},
created
()
{
created
()
{
this
.
searchGroup
();
this
.
searchGroup
();
console
.
log
(
this
.
form
,
400
);
},
},
methods
:
{
methods
:
{
handleTagCloseTag
()
{
handleTagCloseTag
()
{
...
@@ -94,7 +97,6 @@ export default {
...
@@ -94,7 +97,6 @@ export default {
this
.
form
.
memberLabelId
=
''
;
this
.
form
.
memberLabelId
=
''
;
},
},
saveTagPop
(
data
)
{
saveTagPop
(
data
)
{
console
.
log
(
data
,
'tagItemId'
);
const
{
tagItemId
,
tagItemName
}
=
data
;
const
{
tagItemId
,
tagItemName
}
=
data
;
this
.
form
.
memberLabelId
=
tagItemId
;
this
.
form
.
memberLabelId
=
tagItemId
;
this
.
form
.
memberLabelName
=
tagItemName
;
this
.
form
.
memberLabelName
=
tagItemName
;
...
@@ -141,9 +143,27 @@ export default {
...
@@ -141,9 +143,27 @@ export default {
},
},
// 保存按钮
// 保存按钮
save
()
{
save
()
{
if
(
!
this
.
$refs
.
welcomeItem
.
submit
())
{
if
(
this
.
form
.
memberLabelStatus
==
0
)
{
this
.
$confirm
(
'关联的标签在GIC中已被删除,无法统计和查看添加好友客户数据,为确保后续客户数据统计,请重新关联标签'
,
'关联的标签已被删除,请重新关联标签'
,
{
confirmButtonText
:
'选择标签'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(
res
=>
{
this
.
form
.
memberLabelId
=
''
;
this
.
form
.
memberLabelName
=
''
;
this
.
$nextTick
(
_
=>
{
const
isError
=
document
.
getElementsByClassName
(
'memberTag-form-item'
);
isError
[
0
].
scrollIntoView
({
block
:
'center'
,
behavior
:
'smooth'
});
});
});
return
;
return
;
}
}
// if (!this.$refs.welcomeItem.submit()) {
// return;
// }
this
.
$refs
.
form
.
validate
(
async
valid
=>
{
this
.
$refs
.
form
.
validate
(
async
valid
=>
{
if
(
valid
)
{
if
(
valid
)
{
this
.
form
.
passFlag
=
this
.
form
.
passFlag
?
1
:
0
;
this
.
form
.
passFlag
=
this
.
form
.
passFlag
?
1
:
0
;
...
...
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