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
3c510473
Commit
3c510473
authored
Nov 11, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改人头费计算问题
parent
424c81b7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
61 additions
and
13 deletions
+61
-13
CommondityOrderList.vue
src/components/Buying/CommondityOrderList.vue
+55
-6
leaderPay2.vue
src/components/leaderPay2.vue
+6
-7
No files found.
src/components/Buying/CommondityOrderList.vue
View file @
3c510473
...
@@ -12,13 +12,13 @@
...
@@ -12,13 +12,13 @@
<li>
<li>
<span>
<span>
<em>
旅客名称
</em>
<em>
旅客名称
</em>
<el-input
v-model=
"msg.AccountName"
@
keyup
.
enter
.
native=
"getList"
class=
"
w150
"
></el-input>
<el-input
v-model=
"msg.AccountName"
@
keyup
.
enter
.
native=
"getList"
class=
""
></el-input>
</span>
</span>
</li>
</li>
<li
style=
"display:none;"
>
<li
style=
"display:none;"
>
<span>
<span>
<em>
同行
</em>
<em>
同行
</em>
<el-select
class=
"
w150
"
v-model=
"msg.CustomerId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
""
v-model=
"msg.CustomerId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
>
</el-option>
</el-option>
<el-option
v-for=
"item in CustomerList"
:label=
"item.CustomerName"
:value=
"item.CustomerId"
<el-option
v-for=
"item in CustomerList"
:label=
"item.CustomerName"
:value=
"item.CustomerId"
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<li>
<li>
<span>
<span>
<em>
销售
</em>
<em>
销售
</em>
<el-select
class=
"
w150
"
v-model=
"msg.SaleId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
""
v-model=
"msg.SaleId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
>
</el-option>
</el-option>
<el-option
v-for=
"item in EmployeeList"
:label=
"item.EmName"
:value=
"item.EmployeeId"
<el-option
v-for=
"item in EmployeeList"
:label=
"item.EmName"
:value=
"item.EmployeeId"
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
<li>
<li>
<span>
<span>
<em>
接单领队
</em>
<em>
接单领队
</em>
<el-select
class=
"
w150
"
v-model=
"msg.ReciveLeaderId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
""
v-model=
"msg.ReciveLeaderId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"SelectDefaultValue"
>
</el-option>
</el-option>
<el-option
v-for=
"item in LeaderList"
:label=
"item.Name"
:value=
"item.ID"
<el-option
v-for=
"item in LeaderList"
:label=
"item.Name"
:value=
"item.ID"
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
<li>
<li>
<span>
<span>
<em>
订单状态
</em>
<em>
订单状态
</em>
<el-select
filterable
v-model=
"msg.COrderState"
class=
"
w150
"
>
<el-select
filterable
v-model=
"msg.COrderState"
class=
""
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"-1"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"-1"
></el-option>
<el-option
v-for=
"item in OrderStatusList"
:label=
"item.Name"
:value=
"item.Id"
<el-option
v-for=
"item in OrderStatusList"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.ID"
></el-option>
:key=
"item.ID"
></el-option>
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<td>
<td>
<el-button-group>
<el-button-group>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"分派领队"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"分派领队"
placement=
"top"
>
<el-button
type=
"primary"
size=
"mini"
icon=
"iconfont icon-jinyong"
@
click=
"SetAccountStatus(item.Id,1)"
>
<el-button
type=
"primary"
size=
"mini"
icon=
"iconfont icon-jinyong"
@
click=
"SetAccountStatus(item.
Corder
Id,1)"
>
</el-button>
</el-button>
</el-tooltip>
</el-tooltip>
</el-button-group>
</el-button-group>
...
@@ -125,6 +125,29 @@
...
@@ -125,6 +125,29 @@
</tr>
</tr>
</tfoot>
</tfoot>
</table>
</table>
<el-dialog
custom-class=
"w400"
title=
"分配领队"
:visible
.
sync=
"outerVisible"
center
:before-close=
"closeChangeMachie"
>
<el-form
:model=
"addMsg"
label-width=
"130px"
>
<el-form-item
label=
"领队"
prop=
"state"
>
<el-select
filterable
v-model=
"addMsg.ReciveLeaderId"
prop=
"ParentId"
>
<el-option
v-for=
"item in LeaderList"
:label=
"item.Name"
:value=
"item.ID"
:key=
"item.ID"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false"
>
{{$t('pub.cancelBtn')}}
</button>
<button
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
>
{{$t('pub.saveBtn')}}
</button>
</div>
</el-dialog>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -142,6 +165,11 @@
...
@@ -142,6 +165,11 @@
pageSize
:
10
,
pageSize
:
10
,
total
:
0
,
total
:
0
,
},
},
addMsg
:
{
ReciveLeaderId
:
''
,
OrderIdList
:
[],
},
outerVisible
:
false
,
loading
:
false
,
loading
:
false
,
dataList
:
[],
dataList
:
[],
//账户修改
//账户修改
...
@@ -170,6 +198,27 @@
...
@@ -170,6 +198,27 @@
},
},
filters
:
{},
filters
:
{},
methods
:
{
methods
:
{
closeChangeMachie
(
done
)
{
done
();
},
submitForm
(){
this
.
apipost
(
'ShopOrder_get_SetShopOrderAllotLeader'
,
this
.
addMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
outerVisible
=
false
;
this
.
getList
();
}
},
err
=>
{}
)
},
SetAccountStatus
(
id
){
this
.
addMsg
.
OrderIdList
=
[]
this
.
addMsg
.
ReciveLeaderId
=
''
this
.
addMsg
.
OrderIdList
.
push
(
id
)
this
.
outerVisible
=
true
;
},
handleCurrentChange
(
val
)
{
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
this
.
getList
();
...
...
src/components/leaderPay2.vue
View file @
3c510473
...
@@ -1343,11 +1343,8 @@
...
@@ -1343,11 +1343,8 @@
return
return
}
}
let
list
=
this
.
listCost
let
list
=
this
.
listCost
let
allPrice
=
0
;
let
allPrice
=
obj
.
UnitPrice
*
obj
.
PeopleNum
;
let
yizhiPrice
=
list
[
0
].
TotalPrice
;
let
yizhiPrice
=
obj
.
TotalPrice
;
for
(
let
i
=
0
;
i
<
list
.
length
;
i
++
)
{
allPrice
=
list
[
i
].
UnitPrice
*
list
[
i
].
PeopleNum
}
if
(
allPrice
<
inputPrice
+
yizhiPrice
)
{
if
(
allPrice
<
inputPrice
+
yizhiPrice
)
{
this
.
$message
.
error
(
'金额有误'
)
this
.
$message
.
error
(
'金额有误'
)
return
return
...
@@ -1393,11 +1390,11 @@
...
@@ -1393,11 +1390,11 @@
this
.
listCost
[
this
.
dialogFormVisibleIndex
]
=
obj
this
.
listCost
[
this
.
dialogFormVisibleIndex
]
=
obj
this
.
$forceUpdate
()
this
.
$forceUpdate
()
this
.
$message
.
success
(
"制单成功"
)
this
.
$message
.
success
(
"制单成功"
)
this
.
getNavT
()
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
this
.
dialogFormVisibleLoding
=
false
this
.
dialogFormVisible
=
false
},
null
)
},
null
)
},
},
goZhiDan
:
function
(
obj
)
{
goZhiDan
:
function
(
obj
)
{
...
@@ -1452,6 +1449,8 @@
...
@@ -1452,6 +1449,8 @@
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
$message
.
error
(
res
.
data
.
message
);
}
}
this
.
dialogFormVisibleLoding
=
false
this
.
dialogFormVisible
=
false
},
},
err
=>
{}
err
=>
{}
);
);
...
...
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