Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
a895a0be
Commit
a895a0be
authored
Jul 04, 2022
by
Marcus
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
4e4a96b2
95b1d12a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
103 additions
and
37 deletions
+103
-37
customer.js
src/api/ecw/customer.js
+4
-2
index.vue
src/views/ecw/customerCommissionInfo/index.vue
+72
-32
index.vue
src/views/ecw/oceanCustomer/index.vue
+24
-2
index.vue
src/views/member/user/index.vue
+3
-1
No files found.
src/api/ecw/customer.js
View file @
a895a0be
...
@@ -117,9 +117,11 @@ export function getPublicList(query) {
...
@@ -117,9 +117,11 @@ export function getPublicList(query) {
}
}
//捞取
//捞取
export
function
setFishing
(
query
){
export
function
setFishing
(
data
){
return
request
({
return
request
({
url
:
''
,
url
:
'
/ecw/customer/catch-open-sea-customer
'
,
method
:
'
put
'
,
data
:
data
})
})
}
}
...
...
src/views/ecw/customerCommissionInfo/index.vue
View file @
a895a0be
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
<el-col
:span=
"24"
>
<el-col
:span=
"24"
>
<el-form-item
label=
"佣金类型(明佣、暗佣)"
>
<el-form-item
label=
"佣金类型(明佣、暗佣)"
>
<el-radio-group
v-model=
"form.type"
>
<el-radio-group
v-model=
"form.type"
>
<el-radio
v-for=
"(item,index) in getDictDatas(DICT_TYPE.COMMISSION_TYPE)"
:label=
"parseInt(item.value)"
<el-radio
v-for=
"(item,index) in getDictDatas(DICT_TYPE.COMMISSION_TYPE)"
v-show=
"item.value != 0"
:label=
"parseInt(item.value)"
:key=
"index"
>
{{
item
.
label
}}
:key=
"index"
>
{{
item
.
label
}}
</el-radio>
</el-radio>
</el-radio-group>
</el-radio-group>
...
@@ -98,8 +98,8 @@
...
@@ -98,8 +98,8 @@
:options=
"getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
></custom-selectors-dictionary>
:options=
"getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
></custom-selectors-dictionary>
</div>
</div>
<div>
<div>
<custom-selectors-dictionary
v-model=
"mingServantFrom[0].refundUnit"
<custom-selectors-dictionary
v-model=
"mingServantFrom[0].refundUnit"
label-key=
"titleZh"
value-key=
"id"
:options=
"
getDictDatas(DICT_TYPE.COMMISSION_UNIT)
"
></custom-selectors-dictionary>
:options=
"
weightList
"
></custom-selectors-dictionary>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -131,8 +131,8 @@
...
@@ -131,8 +131,8 @@
:options=
"getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
></custom-selectors-dictionary>
:options=
"getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
></custom-selectors-dictionary>
</div>
</div>
<div
class=
"custom"
>
<div
class=
"custom"
>
<custom-selectors-dictionary
v-model=
"item.darkUnit"
<custom-selectors-dictionary
v-model=
"item.darkUnit"
label-key=
"titleZh"
value-key=
"id"
:options=
"
getDictDatas(DICT_TYPE.COMMISSION_UNIT)
"
></custom-selectors-dictionary>
:options=
"
weightList
"
></custom-selectors-dictionary>
</div>
</div>
</div>
</div>
<div>
<div>
...
@@ -157,7 +157,7 @@
...
@@ -157,7 +157,7 @@
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
>
<custom-selectors-dictionary
v-model=
"item.amountUnit"
<custom-selectors-dictionary
v-model=
"item.amountUnit"
:options=
"getDictDatas(DICT_TYPE.COMMISSION_UNIT)
"
></custom-selectors-dictionary>
label-key=
"titleZh"
value-key=
"id"
:options=
"weightList
"
></custom-selectors-dictionary>
</div>
</div>
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
...
@@ -171,7 +171,7 @@
...
@@ -171,7 +171,7 @@
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
>
<custom-selectors-dictionary
v-model=
"item.refundUnit"
<custom-selectors-dictionary
v-model=
"item.refundUnit"
:options=
"getDictDatas(DICT_TYPE.COMMISSION_UNIT)
"
></custom-selectors-dictionary>
label-key=
"titleZh"
value-key=
"id"
:options=
"weightList
"
></custom-selectors-dictionary>
</div>
</div>
</div>
</div>
<el-button
type=
"primary"
@
click=
"addToFn(2)"
v-show=
"darkServantAndRebateForm.length -1 === index"
>
添加
</el-button>
<el-button
type=
"primary"
@
click=
"addToFn(2)"
v-show=
"darkServantAndRebateForm.length -1 === index"
>
添加
</el-button>
...
@@ -189,8 +189,8 @@
...
@@ -189,8 +189,8 @@
:options=
"getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
></custom-selectors-dictionary>
:options=
"getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
></custom-selectors-dictionary>
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
>
<custom-selectors-dictionary
v-model=
"mingServantAnddarkServant[0].refundUnit"
<custom-selectors-dictionary
label-key=
"titleZh"
value-key=
"id"
v-model=
"mingServantAnddarkServant[0].refundUnit"
:options=
"
getDictDatas(DICT_TYPE.COMMISSION_UNIT)
"
></custom-selectors-dictionary>
:options=
"
weightList
"
></custom-selectors-dictionary>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -208,8 +208,8 @@
...
@@ -208,8 +208,8 @@
:options=
"getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
></custom-selectors-dictionary>
:options=
"getDictDatas(DICT_TYPE.COMMISSION_CURRENCY_TYPE)"
></custom-selectors-dictionary>
</div>
</div>
<div
class=
"item"
>
<div
class=
"item"
>
<custom-selectors-dictionary
v-model=
"mingServantAnddarkServant[0].darkAdjustUnit"
<custom-selectors-dictionary
v-model=
"mingServantAnddarkServant[0].darkAdjustUnit"
label-key=
"titleZh"
value-key=
"id"
:options=
"
getDictDatas(DICT_TYPE.COMMISSION_UNIT)
"
></custom-selectors-dictionary>
:options=
"
weightList
"
></custom-selectors-dictionary>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -240,6 +240,7 @@ import customSelectorsDictionary from "./customSelectorsDictionary"
...
@@ -240,6 +240,7 @@ import customSelectorsDictionary from "./customSelectorsDictionary"
import
{
getTradeCityList
}
from
"
@/api/ecw/region
"
;
import
{
getTradeCityList
}
from
"
@/api/ecw/region
"
;
import
RoutersSelector
from
"
@/components/RoutersSelector
"
import
RoutersSelector
from
"
@/components/RoutersSelector
"
import
CustomersSelector
from
"
@/components/CustomersSelector
"
;
import
CustomersSelector
from
"
@/components/CustomersSelector
"
;
import
{
getUnitList
}
from
"
@/api/ecw/unit
"
;
export
default
{
export
default
{
name
:
"
CustomerCommissionInfo
"
,
name
:
"
CustomerCommissionInfo
"
,
...
@@ -273,7 +274,7 @@ export default {
...
@@ -273,7 +274,7 @@ export default {
{
{
refund
:
0
,
refund
:
0
,
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
refundUnit
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
0
].
value
)
,
refundUnit
:
undefined
,
}
}
],
],
//暗佣金+产品
//暗佣金+产品
...
@@ -283,7 +284,7 @@ export default {
...
@@ -283,7 +284,7 @@ export default {
productAttr
:
undefined
,
//暗佣 产品属性
productAttr
:
undefined
,
//暗佣 产品属性
darkCommission
:
0
,
//暗佣 佣金
darkCommission
:
0
,
//暗佣 佣金
darkCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣 货币
darkCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣 货币
darkUnit
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
0
].
value
)
,
// 暗佣 单位
darkUnit
:
undefined
,
// 暗佣 单位
}
}
],
],
//暗佣+达标返佣
//暗佣+达标返佣
...
@@ -291,10 +292,10 @@ export default {
...
@@ -291,10 +292,10 @@ export default {
{
{
amount
:
0
,
// 暗佣-满减金额
amount
:
0
,
// 暗佣-满减金额
amountCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣-满减金额对应货币
amountCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣-满减金额对应货币
amountUnit
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
0
].
value
)
,
// 暗佣-满减金额对应单位,
amountUnit
:
undefined
,
// 暗佣-满减金额对应单位,
refund
:
0
,
//暗佣-满之后返还金额
refund
:
0
,
//暗佣-满之后返还金额
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
//暗佣-满之后返还金额的货币
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
//暗佣-满之后返还金额的货币
refundUnit
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
0
].
value
)
,
//暗佣-满之后返还金额的单位
refundUnit
:
undefined
,
//暗佣-满之后返还金额的单位
}
}
],
],
//暗佣+明金
//暗佣+明金
...
@@ -302,10 +303,10 @@ export default {
...
@@ -302,10 +303,10 @@ export default {
{
{
refund
:
0
,
// 暗佣+明佣 上调金额
refund
:
0
,
// 暗佣+明佣 上调金额
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣+明佣 上调对应的货币
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣+明佣 上调对应的货币
refundUnit
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
0
].
value
)
,
//暗佣+明佣 上调对应的单位
refundUnit
:
undefined
,
//暗佣+明佣 上调对应的单位
darkAdjustCommission
:
0
,
//暗佣+明佣 上调金额
darkAdjustCommission
:
0
,
//暗佣+明佣 上调金额
darkAdjustCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
//暗佣+明佣 上调对应的货币
darkAdjustCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
//暗佣+明佣 上调对应的货币
darkAdjustUnit
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
0
].
value
)
,
//暗佣+明佣 上调对应的单位
darkAdjustUnit
:
undefined
,
//暗佣+明佣 上调对应的单位
}
}
],
],
customerForm
:
{
customerForm
:
{
...
@@ -327,6 +328,8 @@ export default {
...
@@ -327,6 +328,8 @@ export default {
},
},
customerShow
:
true
,
customerShow
:
true
,
id
:
undefined
,
//佣金id
id
:
undefined
,
//佣金id
weightList
:[]
};
};
},
},
computed
:{
computed
:{
...
@@ -338,6 +341,43 @@ export default {
...
@@ -338,6 +341,43 @@ export default {
},
},
},
},
created
()
{
created
()
{
//重量单位
getUnitList
().
then
(
r
=>
{
if
(
r
.
code
===
0
){
this
.
weightList
=
r
.
data
this
.
$set
(
this
.
mingServantFrom
,
0
,
{
refund
:
0
,
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
refundUnit
:
parseInt
(
this
.
weightList
[
0
].
id
),})
this
.
$set
(
this
.
darkServantAndProductForm
,
0
,
{
productType
:
undefined
,
//商品类型
productAttr
:
undefined
,
//暗佣 产品属性
darkCommission
:
0
,
//暗佣 佣金
darkCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣 货币
darkUnit
:
parseInt
(
this
.
weightList
[
0
].
id
),
// 暗佣 单位
})
this
.
$set
(
this
.
darkServantAndRebateForm
,
0
,
{
amount
:
0
,
// 暗佣-满减金额
amountCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣-满减金额对应货币
amountUnit
:
parseInt
(
this
.
weightList
[
0
].
id
),
// 暗佣-满减金额对应单位,
refund
:
0
,
//暗佣-满之后返还金额
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
//暗佣-满之后返还金额的货币
refundUnit
:
parseInt
(
this
.
weightList
[
0
].
id
),
//暗佣-满之后返还金额的单位
})
this
.
$set
(
this
.
mingServantAnddarkServant
,
0
,
{
refund
:
0
,
// 暗佣+明佣 上调金额
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣+明佣 上调对应的货币
refundUnit
:
parseInt
(
this
.
weightList
[
0
].
id
),
//暗佣+明佣 上调对应的单位
darkAdjustCommission
:
0
,
//暗佣+明佣 上调金额
darkAdjustCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
//暗佣+明佣 上调对应的货币
darkAdjustUnit
:
parseInt
(
this
.
weightList
[
0
].
id
),
//暗佣+明佣 上调对应的单位
})
}
})
this
.
getCustomeList
();
this
.
getCustomeList
();
if
(
this
.
$route
.
params
.
dictId
!=
0
){
if
(
this
.
$route
.
params
.
dictId
!=
0
){
commissionGetByCustomerId
(
this
.
$route
.
params
.
dictId
).
then
(
r
=>
{
commissionGetByCustomerId
(
this
.
$route
.
params
.
dictId
).
then
(
r
=>
{
...
@@ -437,9 +477,9 @@ export default {
...
@@ -437,9 +477,9 @@ export default {
this
.
darkServantAndRebateForm
.
push
(
{
this
.
darkServantAndRebateForm
.
push
(
{
amount
:
0
,
// 暗佣-满减金额
amount
:
0
,
// 暗佣-满减金额
amountCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣-满减金额对应货币
amountCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
// 暗佣-满减金额对应货币
amountUnit
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
0
].
value
),
// 暗佣-满减金额对应单位,
amountUnit
:
parseInt
(
this
.
weightList
[
0
].
id
),
// 暗佣-满减金额对应单位,
refund
:
0
,
//暗佣-满之后返还金额
refund
:
0
,
//暗佣-满之后返还金额
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
//暗佣-满之后返还金额的货币
refundCurrency
:
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_CURRENCY_TYPE
)[
0
].
value
),
//暗佣-满之后返还金额的货币
refundUnit
:
this
.
darkServantAndRebateForm
[
0
].
refundUnit
,
//暗佣-满之后返还金额的单位
refundUnit
:
this
.
darkServantAndRebateForm
[
0
].
refundUnit
,
//暗佣-满之后返还金额的单位
})
})
}
}
...
@@ -516,36 +556,36 @@ export default {
...
@@ -516,36 +556,36 @@ export default {
deep
:
true
,
deep
:
true
,
},
},
'
form.transportId
'
:
function
(
val
){
'
form.transportId
'
:
function
(
val
){
if
(
!
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)
)
return
if
(
!
this
.
weightList
)
return
if
((
val
==
1
||
val
==
2
)){
if
((
val
==
1
||
val
==
2
)){
let
index
=
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
).
findIndex
(
item
=>
item
.
label
==
'
立方米
'
);
let
index
=
this
.
weightList
.
findIndex
(
item
=>
item
.
id
==
7
);
this
.
mingServantFrom
.
forEach
(
item
=>
{
this
.
mingServantFrom
.
forEach
(
item
=>
{
item
.
refundUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
refundUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
})
})
this
.
mingServantAnddarkServant
.
forEach
(
item
=>
{
this
.
mingServantAnddarkServant
.
forEach
(
item
=>
{
item
.
refundUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
refundUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
item
.
darkAdjustUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
darkAdjustUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
})
})
this
.
darkServantAndRebateForm
.
forEach
(
item
=>
{
this
.
darkServantAndRebateForm
.
forEach
(
item
=>
{
item
.
refundUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
refundUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
})
})
this
.
darkServantAndProductForm
.
forEach
(
item
=>
{
this
.
darkServantAndProductForm
.
forEach
(
item
=>
{
item
.
darkUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
darkUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
})
})
}
else
{
}
else
{
let
index
=
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
).
findIndex
(
item
=>
item
.
label
==
'
千克
'
);
let
index
=
this
.
weightList
.
findIndex
(
item
=>
item
.
id
==
6
);
this
.
mingServantFrom
.
forEach
(
item
=>
{
this
.
mingServantFrom
.
forEach
(
item
=>
{
item
.
refundUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
refundUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
})
})
this
.
mingServantAnddarkServant
.
forEach
(
item
=>
{
this
.
mingServantAnddarkServant
.
forEach
(
item
=>
{
item
.
refundUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
refundUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
item
.
darkAdjustUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
darkAdjustUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
})
})
this
.
darkServantAndRebateForm
.
forEach
(
item
=>
{
this
.
darkServantAndRebateForm
.
forEach
(
item
=>
{
item
.
refundUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
refundUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
})
})
this
.
darkServantAndProductForm
.
forEach
(
item
=>
{
this
.
darkServantAndProductForm
.
forEach
(
item
=>
{
item
.
darkUnit
=
parseInt
(
this
.
getDictDatas
(
this
.
DICT_TYPE
.
COMMISSION_UNIT
)[
index
].
value
);
item
.
darkUnit
=
parseInt
(
this
.
weightList
[
index
].
id
);
})
})
}
}
...
...
src/views/ecw/oceanCustomer/index.vue
View file @
a895a0be
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-folder-add"
@
click=
"distribution(scope.row)"
>
移交
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-folder-add"
@
click=
"distribution(scope.row)"
>
移交
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-crop"
>
捞取
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-crop"
@
click=
"fishingFn(scope.row)"
>
捞取
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -120,7 +120,7 @@
...
@@ -120,7 +120,7 @@
</template>
</template>
<
script
>
<
script
>
import
{
createCustomer
,
updateCustomer
,
deleteCustomer
,
handOverCustomer
,
getPublicList
,
exportCustomerExcel
}
from
"
@/api/ecw/customer
"
;
import
{
createCustomer
,
updateCustomer
,
deleteCustomer
,
handOverCustomer
,
getPublicList
,
exportCustomerExcel
,
setFishing
}
from
"
@/api/ecw/customer
"
;
import
{
getDictDatas
,
DICT_TYPE
}
from
'
@/utils/dict
'
;
import
{
getDictDatas
,
DICT_TYPE
}
from
'
@/utils/dict
'
;
import
upload
from
'
@/components/ImageUpload
'
import
upload
from
'
@/components/ImageUpload
'
import
{
listServiceUser
}
from
"
@/api/system/user
"
;
import
{
listServiceUser
}
from
"
@/api/system/user
"
;
...
@@ -365,6 +365,28 @@ export default {
...
@@ -365,6 +365,28 @@ export default {
}
}
})
})
},
},
fishingFn
(
row
){
this
.
$confirm
(
`是否要捞取
${
row
.
name
}
的客户`
,
'
提示
'
,
{
confirmButtonText
:
'
确定
'
,
cancelButtonText
:
'
取消
'
,
type
:
'
warning
'
}).
then
(()
=>
{
setFishing
({
id
:
row
.
id
}
).
then
(
r
=>
{
if
(
r
.
code
===
0
){
this
.
getList
()
this
.
$message
({
type
:
'
success
'
,
message
:
'
捞取成功!
'
});
}
})
}).
catch
(()
=>
{
this
.
$message
({
type
:
'
info
'
,
message
:
'
已取消捞取
'
});
});
}
}
}
};
};
</
script
>
</
script
>
src/views/member/user/index.vue
View file @
a895a0be
...
@@ -504,6 +504,7 @@ export default {
...
@@ -504,6 +504,7 @@ export default {
img2
:
this
.
IdDetails
.
img2
,
img2
:
this
.
IdDetails
.
img2
,
name
:
this
.
IdDetails
.
name
,
name
:
this
.
IdDetails
.
name
,
userCardAuthId
:
this
.
IdDetails
.
id
,
userCardAuthId
:
this
.
IdDetails
.
id
,
auditPass
:
this
.
IdDetails
.
status
===
3
?
true
:
false
,
}
;
}
;
memberUserUpdateIdCard
(
p
).
then
(
r
=>
{
memberUserUpdateIdCard
(
p
).
then
(
r
=>
{
if
(
r
.
code
===
0
){
if
(
r
.
code
===
0
){
...
@@ -526,7 +527,8 @@ export default {
...
@@ -526,7 +527,8 @@ export default {
img2
:
this
.
enterpriseFrom
.
img2
,
img2
:
this
.
enterpriseFrom
.
img2
,
legalName
:
this
.
enterpriseFrom
.
legalName
,
legalName
:
this
.
enterpriseFrom
.
legalName
,
name
:
this
.
enterpriseFrom
.
name
,
name
:
this
.
enterpriseFrom
.
name
,
userEnterpriseAuthId
:
this
.
enterpriseFrom
.
id
userEnterpriseAuthId
:
this
.
enterpriseFrom
.
id
,
auditPass
:
this
.
enterpriseFrom
.
status
===
3
?
true
:
false
,
}
}
memberUserUpdateEnterprise
(
p
).
then
(
r
=>
{
memberUserUpdateEnterprise
(
p
).
then
(
r
=>
{
if
(
r
.
code
===
0
){
if
(
r
.
code
===
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