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
9b6eff4d
Commit
9b6eff4d
authored
Jan 31, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'op备注@@@'
parent
38405ae4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
2 deletions
+39
-2
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+38
-1
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+1
-1
No files found.
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
9b6eff4d
...
...
@@ -1566,6 +1566,7 @@
<div
v-if=
"item.orderState!='4'"
@
click=
"goUrlP('旅客名单','passengerSaleList',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=
"isUpdateOrder"
@
click=
'zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'
>
OP备注
</div>
<div
v-if=
"item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')"
@
click=
'deleteItem(item)'
>
取消
</div>
</div>
<el-button
slot=
"reference"
type=
"primary"
style=
'background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
icon=
"iconfont icon-more"
></el-button>
...
...
@@ -1827,7 +1828,7 @@
</div>
<el-button
slot=
"reference"
type=
"primary"
style=
'background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
icon=
"iconfont icon-more"
></el-button>
</el-popover>
</el-tooltip>
</el-tooltip>
</el-button-group>
<payurlItem
v-if=
'item.isOwn==1'
:item=
"item"
:showID=
"showID"
v-show=
"item.orderState!='4'&&item.orderState!='3'"
v-on:childByValue=
"childByValue"
></payurlItem>
</td>
...
...
@@ -1922,6 +1923,18 @@
<div
class=
"combottomDiv"
v-if=
"showChangeSales"
style=
"height:200px;"
>
<updateSalesMan
@
closeUpdiv=
"closeSalseDiv"
@
getList=
"getList"
:subInfo=
"subInfo"
></updateSalesMan>
</div>
<el-dialog
custom-class=
'w350'
title=
"修改OP备注"
:visible
.
sync=
"zhuanLoading"
center
:before-close=
"initOPRemarkMsg"
>
<!--zhaunMsg.TCNUM-->
<el-form
label-width=
"110px"
>
<el-form-item
label=
"OP备注:"
class=
"w280"
>
<el-input
type=
"textarea"
:rows=
"2"
v-model=
"OPRemarkMsg.OP_Remarks"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"TransferDocuments"
>
{{$t('pub.saveBtn')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"initOPRemarkMsg"
>
{{$t('pub.cancelBtn')}}
</button>
</div>
</el-dialog>
</div>
</template>
...
...
@@ -1933,6 +1946,11 @@ import updateSalesMan from "../commonPage/updateSalesMan.vue";
export
default
{
data
()
{
return
{
OPRemarkMsg
:
{
OrderId
:
''
,
OP_Remarks
:
''
,
},
zhuanLoading
:
false
,
checkedObj
:{},
positionId
:
0
,
pickerOptions0
:
{
...
...
@@ -2227,6 +2245,25 @@ export default {
}
},
methods
:
{
TransferDocuments
:
function
()
{
this
.
apipost
(
'sellorder_get_SetOrderOPRemarks'
,
this
.
OPRemarkMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
getList
()
this
.
initOPRemarkMsg
()
this
.
zhuanLoading
=
false
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
null
)
},
initOPRemarkMsg
(){
this
.
OPRemarkMsg
=
{
OP_Remarks
:
''
,
OrderId
:
''
,
}
this
.
zhuanLoading
=
false
},
goUrlSFD
:
function
(
path
,
name
,
item
)
{
let
obj
=
JSON
.
parse
(
JSON
.
stringify
(
item
))
obj
.
oP_Remarks
=
''
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
9b6eff4d
...
...
@@ -2730,7 +2730,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
}
this
.
returnPrice
=
0
;
if
(
res
.
data
.
data
.
modelPrice
&&
res
.
data
.
data
.
modelPrice
.
BackAddPrice
)
{
this
.
strat
Price
=
res
.
data
.
data
.
modelPrice
.
BackAddPrice
;
this
.
return
Price
=
res
.
data
.
data
.
modelPrice
.
BackAddPrice
;
}
if
(
this
.
returnPrice
==
0
)
{
this
.
returnPriceShow
=
false
;
...
...
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