Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
clique-web
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
clique
clique-web
Commits
07a77660
Commit
07a77660
authored
Oct 31, 2022
by
huaying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 特殊积分策略门店商品人群可编辑
parent
bec62c9e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
48 deletions
+34
-48
editIntegralSytem.vue
src/view/companyGroup/membershipSystem/editIntegralSytem.vue
+16
-20
editPointSystem.vue
src/view/companyGroup/membershipSystem/editPointSystem.vue
+18
-28
No files found.
src/view/companyGroup/membershipSystem/editIntegralSytem.vue
View file @
07a77660
...
...
@@ -23,7 +23,7 @@
</el-form-item>
<el-form-item
label=
"适用对象"
prop
class=
"margin-20"
>
<el-select
:disabled=
"true"
@
change=
"changePeople"
v-model=
"ruleForm.useCrowd"
placeholder=
"请选择"
>
<el-select
@
change=
"changePeople"
v-model=
"ruleForm.useCrowd"
placeholder=
"请选择"
>
<el-option
v-for=
"item in applyObjOption"
:key=
"item.value"
...
...
@@ -33,7 +33,7 @@
</el-select>
</el-form-item>
<el-form-item
label=
"人群定向"
v-if=
"ruleForm.useCrowd == 2"
prop
class=
"padding-0"
>
<el-button
:disabled=
"true"
@
click=
"showPeople"
>
已设置
{{
selectCount
}}
项筛选
</el-button>
<el-button
@
click=
"showPeople"
>
已设置
{{
selectCount
}}
项筛选
</el-button>
</el-form-item>
<el-form-item
label=
"适用条件"
class=
"padding-0"
>
...
...
@@ -66,7 +66,6 @@
<el-form-item
label=
"适用商品"
class=
"margin-20"
>
<el-select
:disabled=
"opendisabled1"
class=
"fl w240"
style=
"margin-right: 10px;"
v-model=
"item.channelRelationProType"
...
...
@@ -83,7 +82,6 @@
<!-- 商品品牌 -->
<el-select
:disabled=
"opendisabled1"
size=
"small"
class=
"fl w240 valueWx"
@
change=
"selectGoodsStoreWx"
...
...
@@ -103,7 +101,6 @@
<!-- 商品品类 -->
<div
v-if=
"item.channelRelationProType == 3"
class=
"fl goods-cate cateDataWx"
>
<goodsCate
:disabled=
"opendisabled1"
ref=
"selectGoodsCate"
:selectCateType=
"selectCateTypeWx"
:selectCateData=
"selectCateDataWx"
...
...
@@ -112,7 +109,6 @@
</div>
<el-button
:disabled=
"opendisabled1"
style=
"width:202px"
class=
"fl goodsListWx"
v-if=
"item.channelRelationProType == 4"
...
...
@@ -168,10 +164,10 @@
<el-select
v-model=
"storeValue"
v-if=
"!isJinHua"
class=
"w240"
>
<el-option
label=
"所有门店"
value=
""
></el-option>
</el-select>
<vue-gic-store-new
:disabled=
"opendisabled9"
v-else
:scenesVal=
"scencs"
:options=
"options"
:isAdd=
"isAdd"
:uuid
.
sync=
"wmuuid"
ref=
"wmstoreGroup"
></vue-gic-store-new>
<vue-gic-store-new
v-else
:scenesVal=
"scencs"
:options=
"options"
:isAdd=
"isAdd"
:uuid
.
sync=
"wmuuid"
ref=
"wmstoreGroup"
></vue-gic-store-new>
</el-form-item>
<el-form-item
label=
"微盟商品"
class=
"margin-20"
>
<el-select
:disabled=
"opendisabled9"
v-model=
"item.channelRelationProType"
placeholder=
"请选择"
class=
"w240"
>
<el-select
v-model=
"item.channelRelationProType"
placeholder=
"请选择"
class=
"w240"
>
<el-option
v-for=
"item in wMGoodOption"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</el-form-item>
...
...
@@ -289,9 +285,9 @@ export default {
data
()
{
return
{
scrollToError
,
opendisabled3
:
false
,
opendisabled1
:
false
,
opendisabled9
:
false
,
//
opendisabled3: false,
//
opendisabled1: false,
//
opendisabled9: false,
repProjectName
:
'gic-clique'
,
navpath
:
[
{
...
...
@@ -811,15 +807,15 @@ export default {
if
(
item
.
channelList
)
{
item
.
channelList
.
forEach
(
item
=>
{
if
(
item
.
openStatus
==
true
)
{
if
(
item
.
channelType
==
3
)
{
this
.
opendisabled3
=
true
;
}
else
if
(
item
.
channelType
==
1
)
{
this
.
opendisabled1
=
true
;
}
else
if
(
item
.
channelType
==
9
)
{
this
.
opendisabled9
=
true
;
}
}
//
if(item.openStatus == true) {
//
if(item.channelType==3) {
//
this.opendisabled3 = true;
//
}else if(item.channelType==1) {
//
this.opendisabled1 = true;
//
}else if(item.channelType==9) {
//
this.opendisabled9 = true;
//
}
//
}
if
(
item
.
openStatus
==
false
)
{
item
.
integralUseDiscountControl
==
1
}
...
...
src/view/companyGroup/membershipSystem/editPointSystem.vue
View file @
07a77660
...
...
@@ -34,12 +34,10 @@
:uuid
.
sync=
"uuid"
:isClique=
"true"
ref=
"storeGroup"
:readonly=
"opendisabled3"
></dm-store-selector>
</el-form-item>
<el-form-item
label=
"适用商品:"
prop=
"name"
class=
"margin-20"
>
<el-select
:disabled=
"opendisabled3"
class=
" w215"
v-model=
"item.channelRelationProType"
placeholder=
"请选择"
...
...
@@ -54,7 +52,6 @@
</el-select>
<!-- 二级 -->
<span
:disabled=
"opendisabled3"
class=
"span-txt"
ref=
"treeinput"
v-if=
"item.channelRelationProType == 2"
...
...
@@ -67,7 +64,6 @@
@
click=
"toggle('brand')"
>
已选择
{{
item
.
strategyGoodsRelationIdArr
?
item
.
strategyGoodsRelationIdArr
.
length
:
0
}}
个品类
</span>
<treeselect
:disabled=
"opendisabled3"
v-if=
"item.channelRelationProType == 2 || item.channelRelationProType == 3"
placeholder
noOptionsText=
"暂无数据"
...
...
@@ -84,7 +80,6 @@
/>
<!--:default-expand-level="1":load-options="loadOptions" :normalizer="normalizer" :always-open="goodsOpen" -->
<el-button
:disabled=
"opendisabled3"
v-if=
"item.channelRelationProType == 4"
@
click=
"showGoodsDialog"
>
已选0件商品
</el-button>
...
...
@@ -149,7 +144,6 @@
<el-form-item
label=
"适用商品:"
class=
"margin-20"
>
<el-select
:disabled=
"opendisabled1"
class=
"w215"
v-model=
"item.channelRelationProType"
placeholder=
"请选择"
...
...
@@ -164,21 +158,18 @@
</el-select>
<!-- 二级 -->
<span
:disabled=
"opendisabled1"
class=
"span-txt"
ref=
"treeinput"
v-if=
"item.channelRelationProType == 2"
@
click=
"toggle('wx')"
>
已选择
{{
item
.
goodsRelationIds
?
item
.
goodsRelationIds
.
length
:
0
}}
个品牌
</span>
<span
:disabled=
"opendisabled1"
class=
"span-txt"
ref=
"treeinput"
v-if=
"item.channelRelationProType == 3"
@
click=
"toggle('wx')"
>
已选择
{{
item
.
goodsRelationIds
?
item
.
goodsRelationIds
.
length
:
0
}}
个品类
</span>
<treeselect
:disabled=
"opendisabled1"
v-if=
"item.channelRelationProType == 2 || item.channelRelationProType == 3"
placeholder
noOptionsText=
"暂无数据"
...
...
@@ -194,7 +185,6 @@
/>
<!--model=item.strategyGoodsRelationIds和上一个相同会有问题 -->
<el-button
:disabled=
"opendisabled1"
v-if=
"item.channelRelationProType == 4"
@
click=
"showGoodsDialog"
>
已选0件商品
</el-button>
...
...
@@ -295,10 +285,10 @@
<el-select
v-model=
"storeValue"
v-if=
"!isJinHua"
class=
"w215"
>
<el-option
label=
"所有门店"
value=
""
></el-option>
</el-select>
<vue-gic-store-new
:disabled=
"opendisabled9"
v-else
:scenesVal=
"scencs"
:options=
"options"
:isAdd=
"isAdd"
:uuid
.
sync=
"wmuuid"
ref=
"wmstoreGroup"
></vue-gic-store-new>
<vue-gic-store-new
v-else
:scenesVal=
"scencs"
:options=
"options"
:isAdd=
"isAdd"
:uuid
.
sync=
"wmuuid"
ref=
"wmstoreGroup"
></vue-gic-store-new>
</el-form-item>
<el-form-item
label=
"微盟商品:"
class=
"margin-20"
>
<el-select
:disabled=
"opendisabled9"
v-model=
"item.channelRelationProType"
placeholder=
"请选择"
class=
"w215"
>
<el-select
v-model=
"item.channelRelationProType"
placeholder=
"请选择"
class=
"w215"
>
<el-option
v-for=
"item in wMGoodOption"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</el-form-item>
...
...
@@ -403,11 +393,11 @@
<dm-sub-title
text=
"规则配置"
type=
"fill"
style=
"margin: 40px 0 20px"
></dm-sub-title>
<el-form-item
label=
"适用对象:"
prop=
"useCrowd"
class=
"margin-20"
>
<el-radio-group
v-model=
"ruleForm.useCrowd"
>
<el-radio
:disabled=
"true"
v-for=
"item in applyObjOption"
:key=
"item.value"
:label=
"item.value"
>
{{ item.label }}
</el-radio>
<el-radio
v-for=
"item in applyObjOption"
:key=
"item.value"
:label=
"item.value"
>
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label=
"人群定向"
v-if=
"ruleForm.useCrowd == 2"
prop=
""
class=
"padding-0"
>
<el-button
:disabled=
"true"
style=
"width: 214px;"
@
click=
"showPeople"
>
已设置{{ selectCount }}项筛选
</el-button>
<el-button
style=
"width: 214px;"
@
click=
"showPeople"
>
已设置{{ selectCount }}项筛选
</el-button>
</el-form-item>
<el-form-item
label=
"获取规则:"
prop=
"integralGetStatus"
>
<div>
...
...
@@ -591,8 +581,8 @@
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-row>
<el-button
:disabled=
"true"
@
click=
"dialogVisiblePeople = false"
>
取 消
</el-button>
<el-button
:disabled=
"true"
type=
"primary"
@
click=
"getPeopleData"
>
确 定
</el-button>
<el-button
@
click=
"dialogVisiblePeople = false"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"getPeopleData"
>
确 定
</el-button>
</el-row>
</span>
</el-dialog>
...
...
@@ -650,9 +640,9 @@ export default {
}
return
{
scrollToError
,
opendisabled3
:
false
,
opendisabled1
:
false
,
opendisabled9
:
false
,
//
opendisabled3: false,
//
opendisabled1: false,
//
opendisabled9: false,
yearYT
:
''
,
//按年失效 年
yearMT
:
''
,
//按年失效 月
yearDT
:
''
,
//按年失效 日
...
...
@@ -1507,15 +1497,15 @@ export default {
channelList
=
channelList
.
concat
(
item
.
channelList
.
filter
(
el
=>
!
channelListSort
.
some
(
item
=>
el
.
channelType
==
item
)));
item
.
channelList
=
channelList
;
item
.
channelList
.
forEach
(
item
=>
{
if
(
item
.
openStatus
==
true
)
{
if
(
item
.
channelType
==
3
)
{
this
.
opendisabled3
=
true
;
}
else
if
(
item
.
channelType
==
1
)
{
this
.
opendisabled1
=
true
;
}
else
if
(
item
.
channelType
==
9
)
{
this
.
opendisabled9
=
true
;
}
}
//
if(item.openStatus == true) {
//
if(item.channelType==3) {
//
this.opendisabled3 = true;
//
}else if(item.channelType==1) {
//
this.opendisabled1 = true;
//
}else if(item.channelType==9) {
//
this.opendisabled9 = true;
//
}
//
}
if
(
item
.
openStatus
==
false
)
{
item
.
integralUseDiscountControl
==
1
}
...
...
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