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
59a4da6d
Commit
59a4da6d
authored
Aug 28, 2023
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
no message
parents
3863cfc7
a4e806a7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
214 additions
and
48 deletions
+214
-48
VisaProductOrder.vue
src/components/SalesVisa/components/VisaProductOrder.vue
+17
-8
visaOrderList.vue
src/components/SalesVisa/components/visaOrderList.vue
+50
-1
index.vue
...ravelmanager/TravelGroupControl/UpgradedVersion/index.vue
+147
-39
No files found.
src/components/SalesVisa/components/VisaProductOrder.vue
View file @
59a4da6d
...
...
@@ -306,25 +306,25 @@
<li>
<span>
<em>
{{
$t
(
'fnc.danhao'
)
}}
</em>
<el-input
class=
'w2
2
0'
v-model=
'msg.VisaTCNUM'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
<el-input
class=
'w2
0
0'
v-model=
'msg.VisaTCNUM'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</li>
<li>
<span>
<em>
订单ID
</em>
<el-input
class=
'w2
2
0'
v-model=
'msg.OrderId'
placeholder=
"请输入订单ID"
></el-input>
<el-input
class=
'w2
0
0'
v-model=
'msg.OrderId'
placeholder=
"请输入订单ID"
></el-input>
</span>
</li>
<li>
<span>
<em>
{{
$t
(
'hotel.product_name'
)
}}
</em>
<el-input
class=
'w2
2
0'
v-model=
'msg.Name'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
<el-input
class=
'w2
0
0'
v-model=
'msg.Name'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</li>
<li>
<span>
<em>
订单状态
</em>
<el-select
v-model=
'msg.VisaOrderStatus'
>
<el-select
class=
'w200'
v-model=
'msg.VisaOrderStatus'
>
<el-option
label=
"不限"
value=
"0"
key=
'0'
></el-option>
<el-option
label=
"正常"
value=
"1"
key=
'1'
></el-option>
<el-option
label=
"取消"
value=
"2"
key=
'2'
></el-option>
...
...
@@ -334,7 +334,7 @@
<li>
<span>
<em>
完结状态
</em>
<el-select
v-model=
'msg.IsFinish'
>
<el-select
class=
'w200'
v-model=
'msg.IsFinish'
>
<el-option
label=
"不限"
value=
"0"
key=
'0'
></el-option>
<el-option
label=
"已完结"
value=
"1"
key=
'1'
></el-option>
<el-option
label=
"未完结"
value=
"2"
key=
'2'
></el-option>
...
...
@@ -343,7 +343,7 @@
<li
v-if=
"pagesTitle!='销售'"
>
<span>
<em>
业务员
</em>
<el-select
filterable
v-model=
'msg.CreateBy'
>
<el-select
class=
'w200'
filterable
v-model=
'msg.CreateBy'
>
<el-option
:value=
"0"
label=
"不限"
></el-option>
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmName'
:value=
'item.EmployeeId'
:key=
'item.EmployeeId'
>
...
...
@@ -354,7 +354,7 @@
<li>
<span>
<em>
OP
</em>
<el-select
filterable
v-model=
'msg.OpEmpId'
>
<el-select
class=
'w200'
filterable
v-model=
'msg.OpEmpId'
>
<el-option
:value=
"0"
label=
"不限"
></el-option>
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmName'
:value=
'item.EmployeeId'
:key=
'item.EmployeeId'
>
...
...
@@ -365,7 +365,7 @@
<li
v-if=
"pagesTitle!='销售'"
>
<span>
<em>
公司
</em>
<el-select
filterable
class=
"w217"
v-model=
"msg.RB_Branch_Id"
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
'w200'
filterable
v-model=
"msg.RB_Branch_Id"
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:value=
"-1"
label=
"不限"
></el-option>
<el-option
v-for=
"item in layerCompanyList"
:label=
"item.BName"
:value=
"item.Id"
:key=
"item.Id"
>
</el-option>
...
...
@@ -379,6 +379,13 @@
-
<el-date-picker
v-model=
'msg.EndDate'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
完结日期
</em>
<el-date-picker
v-model=
'msg.FinishSDate'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
-
<el-date-picker
v-model=
'msg.FinishEDate'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
</span>
</li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"getList()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
</li>
...
...
@@ -528,6 +535,8 @@
pageSize
:
12
,
StartDate
:
''
,
EndDate
:
''
,
FinishSDate
:
''
,
FinishEDate
:
''
,
SendStartDate
:
''
,
SendEndDate
:
''
,
Name
:
''
,
...
...
src/components/SalesVisa/components/visaOrderList.vue
View file @
59a4da6d
...
...
@@ -823,6 +823,11 @@
v-loading=
"scope.row.loading"
>
<span
class=
"c059FF6"
>
完结
</span>
</div>
<div
v-if=
"IsSupperOrderEdit&&pagesTitle!='销售'&&scope.row.isFinish==1"
class=
"row-c cursor-pointer radius5 change py5"
@
click=
'setOPEmpId(scope.row)'
v-loading=
"scope.row.loading"
>
<span
class=
"c059FF6"
>
修改OP
</span>
</div>
<div
class=
"row-c cursor-pointer radius5 change py5"
v-if=
"IsSupperOrderEdit&&!scope.row.commissionMoney&&!scope.row.opCommission&&pagesTitle!='销售'"
@
click=
"queryObj=scope.row,showTransferOrder=true"
>
...
...
@@ -960,6 +965,18 @@
<el-button
size=
"mini"
type=
"danger"
@
click=
"PerferPrice"
>
确 定
</el-button>
</span>
</el-dialog>
<el-dialog
title=
"修改OP"
:visible
.
sync=
"EditOPVisible"
width=
"400px"
>
<div>
<el-select
v-model=
"OPEmpId"
filterable
size=
mini
>
<el-option
v-for=
"item in OPEmpList"
:key=
"item.EmployeeId"
:label=
"item.EmName"
:value=
"item.EmployeeId"
>
</el-option>
</el-select>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"mini"
@
click=
"EditOPVisible = false"
>
取 消
</el-button>
<el-button
size=
"mini"
type=
"danger"
@
click=
"sureOPEmp"
>
确 定
</el-button>
</span>
</el-dialog>
<offset
:isShow=
"cdState"
:obj=
"queryObj"
@
close=
"cdState=false"
></offset>
<TransferOrder
v-if=
"showTransferOrder"
:isShow=
"showTransferOrder"
:obj=
"queryObj"
@
success=
"showTransferOrder=false,$emit('success')"
@
close=
"showTransferOrder=false"
></TransferOrder>
...
...
@@ -1067,7 +1084,11 @@
TotalPrice
:
0
,
PeopleNum
:
0
},
IsSupperOrderEdit
:
false
IsSupperOrderEdit
:
false
,
EditOPVisible
:
false
,
OPEmpId
:
0
,
OPOrderId
:
0
,
OPEmpList
:
[]
};
},
watch
:
{
...
...
@@ -1556,6 +1577,33 @@
this
.
copyId
=
0
;
},
2000
);
},
GetOPEmpList
()
{
let
userInfo
=
this
.
getLocalStorage
();
this
.
apipost
(
'admin_get_EmployeeGetList'
,
{
GroupId
:
userInfo
.
RB_Group_id
,
DepartmentId
:
232
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
OPEmpList
=
res
.
data
.
data
;
}
},
err
=>
{})
},
setOPEmpId
(
item
)
{
this
.
EditOPVisible
=
true
;
this
.
OPOrderId
=
item
.
id
;
},
sureOPEmp
()
{
if
(
this
.
OPEmpId
<=
0
){
this
.
Info
(
'请选择OP!'
)
return
}
this
.
apipost
(
'dmc_post_SetVisaOrderFinishEmp'
,
{
VisaOrderIds
:
this
.
OPOrderId
,
EmpId
:
this
.
OPEmpId
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
EditOPVisible
=
false
;
this
.
Success
(
res
.
data
.
message
)
this
.
$emit
(
'success'
);
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
err
=>
{})
},
},
mounted
()
{
this
.
qjGroupId
=
this
.
QjGroupId
();
...
...
@@ -1567,6 +1615,7 @@
if
(
ActionMenuCode
.
indexOf
(
'isEditAmount'
)
!=
-
1
)
{
this
.
IsSupperOrderEdit
=
true
}
this
.
GetOPEmpList
()
}
};
...
...
src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue
View file @
59a4da6d
This diff is collapsed.
Click to expand it.
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