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
879e21c5
Commit
879e21c5
authored
Feb 12, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
88fd6fbd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
97 additions
and
1 deletion
+97
-1
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+48
-1
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+49
-0
No files found.
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
879e21c5
...
@@ -1570,6 +1570,8 @@
...
@@ -1570,6 +1570,8 @@
<div
v-if=
"item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
@
click=
'getHouse(item)'
>
修改房型
</div>
<div
v-if=
"item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
@
click=
'getHouse(item)'
>
修改房型
</div>
<div
v-if=
"item.isOrder=='1'&&item.orderState!='4'"
@
click=
"transfer(item)"
>
订单转团
</div>
<div
v-if=
"item.isOrder=='1'&&item.orderState!='4'"
@
click=
"transfer(item)"
>
订单转团
</div>
<div
v-if=
"isUpdateOrder"
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'
>
OP备注
</div>
<div
v-if=
"isUpdateOrder"
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'
>
OP备注
</div>
<!-- v-if="item.isUpdateOrderCommission" -->
<div
@
click=
'TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate, TiChengLoading = true'
>
修改提成
</div>
<div
v-if=
"item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')"
@
click=
'setChargeLoss(item)'
>
<div
v-if=
"item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')"
@
click=
'setChargeLoss(item)'
>
<span
v-if=
"item.isChargeLossOrders==1"
>
恢复收损
</span>
<span
v-if=
"item.isChargeLossOrders==1"
>
恢复收损
</span>
<span
v-else
>
设为收损
</span>
<span
v-else
>
设为收损
</span>
...
@@ -1945,6 +1947,20 @@
...
@@ -1945,6 +1947,20 @@
<button
class=
"normalBtn"
type=
"primary"
@
click=
"TransferDocuments"
>
{{$t('pub.saveBtn')}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"TransferDocuments"
>
{{$t('pub.saveBtn')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"initOPRemarkMsg"
>
{{$t('pub.cancelBtn')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"initOPRemarkMsg"
>
{{$t('pub.cancelBtn')}}
</button>
</div>
</div>
</el-dialog>
<el-dialog
custom-class=
'w350'
title=
"修改提成"
:visible
.
sync=
"TiChengLoading"
center
:before-close=
"initTCMsg"
>
<!--zhaunMsg.TCNUM-->
<el-form
label-width=
"110px"
>
<el-form-item
label=
"扣除提成比例:"
class=
"w280"
>
<el-input
placeholder=
"请输入"
v-model=
"TCMsg.CommissionMinusRate"
@
keyup
.
native=
"maxCommissionMinusRate"
>
<
template
slot=
"append"
>
%
</
template
>
</el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"submitTCMsg"
>
{{$t('pub.saveBtn')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"initTCMsg"
>
{{$t('pub.cancelBtn')}}
</button>
</div>
</el-dialog>
</el-dialog>
</div>
</div>
</template>
</template>
...
@@ -1962,6 +1978,11 @@ export default {
...
@@ -1962,6 +1978,11 @@ export default {
OP_Remarks
:
''
,
OP_Remarks
:
''
,
},
},
zhuanLoading
:
false
,
zhuanLoading
:
false
,
TiChengLoading
:
false
,
TCMsg
:
{
OrderId
:
0
,
CommissionMinusRate
:
0
,
},
checkedObj
:{},
checkedObj
:{},
positionId
:
0
,
positionId
:
0
,
pickerOptions0
:
{
pickerOptions0
:
{
...
@@ -2235,7 +2256,7 @@ export default {
...
@@ -2235,7 +2256,7 @@ export default {
subInfo
:{
subInfo
:{
CreateBy
:
''
,
CreateBy
:
''
,
OrderId
:
0
OrderId
:
0
}
}
,
};
};
},
},
components
:
{
components
:
{
...
@@ -2259,6 +2280,32 @@ export default {
...
@@ -2259,6 +2280,32 @@ export default {
}
}
},
},
methods
:
{
methods
:
{
maxCommissionMinusRate
:
function
()
{
this
.
TCMsg
.
CommissionMinusRate
=
this
.
TCMsg
.
CommissionMinusRate
.
replace
(
/
[^\.\d]
/g
,
''
);
this
.
TCMsg
.
CommissionMinusRate
=
this
.
TCMsg
.
CommissionMinusRate
.
replace
(
'.'
,
''
);
if
(
this
.
TCMsg
.
CommissionMinusRate
>
100
)
{
this
.
TCMsg
.
CommissionMinusRate
=
100
}
},
submitTCMsg
:
function
()
{
this
.
apipost
(
'sellorder_post_SetOrderCommission'
,
this
.
TCMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
getList
()
this
.
initTCMsg
()
this
.
TiChengLoading
=
false
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
null
)
},
initTCMsg
:
function
()
{
this
.
TiChengLoading
=
false
this
.
TCMsg
=
{
OrderId
:
0
,
CommissionMinusRate
:
0
,
}
},
TransferDocuments
:
function
()
{
TransferDocuments
:
function
()
{
this
.
apipost
(
'sellorder_get_SetOrderOPRemarks'
,
this
.
OPRemarkMsg
,
res
=>
{
this
.
apipost
(
'sellorder_get_SetOrderOPRemarks'
,
this
.
OPRemarkMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
879e21c5
...
@@ -1476,6 +1476,7 @@
...
@@ -1476,6 +1476,7 @@
<div
@
click=
"toTrip(item)"
>
出团通知书(
{{
SetNoticeMsg
.
OutNotice
==
1
?
'OK'
:
'暂定'
}}
)
</div>
<div
@
click=
"toTrip(item)"
>
出团通知书(
{{
SetNoticeMsg
.
OutNotice
==
1
?
'OK'
:
'暂定'
}}
)
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'
>
OP备注
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'
>
OP备注
</div>
<div
@
click=
'TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'
>
修改提成
</div>
<div
@
click=
'deleteItem(item)'
>
删除
</div>
<div
@
click=
'deleteItem(item)'
>
删除
</div>
</div>
</div>
<el-button
slot=
"reference"
type=
"primary"
style=
'background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
<el-button
slot=
"reference"
type=
"primary"
style=
'background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
...
@@ -1658,6 +1659,7 @@
...
@@ -1658,6 +1659,7 @@
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(childItem)"
>
修改业务员
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(childItem)"
>
修改业务员
</div>
<div
@
click=
"transfer(childItem)"
>
订单转团
</div>
<div
@
click=
"transfer(childItem)"
>
订单转团
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'
>
OP备注
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'
>
OP备注
</div>
<div
@
click=
'TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate, TiChengLoading = true'
>
修改提成
</div>
<div
v-if=
"childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
<div
v-if=
"childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@
click=
'deleteItem(childItem)'
>
@
click=
'deleteItem(childItem)'
>
删除
删除
...
@@ -1876,6 +1878,7 @@
...
@@ -1876,6 +1878,7 @@
<div
@
click=
"toTrip(item)"
>
出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})
</div>
<div
@
click=
"toTrip(item)"
>
出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'
>
OP备注
</div>
<div
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'
>
OP备注
</div>
<div
@
click=
'TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate, TiChengLoading = true'
>
修改提成
</div>
<div
v-if=
"item.OrderState=='2'||item.OrderState=='3'"
@
click=
'deleteItem(item)'
>
删除
</div>
<div
v-if=
"item.OrderState=='2'||item.OrderState=='3'"
@
click=
'deleteItem(item)'
>
删除
</div>
</div>
</div>
<el-button
slot=
"reference"
type=
"primary"
style=
'background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
<el-button
slot=
"reference"
type=
"primary"
style=
'background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
...
@@ -2082,6 +2085,20 @@
...
@@ -2082,6 +2085,20 @@
<el-dialog
custom-class=
'w450'
title=
"行程下载"
:visible
.
sync=
"travelControlTripLayerShow"
center
>
<el-dialog
custom-class=
'w450'
title=
"行程下载"
:visible
.
sync=
"travelControlTripLayerShow"
center
>
<tripDownLoadCommon
ref=
"tripDownLoadCommon"
:tripObj=
"tripObj"
@
headCallBack=
"hideTripDown"
:downType=
"2"
></tripDownLoadCommon>
<tripDownLoadCommon
ref=
"tripDownLoadCommon"
:tripObj=
"tripObj"
@
headCallBack=
"hideTripDown"
:downType=
"2"
></tripDownLoadCommon>
</el-dialog>
</el-dialog>
<el-dialog
custom-class=
'w350'
title=
"修改提成"
:visible
.
sync=
"TiChengLoading"
center
:before-close=
"initTCMsg"
>
<!--zhaunMsg.TCNUM-->
<el-form
label-width=
"110px"
>
<el-form-item
label=
"扣除提成比例:"
class=
"w280"
>
<el-input
placeholder=
"请输入"
v-model=
"TCMsg.CommissionMinusRate"
@
keyup
.
native=
"maxCommissionMinusRate"
>
<
template
slot=
"append"
>
%
</
template
>
</el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"submitTCMsg"
>
{{$t('pub.saveBtn')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"initTCMsg"
>
{{$t('pub.cancelBtn')}}
</button>
</div>
</el-dialog>
</div>
</div>
</template>
</template>
...
@@ -2107,6 +2124,11 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
...
@@ -2107,6 +2124,11 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
OrderId
:
''
,
OrderId
:
''
,
OP_Remarks
:
''
,
OP_Remarks
:
''
,
},
},
TiChengLoading
:
false
,
TCMsg
:
{
OrderId
:
0
,
CommissionMinusRate
:
0
,
},
zhuanLoading
:
false
,
zhuanLoading
:
false
,
notUpdate
:
true
,
notUpdate
:
true
,
//是否显示操作按钮
//是否显示操作按钮
...
@@ -2439,6 +2461,33 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
...
@@ -2439,6 +2461,33 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan
:
updateSalesMan
updateSalesMan
:
updateSalesMan
},
},
methods
:
{
methods
:
{
maxCommissionMinusRate
:
function
()
{
this
.
TCMsg
.
CommissionMinusRate
=
this
.
TCMsg
.
CommissionMinusRate
.
replace
(
/
[^\.\d]
/g
,
''
);
this
.
TCMsg
.
CommissionMinusRate
=
this
.
TCMsg
.
CommissionMinusRate
.
replace
(
'.'
,
''
);
if
(
this
.
TCMsg
.
CommissionMinusRate
>
100
)
{
this
.
TCMsg
.
CommissionMinusRate
=
100
}
this
.
$forceUpdate
()
},
submitTCMsg
:
function
()
{
this
.
apipost
(
'sellorder_post_SetOrderCommission'
,
this
.
TCMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
getList
()
this
.
initTCMsg
()
this
.
TiChengLoading
=
false
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
null
)
},
initTCMsg
:
function
()
{
this
.
TiChengLoading
=
false
this
.
TCMsg
=
{
OrderId
:
0
,
CommissionMinusRate
:
0
,
}
},
goUrlSFD
:
function
(
path
,
name
,
item
)
{
goUrlSFD
:
function
(
path
,
name
,
item
)
{
let
obj
=
JSON
.
parse
(
JSON
.
stringify
(
item
))
let
obj
=
JSON
.
parse
(
JSON
.
stringify
(
item
))
obj
.
oP_Remarks
=
''
obj
.
oP_Remarks
=
''
...
...
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