Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
8bfc1337
Commit
8bfc1337
authored
Nov 17, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改國內op制單的參數
parent
c5a1f879
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
33 deletions
+37
-33
OPsalesCommission.vue
...components/FinancialModule/domestic/OPsalesCommission.vue
+35
-31
domesticCommission.vue
src/components/FinancialModule/domesticCommission.vue
+2
-2
No files found.
src/components/FinancialModule/domestic/OPsalesCommission.vue
View file @
8bfc1337
...
...
@@ -26,7 +26,7 @@
<ul
class=
"opUl"
>
<li>
<em>
出团公司
</em>
<el-select
v-model=
"msg.OutBranchId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
>
<el-select
v-model=
"msg.OutBranchId"
size=
"mini"
@
change=
"handleCurrentChange(1)"
>
<el-option
label=
"不限"
:value=
"-1"
></el-option>
<el-option
v-for=
"(item,index) in BranchList"
:key=
"item.index"
:label=
"item.BName"
:value=
"item.Id"
></el-option>
...
...
@@ -63,11 +63,11 @@
</td>
<td>
{{
item
.
BranchCommission
}}
</td>
<td>
<span
v-for=
"(x,y) in item.FinanceIdList"
>
<span
v-for=
"(x,y) in item.FinanceIdList"
>
<span
style=
"cursor: pointer;text-decoration: underline;"
@
click=
'gofinancialdetail(x)'
>
{{
x
}}
</span>
{{
item
.
FinanceIdList
.
length
==
y
+
1
?
''
:
'、'
}}
{{
item
.
FinanceIdList
.
length
==
y
+
1
?
''
:
'、'
}}
</span>
</td>
<td>
...
...
@@ -81,7 +81,7 @@
icon=
"iconfont icon-chakan"
circle
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"cMaker==true"
class=
"item"
effect=
"dark"
content=
"制单"
placement=
"top"
>
<el-button
@
click=
"YijianZD(item)"
type=
"danger"
class=
"CM_look"
v-if=
"cMaker==true"
<el-button
@
click=
"YijianZD(item)"
type=
"danger"
class=
"CM_look"
v-if=
"cMaker==true"
icon=
"iconfont icon-mui-icon-add"
circle
></el-button>
</el-tooltip>
...
...
@@ -105,12 +105,12 @@
export
default
{
data
()
{
return
{
Month
:
moment
().
format
(
"YYYY-MM"
),
Month
:
moment
().
subtract
(
1
,
'months'
).
format
(
"YYYY-MM"
),
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
Periods
:
0
,
OutBranchId
:
-
1
,
OutBranchId
:
-
1
,
},
loading
:
false
,
//数据源
...
...
@@ -118,8 +118,8 @@
total
:
0
,
btnShow
:
false
,
btnLoading
:
false
,
BranchList
:[],
cMaker
:
false
,
//是否可以制单
BranchList
:
[],
cMaker
:
false
,
//是否可以制单
}
},
mounted
()
{
...
...
@@ -137,8 +137,8 @@
},
methods
:
{
//初始化公司
getCompanyList
()
{
//初始化公司
getCompanyList
()
{
let
userInfo
=
this
.
getLocalStorage
();
var
RB_Group_id
=
userInfo
.
RB_Group_id
;
let
msg
=
{
...
...
@@ -158,7 +158,7 @@
err
=>
{
}
);
},
handleCurrentChange
(
val
)
{
...
...
@@ -216,24 +216,28 @@
);
},
YijianZD
(
item
)
{
let
Money
if
(
this
.
msg
.
OutBranchId
>-
1
)
{
if
(
item
.
BranchCommission
>
0
)
{
Money
=
item
.
BranchCommission
}
else
{
let
Money
if
(
this
.
msg
.
OutBranchId
>
-
1
)
{
if
(
item
.
BranchCommission
>
0
)
{
Money
=
item
.
BranchCommission
}
else
{
this
.
Error
(
"公司提成为0,不能制单!"
)
return
;
}
}
else
{
Money
=
item
.
SumPrice
}
else
{
Money
=
item
.
SumPrice
}
let
obj
=
{
CostType
:
112
,
Money
:
Money
,
CurrencyId
:
1
,
XSTC
:
1
,
OtherType
:
48
,
ReFinanceId
:
item
.
Id
// CurrencyId: 1,
// XSTC: 1,
OtherType
:
48
,
ReFinanceId
:
item
.
Id
,
SelectState
:
true
,
OrderSource
:
8
,
OrderID
:
0
,
}
let
query
=
{
blank
:
"y"
,
...
...
@@ -242,27 +246,27 @@
IsUploadPic
:
1
,
orderObj
:
JSON
.
stringify
(
obj
)
}
if
(
this
.
msg
.
OutBranchId
>
0
)
{
query
.
id
=
3
0
if
(
this
.
msg
.
OutBranchId
>
-
1
)
{
query
.
id
=
3
1
query
.
Name
=
"分公司销售提成单"
}
else
{
query
.
id
=
2
8
}
else
{
query
.
id
=
2
9
query
.
Name
=
"总部销售提成单"
}
this
.
$router
.
push
({
path
:
"/addFinancialDocuments"
,
query
});
},
gofinancialdetail
(
id
){
gofinancialdetail
(
id
)
{
this
.
$router
.
push
({
name
:
'FinancialDocumentsDetail'
,
query
:
{
id
:
id
,
blank
:
'y'
,
tab
:
'单据详情'
id
:
id
,
blank
:
'y'
,
tab
:
'单据详情'
}
})
}
...
...
src/components/FinancialModule/domesticCommission.vue
View file @
8bfc1337
...
...
@@ -105,7 +105,7 @@
export
default
{
data
()
{
return
{
Month
:
moment
().
format
(
"YYYY-MM"
),
Month
:
moment
().
subtract
(
1
,
'months'
).
format
(
"YYYY-MM"
),
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
...
...
@@ -263,7 +263,7 @@
IsUploadPic
:
1
,
orderObj
:
JSON
.
stringify
(
obj
)
}
if
(
this
.
msg
.
OutBranchId
>
0
){
if
(
this
.
msg
.
OutBranchId
>
-
1
){
query
.
id
=
30
query
.
Name
=
"分公司销售提成单"
}
else
{
...
...
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