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
e622536e
Commit
e622536e
authored
Oct 08, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
域名调整页面调整
parent
e1c913e9
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
455 additions
and
447 deletions
+455
-447
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+1
-14
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+0
-14
TravelContractNewRB.vue
src/components/TravelContractNewRB.vue
+7
-4
directorOrderList.vue
src/components/TravelManager/Lxy/directorOrderList.vue
+28
-21
travelOrders.vue
src/components/TravelManager/customizedcar/travelOrders.vue
+408
-385
index.vue
src/components/index.vue
+1
-9
index.js
src/plug/index.js
+10
-0
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
e622536e
...
...
@@ -2734,20 +2734,7 @@ else if (Type==2) {
tab
:
this
.
$t
(
'objFill.djpxq'
)
}
});
// return
// let href
// let url
// if (this.isOnline()) {
// url = 'http://fcrmyx.oytour.com/#/'
// } else {
// url = 'http://localhost:8081/#/'
// }
// let data = [{
// path: 'customerOrder',
// OrderId: this.GetDetail.ReFinanceId,
// }]
// href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
// window.open(href);
},
GetAuth
()
{
var
actionCode
=
this
.
$AuthCode
.
TeamShouZhi
;
...
...
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
e622536e
...
...
@@ -1962,20 +1962,6 @@
tab
:
this
.
$t
(
'objFill.djpxq'
)
}
});
// return
// let href
// let url
// if (this.isOnline()) {
// url = 'http://fcrmyx.oytour.com/#/'
// } else {
// url = 'http://localhost:8081/#/'
// }
// let data = [{
// path: 'customerOrder',
// OrderId: this.GetDetail.ReFinanceId,
// }]
// href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
// window.open(href);
},
GetAuth
()
{
var
actionCode
=
this
.
$AuthCode
.
TeamShouZhi
;
...
...
src/components/TravelContractNewRB.vue
View file @
e622536e
...
...
@@ -389,7 +389,8 @@
<tr>
<td>
<el-form-item
label=
"公司名称"
>
<el-select
v-model=
"CtObj.SignType"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"changeSignType"
class=
"w300"
>
<el-select
v-model=
"CtObj.SignType"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"changeSignType"
class=
"w300"
>
<el-option
key=
"0"
label=
"四川和平国际旅行社有限公司"
:value=
"0"
>
</el-option>
<el-option
key=
"1"
label=
"(株)ピースインターナショナル"
:value=
"1"
>
...
...
@@ -471,7 +472,8 @@
<tr>
<td>
<el-form-item
label=
"旅游者同意选择下列第"
>
<el-select
:placeholder=
"$t('pub.pleaseSel')"
filterable
class=
'w150'
v-model=
"CtObj.carpoolOpinion"
>
<el-select
:placeholder=
"$t('pub.pleaseSel')"
filterable
class=
'w150'
v-model=
"CtObj.carpoolOpinion"
>
<el-option
label=
"A"
:value=
'1'
></el-option>
<el-option
label=
"B"
:value=
'2'
></el-option>
<el-option
label=
"C"
:value=
'3'
></el-option>
...
...
@@ -1444,12 +1446,13 @@
let
lineTeam
=
this
.
CtObj
.
productName
;
let
days
=
this
.
CtObj
.
dayNum
;
let
nights
=
this
.
CtObj
.
nightNum
;
var
erpUrl
=
this
.
domainManager
().
erpSiteUrl
;
this
.
msgGuest
.
forEach
(
x
=>
{
let
obj
=
{};
if
(
x
.
checked
)
{
obj
.
mobiles
=
x
.
clientCall
;
obj
.
Url
=
`
http://yx.oytour.com/#/
clientConfirm?TCID=
${
this
.
msg
.
TCID
}
&orderID=
${
this
.
msg
.
orderID
}
&guestId=
${
x
.
guestId
}
`
;
obj
.
Url
=
erpUrl
+
`clientConfirm?TCID=
${
this
.
msg
.
TCID
}
&orderID=
${
this
.
msg
.
orderID
}
&guestId=
${
x
.
guestId
}
`
;
msgObj
.
push
(
obj
);
}
})
...
...
src/components/TravelManager/Lxy/directorOrderList.vue
View file @
e622536e
...
...
@@ -11,7 +11,8 @@
<div>
<span>
下单时间:
</span>
<el-date-picker
v-model=
"dateList"
@
change=
"msg.pageIndex=1,getList()"
size=
"small"
type=
"datetimerange"
:range-separator=
"$t('OrderList.zhi')"
value-format=
"yyyy-MM-dd HH:mm:ss"
:start-placeholder=
"$t('OrderList.star')"
:end-placeholder=
"$t('OrderList.end')"
>
:range-separator=
"$t('OrderList.zhi')"
value-format=
"yyyy-MM-dd HH:mm:ss"
:start-placeholder=
"$t('OrderList.star')"
:end-placeholder=
"$t('OrderList.end')"
>
</el-date-picker>
<span
style=
"margin-left:15px"
>
所属平台:
</span>
<el-select
class=
"w120"
@
change=
"msg.pageIndex=1,getList()"
v-model=
"msg.OrderSource"
size=
"small"
...
...
@@ -35,9 +36,10 @@
</el-option>
</el-select>
<el-input
@
clear=
"msg.pageIndex=1,getList()"
@
keyup
.
enter
.
native=
"msg.pageIndex=1,getList()"
clearable
style=
"margin-left:15px;width:300px"
class=
"input-with-select"
:placeholder=
"$t('fnc.qsrneirong')"
v-model=
"msgVal"
size=
"small"
>
<el-select
class=
"pendSelect"
@
change=
"ChangeId"
v-model=
"msgId"
slot=
"prepend"
:placeholder=
"$t('pub.pleaseSel')"
>
style=
"margin-left:15px;width:300px"
class=
"input-with-select"
:placeholder=
"$t('fnc.qsrneirong')"
v-model=
"msgVal"
size=
"small"
>
<el-select
class=
"pendSelect"
@
change=
"ChangeId"
v-model=
"msgId"
slot=
"prepend"
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in option"
:key=
"item.Id"
:label=
"item.name"
:value=
"item.Id"
>
</el-option>
</el-select>
...
...
@@ -205,7 +207,7 @@
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
</span>
</div>
<div
flex=
"cross:center main:center"
>
人数:x
{{
list
.
Number
}}
</div>
<div
flex=
"cross:center main:center"
>
人数:x
{{
list
.
Number
}}
</div>
</div>
<div
style=
"width: 200px; display: flex;flex-direction:column;justify-content: center"
v-if=
"TenantId==1"
>
...
...
@@ -451,7 +453,8 @@
</el-form-item>
<
template
v-if=
"fhMsg.Type==1"
>
<el-form-item
label=
"快递公司"
prop=
"ExpressId"
>
<el-select
class=
"w200"
size=
"small"
v-model=
"fhMsg.ExpressId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
"w200"
size=
"small"
v-model=
"fhMsg.ExpressId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in ExpressList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
...
...
@@ -498,7 +501,8 @@
<el-option
v-for=
"item in cityList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
<el-select
size=
"small"
v-model=
"shMsg.District"
style=
"width:144px"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
size=
"small"
v-model=
"shMsg.District"
style=
"width:144px"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in areaList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
...
...
@@ -1580,9 +1584,10 @@
ECOrderDetailId
:
list
.
Id
}]
}
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window
.
open
(
'http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID='
+
companyID
+
'&orderObj='
+
JSON
.
stringify
(
orderObj
))
var
newUrl
=
this
.
domainManager
().
erpSiteUrl
+
'ChoiceAddFinancialDocuments?Type=1&companyID='
+
companyID
+
'&orderObj='
+
JSON
.
stringify
(
orderObj
)
window
.
open
(
newUrl
)
},
goPayment
(
item
,
list
)
{
//跳到erp付款单
let
currentUser
=
this
.
getLocalStorage
()
...
...
@@ -1597,19 +1602,20 @@
ECOrderDetailId
:
list
.
Id
}]
}
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window
.
open
(
'http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID='
+
companyID
+
'&orderObj='
+
JSON
.
stringify
(
orderObj
))
var
newUrl
=
this
.
domainManager
().
erpSiteUrl
+
'ChoiceAddFinancialDocuments?Type=2&companyID='
+
companyID
+
'&orderObj='
+
JSON
.
stringify
(
orderObj
)
window
.
open
(
newUrl
)
},
goSF
(
item
)
{
//收入详情
// window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID +
// '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
this
.
CommonJump
(
'FinancialDocumentsDetail'
,{
id
:
item
.
FrID
})
this
.
CommonJump
(
'FinancialDocumentsDetail'
,
{
id
:
item
.
FrID
})
},
goZF
(
item
)
{
//付款详情
// window.open('http://yx.oytour.com/#/FinancialDocumentsDetail?id=' + item.FrID +
// '&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85')
this
.
CommonJump
(
'FinancialDocumentsDetail'
,{
id
:
item
.
FrID
})
this
.
CommonJump
(
'FinancialDocumentsDetail'
,
{
id
:
item
.
FrID
})
}
},
};
...
...
@@ -1621,10 +1627,11 @@
padding-top
:
3px
;
margin-left
:
7px
;
}
.orderList
span
{
.orderList
span
{
font-size
:
13px
;
font-weight
:
normal
;
}
}
.orderList
.upload-demo
{
float
:
right
;
...
...
src/components/TravelManager/customizedcar/travelOrders.vue
View file @
e622536e
...
...
@@ -11,7 +11,8 @@
<div>
<span>
下单时间:
</span>
<el-date-picker
v-model=
"dateList"
@
change=
"msg.pageIndex=1,getList()"
size=
"small"
type=
"datetimerange"
:range-separator=
"$t('OrderList.zhi')"
value-format=
"yyyy-MM-dd HH:mm:ss"
:start-placeholder=
"$t('OrderList.star')"
:end-placeholder=
"$t('OrderList.end')"
>
:range-separator=
"$t('OrderList.zhi')"
value-format=
"yyyy-MM-dd HH:mm:ss"
:start-placeholder=
"$t('OrderList.star')"
:end-placeholder=
"$t('OrderList.end')"
>
</el-date-picker>
<span
style=
"margin-left:15px"
>
订单来源:
</span>
<el-select
class=
"w120"
@
change=
"msg.pageIndex=1,getList()"
v-model=
"msg.OrderSource"
size=
"small"
...
...
@@ -27,11 +28,12 @@
<el-option
v-for=
"item in orderTypeList"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
<el-input
@
clear=
"msg.pageIndex=1,getList()"
@
keyup
.
enter
.
native=
"msg.pageIndex=1,getList()"
clearable
style=
"margin-left:15px;width:300px"
class=
"input-with-select"
:placeholder=
"$t('fnc.qsrneirong')"
v-model=
"msgVal"
size=
"small"
>
<el-select
class=
"pendSelect"
@
change=
"ChangeId"
v-model=
"msgId"
slot=
"prepend"
:placeholder=
"$t('pub.pleaseSel')"
>
style=
"margin-left:15px;width:300px"
class=
"input-with-select"
:placeholder=
"$t('fnc.qsrneirong')"
v-model=
"msgVal"
size=
"small"
>
<el-select
class=
"pendSelect"
@
change=
"ChangeId"
v-model=
"msgId"
slot=
"prepend"
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in option"
:key=
"item.Id"
:label=
"item.name"
:value=
"item.Id"
>
</el-option>
</el-select>
...
...
@@ -79,7 +81,7 @@
<div
style=
"width: 20%;"
>
操作
</div>
</div>
<div
class=
"app-order-list"
>
<el-card
v-for=
"(item,index) in tableData"
:key=
"index"
class=
"app-order-item"
shadow=
"never"
>
<el-card
v-for=
"(item,index) in tableData"
:key=
"index"
class=
"app-order-item"
shadow=
"never"
>
<div
v-if=
"item.OrderType!=5"
>
<div
slot=
"header"
class=
"clearfix"
>
<div
flex=
"cross:center"
class=
"app-order-head"
>
...
...
@@ -93,7 +95,7 @@
<el-tag
v-if=
"item.OrderSource==5"
size=
"small"
type=
"danger"
>
{{
item
.
OrderTypeName
}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==6"
size=
"small"
type=
"danger"
>
{{
item
.
OrderTypeName
}}
</el-tag>
</div>
<div
flex=
"cross:center"
class=
"app-order-user"
>
<img
v-if=
"item.OrderSource==1"
src=
"../../../assets/img/userman/wx.png"
alt=
""
>
<span>
{{
item
.
UserName
}}
(
{{
item
.
UserId
}}
)
</span>
...
...
@@ -106,8 +108,10 @@
</div>
<div
flex=
"dir:left wrap:wrap"
class=
"app-order-offline"
>
<el-tag
v-if=
"item.PaymentTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"warning"
>
未付款
</el-tag>
<el-tag
v-if=
"item.OrderStatus== 2 "
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待确认
</el-tag>
<el-tag
v-if=
"item.OrderStatus== 5 "
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待处理
</el-tag>
<el-tag
v-if=
"item.OrderStatus== 2 "
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待确认
</el-tag>
<el-tag
v-if=
"item.OrderStatus== 5 "
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待处理
</el-tag>
<el-tag
v-if=
"item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"warning"
>
已付款
</el-tag>
...
...
@@ -135,15 +139,16 @@
<div
class=
"app-order-body"
>
<div
class=
"goods-item"
style=
"width: 60%;"
>
<div
v-for=
"(list,index2) in getshangplist(item)"
:key=
"index2"
class=
"goods"
>
<div
>
<img
:src=
"list.HotelImage"
v-if=
'item.OrderType == 1'
class=
"goods-image"
/>
<img
:src=
"list.DiningImg"
v-if=
'item.OrderType == 2'
class=
"goods-image"
/>
<img
:src=
"list.TicketImg"
v-if=
'item.OrderType == 3'
class=
"goods-image"
/>
<div>
<img
:src=
"list.HotelImage"
v-if=
'item.OrderType == 1'
class=
"goods-image"
/>
<img
:src=
"list.DiningImg"
v-if=
'item.OrderType == 2'
class=
"goods-image"
/>
<img
:src=
"list.TicketImg"
v-if=
'item.OrderType == 3'
class=
"goods-image"
/>
<div
flex=
"dir:left"
style=
'display:flex'
>
<div
class=
"goods-info"
>
<div
class=
"goods-name"
>
<div
class=
"app-ellipsis"
>
<div
class=
"vue-line-clamp"
style=
"word-break: break-all; -webkit-line-clamp: 2;font-size: 15px;font-weight: 500;"
>
<div
class=
"vue-line-clamp"
style=
"word-break: break-all; -webkit-line-clamp: 2;font-size: 15px;font-weight: 500;"
>
<span
v-if=
'item.OrderType == 1'
>
{{
list
.
HotelName
}}
</span>
<span
v-if=
'item.OrderType == 2'
>
{{
list
.
MealName
}}
</span>
<span
v-if=
'item.OrderType == 3'
>
{{
list
.
TicketName
}}
</span>
...
...
@@ -153,46 +158,54 @@
</div>
<div
style=
"margin-bottom: 5px;"
>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 1'
>
房间数:x
{{
list
.
RoomNumber
}}
</span>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 2 || item.OrderType == 3'
>
数量:x
{{
list
.
PeopleNumber
}}
</span>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 2 || item.OrderType == 3'
>
数量:x
{{
list
.
PeopleNumber
}}
</span>
</div>
<div
style=
"margin-bottom: 5px;"
>
<span>
单价:¥
{{
list
.
Unit_Price
}}
</span></div>
<div
style=
"margin-bottom: 5px;"
>
<span>
单价:¥
{{
list
.
Unit_Price
}}
</span></div>
<div
style=
"margin-bottom: 5px;"
v-if=
'item.OrderType == 1'
>
<span>
入店时间:
{{
list
.
StartDate
}}
-
{{
list
.
EndDate
}}
</span>
</div>
</div>
<div
style=
"margin-bottom: 5px;"
v-if=
'item.OrderType == 4'
>
<span>
上车地点:
{{
list
.
DepartAddress
}}
上车地点:
{{
list
.
DepartAddress
}}
</span>
<span
style=
'margin:0 5px'
></span>
<span
style=
'margin:0 5px'
></span>
<span>
下车地点:
{{
list
.
ArriveAddress
}}
</span>
</div>
</div>
<div
style=
"margin-bottom: 5px;"
v-if=
'item.OrderType == 4'
>
</div>
<div
style=
"margin-bottom: 5px;"
>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 1'
>
到店时间:
{{
list
.
ArrivalTime
}}
</span>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 1'
>
到店时间:
{{
list
.
ArrivalTime
}}
</span>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 2'
>
就餐时间:
{{
list
.
Date
}}
</span>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 3'
>
入园时间:
{{
list
.
Date
}}
</span>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 4'
>
出行时间:
{{
list
.
Date
}}
{{
list
.
DepartureTime
}}
</span>
<span
style=
"margin-right: 10px;"
v-if=
'item.OrderType == 4'
>
出行时间:
{{
list
.
Date
}}
{{
list
.
DepartureTime
}}
</span>
</div>
</div>
<div
flex=
"dir:left box:mean"
style=
"width: 350px;display: flex;align-items: center;justify-content: center;"
>
<div
flex=
"dir:left box:mean"
style=
"width: 350px;display: flex;align-items: center;justify-content: center;"
>
<div
flex=
"cross:center main:center"
style=
"display: flex;flex-direction: column;align-items: flex-start;width: 55%;"
>
<span
style=
"cursor:pointer"
>
小计:¥
{{
list
.
Final_Price
}}
<span
style=
"color:#f56c6c"
v-if=
'item.Refund && item.Refund>0'
>
(实退:¥
{{
item
.
Refund
}}
)
</span>
<!--
<img
v-if=
"item.PaymentTime==''"
@
click=
"EditPrice(item,1,list)"
<span
style=
"cursor:pointer"
>
小计:¥
{{
list
.
Final_Price
}}
<span
style=
"color:#f56c6c"
v-if=
'item.Refund && item.Refund>0'
>
(实退:¥
{{
item
.
Refund
}}
)
</span>
<!--
<img
v-if=
"item.PaymentTime==''"
@
click=
"EditPrice(item,1,list)"
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
-->
</span>
</span>
<span
style=
"cursor:pointer"
>
成本:¥
{{
list
.
CostMoney
}}
<img
v-if=
"item.OrderStatus!==4"
@
click=
"costBtn_t(list,item)"
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
</span>
<span
style=
"cursor:pointer"
v-if=
'item.OrderType == 4 && list.PeopleNumber && list.PeopleNumber>0'
>
成人:
{{
list
.
PeopleNumber
}}
人
</span>
<span
style=
"cursor:pointer"
v-if=
'item.OrderType == 4 && list.ChildNumber && list.ChildNumber>0'
>
儿童:
{{
list
.
ChildNumber
}}
人
</span>
<span
style=
"cursor:pointer"
v-if=
'item.OrderType == 4 && list.PeopleNumber && list.PeopleNumber>0'
>
成人:
{{
list
.
PeopleNumber
}}
人
</span>
<span
style=
"cursor:pointer"
v-if=
'item.OrderType == 4 && list.ChildNumber && list.ChildNumber>0'
>
儿童:
{{
list
.
ChildNumber
}}
人
</span>
</div>
</div>
<div
style=
"width: 200px; display: flex;flex-direction:column;justify-content: center"
...
...
@@ -208,36 +221,36 @@
</div>
</div>
</div>
<div
class=
"billStyle"
v-if=
"((item.SFinanceList && item.SFinanceList.length>0)||(item.ZFinanceList && item.ZFinanceList.length >0) ) "
>
<div
class=
"billStyle_item"
style=
"border-right: 1px solid #EBEEF5"
>
收入单据:
<span
v-for=
"(x,index2) in item.SFinanceList"
:key=
"index2"
@
click=
"goSF(x)"
>
<span
class=
"billtext"
v-if=
"x.Status == 0"
:style=
"
{color:'#00FFFF'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 1&& x.Is_Cashier!=1"
:style=
"
{color:'#0080FF'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 1&&x.Is_Cashier==1"
:style=
"
{color:'#FF4048'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 2"
>
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 3"
:style=
"
{color:'#FFF100'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 4"
:style=
"
{color:'#800080'}">
{{
x
.
FrID
}}
</span>
</span>
</div>
<div
class=
"billStyle_item"
>
支出单据:
<span
v-for=
"(x,index2) in item.ZFinanceList"
:key=
"index2"
@
click=
"goZF(x)"
>
<span
class=
"billtext"
v-if=
"x.Status == 0"
:style=
"
{color:'#00FFFF'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 1 && x.Is_Cashier!=1"
:style=
"
{color:'#0080FF'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 1&&x.Is_Cashier==1"
:style=
"
{color:'#FF4048'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 2"
>
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 3"
:style=
"
{color:'#FFF100'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 4"
:style=
"
{color:'#800080'}">
{{
x
.
FrID
}}
</span>
</span>
</div>
<div
class=
"billStyle"
v-if=
"((item.SFinanceList && item.SFinanceList.length>0)||(item.ZFinanceList && item.ZFinanceList.length >0) ) "
>
<div
class=
"billStyle_item"
style=
"border-right: 1px solid #EBEEF5"
>
收入单据:
<span
v-for=
"(x,index2) in item.SFinanceList"
:key=
"index2"
@
click=
"goSF(x)"
>
<span
class=
"billtext"
v-if=
"x.Status == 0"
:style=
"
{color:'#00FFFF'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 1&& x.Is_Cashier!=1"
:style=
"
{color:'#0080FF'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 1&&x.Is_Cashier==1"
:style=
"
{color:'#FF4048'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 2"
>
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 3"
:style=
"
{color:'#FFF100'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 4"
:style=
"
{color:'#800080'}">
{{
x
.
FrID
}}
</span>
</span>
</div>
<div
class=
"billStyle_item"
>
支出单据:
<span
v-for=
"(x,index2) in item.ZFinanceList"
:key=
"index2"
@
click=
"goZF(x)"
>
<span
class=
"billtext"
v-if=
"x.Status == 0"
:style=
"
{color:'#00FFFF'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 1 && x.Is_Cashier!=1"
:style=
"
{color:'#0080FF'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 1&&x.Is_Cashier==1"
:style=
"
{color:'#FF4048'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 2"
>
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 3"
:style=
"
{color:'#FFF100'}">
{{
x
.
FrID
}}
</span>
<span
class=
"billtext"
v-if=
"x.Status == 4"
:style=
"
{color:'#800080'}">
{{
x
.
FrID
}}
</span>
</span>
</div>
</div>
</div>
</div>
<div
flex=
"cross:center"
class=
"app-order-info"
style=
"width: 15%;"
>
...
...
@@ -266,7 +279,7 @@
<img
@
click=
"qrEnd(item,2)"
v-if=
"item.OrderStatus==3"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
-->
<!--待处理-->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"同意"
placement=
"top"
v-if=
"item.OrderStatus==5"
>
<img
@
click=
"pending(item,1)"
v-if=
"item.OrderStatus==5"
class=
"app-order-icon"
...
...
@@ -287,7 +300,7 @@
src=
"../../../assets/img/userman/del.png"
alt=
""
>
</el-tooltip>
<
template
v-if=
"msg.Recycled==2"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"添加备注"
placement=
"top"
>
<img
@
click=
"fRhsz(item,1)"
class=
"app-order-icon"
src=
"../../../assets/img/userman/add_remark.png"
alt=
""
>
...
...
@@ -301,285 +314,288 @@
</div>
</div>
<div
class=
"card-footer"
>
<div>
<div
flex=
"dir:left"
>
<div
class=
"address-box"
>
联系人: {{item.Consignee}}
<span
style=
'margin:0 5px'
></span>
电话:{{item.Mobile}}
<span
style=
"margin-left:15px"
v-if=
"item.CancelRemark && item.CancelRemark!=''"
>
取消备注:{{item.CancelRemark}}
</span>
</div>
<!-- <button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
<div>
<div
flex=
"dir:left"
>
<div
class=
"address-box"
>
联系人: {{item.Consignee}}
<span
style=
'margin:0 5px'
></span>
电话:{{item.Mobile}}
<span
style=
"margin-left:15px"
v-if=
"item.CancelRemark && item.CancelRemark!=''"
>
取消备注:{{item.CancelRemark}}
</span>
</div>
<!-- <button v-if="item.OrderStatus==2" @click="ExitshAdress(item)" type="button"
class="el-button el-button--text is-circle"><i class="el-icon-edit"></i></button> -->
</div>
</div>
</div>
<div
v-if=
"item.Remark && item.Remark!=''"
class=
"seller-remark"
>
商家备注:{{item.Remark}}
</div>
</div>
</div>
<!-- 城际样式 -->
<div
v-if=
"item.OrderType==5"
>
<div
slot=
"header"
class=
"clearfix"
>
<div
flex=
"cross:center"
class=
"app-order-head"
>
<div
class=
"app-order-time"
>
{{item.CreateDate}}
</div>
<div
class=
"app-order-user"
>
<span
class=
"app-order-time"
style=
"margin-right: 5px"
>
订单号:
</span>
{{item.OrderNo}}({{item.OrderId}})
<el-tag
v-if=
"item.OrderSource==1"
size=
"small"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==2"
size=
"small"
type=
"success"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==3"
size=
"small"
type=
"info"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==4"
size=
"small"
type=
"warning"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==5"
size=
"small"
type=
"danger"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==6"
size=
"small"
type=
"danger"
>
{{item.OrderTypeName}}
</el-tag>
</div>
<div
flex=
"cross:center"
class=
"app-order-user"
>
<img
v-if=
"item.OrderSource==1"
src=
"../../../assets/img/userman/wx.png"
alt=
""
>
<span>
{{item.UserName}}({{item.UserId}})
</span>
</div>
<div
v-if=
"item.BuyerMessage && item.BuyerMessage!=''"
flex=
"cross:center"
class=
"remark-box"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"item.BuyerMessage"
placement=
"top"
>
<img
src=
"../../../assets/img/userman/remark.png"
alt=
""
>
</el-tooltip>
<div
slot=
"header"
class=
"clearfix"
>
<div
flex=
"cross:center"
class=
"app-order-head"
>
<div
class=
"app-order-time"
>
{{item.CreateDate}}
</div>
<div
class=
"app-order-user"
>
<span
class=
"app-order-time"
style=
"margin-right: 5px"
>
订单号:
</span>
{{item.OrderNo}}({{item.OrderId}})
<el-tag
v-if=
"item.OrderSource==1"
size=
"small"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==2"
size=
"small"
type=
"success"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==3"
size=
"small"
type=
"info"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==4"
size=
"small"
type=
"warning"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==5"
size=
"small"
type=
"danger"
>
{{item.OrderTypeName}}
</el-tag>
<el-tag
v-if=
"item.OrderSource==6"
size=
"small"
type=
"danger"
>
{{item.OrderTypeName}}
</el-tag>
</div>
</div>
<div
flex=
"dir:left wrap:wrap"
class=
"app-order-offline"
>
<el-tag
v-if=
"item.PaymentTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"warning"
>
未付款
</el-tag>
<el-tag
v-if=
"item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"warning"
>
已付款
</el-tag>
<el-tag
v-if=
"item.DeliveryTime=='' && item.ReceivingTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待确认
</el-tag>
<el-tag
v-if=
"item.DeliveryTime!='' && item.ReceivingTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待出行
</el-tag>
<el-tag
v-if=
"item.DeliveryTime!='' && item.ReceivingTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
出行中
</el-tag>
<el-tag
v-if=
"item.ReceivingTime!='' && item.FinishTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
出行完成
</el-tag>
<el-tag
v-if=
"item.FinishTime!=''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
已完成
</el-tag>
<el-tag
v-if=
"item.OrderStatus==7"
style=
"margin-left:5px"
size=
"small"
type=
"danger"
>
已取消
</el-tag>
</div>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"强制取消"
placement=
"top-start"
>
<img
v-if=
"item.OrderStatus==1 || item.OrderStatus==2"
@
click=
"OrderExit3(item)"
style=
"right:60px"
class=
"app-order-btnimg"
src=
"../../../assets/img/userman/force.png"
alt=
""
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"加入回收站"
placement=
"top-start"
>
<img
v-if=
"msg.Recycled!=1"
@
click=
"fRhsz2(item,4)"
class=
"app-order-btnimg"
src=
"../../../assets/img/userman/del1.png"
alt=
""
>
<div
flex=
"cross:center"
class=
"app-order-user"
>
<img
v-if=
"item.OrderSource==1"
src=
"../../../assets/img/userman/wx.png"
alt=
""
>
<span>
{{item.UserName}}({{item.UserId}})
</span>
</div>
<div
v-if=
"item.BuyerMessage && item.BuyerMessage!=''"
flex=
"cross:center"
class=
"remark-box"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"item.BuyerMessage"
placement=
"top"
>
<img
src=
"../../../assets/img/userman/remark.png"
alt=
""
>
</el-tooltip>
</div>
<div
flex=
"dir:left wrap:wrap"
class=
"app-order-offline"
>
<el-tag
v-if=
"item.PaymentTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"warning"
>
未付款
</el-tag>
<el-tag
v-if=
"item.PaymentTime!='' && item.DeliveryTime=='' && item.ReceivingTime=='' && item.FinishTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"warning"
>
已付款
</el-tag>
<el-tag
v-if=
"item.DeliveryTime=='' && item.ReceivingTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待确认
</el-tag>
<el-tag
v-if=
"item.DeliveryTime!='' && item.ReceivingTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待出行
</el-tag>
<el-tag
v-if=
"item.DeliveryTime!='' && item.ReceivingTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
出行中
</el-tag>
<el-tag
v-if=
"item.ReceivingTime!='' && item.FinishTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
出行完成
</el-tag>
<el-tag
v-if=
"item.FinishTime!=''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
已完成
</el-tag>
<el-tag
v-if=
"item.OrderStatus==7"
style=
"margin-left:5px"
size=
"small"
type=
"danger"
>
已取消
</el-tag>
</div>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"强制取消"
placement=
"top-start"
>
<img
v-if=
"item.OrderStatus==1 || item.OrderStatus==2"
@
click=
"OrderExit3(item)"
style=
"right:60px"
class=
"app-order-btnimg"
src=
"../../../assets/img/userman/force.png"
alt=
""
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"加入回收站"
placement=
"top-start"
>
<img
v-if=
"msg.Recycled!=1"
@
click=
"fRhsz2(item,4)"
class=
"app-order-btnimg"
src=
"../../../assets/img/userman/del1.png"
alt=
""
>
</el-tooltip>
</div>
<div
class=
"app-order-body"
>
<div
class=
"goods-item"
style=
"width: 60%;
"
>
<div
v-for=
"(list,index2) in item.SDGoodsList"
:key=
"index2"
class=
"goods
"
>
<div
>
<img
:src=
"list.CoverImagePath"
class=
"goods-image"
/
>
<div
flex=
"dir:left"
style=
"display:flex"
>
<div
class=
"goods-info
"
>
<div
class=
"goods-name
"
>
<div
class=
"app-ellipsis
"
>
<div
class=
"vue-line-clamp"
style=
"word-break: break-all; -webkit-line-clamp: 2;
"
>
{{list.GoodsName}}
</div>
</div
>
<div
class=
"app-order-body
"
>
<div
class=
"goods-item"
style=
"width: 60%;
"
>
<div
v-for=
"(list,index2) in item.SDGoodsList"
:key=
"index2"
class=
"goods"
>
<div
>
<img
:src=
"list.CoverImagePath"
class=
"goods-image"
/
>
<div
flex=
"dir:left"
style=
"display:flex
"
>
<div
class=
"goods-info
"
>
<div
class=
"goods-name
"
>
<div
class=
"app-ellipsis
"
>
<div
class=
"vue-line-clamp"
style=
"word-break: break-all; -webkit-line-clamp: 2;"
>
{{list.GoodsName}}
</div>
</div>
<div
style=
"margin-bottom: 5px;"
>
<span
style=
"margin-right: 10px;"
>
车辆:{{list.CarName}}、{{list.CarColorName}}、{{list.CarNumber}}
</span>
</div>
<div
style=
"margin-bottom: 5px;"
>
<span
style=
"margin-right: 10px;"
>
导游:{{list.GuideName}}
</span>
<span
style=
"margin-right: 10px;"
>
服务类型:{{list.CarTypeName}}、{{list.CarType==5? (list.IsSpell==1?'拼车':'不拼车'):''}}
</span>
</div>
<div
style=
"margin-bottom: 5px;"
>
<span
style=
"margin-right: 10px;"
>
出发时间:{{list.TripSTime}}
</span>
</div>
<div
style=
" display: flex;flex-direction: row;align-items: center;"
v-if=
"list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0"
>
<span>
赞羊小计:¥{{list.SmallShopsCostPrice}}
</span>
</div>
</div>
<div
flex=
"dir:left box:mean"
style=
"width: 350px;display: flex;align-items: center;justify-content: center;"
>
<div
flex=
"cross:center main:center"
style=
"display: flex;flex-direction: column;align-items: flex-start;width: 55%;"
>
<span
style=
"cursor:pointer"
>
小计:¥{{list.Final_Price}}
<img
v-if=
"item.PaymentTime==''"
@
click=
"EditPrice(item,1,list)"
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
</span>
<span
style=
"cursor:pointer"
>
商品成本:¥{{ list.CostMoney}}
<img
v-if=
"item.OrderStatus!==7"
@
click=
"costBtn(list,1)"
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
</span>
<span
style=
"cursor:pointer"
>
保险成本:¥{{list.InsuranceCostMoney}}
<img
v-if=
"item.OrderStatus!==7"
@
click=
"costBtn2(list,2)"
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
</span>
<!-- <span style="cursor:pointer">供应商:{{list.SupplierName !=null ? list.SupplierName :''}}
<div
style=
"margin-bottom: 5px;"
>
<span
style=
"margin-right: 10px;"
>
车辆:{{list.CarName}}、{{list.CarColorName}}、{{list.CarNumber}}
</span>
</div>
<div
style=
"margin-bottom: 5px;"
>
<span
style=
"margin-right: 10px;"
>
导游:{{list.GuideName}}
</span>
<span
style=
"margin-right: 10px;"
>
服务类型:{{list.CarTypeName}}、{{list.CarType==5? (list.IsSpell==1?'拼车':'不拼车'):''}}
</span>
</div>
<div
style=
"margin-bottom: 5px;"
>
<span
style=
"margin-right: 10px;"
>
出发时间:{{list.TripSTime}}
</span>
</div>
<div
style=
" display: flex;flex-direction: row;align-items: center;"
v-if=
"list.SmallShopsCostPrice!=null && list.SmallShopsCostPrice!=''&& list.SmallShopsCostPrice>0&& item.SmallShopsId!=0"
>
<span>
赞羊小计:¥{{list.SmallShopsCostPrice}}
</span>
</div>
</div>
<div
flex=
"dir:left box:mean"
style=
"width: 350px;display: flex;align-items: center;justify-content: center;"
>
<div
flex=
"cross:center main:center"
style=
"display: flex;flex-direction: column;align-items: flex-start;width: 55%;"
>
<span
style=
"cursor:pointer"
>
小计:¥{{list.Final_Price}}
<img
v-if=
"item.PaymentTime==''"
@
click=
"EditPrice(item,1,list)"
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
</span>
<span
style=
"cursor:pointer"
>
商品成本:¥{{ list.CostMoney}}
<img
v-if=
"item.OrderStatus!==7"
@
click=
"costBtn(list,1)"
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
</span>
<span
style=
"cursor:pointer"
>
保险成本:¥{{list.InsuranceCostMoney}}
<img
v-if=
"item.OrderStatus!==7"
@
click=
"costBtn2(list,2)"
src=
"../../../assets/img/userman/edit1.png"
alt=
""
>
</span>
<!-- <span style="cursor:pointer">供应商:{{list.SupplierName !=null ? list.SupplierName :''}}
<img v-if="item.OrderStatus!==7" @click="UpdateSuplier(list)"
src="../../../assets/img/userman/edit1.png" alt="">
</span> -->
</div>
<div
flex=
"cross:center main:center"
>
人数:x {{list.Number}}
</div>
</div>
<div
style=
"width: 200px; display: flex;flex-direction:column;justify-content: center"
v-if=
"TenantId==1"
>
<el-dropdown
trigger=
"click"
style=
"margin-left: 50px"
>
<span
class=
"el-dropdown-link"
>
制单
</span>
<el-dropdown-menu
slot=
"dropdown"
class=
"TC-dropdown"
>
<el-dropdown-item
@
click
.
native=
"goCollection(item,list)"
>
收入制单
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goPayment(item,list)"
>
付款制单
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<div
style=
"margin-top: 10px;font-size: 12px"
v-if=
"list.YSMoney!=0 || list.RealMoney!=0 || list.YFMoney!=0 || list.PayMoney!=0"
>
其他费用:
</div>
<div
style=
"font-size: 12px"
v-if=
"list.YSMoney!=0 || list.RealMoney!=0"
>
<span>
应收:¥{{list.YSMoney}}
</span>
<span
style=
"margin-left: 10px"
>
实收:¥{{list.RealMoney}}
</span>
</div>
<div
style=
"font-size: 12px"
v-if=
"list.YFMoney!=0 || list.PayMoney!=0"
>
<span>
应付:¥{{list.YFMoney}}
</span>
<span
style=
"margin-left: 10px"
>
实付:¥{{list.PayMoney}}
</span>
</div>
</div>
<div
flex=
"cross:center main:center"
>
人数:x {{list.Number}}
</div>
</div>
</div>
<div
class=
"billStyle"
v-if=
"(list.SFinanceList.length>0|| list.ZFinanceList.length >0) "
>
<div
class=
"billStyle_item"
style=
"border-right: 1px solid #EBEEF5"
>
收入单据:
<span
v-for=
"(item,index2) in list.SFinanceList"
:key=
"index2"
@
click=
"goSF(item)"
>
<span
class=
"billtext"
v-if=
"item.Status == 0"
:style=
"{color:'#00FFFF'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 1&& item.Is_Cashier!=1"
:style=
"{color:'#0080FF'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 1&&item.Is_Cashier==1"
:style=
"{color:'#FF4048'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 2"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 3"
:style=
"{color:'#FFF100'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 4"
:style=
"{color:'#800080'}"
>
{{item.FrID}}
</span>
</span>
</div>
<div
class=
"billStyle_item"
>
支出单据:
<span
v-for=
"(item,index2) in list.ZFinanceList"
:key=
"index2"
@
click=
"goZF(item)"
>
<span
class=
"billtext"
v-if=
"item.Status == 0"
:style=
"{color:'#00FFFF'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 1 && item.Is_Cashier!=1"
:style=
"{color:'#0080FF'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 1&&item.Is_Cashier==1"
:style=
"{color:'#FF4048'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 2"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 3"
:style=
"{color:'#FFF100'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 4"
:style=
"{color:'#800080'}"
>
{{item.FrID}}
</span>
</span>
<div
style=
"width: 200px; display: flex;flex-direction:column;justify-content: center"
v-if=
"TenantId==1"
>
<el-dropdown
trigger=
"click"
style=
"margin-left: 50px"
>
<span
class=
"el-dropdown-link"
>
制单
</span>
<el-dropdown-menu
slot=
"dropdown"
class=
"TC-dropdown"
>
<el-dropdown-item
@
click
.
native=
"goCollection(item,list)"
>
收入制单
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goPayment(item,list)"
>
付款制单
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<div
style=
"margin-top: 10px;font-size: 12px"
v-if=
"list.YSMoney!=0 || list.RealMoney!=0 || list.YFMoney!=0 || list.PayMoney!=0"
>
其他费用:
</div>
<div
style=
"font-size: 12px"
v-if=
"list.YSMoney!=0 || list.RealMoney!=0"
>
<span>
应收:¥{{list.YSMoney}}
</span>
<span
style=
"margin-left: 10px"
>
实收:¥{{list.RealMoney}}
</span>
</div>
<div
style=
"font-size: 12px"
v-if=
"list.YFMoney!=0 || list.PayMoney!=0"
>
<span>
应付:¥{{list.YFMoney}}
</span>
<span
style=
"margin-left: 10px"
>
实付:¥{{list.PayMoney}}
</span>
</div>
</div>
</div>
</div>
</div>
<div
flex=
"cross:center"
class=
"app-order-info"
style=
"width: 15%;"
>
<div
flex=
"dir:top"
>
<div>
<span
style=
"font-size: 16px;"
>
¥{{item.Income}}
</span>
<el-popover
placement=
"bottom"
width=
"200"
trigger=
"hover"
:content=
"'商品小计 '+ item.Income +'元'"
>
<img
slot=
"reference"
src=
"../../../assets/img/userman/price.png"
alt=
""
>
</el-popover>
</div>
<div
class=
"express-price"
><span>
<span
style=
"color: rgb(144, 147, 153);"
>
(含保险¥{{item.InsuranceMoney}})
</span>
</span></div>
<div>
<el-tag
effect=
"dark"
type=
"warning"
size=
"mini"
>
{{item.PaymentWayName}}
</el-tag>
</div>
<div
style=
"font-size: 12px"
v-if=
"item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0"
>
<span>
优惠金额:¥{{item.CouponMoney}}
</span>
</div>
<div
style=
"font-size: 12px"
v-if=
"item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0"
>
<span>
积分抵用金额:¥{{item.IntegralMoney}}
</span>
</div>
<div
style=
"font-size: 12px"
v-if=
"item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0"
>
<span>
积分数:¥{{item.IntegralNumber}}
</span>
<div
class=
"billStyle"
v-if=
"(list.SFinanceList.length>0|| list.ZFinanceList.length >0) "
>
<div
class=
"billStyle_item"
style=
"border-right: 1px solid #EBEEF5"
>
收入单据:
<span
v-for=
"(item,index2) in list.SFinanceList"
:key=
"index2"
@
click=
"goSF(item)"
>
<span
class=
"billtext"
v-if=
"item.Status == 0"
:style=
"{color:'#00FFFF'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 1&& item.Is_Cashier!=1"
:style=
"{color:'#0080FF'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 1&&item.Is_Cashier==1"
:style=
"{color:'#FF4048'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 2"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 3"
:style=
"{color:'#FFF100'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 4"
:style=
"{color:'#800080'}"
>
{{item.FrID}}
</span>
</span>
</div>
<div
style=
"font-size: 12px"
v-if=
"item.MemberDiscountCouponList && item.MemberDiscountCouponList.length>0"
>
<span>
优惠券信息:
</span>
<span
v-for=
"(MItem,Mindex) in item.MemberDiscountCouponList"
:key=
"Mindex"
>
{{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
<div
class=
"billStyle_item"
>
支出单据:
<span
v-for=
"(item,index2) in list.ZFinanceList"
:key=
"index2"
@
click=
"goZF(item)"
>
<span
class=
"billtext"
v-if=
"item.Status == 0"
:style=
"{color:'#00FFFF'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 1 && item.Is_Cashier!=1"
:style=
"{color:'#0080FF'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 1&&item.Is_Cashier==1"
:style=
"{color:'#FF4048'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 2"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 3"
:style=
"{color:'#FFF100'}"
>
{{item.FrID}}
</span>
<span
class=
"billtext"
v-if=
"item.Status == 4"
:style=
"{color:'#800080'}"
>
{{item.FrID}}
</span>
</span>
</div>
</div>
</div>
<div
class=
"app-order-info"
style=
"padding: 10px; border-right: 0px; width: 20%;"
>
<div
flex=
"wrap:wrap cross:center"
>
<
template
v-if=
"msg.Recycled==2"
>
<!-- 待确认 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确认"
placement=
"top"
v-if=
"item.OrderStatus==2"
>
<img
v-if=
"item.OrderStatus==2"
@
click=
"qrEnd2(item,1)"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<!-- 待出行 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确认出行"
placement=
"top"
v-if=
"item.OrderStatus==3"
>
<img
@
click=
"qrEnd2(item,2)"
v-if=
"item.OrderStatus==3"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<!-- 已收货 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确认完成"
placement=
"top"
v-if=
"item.OrderStatus==4"
>
<img
@
click=
"qrEnd2(item,3)"
v-if=
"item.OrderStatus==4"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<!--待处理-->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"同意"
placement=
"top"
v-if=
"item.OrderStatus==6"
>
<img
@
click=
"pending(item,1)"
v-if=
"item.OrderStatus==6"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"拒绝"
placement=
"top"
v-if=
"item.OrderStatus==6"
>
<img
@
click=
"pending(item,2)"
v-if=
"item.OrderStatus==6"
class=
"app-order-icon"
src=
"../../../assets/img/userman/nopass.png"
alt=
""
>
</el-tooltip>
</
template
>
<!-- 回收站 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"恢复订单"
placement=
"top"
>
<img
@
click=
"fRhsz2(item,7)"
v-if=
"msg.Recycled==1"
class=
"app-order-icon"
src=
"../../../assets/img/userman/renew.png"
alt=
""
>
</div>
<div
flex=
"cross:center"
class=
"app-order-info"
style=
"width: 15%;"
>
<div
flex=
"dir:top"
>
<div>
<span
style=
"font-size: 16px;"
>
¥{{item.Income}}
</span>
<el-popover
placement=
"bottom"
width=
"200"
trigger=
"hover"
:content=
"'商品小计 '+ item.Income +'元'"
>
<img
slot=
"reference"
src=
"../../../assets/img/userman/price.png"
alt=
""
>
</el-popover>
</div>
<div
class=
"express-price"
><span>
<span
style=
"color: rgb(144, 147, 153);"
>
(含保险¥{{item.InsuranceMoney}})
</span>
</span></div>
<div>
<el-tag
effect=
"dark"
type=
"warning"
size=
"mini"
>
{{item.PaymentWayName}}
</el-tag>
</div>
<div
style=
"font-size: 12px"
v-if=
"item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0"
>
<span>
优惠金额:¥{{item.CouponMoney}}
</span>
</div>
<div
style=
"font-size: 12px"
v-if=
"item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0"
>
<span>
积分抵用金额:¥{{item.IntegralMoney}}
</span>
</div>
<div
style=
"font-size: 12px"
v-if=
"item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0"
>
<span>
积分数:¥{{item.IntegralNumber}}
</span>
</div>
<div
style=
"font-size: 12px"
v-if=
"item.MemberDiscountCouponList && item.MemberDiscountCouponList.length>0"
>
<span>
优惠券信息:
</span>
<span
v-for=
"(MItem,Mindex) in item.MemberDiscountCouponList"
:key=
"Mindex"
>
{{MItem.Name}}券,{{MItem.CouponType==1?'满'+MItem.MinConsumePrice+'元减'+MItem.DiscountsPrice+'元':'满'+MItem.MinConsumePrice+'元打'+MItem.DiscountsPrice+'折'}}
</span>
</div>
</div>
</div>
<div
class=
"app-order-info"
style=
"padding: 10px; border-right: 0px; width: 20%;"
>
<div
flex=
"wrap:wrap cross:center"
>
<
template
v-if=
"msg.Recycled==2"
>
<!-- 待确认 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确认"
placement=
"top"
v-if=
"item.OrderStatus==2"
>
<img
v-if=
"item.OrderStatus==2"
@
click=
"qrEnd2(item,1)"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除订单"
placement=
"top"
>
<img
@
click=
"DeleteOrder(item)"
v-if=
"msg.Recycled==1"
class=
"app-order-icon"
src=
"../../../assets/img/userman/del.png"
alt=
""
>
<!-- 待出行 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确认出行"
placement=
"top"
v-if=
"item.OrderStatus==3"
>
<img
@
click=
"qrEnd2(item,2)"
v-if=
"item.OrderStatus==3"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<
template
v-if=
"msg.Recycled==2"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"添加备注"
placement=
"top"
>
<img
@
click=
"OrderExit(item,1)"
class=
"app-order-icon"
src=
"../../../assets/img/userman/add_remark.png"
alt=
""
>
</el-tooltip>
</
template
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看订单详情"
placement=
"top"
>
<img
@
click=
"goCommonJump('directorOrderDetails',item.OrderId)"
class=
"app-order-icon"
src=
"../../../assets/img/userman/detail.png"
alt=
""
>
<!-- 已收货 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确认完成"
placement=
"top"
v-if=
"item.OrderStatus==4"
>
<img
@
click=
"qrEnd2(item,3)"
v-if=
"item.OrderStatus==4"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
</div>
<!--待处理-->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"同意"
placement=
"top"
v-if=
"item.OrderStatus==6"
>
<img
@
click=
"pending(item,1)"
v-if=
"item.OrderStatus==6"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"拒绝"
placement=
"top"
v-if=
"item.OrderStatus==6"
>
<img
@
click=
"pending(item,2)"
v-if=
"item.OrderStatus==6"
class=
"app-order-icon"
src=
"../../../assets/img/userman/nopass.png"
alt=
""
>
</el-tooltip>
</
template
>
<!-- 回收站 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"恢复订单"
placement=
"top"
>
<img
@
click=
"fRhsz2(item,7)"
v-if=
"msg.Recycled==1"
class=
"app-order-icon"
src=
"../../../assets/img/userman/renew.png"
alt=
""
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除订单"
placement=
"top"
>
<img
@
click=
"DeleteOrder(item)"
v-if=
"msg.Recycled==1"
class=
"app-order-icon"
src=
"../../../assets/img/userman/del.png"
alt=
""
>
</el-tooltip>
<
template
v-if=
"msg.Recycled==2"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"添加备注"
placement=
"top"
>
<img
@
click=
"OrderExit(item,1)"
class=
"app-order-icon"
src=
"../../../assets/img/userman/add_remark.png"
alt=
""
>
</el-tooltip>
</
template
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看订单详情"
placement=
"top"
>
<img
@
click=
"goCommonJump('directorOrderDetails',item.OrderId)"
class=
"app-order-icon"
src=
"../../../assets/img/userman/detail.png"
alt=
""
>
</el-tooltip>
</div>
</div>
<div
class=
"card-footer"
>
<div>
<div
flex=
"dir:left"
>
<div
class=
"address-box"
>
联系人: {{item.Consignee}}
<span
style=
'margin:0 5px'
></span>
电话: {{item.Mobile}}
出发地:{{item.ShoppingAddress}}
{{item.SDGoodsList[0].CarType!=5 ?('目的地:'+item.DestinationAddress):''}}
</div>
<button
v-if=
"item.OrderStatus==2"
@
click=
"ExitshAdress(item)"
type=
"button"
class=
"el-button el-button--text is-circle"
><i
class=
"el-icon-edit"
></i></button>
</div>
<div
class=
"card-footer"
>
<div>
<div
flex=
"dir:left"
>
<div
class=
"address-box"
>
联系人: {{item.Consignee}}
<span
style=
'margin:0 5px'
></span>
电话:
{{item.Mobile}}
出发地:{{item.ShoppingAddress}}
{{item.SDGoodsList[0].CarType!=5 ?('目的地:'+item.DestinationAddress):''}}
</div>
<button
v-if=
"item.OrderStatus==2"
@
click=
"ExitshAdress(item)"
type=
"button"
class=
"el-button el-button--text is-circle"
><i
class=
"el-icon-edit"
></i></button>
</div>
<div
v-if=
"item.Remark && item.Remark!=''"
class=
"seller-remark"
>
商家备注:{{item.Remark}}
</div>
</div>
<div
v-if=
"item.Remark && item.Remark!=''"
class=
"seller-remark"
>
商家备注:{{item.Remark}}
</div>
</div>
</div>
</el-card>
<el-card
v-if=
"tableData.length==0"
class=
"app-order-item"
shadow=
"never"
>
...
...
@@ -621,17 +637,18 @@
<div
style=
"width100%;height:15px"
></div>
<div
v-if=
"pendMgs.Type==1 && pendMgs.OrderType!=5"
>
<span>
退款金额
</span>
<el-input
type=
"text"
size=
"small"
v-model=
"pendMgs.RefundMoney"
placeholder=
"退款金额"
></el-input>
<el-input
type=
"text"
size=
"small"
v-model=
"pendMgs.RefundMoney"
placeholder=
"退款金额"
></el-input>
</div>
<el-input
v-if=
"pendMgs.Type==2"
type=
"textarea"
size=
"small"
v-model=
"pendMgs.Remark"
placeholder=
"拒绝理由"
></el-input>
<el-input
v-if=
"pendMgs.Type==2"
type=
"textarea"
size=
"small"
v-model=
"pendMgs.Remark"
placeholder=
"拒绝理由"
>
</el-input>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"pendD = false"
>
{{$t('pub.cancelBtn')}}
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"pendingForm()"
>
确 定
</el-button>
</span>
</el-dialog>
<!-- 发货 -->
<!-- 选择导出信息 -->
<el-dialog
title=
"选择导出信息"
:visible
.
sync=
"dialogVisible"
width=
"960px"
>
<el-form
style=
"border: 1px solid #F0F2F7;"
:model=
"addMsg"
ref=
"addMsg"
label-width=
"100px"
>
...
...
@@ -667,15 +684,16 @@
<span
style=
"font-size:20px"
>
提示
</span>
</p>
<p
class=
"center"
style=
"padding: 10px 15px;"
>
{{hstips}}
</p>
<el-input
style=
"margin-left: 10px; width: 400px;"
size=
"small"
type=
"textarea"
v-if=
'hszMsg.Type == 1'
v-model=
"hszMsg.Remark"
></el-input>
<el-input
style=
"margin-left: 10px; width: 400px;"
size=
"small"
type=
"textarea"
v-if=
'hszMsg.Type == 1'
v-model=
"hszMsg.Remark"
></el-input>
<div
style=
"text-align:center;margin-top:20px"
>
<el-button
size=
"small"
@
click=
"hszDig=fasle"
>
取消
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"hszOk"
>
确定
</el-button>
</div>
</el-dialog>
<!-- 放入回收站 -->
<!-- 放入回收站 -->
<el-dialog
custom-class=
"hszDigClass"
:visible
.
sync=
"hszDig2"
width=
"420px"
>
<p
style=
"padding: 10px 15px;"
class=
"center"
>
<i
class=
"el-icon-warning"
style=
"color:#E6A23C;font-size:24px"
></i>
...
...
@@ -731,7 +749,7 @@
<el-button
size=
"small"
type=
"primary"
@
click=
"costForm2('CostMoney')"
>
确 定
</el-button>
</span>
</el-dialog>
<el-dialog
:title=
"cosType==1?'商品成本修改':'运费成本修改'"
:visible
.
sync=
"costDig"
width=
"600px"
>
<el-dialog
:title=
"cosType==1?'商品成本修改':'运费成本修改'"
:visible
.
sync=
"costDig"
width=
"600px"
>
<el-form
:model=
"costMsg"
ref=
"costMsg"
label-width=
"80px"
>
<el-form-item
:label=
"cosType==1?'商品成本':'运费成本'"
>
<el-input
size=
"small"
v-model=
"costMsg.Money"
step=
"1"
min=
"0"
...
...
@@ -744,15 +762,15 @@
<el-button
size=
"small"
type=
"primary"
@
click=
"costForm('costMsg')"
>
确 定
</el-button>
</span>
</el-dialog>
</div>
</template>
<
script
>
export
default
{
name
:
"orderList"
,
components
:{
components
:
{
},
data
()
{
return
{
...
...
@@ -765,7 +783,7 @@
priceDig
:
false
,
costDig
:
false
,
//商品、运费成本的修改
costDig2
:
false
,
//商品、运费成本的修改
costDig_t
:
false
,
costDig_t
:
false
,
cosType
:
1
,
costMsg
:
{
Id
:
0
,
...
...
@@ -861,7 +879,7 @@
msg
:
{
pageIndex
:
1
,
pageSize
:
15
,
OrderSource
:
0
,
OrderSource
:
0
,
OrderType
:
0
,
OrderId
:
0
,
StartTime
:
''
,
...
...
@@ -874,13 +892,13 @@
Mobile
:
''
,
ProductCode
:
''
,
Recycled
:
2
,
// DeliveryMethod: 0,
// Name: '',
// MerchantsNo: '',
// GoodsName: '',
// ProductCode: '',
// AnchorName: '',
...
...
@@ -900,7 +918,7 @@
Id
:
3
,
name
:
'用户ID'
},
{
Id
:
4
,
name
:
'联系人'
...
...
@@ -909,7 +927,7 @@
Id
:
5
,
name
:
'联系电话'
},
],
msgId
:
1
,
ExpressList
:
[],
...
...
@@ -936,7 +954,7 @@
CommonId
:
0
,
//公用id 给弹窗用
TenantId
:
0
,
cost_tMSg
:
{},
//成本管理
cost_tMSg
:
{},
//成本管理
}
},
created
()
{
...
...
@@ -1009,7 +1027,7 @@
ChangeId
(
val
)
{
let
msgVal
=
this
.
msgVal
;
if
(
val
==
1
)
{
this
.
msg
.
OrderNo
=
msgVal
;
this
.
msg
.
OrderNo
=
msgVal
;
this
.
msg
.
UserName
=
''
;
this
.
msg
.
UserId
=
''
;
this
.
msg
.
Consignee
=
''
;
...
...
@@ -1039,7 +1057,7 @@
this
.
msg
.
Consignee
=
''
;
this
.
msg
.
Mobile
=
msgVal
;
}
},
hszOk
()
{
this
.
lxymallapipost
(
'/api/DmcOrder/SetDmcOrderOperation'
,
this
.
hszMsg
,
...
...
@@ -1056,8 +1074,8 @@
null
);
},
hszOk2
()
{
this
.
lxymallapipost
(
'/api/order/SetOrderOperation'
,
this
.
hszMsg2
,
hszOk2
()
{
this
.
lxymallapipost
(
'/api/order/SetOrderOperation'
,
this
.
hszMsg2
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
...
...
@@ -1077,7 +1095,7 @@
this
.
pendMgs
.
Type
=
type
;
this
.
pendMgs
.
Remark
=
''
;
this
.
pendMgs
.
RefundMoney
=
item
.
PreferPrice
;
this
.
pendMgs
.
OrderType
=
item
.
OrderType
;
//来判断的否是城际专车 是的话用之前的接口
this
.
pendMgs
.
OrderType
=
item
.
OrderType
;
//来判断的否是城际专车 是的话用之前的接口
},
...
...
@@ -1085,7 +1103,7 @@
pendingForm
()
{
this
.
loading
=
true
;
let
url
=
'/api/DmcOrder/SetDmcOrderCancelAudit'
if
(
this
.
pendMgs
.
OrderType
==
5
)
{
if
(
this
.
pendMgs
.
OrderType
==
5
)
{
url
=
'/api/order/SetOrderApplyForCancelAudit'
}
this
.
lxymallapipost
(
url
,
this
.
pendMgs
,
...
...
@@ -1140,7 +1158,7 @@
});
},
// 司导的确认完成
// 司导的确认完成
qrEnd2
(
item
,
num
)
{
let
msg
=
{
OrderId
:
item
.
OrderId
,
...
...
@@ -1179,7 +1197,7 @@
// 放入回收站
fRhsz
(
item
,
num
)
{
let
Remark
=
''
if
(
num
==
1
)
{
if
(
num
==
1
)
{
this
.
hstips
=
"备注修改"
Remark
=
item
.
Remark
}
...
...
@@ -1189,13 +1207,13 @@
if
(
num
==
4
)
{
this
.
hstips
=
"是否移出回收站?"
}
if
(
num
==
5
)
{
if
(
num
==
5
)
{
this
.
hstips
=
"是否删除?"
}
this
.
hszMsg
=
{
OrderId
:
item
.
OrderId
,
Type
:
num
,
Remark
:
Remark
Remark
:
Remark
};
this
.
hszDig
=
true
;
},
...
...
@@ -1283,7 +1301,7 @@
});
},
FhsubmitForm
(
formName
)
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
...
...
@@ -1476,7 +1494,7 @@
);
});
},
OrderExit3
(
item
){
OrderExit3
(
item
)
{
let
that
=
this
;
let
text
=
''
;
if
(
item
.
OrderStatus
==
1
)
{
...
...
@@ -1535,13 +1553,13 @@
that
.
msg
.
EndTime
=
''
;
}
that
.
loading
=
true
;
that
.
lxymallapipost
(
"/api/DmcOrder/GetDmcOrderCommonPageList_V2"
,
that
.
msg
,
res
=>
{
that
.
lxymallapipost
(
"/api/DmcOrder/GetDmcOrderCommonPageList_V2"
,
that
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
that
.
loading
=
false
;
that
.
total
=
res
.
data
.
data
.
count
;
let
pageData
=
res
.
data
.
data
.
pageData
;
that
.
tableData
=
pageData
;
this
.
$forceUpdate
()
that
.
loading
=
false
;
that
.
total
=
res
.
data
.
data
.
count
;
let
pageData
=
res
.
data
.
data
.
pageData
;
that
.
tableData
=
pageData
;
this
.
$forceUpdate
()
}
})
...
...
@@ -1609,29 +1627,29 @@
}
})
},
costBtn_t
(
list
,
item
)
{
this
.
cost_tMSg
.
OrderDetailId
=
list
.
Id
;
this
.
cost_tMSg
.
OrderType
=
item
.
OrderType
;
this
.
cost_tMSg
.
CostMoney
=
list
.
CostMoney
;
this
.
costDig_t
=
true
costBtn_t
(
list
,
item
)
{
this
.
cost_tMSg
.
OrderDetailId
=
list
.
Id
;
this
.
cost_tMSg
.
OrderType
=
item
.
OrderType
;
this
.
cost_tMSg
.
CostMoney
=
list
.
CostMoney
;
this
.
costDig_t
=
true
},
costForm_t
(){
//成本修改 新的
if
(
this
.
cost_tMSg
.
CostMoney
==
''
)
{
costForm_t
()
{
//成本修改 新的
if
(
this
.
cost_tMSg
.
CostMoney
==
''
)
{
this
.
Info
(
'请输入修改成本金额'
)
return
}
this
.
lxymallapipost
(
'/api/DmcOrder/SetDmcOrderCost'
,
this
.
cost_tMSg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
this
.
costDig_t
=
false
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
this
.
costDig_t
=
false
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
costBtn
(
list
,
type
)
{
this
.
cosType
=
type
;
...
...
@@ -1651,7 +1669,7 @@
this
.
costDig2
=
true
;
},
costForm
(
formName
)
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
...
...
@@ -1762,19 +1780,20 @@
ECOrderDetailId
:
list
.
Id
}]
}
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=1&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window
.
open
(
'http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=1&companyID='
+
companyID
+
'&orderObj='
+
JSON
.
stringify
(
orderObj
))
var
newUrl
=
this
.
domainManager
().
erpSiteUrl
+
'ChoiceAddFinancialDocuments?Type=1&companyID='
+
companyID
+
'&orderObj='
+
JSON
.
stringify
(
orderObj
)
window
.
open
(
newUrl
);
},
getshangplist
(
item
){
getshangplist
(
item
)
{
let
List
=
[];
if
(
item
.
OrderType
==
1
)
{
if
(
item
.
OrderType
==
1
)
{
List
=
item
.
HotelList
}
else
if
(
item
.
OrderType
==
2
)
{
}
else
if
(
item
.
OrderType
==
2
)
{
List
=
item
.
DiningList
}
else
if
(
item
.
OrderType
==
3
)
{
}
else
if
(
item
.
OrderType
==
3
)
{
List
=
item
.
TicketList
}
else
if
(
item
.
OrderType
==
4
)
{
}
else
if
(
item
.
OrderType
==
4
)
{
List
=
item
.
CarList
}
return
List
...
...
@@ -1792,19 +1811,20 @@
ECOrderDetailId
:
list
.
Id
}]
}
// window.open('http://www.test.com:8081/#/ChoiceAddFinancialDocuments?Type=2&companyID='+companyID+'&orderObj='+JSON.stringify(orderObj))
window
.
open
(
'http://yx.oytour.com/#/ChoiceAddFinancialDocuments?Type=2&companyID='
+
companyID
+
'&orderObj='
+
JSON
.
stringify
(
orderObj
))
var
newUrl
=
this
.
domainManager
().
erpSiteUrl
+
'ChoiceAddFinancialDocuments?Type=2&companyID='
+
companyID
+
'&orderObj='
+
JSON
.
stringify
(
orderObj
)
window
.
open
(
newUrl
)
},
goSF
(
item
)
{
//收入详情
this
.
$router
.
push
({
name
:
'FinancialDocumentsDetail'
,
query
:
{
id
:
item
.
FrID
,
blank
:
'y'
blank
:
'y'
}
});
},
goZF
(
item
)
{
//付款详情
...
...
@@ -1812,19 +1832,19 @@
name
:
'FinancialDocumentsDetail'
,
query
:
{
id
:
item
.
FrID
,
blank
:
'y'
blank
:
'y'
}
});
},
goCommonJump
(
url
,
id
)
{
goCommonJump
(
url
,
id
)
{
this
.
$router
.
push
({
name
:
url
,
query
:
{
OrderId
:
id
,
blank
:
'y'
blank
:
'y'
}
});
}
...
...
@@ -2110,12 +2130,15 @@
border-radius
:
2px
;
margin-right
:
4px
;
}
.vue-line-clamp
span
{
font-size
:
16px
;
font-weight
:
bold
.vue-line-clamp
span
{
font-size
:
16px
;
font-weight
:
bold
}
.orderList
span
{
.orderList
span
{
font-size
:
13px
;
font-weight
:
normal
;
}
}
</
style
>
src/components/index.vue
View file @
e622536e
...
...
@@ -2394,16 +2394,8 @@
},
LogSetReadStatus
(
s
)
{
if
(
s
.
Type
==
7
)
{
let
url
=
""
;
if
(
!
this
.
isOnline
())
{
url
=
"http://testerp.oytour.com:8081/#/"
;
}
else
{
url
=
"http://yx.oytour.com/#/"
;
}
let
url
=
this
.
domainManager
().
erpSiteUrl
;
let
path
=
url
+
s
.
Link
;
let
routeData
=
this
.
$router
.
resolve
({
name
:
path
})
window
.
open
(
path
,
'_blank'
)
}
else
{
this
.
apipost
(
...
...
src/plug/index.js
View file @
e622536e
...
...
@@ -118,6 +118,7 @@ export default {
let
mallUrl
=
""
;
//商城API
let
lxymallUrl
=
''
;
//国内游api
let
crmUrl
=
""
;
//crm API
let
erpSiteUrl
=
""
;
//ERP站点
let
locationName
=
window
.
location
.
hostname
;
let
isOnline
=
0
;
//0-本地测试,1-线上
let
ocrUrl
=
"http://192.168.5.46:8888"
;
...
...
@@ -130,12 +131,14 @@ export default {
mallUrl
=
"http://192.168.5.214:8200"
;
lxymallUrl
=
"http://192.168.20.13:8088"
;
crmUrl
=
"http://192.168.5.46:5003"
erpSiteUrl
=
"http://localhost:8080/#/"
;
if
(
locationName
.
indexOf
(
'testerp.oytour'
)
!==
-
1
)
{
domainUrl
=
"http://testapi.oytour.com"
;
mallUrl
=
"https://mallapi.oytour.com"
;
lxymallUrl
=
"https://erpmallapi.oytour.com"
;
crmUrl
=
"http://testcrm.oytour.com"
;
ocrUrl
=
"http://ocr.oytour.com"
;
erpSiteUrl
=
"http://admin.oytour.com/#/"
;
isOnline
=
1
;
}
else
if
(
locationName
.
indexOf
(
'ys.oytour'
)
!==
-
1
)
{
domainUrl
=
"http://reborn.oytour.com"
;
...
...
@@ -143,6 +146,7 @@ export default {
lxymallUrl
=
"https://erpmallapi.oytour.com"
;
crmUrl
=
"http://crm.oytour.com"
;
ocrUrl
=
"http://ocr.oytour.com"
;
erpSiteUrl
=
"http://admin.oytour.com/#/"
;
isOnline
=
1
;
}
else
if
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
)
{
domainUrl
=
"http://reborn.oytour.com"
;
...
...
@@ -150,13 +154,19 @@ export default {
lxymallUrl
=
"https://erpmallapi.oytour.com"
;
crmUrl
=
"http://crm.oytour.com"
;
ocrUrl
=
"http://ocr.oytour.com"
;
erpSiteUrl
=
"http://admin.oytour.com/#/"
;
isOnline
=
1
;
}
var
userInfo
=
this
.
getLocalStorage
();
if
(
userInfo
&&
userInfo
.
ERPUrl
&&
userInfo
.
ERPUrl
!=
''
)
{
erpSiteUrl
=
userInfo
.
ERPUrl
;
}
var
obj
=
{
IsOnline
:
isOnline
,
//0-本地,1-线上
//主地址
DomainUrl
:
domainUrl
,
ocrUrl
:
ocrUrl
,
//行程下载地址
erpSiteUrl
:
erpSiteUrl
,
//ERP站点地址
//常用提交数据URL
PostUrl
:
domainUrl
+
"/api/common/post"
,
//上传文件URL
...
...
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