Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica.cloud.web-education-admin
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
提交
议题看板
打开侧边栏
jingqi.liu
pica.cloud.web-education-admin
提交
0f304d62
提交
0f304d62
编写于
6月 15, 2021
作者:
vino
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
设置分佣优化
上级
94fc9e51
变更
2
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
278 行增加
和
107 行删除
+278
-107
goods-manage.vue
src/views/goods/goods-manage.vue
+225
-91
shop-list.vue
src/views/shop/shop-list.vue
+53
-16
未找到文件。
src/views/goods/goods-manage.vue
浏览文件 @
0f304d62
...
@@ -247,36 +247,64 @@
...
@@ -247,36 +247,64 @@
label-position=
"right"
label-position=
"right"
size=
"mini"
size=
"mini"
style=
"width: 100%;"
>
style=
"width: 100%;"
>
<div
v-for=
"(item, index) in setPriceForm.adminCommissionGoodsRespList"
:key=
"index"
>
<!-- <div v-for="(item, index) in setPriceForm.adminCommissionGoodsRespList" :key="index" >-->
<el-form-item
v-if=
"item.commissionKind == 1"
label=
"分佣方式"
>
<!-- <el-form-item v-if="item.commissionKind == 1" label="分佣方式">-->
<!-- <el-col :span="18">-->
<!-- <el-radio-group v-model="item.commissionType" size="small" style="line-height: 45px;">-->
<!-- <div>-->
<!-- <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣(%)</el-radio>-->
<!-- <span style="float: right;width: 100px;"><el-input-number v-model="item.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额(元)</el-radio>-->
<!-- <span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="item.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>-->
<!-- </div>-->
<!-- </el-radio-group>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="item.commissionKind == 2" label="药代分佣方式">-->
<!-- <el-col :span="18">-->
<!-- <el-radio-group v-model="item.commissionType" size="small" style="line-height: 45px;">-->
<!-- <div>-->
<!-- <el-radio :label="1" style="float: left;margin-top: 5px;line-height: 20px;">按比例分佣(%)</el-radio>-->
<!-- <span style="float: right;width: 100px;"><el-input-number v-model="item.commissionPrice1" size="small" :precision="2" :min="0"></el-input-number></span>-->
<!-- </div>-->
<!-- <div>-->
<!-- <el-radio :label="2" style="float: left;margin-top: 30px;line-height: 20px;">固定分佣金额(元)</el-radio>-->
<!-- <span style="float: right;width: 100px;margin-left: 14px;"><el-input-number v-model="item.commissionPrice2" size="small" :precision="2" :min="0" :max="9999.99"></el-input-number></span>-->
<!-- </div>-->
<!-- </el-radio-group>-->
<!-- </el-col>-->
<!-- </el-form-item>-->
<!-- </div>-->
<el-form-item
label=
"分佣方式"
>
<el-col
:span=
"18"
>
<el-col
:span=
"18"
>
<el-radio-group
v-model=
"item
.commissionType"
size=
"small"
style=
"line-height: 45px;"
>
<el-radio-group
v-model=
"setPriceForm.commission
.commissionType"
size=
"small"
style=
"line-height: 45px;"
>
<div>
<div>
<el-radio
:label=
"1"
style=
"float: left;margin-top: 5px;line-height: 20px;"
>
按比例分佣(%)
</el-radio>
<el-radio
:label=
"1"
style=
"float: left;margin-top: 5px;line-height: 20px;"
>
按比例分佣(%)
</el-radio>
<span
style=
"float: right;width: 100px;"
><el-input-number
v-model=
"item
.commissionPrice1"
size=
"small"
:precision=
"2"
:min=
"0"
></el-input-number></span>
<span
style=
"float: right;width: 100px;"
><el-input-number
v-model=
"setPriceForm.commission
.commissionPrice1"
size=
"small"
:precision=
"2"
:min=
"0"
></el-input-number></span>
</div>
</div>
<div>
<div>
<el-radio
:label=
"2"
style=
"float: left;margin-top: 30px;line-height: 20px;"
>
固定分佣金额(元)
</el-radio>
<el-radio
:label=
"2"
style=
"float: left;margin-top: 30px;line-height: 20px;"
>
固定分佣金额(元)
</el-radio>
<span
style=
"float: right;width: 100px;margin-left: 14px;"
><el-input-number
v-model=
"item
.commissionPrice2"
size=
"small"
:precision=
"2"
:min=
"0"
:max=
"9999.99"
></el-input-number></span>
<span
style=
"float: right;width: 100px;margin-left: 14px;"
><el-input-number
v-model=
"setPriceForm.commission
.commissionPrice2"
size=
"small"
:precision=
"2"
:min=
"0"
:max=
"9999.99"
></el-input-number></span>
</div>
</div>
</el-radio-group>
</el-radio-group>
</el-col>
</el-col>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"item.commissionKind == 2"
label=
"药代分佣方式"
>
<el-form-item
label=
"药代分佣方式"
>
<el-col
:span=
"18"
>
<el-col
:span=
"18"
>
<el-radio-group
v-model=
"item
.commissionType"
size=
"small"
style=
"line-height: 45px;"
>
<el-radio-group
v-model=
"setPriceForm.proxyCommission
.commissionType"
size=
"small"
style=
"line-height: 45px;"
>
<div>
<div>
<el-radio
:label=
"1"
style=
"float: left;margin-top: 5px;line-height: 20px;"
>
按比例分佣(%)
</el-radio>
<el-radio
:label=
"1"
style=
"float: left;margin-top: 5px;line-height: 20px;"
>
按比例分佣(%)
</el-radio>
<span
style=
"float: right;width: 100px;"
><el-input-number
v-model=
"item
.commissionPrice1"
size=
"small"
:precision=
"2"
:min=
"0"
></el-input-number></span>
<span
style=
"float: right;width: 100px;"
><el-input-number
v-model=
"setPriceForm.proxyCommission
.commissionPrice1"
size=
"small"
:precision=
"2"
:min=
"0"
></el-input-number></span>
</div>
</div>
<div>
<div>
<el-radio
:label=
"2"
style=
"float: left;margin-top: 30px;line-height: 20px;"
>
固定分佣金额(元)
</el-radio>
<el-radio
:label=
"2"
style=
"float: left;margin-top: 30px;line-height: 20px;"
>
固定分佣金额(元)
</el-radio>
<span
style=
"float: right;width: 100px;margin-left: 14px;"
><el-input-number
v-model=
"item
.commissionPrice2"
size=
"small"
:precision=
"2"
:min=
"0"
:max=
"9999.99"
></el-input-number></span>
<span
style=
"float: right;width: 100px;margin-left: 14px;"
><el-input-number
v-model=
"setPriceForm.proxyCommission
.commissionPrice2"
size=
"small"
:precision=
"2"
:min=
"0"
:max=
"9999.99"
></el-input-number></span>
</div>
</div>
</el-radio-group>
</el-radio-group>
</el-col>
</el-col>
</el-form-item>
</el-form-item>
</div>
<!-- <el-form-item label="分佣方式" prop="commissionType">-->
<!-- <el-form-item label="分佣方式" prop="commissionType">-->
<!-- <el-col :span="18">-->
<!-- <el-col :span="18">-->
<!-- <el-radio-group v-model="setPriceForm.commissionType" size="small" style="line-height: 45px;">-->
<!-- <el-radio-group v-model="setPriceForm.commissionType" size="small" style="line-height: 45px;">-->
...
@@ -394,7 +422,27 @@
...
@@ -394,7 +422,27 @@
// storeId: '',
// storeId: '',
// goodsId: '',
// goodsId: '',
// maxPrice: ''
// maxPrice: ''
adminCommissionGoodsRespList
:[]
adminCommissionGoodsRespList
:[],
commission
:{
commissionKind
:
""
,
commissionPrice
:
""
,
commissionPrice1
:
''
,
commissionPrice2
:
''
,
commissionType
:
""
,
goodsId
:
""
,
maxPrice
:
0
,
storeId
:
""
,
},
proxyCommission
:{
commissionKind
:
""
,
commissionPrice
:
""
,
commissionPrice1
:
''
,
commissionPrice2
:
''
,
commissionType
:
""
,
goodsId
:
""
,
maxPrice
:
0
,
storeId
:
""
,
},
},
},
setPriceRules
:
{
setPriceRules
:
{
commissionType
:
[
commissionType
:
[
...
@@ -772,52 +820,86 @@
...
@@ -772,52 +820,86 @@
else
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
==
2
){
else
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
==
2
){
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
/
100
;
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
/
100
;
}
}
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
==
1
){
// this.setPriceForm.commission = this.setPriceForm.adminCommissionGoodsRespList[i];
this
.
setPriceForm
.
commission
.
commissionKind
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
;
this
.
setPriceForm
.
commission
.
commissionPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
;
this
.
setPriceForm
.
commission
.
commissionPrice1
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice1
;
this
.
setPriceForm
.
commission
.
commissionPrice2
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
;
this
.
setPriceForm
.
commission
.
commissionType
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
;
this
.
setPriceForm
.
commission
.
goodsId
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
goodsId
;
this
.
setPriceForm
.
commission
.
maxPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
maxPrice
;
this
.
setPriceForm
.
commission
.
storeId
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
storeId
;
}
else
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
==
2
){
// this.setPriceForm.proxyCommission = this.setPriceForm.adminCommissionGoodsRespList[i];
this
.
setPriceForm
.
proxyCommission
.
commissionKind
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
;
this
.
setPriceForm
.
proxyCommission
.
commissionPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
;
this
.
setPriceForm
.
proxyCommission
.
commissionPrice1
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice1
;
this
.
setPriceForm
.
proxyCommission
.
commissionPrice2
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
;
this
.
setPriceForm
.
proxyCommission
.
commissionType
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
;
this
.
setPriceForm
.
proxyCommission
.
goodsId
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
goodsId
;
this
.
setPriceForm
.
proxyCommission
.
maxPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
maxPrice
;
this
.
setPriceForm
.
proxyCommission
.
storeId
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
storeId
;
}
}
}
let
newArray
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
filter
(
function
(
item
)
{
let
newArray
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
filter
(
function
(
item
)
{
return
item
.
commissionKind
==
1
;
return
item
.
commissionKind
==
1
;
});
});
if
(
newArray
==
null
||
newArray
.
length
==
0
){
if
(
newArray
==
null
||
newArray
.
length
==
0
){
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
push
(
{
this
.
setPriceForm
.
commission
=
{
commissionKind
:
1
,
commissionKind
:
1
,
commissionPrice
:
""
,
commissionPrice
:
""
,
commissionType
:
1
,
commissionPrice1
:
undefined
,
commissionPrice2
:
undefined
,
commissionType
:
0
,
goodsId
:
row
.
goodsId
,
goodsId
:
row
.
goodsId
,
maxPrice
:
0
,
maxPrice
:
0
,
storeId
:
row
.
storeId
,
storeId
:
row
.
storeId
,
}
)
;
};
}
}
let
array
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
filter
(
function
(
item
)
{
let
array
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
filter
(
function
(
item
)
{
return
item
.
commissionKind
==
2
;
return
item
.
commissionKind
==
2
;
});
});
if
(
array
==
null
||
array
.
length
==
0
){
if
(
array
==
null
||
array
.
length
==
0
){
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
push
({
this
.
setPriceForm
.
proxyCommission
=
{
commissionKind
:
2
,
commissionKind
:
2
,
commissionPrice
:
""
,
commissionPrice
:
""
,
commissionType
:
1
,
commissionPrice1
:
undefined
,
commissionPrice2
:
undefined
,
commissionType
:
0
,
goodsId
:
row
.
goodsId
,
goodsId
:
row
.
goodsId
,
maxPrice
:
0
,
maxPrice
:
0
,
storeId
:
row
.
storeId
,
storeId
:
row
.
storeId
,
}
)
;
};
}
}
}
}
else
{
else
{
this
.
setPriceForm
.
adminCommissionGoodsRespList
=
[
{
this
.
setPriceForm
.
commission
=
{
commissionKind
:
1
,
commissionKind
:
1
,
commissionPrice
:
""
,
commissionPrice
:
""
,
commissionType
:
1
,
commissionPrice1
:
undefined
,
commissionPrice2
:
undefined
,
commissionType
:
0
,
goodsId
:
row
.
goodsId
,
goodsId
:
row
.
goodsId
,
maxPrice
:
""
,
maxPrice
:
0
,
storeId
:
row
.
id
,
storeId
:
row
.
storeId
,
},
};
{
this
.
setPriceForm
.
proxyCommission
=
{
commissionKind
:
2
,
commissionKind
:
2
,
commissionPrice
:
""
,
commissionPrice
:
""
,
commissionType
:
1
,
commissionPrice1
:
undefined
,
commissionPrice2
:
undefined
,
commissionType
:
0
,
goodsId
:
row
.
goodsId
,
goodsId
:
row
.
goodsId
,
maxPrice
:
""
,
maxPrice
:
0
,
storeId
:
row
.
i
d
,
storeId
:
row
.
storeI
d
,
}]
};
}
}
// this.setPriceForm.storeId = row.storeId;
// this.setPriceForm.storeId = row.storeId;
...
@@ -841,49 +923,86 @@
...
@@ -841,49 +923,86 @@
},
},
confirmSetPrice
()
{
confirmSetPrice
()
{
for
(
let
i
=
0
;
i
<
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
length
;
i
++
){
if
(
this
.
setPriceForm
.
commission
.
commissionType
==
1
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
&&
(
this
.
setPriceForm
.
commission
.
commissionPrice1
==
undefined
// && (this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == null || this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == "")){
||
this
.
setPriceForm
.
commission
.
commissionPrice1
>
100
)){
//
this
.
$message
({
// this.$message({
message
:
'请输入按比例分佣0-100'
,
// message: '请选择分佣方式',
type
:
"warning"
// type: "warning"
});
// });
return
;
// return;
}
// }
//
if
(
this
.
setPriceForm
.
commission
.
commissionType
==
2
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
&&
this
.
setPriceForm
.
commission
.
commissionPrice2
==
undefined
){
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 == undefined ){
this
.
$message
({
// this.$message({
message
:
'请输入固定分佣金额'
,
// message: '请输入按比例分佣',
type
:
"warning"
// type: "warning"
});
// });
return
;
// return;
}
// }
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
==
1
&&
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice1
>
100
){
if
(
this
.
setPriceForm
.
proxyCommission
.
commissionType
==
1
&&
(
this
.
setPriceForm
.
proxyCommission
.
commissionPrice1
==
undefined
||
this
.
setPriceForm
.
proxyCommission
.
commissionPrice1
>
100
)){
this
.
$message
({
this
.
$message
({
message
:
'请输入按比例分佣0-100'
,
message
:
'请输入按比例分佣0-100'
,
type
:
"warning"
type
:
"warning"
});
});
return
;
return
;
}
}
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
if
(
this
.
setPriceForm
.
proxyCommission
.
commissionType
==
2
// && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 == undefined ){
&&
this
.
setPriceForm
.
proxyCommission
.
commissionPrice2
==
undefined
){
this
.
$message
({
message
:
'请输入固定分佣金额'
,
type
:
"warning"
});
return
;
}
// for(let i = 0; i
<
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
length
;
i
++
){
// // if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// // && (this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == null || this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == "")){
// //
// // this.$message({
// // message: '请选择分佣方式',
// // type: "warning"
// // });
// // return;
// // }
// //
// // if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// // && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 == undefined ){
// // this.$message({
// // message: '请输入按比例分佣',
// // type: "warning"
// // });
// // return;
// // }
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 > 100){
// this.$message({
// this.$message({
// message: '请输入固定分佣金额
',
// message: '请输入按比例分佣0-100
',
// type: "warning"
// type: "warning"
// });
// });
// return;
// return;
// }
// }
// // if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
==
1
){
// // && this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2 && this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 == undefined ){
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice1
*
100
;
// // this.$message({
}
// // message: '请输入固定分佣金额',
else
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
==
2
){
// // type: "warning"
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
*
100
;
// // });
}
// // return;
// // }
}
//
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 1){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice1 * 100;
// }
// else if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionType == 2){
// this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice = this.setPriceForm.adminCommissionGoodsRespList[i].commissionPrice2 * 100;
// }
//
// }
let
timeoutId
=
null
let
timeoutId
=
null
timeoutId
&&
clearTimeout
(
timeoutId
)
timeoutId
&&
clearTimeout
(
timeoutId
)
...
@@ -896,6 +1015,21 @@
...
@@ -896,6 +1015,21 @@
// this.$refs.setPriceForm.validate((valid) => {
// this.$refs.setPriceForm.validate((valid) => {
// if(valid) {
// if(valid) {
vm
.
loading
=
true
vm
.
loading
=
true
if
(
this
.
setPriceForm
.
commission
.
commissionType
==
1
){
this
.
setPriceForm
.
commission
.
commissionPrice
=
this
.
setPriceForm
.
commission
.
commissionPrice1
*
100
;
}
else
if
(
this
.
setPriceForm
.
commission
.
commissionType
==
2
){
this
.
setPriceForm
.
commission
.
commissionPrice
=
this
.
setPriceForm
.
commission
.
commissionPrice2
*
100
;
}
if
(
this
.
setPriceForm
.
proxyCommission
.
commissionType
==
1
){
this
.
setPriceForm
.
proxyCommission
.
commissionPrice
=
this
.
setPriceForm
.
proxyCommission
.
commissionPrice1
*
100
;
}
else
if
(
this
.
setPriceForm
.
proxyCommission
.
commissionType
==
2
){
this
.
setPriceForm
.
proxyCommission
.
commissionPrice
=
this
.
setPriceForm
.
proxyCommission
.
commissionPrice2
*
100
;
}
vm
.
setPriceForm
.
adminCommissionGoodsRespList
[
0
]
=
this
.
setPriceForm
.
commission
;
vm
.
setPriceForm
.
adminCommissionGoodsRespList
[
1
]
=
this
.
setPriceForm
.
proxyCommission
;
// 批量设置价格
// 批量设置价格
if
(
vm
.
batchUpdatePriceFlag
){
if
(
vm
.
batchUpdatePriceFlag
){
let
setPriceList
=
[];
let
setPriceList
=
[];
...
...
src/views/shop/shop-list.vue
浏览文件 @
0f304d62
...
@@ -441,7 +441,9 @@
...
@@ -441,7 +441,9 @@
},
},
confirmSetPrice
()
{
confirmSetPrice
()
{
if
(
this
.
setPriceForm
.
commission
.
commissionType
==
1
&&
this
.
setPriceForm
.
commission
.
commissionPrice1
>
100
){
if
(
this
.
setPriceForm
.
commission
.
commissionType
==
1
&&
(
this
.
setPriceForm
.
commission
.
commissionPrice1
==
undefined
||
this
.
setPriceForm
.
commission
.
commissionPrice1
>
100
)){
this
.
$message
({
this
.
$message
({
message
:
'请输入按比例分佣0-100'
,
message
:
'请输入按比例分佣0-100'
,
type
:
"warning"
type
:
"warning"
...
@@ -449,14 +451,32 @@
...
@@ -449,14 +451,32 @@
return
;
return
;
}
}
if
(
this
.
setPriceForm
.
proxyCommission
.
commissionType
==
1
&&
this
.
setPriceForm
.
proxyCommission
.
commissionPrice1
>
100
){
if
(
this
.
setPriceForm
.
commission
.
commissionType
==
2
&&
this
.
setPriceForm
.
commission
.
commissionPrice2
==
undefined
){
this
.
$message
({
this
.
$message
({
message
:
'请输入
按比例分佣0-100
'
,
message
:
'请输入
固定分佣金额
'
,
type
:
"warning"
type
:
"warning"
});
});
return
;
return
;
}
}
if
(
this
.
setPriceForm
.
proxyCommission
.
commissionType
==
1
&&
(
this
.
setPriceForm
.
proxyCommission
.
commissionPrice1
==
undefined
||
this
.
setPriceForm
.
proxyCommission
.
commissionPrice1
>
100
)){
this
.
$message
({
message
:
'请输入按比例分佣0-100'
,
type
:
"warning"
});
return
;
}
if
(
this
.
setPriceForm
.
proxyCommission
.
commissionType
==
2
&&
this
.
setPriceForm
.
proxyCommission
.
commissionPrice2
==
undefined
){
this
.
$message
({
message
:
'请输入固定分佣金额'
,
type
:
"warning"
});
return
;
}
// for(let i = 0; i
<
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
length
;
i
++
){
// for(let i = 0; i
<
this
.
setPriceForm
.
adminCommissionGoodsRespList
.
length
;
i
++
){
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
// if(this.setPriceForm.adminCommissionGoodsRespList[i].commissionKind == 1
...
@@ -572,10 +592,27 @@
...
@@ -572,10 +592,27 @@
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
/
100
;
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
/
100
;
}
}
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
==
1
){
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
==
1
){
this
.
setPriceForm
.
commission
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
];
// this.setPriceForm.commission = this.setPriceForm.adminCommissionGoodsRespList[i];
this
.
setPriceForm
.
commission
.
commissionKind
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
;
this
.
setPriceForm
.
commission
.
commissionPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
;
this
.
setPriceForm
.
commission
.
commissionPrice1
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice1
;
this
.
setPriceForm
.
commission
.
commissionPrice2
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
;
this
.
setPriceForm
.
commission
.
commissionType
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
;
this
.
setPriceForm
.
commission
.
goodsId
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
goodsId
;
this
.
setPriceForm
.
commission
.
maxPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
maxPrice
;
this
.
setPriceForm
.
commission
.
storeId
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
storeId
;
}
}
else
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
==
2
){
else
if
(
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
==
2
){
this
.
setPriceForm
.
proxyCommission
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
];
// this.setPriceForm.proxyCommission = this.setPriceForm.adminCommissionGoodsRespList[i];
this
.
setPriceForm
.
proxyCommission
.
commissionKind
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionKind
;
this
.
setPriceForm
.
proxyCommission
.
commissionPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice
;
this
.
setPriceForm
.
proxyCommission
.
commissionPrice1
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice1
;
this
.
setPriceForm
.
proxyCommission
.
commissionPrice2
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionPrice2
;
this
.
setPriceForm
.
proxyCommission
.
commissionType
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
commissionType
;
this
.
setPriceForm
.
proxyCommission
.
goodsId
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
goodsId
;
this
.
setPriceForm
.
proxyCommission
.
maxPrice
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
maxPrice
;
this
.
setPriceForm
.
proxyCommission
.
storeId
=
this
.
setPriceForm
.
adminCommissionGoodsRespList
[
i
].
storeId
;
}
}
}
}
...
@@ -586,8 +623,8 @@
...
@@ -586,8 +623,8 @@
this
.
setPriceForm
.
commission
=
{
this
.
setPriceForm
.
commission
=
{
commissionKind
:
1
,
commissionKind
:
1
,
commissionPrice
:
""
,
commissionPrice
:
""
,
commissionPrice1
:
''
,
commissionPrice1
:
undefined
,
commissionPrice2
:
''
,
commissionPrice2
:
undefined
,
commissionType
:
0
,
commissionType
:
0
,
goodsId
:
row
.
tradeStore
.
goodsId
,
goodsId
:
row
.
tradeStore
.
goodsId
,
maxPrice
:
0
,
maxPrice
:
0
,
...
@@ -601,9 +638,9 @@
...
@@ -601,9 +638,9 @@
this
.
setPriceForm
.
proxyCommission
=
{
this
.
setPriceForm
.
proxyCommission
=
{
commissionKind
:
2
,
commissionKind
:
2
,
commissionPrice
:
""
,
commissionPrice
:
""
,
commissionPrice1
:
''
,
commissionPrice1
:
undefined
,
commissionPrice2
:
''
,
commissionPrice2
:
undefined
,
commissionType
:
1
,
commissionType
:
0
,
goodsId
:
row
.
tradeStore
.
goodsId
,
goodsId
:
row
.
tradeStore
.
goodsId
,
maxPrice
:
0
,
maxPrice
:
0
,
storeId
:
row
.
tradeStore
.
id
,
storeId
:
row
.
tradeStore
.
id
,
...
@@ -615,9 +652,9 @@
...
@@ -615,9 +652,9 @@
this
.
setPriceForm
.
commission
=
{
this
.
setPriceForm
.
commission
=
{
commissionKind
:
1
,
commissionKind
:
1
,
commissionPrice
:
""
,
commissionPrice
:
""
,
commissionPrice1
:
''
,
commissionPrice1
:
undefined
,
commissionPrice2
:
''
,
commissionPrice2
:
undefined
,
commissionType
:
1
,
commissionType
:
0
,
goodsId
:
row
.
tradeStore
.
goodsId
,
goodsId
:
row
.
tradeStore
.
goodsId
,
maxPrice
:
0
,
maxPrice
:
0
,
storeId
:
row
.
tradeStore
.
id
,
storeId
:
row
.
tradeStore
.
id
,
...
@@ -626,9 +663,9 @@
...
@@ -626,9 +663,9 @@
this
.
setPriceForm
.
proxyCommission
=
{
this
.
setPriceForm
.
proxyCommission
=
{
commissionKind
:
2
,
commissionKind
:
2
,
commissionPrice
:
""
,
commissionPrice
:
""
,
commissionPrice1
:
''
,
commissionPrice1
:
undefined
,
commissionPrice2
:
''
,
commissionPrice2
:
undefined
,
commissionType
:
1
,
commissionType
:
0
,
goodsId
:
row
.
tradeStore
.
goodsId
,
goodsId
:
row
.
tradeStore
.
goodsId
,
maxPrice
:
0
,
maxPrice
:
0
,
storeId
:
row
.
tradeStore
.
id
,
storeId
:
row
.
tradeStore
.
id
,
...
...
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录