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
58b28a1a
Commit
58b28a1a
authored
Jul 20, 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
e46ac1d6
035efa44
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
act-code-set.vue
src/views/salesleads/components/act-code-set.vue
+4
-2
welcomesItem.vue
src/views/salesleads/components/welcomesItem.vue
+14
-1
No files found.
src/views/salesleads/components/act-code-set.vue
View file @
58b28a1a
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<span
class=
"tabs"
>
开启后,客户添加该企业微信时,无需好友验证,将会自动添加成功
</span>
<span
class=
"tabs"
>
开启后,客户添加该企业微信时,无需好友验证,将会自动添加成功
</span>
</el-form-item>
</el-form-item>
<el-form-item
label=
"活码标签"
prop=
"memberLabelId"
class=
"memberTag-form-item"
>
<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
|| !form.memberLabelName
"
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>
-->
<el-tooltip
:disabled=
"form.memberLabelStatus != 0"
content=
"已删除"
placement=
"top"
v-else
>
<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-tag
closable
@
close=
"handleTagCloseTag"
:type=
"isEdit && form.memberLabelStatus == 0 ? 'warning' : ''"
>
{{
form
.
memberLabelName
}}
</el-tag>
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<dm-memberTag-group
isHb
:visiable
.
sync=
"tagsDialogVisible"
projectName=
"haobao-3"
@
save=
"saveTagPop"
></dm-memberTag-group>
<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"
:welcomeSetType=
"welcomeSetType"
></welcomeItem>
</el-form>
</el-form>
</div>
</div>
<div
class=
"saveBtn"
>
<div
class=
"saveBtn"
>
...
@@ -60,6 +60,7 @@ export default {
...
@@ -60,6 +60,7 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
welcomeSetType
:
1
,
form
:
{
form
:
{
// hmType: 1, //1单人 2多人
// hmType: 1, //1单人 2多人
// name: '', // 名称
// name: '', // 名称
...
@@ -176,6 +177,7 @@ export default {
...
@@ -176,6 +177,7 @@ export default {
actCodeData
:
{
actCodeData
:
{
handler
:
function
(
val
)
{
handler
:
function
(
val
)
{
if
(
val
)
{
if
(
val
)
{
this
.
welcomeSetType
=
2
;
this
.
form
.
hmGroupId
=
val
.
hmGroupId
;
this
.
form
.
hmGroupId
=
val
.
hmGroupId
;
// this.form.passFlag = val.passFlag == 1 ? true : false;
// this.form.passFlag = val.passFlag == 1 ? true : false;
this
.
form
.
memberLabelId
=
val
.
memberLabelId
?
val
.
memberLabelId
:
''
;
this
.
form
.
memberLabelId
=
val
.
memberLabelId
?
val
.
memberLabelId
:
''
;
...
...
src/views/salesleads/components/welcomesItem.vue
View file @
58b28a1a
...
@@ -81,6 +81,10 @@ export default {
...
@@ -81,6 +81,10 @@ export default {
welcomeType
:
{
welcomeType
:
{
type
:
String
,
type
:
String
,
default
:
'code'
default
:
'code'
},
welcomeSetType
:
{
type
:
Number
,
default
:
1
}
}
},
},
data
()
{
data
()
{
...
@@ -181,7 +185,7 @@ export default {
...
@@ -181,7 +185,7 @@ export default {
// 获取选中数据 row表示选中这一行的数据,可以从里面提取所需要的值
// 获取选中数据 row表示选中这一行的数据,可以从里面提取所需要的值
this
.
templateSelection
=
row
;
this
.
templateSelection
=
row
;
this
.
welcomeContent
=
row
.
welcomeContent
;
this
.
welcomeContent
=
row
.
welcomeContent
;
//
this.welcomeId = row.welcomeId;
this
.
welcomeId
=
row
.
welcomeId
;
// this.$emit('getWelcomeId', this.welcomeId);
// this.$emit('getWelcomeId', this.welcomeId);
},
},
// 单选框点击事件
// 单选框点击事件
...
@@ -204,6 +208,15 @@ export default {
...
@@ -204,6 +208,15 @@ export default {
}
}
},
},
watch
:
{
watch
:
{
welcomeSetType
:
{
handler
:
function
(
val
)
{
console
.
log
(
val
);
if
(
val
==
1
)
{
this
.
welcomesType
=
1
;
}
},
immediate
:
true
},
welcomeIdP
:
{
welcomeIdP
:
{
handler
:
async
function
(
val
)
{
handler
:
async
function
(
val
)
{
if
(
val
)
{
if
(
val
)
{
...
...
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