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
05fd5d49
Commit
05fd5d49
authored
May 15, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
统计调整
parent
bc11ad52
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
329 additions
and
345 deletions
+329
-345
roomReservationsDetails.vue
src/components/Hotel/roomReservationsDetails.vue
+1
-1
JapanOrderDetailList.vue
...usManagement/BookAcar/components/JapanOrderDetailList.vue
+123
-113
JapanOrderFList.vue
...nts/busManagement/BookAcar/components/JapanOrderFList.vue
+130
-133
JapanBusMonthFStatistics.vue
src/components/busManagement/JapanBusMonthFStatistics.vue
+44
-47
JapanBusOrderStatistics.vue
src/components/busManagement/JapanBusOrderStatistics.vue
+30
-50
config.js
src/router/config.js
+1
-1
No files found.
src/components/Hotel/roomReservationsDetails.vue
View file @
05fd5d49
...
...
@@ -36,7 +36,7 @@
.roomReservationsDetailsTalbe
thead
tr
th
{
position
:
sticky
;
top
:
0
;
z-index
:
10
00
;
z-index
:
10
;
}
</
style
>
...
...
src/components/busManagement/BookAcar/components/JapanOrderDetailList.vue
View file @
05fd5d49
<
style
scoped
>
.busStatisticsTalbe
{
table-layout
:
fixed
;
}
.busStatisticsTalbe
thead
tr
th
{
position
:
sticky
;
top
:
0
;
z-index
:
10
;
}
</
style
>
<
template
>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"busStatisticsTalbe"
v-loading=
'loading'
>
<tr>
<th
class=
"w100"
>
车公司
</th>
<th
class=
"w110"
>
车牌号
</th>
<th
class=
"w110"
>
司机
</th>
<th
class=
"w150"
>
车型
</th>
<th
class=
"w150"
>
用车性质
</th>
<th
class=
"w150"
>
使用单位
</th>
<th
class=
"w100"
>
用车地点
</th>
<th
class=
"w100"
>
用车日期
</th>
<th
class=
"w100"
>
用车时间
</th>
<th
class=
"w100"
>
还车日期
</th>
<th
class=
"w100"
>
还车时间
</th>
<th
class=
"w200"
>
行程
</th>
<th
class=
"w200"
>
备注
</th>
</tr>
<tbody
v-for=
"(outItem,outindex) in OrderList"
class=
"splitTrCss1"
>
<tr>
<td
>
<div
class=
"w100"
>
{{
outItem
.
CarSupplierName
}}
</div>
</td>
<td
>
<div
class=
"w110"
>
{{
outItem
.
CarNo
}}
</div>
</td>
<td
>
<div
class=
"w110"
>
{{
outItem
.
DriverName
}}
{{
outItem
.
CopilotDriverName
}}
</div>
</td>
<td
>
<div
class=
"w120"
>
{{
outItem
.
CarName
}}
</div>
</td>
<td>
<div
class=
"W100 "
>
{{
outItem
.
UseTypeStr
}}
</div>
</td>
<td>
<div
class=
"w150"
>
{{
outItem
.
CustomerName
}}
</div>
</td>
<td>
<div
class=
"w100"
><span>
{{
outItem
.
StartCityName
}}
<span
v-if=
"outItem.StartCity&&outItem.EndCity"
>
-->
</span>
<span
>
{{
outItem
.
EndCityName
}}
</span></span></div>
</td>
<td>
<div
class=
"w100"
>
{{
outItem
.
UseDateStr
}}
</div>
</td>
<td>
<div
class=
"w100"
>
{{
outItem
.
StartTime
}}
</div>
</td>
<td>
<div
class=
"w100"
>
{{
outItem
.
UseDateStr
}}
</div>
</td>
<td>
<div
class=
"w100"
>
{{
outItem
.
EndTime
}}
</div>
</td>
<td>
<div
class=
"w150"
>
{{
outItem
.
BusContent
}}
</div>
</td>
<td>
<div
class=
"w150"
>
{{
outItem
.
AppendNotes
}}
</div>
</td>
</tr>
</tbody>
</table>
<
template
>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"busStatisticsTalbe"
v-loading=
'loading'
>
<thead>
<tr>
<th
class=
"w100"
>
车公司
</th>
<th
class=
"w110"
>
车牌号
</th>
<th
class=
"w100"
>
司机
</th>
<th
class=
"w100"
>
车型
</th>
<th
class=
"w100"
>
用车性质
</th>
<th
class=
"w135"
>
使用单位
</th>
<th
class=
"w100"
>
使用团号
</th>
<th
class=
"w135"
>
用车地点
</th>
<th
class=
"w100"
>
用车日期
</th>
<th
class=
"w100"
>
用车时间
</th>
<th
class=
"w100"
>
还车日期
</th>
<th
class=
"w100"
>
还车时间
</th>
<th
class=
"w90"
>
状态
</th>
<th
class=
"w210"
>
行程
</th>
<th
class=
"w210"
>
备注
</th>
</tr>
</thead>
<tbody
v-for=
"(outItem,outindex) in OrderList"
class=
"splitTrCss1"
:key=
"outindex"
>
<tr>
<td>
{{
outItem
.
CarSupplierName
}}
</td>
<td>
{{
outItem
.
CarNo
}}
</td>
<td>
{{
outItem
.
DriverName
}}
{{
outItem
.
CopilotDriverName
}}
</td>
<td>
{{
outItem
.
CarName
}}
(
{{
outItem
.
CarSeatNum
}}
座)
</td>
<td>
{{
outItem
.
UseTypeStr
}}
</td>
<td>
{{
outItem
.
CustomerName
}}
</td>
<td>
{{
outItem
.
TCNUM
}}
</td>
<td>
<div><span>
{{
outItem
.
StartCityName
}}
<span
v-if=
"outItem.StartCity&&outItem.EndCity"
>
-->
</span>
<span>
{{
outItem
.
EndCityName
}}
</span></span></div>
</td>
<td>
{{
outItem
.
UseDateStr
}}
</td>
<td>
{{
outItem
.
StartTime
}}
</td>
<td>
{{
outItem
.
UseDateStr
}}
</td>
<td>
{{
outItem
.
EndTime
}}
</td>
<td>
<template
v-if=
"outItem.UseState==0"
>
<span
style=
"color:#E95252 ;"
>
X
</span>
</
template
>
<
template
v-else-if=
"outItem.UseState==1"
>
<span
style=
"color: #ff6600;"
>
O
</span>
</
template
>
<
template
v-else-if=
"outItem.UseState==2"
>
<span
style=
"color:#4BCA81 ;"
>
√
</span>
</
template
>
</td>
<td>
<div
style=
"padding:2px;"
>
{{outItem.BusContent}}
</div>
</td>
<td>
<div
style=
"padding:2px;"
>
{{outItem.AppendNotes}}
</div>
</td>
</tr>
</tbody>
</table>
</template>
<
script
>
export
default
{
props
:
[
"OrderList"
,
"pagesTitle"
,
'loading'
],
data
()
{
return
{
};
},
watch
:
{
pagesTitle
(
val
,
oldval
)
{
},
OrderList
:
{
handler
(
val
,
oldVal
)
{},
<
script
>
export
default
{
props
:
[
"OrderList"
,
"pagesTitle"
,
'loading'
],
data
()
{
return
{};
},
},
methods
:
{
com_onresize
()
{
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定,
var
contentsHeight
=
document
.
body
.
clientHeight
;
var
h
=
contentsHeight
-
50
-
180
-
40
;
if
(
h
<
110
)
{
return
;
}
//设置table的行高
// this.tableHeight = h;
watch
:
{
pagesTitle
(
val
,
oldval
)
{
},
OrderList
:
{
handler
(
val
,
oldVal
)
{},
},
},
success
()
{
this
.
close
();
this
.
$emit
(
"success"
);
methods
:
{
com_onresize
()
{
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定,
var
contentsHeight
=
document
.
body
.
clientHeight
;
var
h
=
contentsHeight
-
50
-
180
-
40
;
if
(
h
<
110
)
{
return
;
}
},
success
()
{
this
.
close
();
this
.
$emit
(
"success"
);
},
},
},
mounted
()
{
this
.
userInfo
=
this
.
getLocalStorage
();
let
ActionMenuCode
=
this
.
userInfo
.
ActionMenuCode
;
if
(
ActionMenuCode
.
indexOf
(
"is_correlationOP"
)
!=
-
1
)
{
this
.
is_correlationOP
=
true
;
}
//自适应高度调节
this
.
com_onresize
();
window
.
onresize
=
()
=>
{
mounted
()
{
//自适应高度调节
this
.
com_onresize
();
};
},
};
window
.
onresize
=
()
=>
{
this
.
com_onresize
();
};
},
};
</
script
>
<
style
></
style
>
<
style
></
style
>
src/components/busManagement/BookAcar/components/JapanOrderFList.vue
View file @
05fd5d49
<
style
scoped
>
.busStatisticsTalbe
{
table-layout
:
fixed
;
}
.busStatisticsTalbe
thead
tr
th
{
position
:
sticky
;
top
:
0
;
z-index
:
10
;
}
</
style
>
<
template
>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"busStatisticsTalbe"
v-loading=
'loading'
>
<tr>
<th
class=
"w100"
>
车公司
</th>
<th
width=
"110"
>
车牌号
</th>
<th
width=
"110"
>
司机
</th>
<th
width=
"150"
>
出车日
</th>
<th
width=
"150"
>
客户
</th>
<th
width=
"100"
>
出发地
</th>
<th
width=
"100"
>
到达地
</th>
<th
width=
"100"
>
天数
</th>
<th
width=
"100"
>
总收入
</th>
<th
width=
"300"
>
收入单据
</th>
<th
width=
"100"
>
总支出
</th>
<th
width=
"300"
>
支出单据
</th>
</tr>
<tbody
v-for=
"(outItem,outindex) in OrderList"
class=
"splitTrCss1"
>
<tr>
<td>
<div
class=
"w100"
>
{{
outItem
.
SupplierName
}}
</div>
</td>
<td>
<div
class=
"w80"
>
{{
outItem
.
CarNo
}}
</div>
</td>
<td
>
<div
class=
"w80"
>
{{
outItem
.
DriverName
}}
{{
outItem
.
CopilotDriverName
}}
</div>
</td>
<td
>
<div
class=
"w120"
>
{{
outItem
.
UseDateStr
}}
</div>
</td>
<td>
<div
class=
"w120 "
>
{{
outItem
.
CustomerName
}}
</div>
</td>
<td>
<div
class=
"w80"
>
{{
outItem
.
StartCityName
}}
</div>
</td>
<td>
<div
class=
"w80"
>
{{
outItem
.
EndCityName
}}
</div>
</td>
<td>
<div
class=
"w100"
>
{{
outItem
.
UseDayCount
}}
</div>
</td>
<td>
<div
class=
"w80"
>
{{
outItem
.
IncomeMoney
}}
</div>
</td>
<td>
<div
class=
"w300"
>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
:class=
"
{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in outItem.IncomeList"
@click="openDetails(x)">
{{
x
.
FrID
}}
</span>
<span
v-if=
"outItem.IncomeList.length == 0"
class=
"c9e fz12"
>
{{
$t
(
'objFill.nocollectiondocument'
)
}}
</span>
</div></div>
</td>
<td>
<div
class=
"w80"
>
{{
outItem
.
OutMoney
}}
</div>
</td>
<td>
<div
class=
"w300"
>
<div
class=
"row wrap orderNo fz12 py"
>
<span
class=
"cursor-pointer radius5 mr mb px5"
:class=
"
{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in outItem.RefundList"
@click="openDetails(x)">
{{
x
.
FrID
}}
</span>
<span
v-if=
"outItem.RefundList.length == 0"
class=
"c9e fz12"
>
{{
$t
(
'objFill.norefundreceipt'
)
}}
</span>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<
template
>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"busStatisticsTalbe"
v-loading=
'loading'
>
<tr>
<th
width=
"120"
>
车公司
</th>
<th
width=
"180"
>
车牌号
</th>
<th
width=
"100"
>
司机
</th>
<th
width=
"120"
>
出车日
</th>
<th
width=
"150"
>
客户
</th>
<th
width=
"150"
>
团号
</th>
<th
width=
"100"
>
出发地
</th>
<th
width=
"100"
>
到达地
</th>
<th
width=
"100"
>
天数
</th>
<th
width=
"100"
>
总收入
</th>
<th
width=
"300"
>
收入单据
</th>
<th
width=
"100"
>
总支出
</th>
<th
width=
"300"
>
支出单据
</th>
</tr>
<tbody
v-for=
"(outItem,outindex) in OrderList"
class=
"splitTrCss1"
:key=
"outindex"
>
<tr>
<td>
{{
outItem
.
SupplierName
}}
</td>
<td>
{{
outItem
.
CarName
}}
{{
outItem
.
CarNo
}}
(
{{
outItem
.
CarSeatNum
}}
座)
</td>
<td>
{{
outItem
.
DriverName
}}
{{
outItem
.
CopilotDriverName
}}
</td>
<td>
{{
outItem
.
UseDateStr
}}
</td>
<td>
{{
outItem
.
CustomerName
}}
</td>
<td>
{{
outItem
.
TCNUM
}}
</td>
<td>
{{
outItem
.
StartCityName
}}
</td>
<td>
{{
outItem
.
EndCityName
}}
</td>
<td>
{{
outItem
.
UseDayCount
}}
</td>
<td>
{{
outItem
.
IncomeMoney
}}
</td>
<td>
<div
class=
"row wrap orderNo fz12 py"
style=
"padding:3px;"
>
<template
v-for=
"(x, i) in outItem.IncomeList"
>
<span
:key=
"i+10000"
class=
"cursor-pointer radius5 mr mb px5"
:class=
"
{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">
{{
x
.
FrID
}}
</span>
</
template
>
<span
v-if=
"outItem.IncomeList.length == 0"
class=
"c9e fz12"
>
{{$t('objFill.nocollectiondocument')}}
</span>
</div>
</td>
<td>
{{outItem.OutMoney}}
</td>
<td>
<div
class=
"row wrap orderNo fz12 py"
style=
"padding:3px;"
>
<
template
v-for=
"(x, i) in outItem.RefundList"
>
<span
:key=
"i+20000"
class=
"cursor-pointer radius5 mr mb px5"
:class=
"
{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">
{{
x
.
FrID
}}
</span>
</
template
>
<span
v-if=
"outItem.RefundList.length == 0"
class=
"c9e fz12"
>
{{$t('objFill.nocostdocument')}}
</span>
</div>
</td>
</tr>
</tbody>
</table>
</template>
<
script
>
export
default
{
props
:
[
"OrderList"
,
"pagesTitle"
,
'loading'
],
data
()
{
return
{
};
},
watch
:
{
pagesTitle
(
val
,
oldval
)
{
},
OrderList
:
{
handler
(
val
,
oldVal
)
{},
},
},
methods
:
{
com_onresize
()
{
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定,
var
contentsHeight
=
document
.
body
.
clientHeight
;
var
h
=
contentsHeight
-
50
-
180
-
40
;
if
(
h
<
110
)
{
return
;
}
//设置table的行高
// this.tableHeight = h;
<
script
>
export
default
{
props
:
[
"OrderList"
,
"pagesTitle"
,
'loading'
],
data
()
{
return
{};
},
success
()
{
this
.
close
();
this
.
$emit
(
"success"
);
watch
:
{
pagesTitle
(
val
,
oldval
)
{
},
OrderList
:
{
handler
(
val
,
oldVal
)
{},
},
},
methods
:
{
com_onresize
()
{
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定,
var
contentsHeight
=
document
.
body
.
clientHeight
;
var
h
=
contentsHeight
-
50
-
180
-
40
;
if
(
h
<
110
)
{
return
;
}
//设置table的行高
// this.tableHeight = h;
},
success
()
{
this
.
close
();
this
.
$emit
(
"success"
);
},
// 单据详情
openDetails
(
item
,
x
)
{
openDetails
(
item
,
x
)
{
let
query
=
{
id
:
item
.
FrID
?
item
.
FrID
:
item
.
ID
,
blank
:
"y"
,
};
this
.
$router
.
push
({
path
:
"/FinancialDocumentsDetail"
,
query
});
this
.
$router
.
push
({
path
:
"/FinancialDocumentsDetail"
,
query
});
},
},
mounted
()
{
this
.
userInfo
=
this
.
getLocalStorage
();
let
ActionMenuCode
=
this
.
userInfo
.
ActionMenuCode
;
if
(
ActionMenuCode
.
indexOf
(
"is_correlationOP"
)
!=
-
1
)
{
this
.
is_correlationOP
=
true
;
}
//自适应高度调节
this
.
com_onresize
();
window
.
onresize
=
()
=>
{
},
mounted
()
{
//自适应高度调节
this
.
com_onresize
();
};
},
};
</
script
>
window
.
onresize
=
()
=>
{
this
.
com_onresize
();
};
},
};
<
style
></
style
>
</
script
>
<
style
></
style
>
src/components/busManagement/JapanBusMonthFStatistics.vue
View file @
05fd5d49
...
...
@@ -5,9 +5,10 @@
<li>
<span>
<em>
{{
$t
(
'fnc.khmingcheng'
)
}}
</em>
<el-select
v-model=
"msg.CustomerId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getLinePlaceList()"
>
<el-select
v-model=
"msg.CustomerId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
clearable
clear
@
clear=
"resetPageIndex()"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'0'
></el-option>
<el-option
v-for=
"item in queryCommonData.
Line
List"
:label=
'item.CustomerName'
:value=
'item.Id'
<el-option
v-for=
"item in queryCommonData.
Customer
List"
:label=
'item.CustomerName'
:value=
'item.Id'
:key=
'item.Id'
>
</el-option>
</el-select>
...
...
@@ -16,35 +17,31 @@
<li>
<span>
<em>
团号
</em>
<el-input
v-model=
'msg.TCNUM'
></el-input>
<el-input
v-model=
'msg.TCNUM'
maxlength=
"40"
@
keyup
.
native
.
enter=
"resetPageIndex()"
clear
@
clear=
"resetPageIndex()"
clearable
></el-input>
</span>
</li>
<li><span><em>
{{
$t
(
'pub.date'
)
}}
</em>
<el-date-picker
v-model=
'msg.UseSTime'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
<el-date-picker
v-model=
'msg.UseSTime'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
@
change=
"resetPageIndex()"
clearable
@
clear=
"resetPageIndex()"
></el-date-picker>
-
<el-date-picker
v-model=
'msg.UseETime'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
<el-date-picker
v-model=
'msg.UseETime'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
@
change=
"resetPageIndex()"
clearable
@
clear=
"resetPageIndex()"
></el-date-picker>
</span>
</li>
<li><span><em>
是否完结
</em></span>
<li
style=
"display:none"
><span><em>
是否完结
</em></span>
<el-select
v-model=
'msg.IsFinish'
>
<el-option
label=
'全部'
value=
'0'
key=
'0'
></el-option>
<el-option
label=
'是'
value=
'1'
key=
'1'
></el-option>
</el-select>
</li>
<!--
<li><span><em>
状态
</em></span>
<el-select
v-model=
'msg.PriceStatus'
>
<el-option
label=
'正常'
value=
'0'
key=
'0'
></el-option>
<el-option
label=
'取消'
value=
'1'
key=
'1'
></el-option>
</el-select>
</li>
-->
<li>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"
getList();
resetPageIndex()"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"resetPageIndex()"
/>
</li>
</ul>
</div>
<div
style=
"width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; "
class=
"ownScrollbarStyle"
:style=
"
{height: boxHeight + 'px'}">
<OrderList
:pagesTitle=
"Title"
:OrderList=
"DataList"
:loading=
"loading"
@
success=
"msg.pageIndex=1,GetList()"
>
</OrderList>
<OrderList
:pagesTitle=
"Title"
:OrderList=
"DataList"
:loading=
"loading"
@
success=
"msg.pageIndex=1,GetList()"
>
</OrderList>
</div>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"total"
></el-pagination>
...
...
@@ -53,11 +50,9 @@
<
script
>
import
OrderList
from
'./BookAcar/components/JapanOrderFList'
;
export
default
{
data
()
{
return
{
userInfo
:
{},
//用户信息
loading
:
false
,
currentPage
:
1
,
total
:
0
,
...
...
@@ -70,34 +65,18 @@
IsFinish
:
"0"
,
TCNUM
:
""
},
Title
:
'日本车行运行统计表
'
,
Title
:
'印象车行用车单统计
'
,
queryCommonData
:
{
PlaceList
:
[],
LineList
:
[],
LineTeamList
:
[],
CustomerList
:
[],
},
thLengthTitle
:
[],
DataList
:
[],
colspanTotal
:
0
,
isCha
:
0
,
boxHeight
:
0
,
showHotelObj
:
{
showPrice
:
false
,
//是否显示价格
showPay
:
false
,
//是否显示支付方式
showZhan
:
false
,
//占房时间
showBtnList
:
false
,
//是否下载、确认按钮
ShowTaxType
:
false
,
//显示税入税别
ShowRebateRatio
:
false
,
//显示返佣比列
ShowSupplier
:
false
,
//是否显示供应商
showCaozuoTime
:
false
,
//操作时间
colspanLength
:
6
//跨行
}
}
},
components
:
{
OrderList
components
:
{
OrderList
},
methods
:
{
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
...
...
@@ -105,6 +84,7 @@
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
;
this
.
getList
();
},
getList
()
{
this
.
loading
=
true
...
...
@@ -116,22 +96,22 @@
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
,
err
=>
{}
)
})
},
getCustomerList
(
CustomerKeyWord
){
this
.
apipost
(
'JapanCar_get_GetJapanCarCustomerList'
,
{
keyWord
:
CustomerKeyWord
},
res
=>
{
getCustomerList
(
CustomerKeyWord
)
{
this
.
apipost
(
'JapanCar_get_GetJapanCarCustomerList'
,
{
keyWord
:
CustomerKeyWord
},
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
Line
List
=
res
.
data
.
data
;
this
.
queryCommonData
.
Customer
List
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
,
err
=>
{}
)
},
})
},
},
mounted
()
{
this
.
userInfo
=
this
.
getLocalStorage
();
let
myDate
=
new
Date
();
let
nowDate
=
myDate
.
getFullYear
()
+
...
...
@@ -140,7 +120,7 @@
"-"
+
myDate
.
getDate
();
this
.
msg
.
UseSTime
=
nowDate
;
this
.
msg
.
UseETime
=
myDate
.
getFullYear
()
+
"-"
+
parseInt
(
myDate
.
getMonth
()
+
2
)
+
"-"
+
myDate
.
getDate
();
this
.
msg
.
UseETime
=
myDate
.
getFullYear
()
+
"-"
+
parseInt
(
myDate
.
getMonth
()
+
2
)
+
"-"
+
myDate
.
getDate
();
let
width
=
window
.
innerWidth
-
50
;
let
height
=
window
.
innerHeight
-
65
-
210
;
this
.
boxHeight
=
height
;
...
...
@@ -252,7 +232,8 @@
overflow
:
auto
;
max-height
:
350px
;
}
.ownScrollbarStyle
.cursor-pointer
{
.ownScrollbarStyle
.cursor-pointer
{
cursor
:
pointer
;
}
...
...
@@ -263,24 +244,31 @@
.ownScrollbarStyle
.mr
{
margin-right
:
10px
;
}
.ownScrollbarStyle
.mb
{
margin-bottom
:
10px
;
}
.ownScrollbarStyle
.px5
{
padding
:
0
5px
;
}
.ownScrollbarStyle
.row
{
.ownScrollbarStyle
.row
{
display
:
flex
;
}
.ownScrollbarStyle
.wrap
{
flex-wrap
:
wrap
;
}
.ownScrollbarStyle
.fz12
{
font-size
:
12px
;
}
.ownScrollbarStyle
.py
{
padding
:
15px
0
;
}
.ownScrollbarStyle
.bgE8F5E9
{
background
:
#e8f5e9
;
}
...
...
@@ -292,12 +280,15 @@
.ownScrollbarStyle
.bgFAEAED
{
background
:
#faeaed
;
}
.ownScrollbarStyle
.bjFFF3E0
{
background
:
#FFF3E0
;
}
.ownScrollbarStyle
.c3FC4FF
{
color
:
#3fc4ff
;
}
.ownScrollbarStyle
.cF1416C
{
color
:
#f1416c
;
}
...
...
@@ -305,19 +296,25 @@
.ownScrollbarStyle
.cF57A98
{
color
:
#f57a98
;
}
.ownScrollbarStyle
.cff9800
{
color
:
#ff9800
;
}
.ownScrollbarStyle
.c04C8C8
{
color
:
#04c8c8
;
}
.ownScrollbarStyle
.c9e
{
color
:
#9e9e9e
;
}
.ownScrollbarStyle
.c059FF6
{
color
:
#059ff6
;
}
.ownScrollbarStyle
.c3FC4FF
{
color
:
#3fc4ff
;
}
</
style
>
src/components/busManagement/JapanBusOrderStatistics.vue
View file @
05fd5d49
...
...
@@ -5,9 +5,10 @@
<li>
<span>
<em>
{{
$t
(
'fnc.khmingcheng'
)
}}
</em>
<el-select
v-model=
"msg.CustomerId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getLinePlaceList()"
>
<el-select
v-model=
"msg.CustomerId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
clearable
clear
@
clear=
"resetPageIndex()"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'0'
></el-option>
<el-option
v-for=
"item in queryCommonData.
Line
List"
:label=
'item.CustomerName'
:value=
'item.Id'
<el-option
v-for=
"item in queryCommonData.
Customer
List"
:label=
'item.CustomerName'
:value=
'item.Id'
:key=
'item.Id'
>
</el-option>
</el-select>
...
...
@@ -16,41 +17,37 @@
<li>
<span>
<em>
团号
</em>
<el-input
v-model=
'msg.TCNUM'
></el-input>
<el-input
v-model=
'msg.TCNUM'
maxlength=
"40"
@
keyup
.
native
.
enter=
"resetPageIndex()"
clear
@
clear=
"resetPageIndex()"
clearable
></el-input>
</span>
</li>
<li><span><em>
{{
$t
(
'pub.date'
)
}}
</em>
<el-date-picker
v-model=
'msg.UseSTime'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
<el-date-picker
v-model=
'msg.UseSTime'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
@
change=
"resetPageIndex()"
clearable
@
clear=
"resetPageIndex()"
></el-date-picker>
-
<el-date-picker
v-model=
'msg.UseETime'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
<el-date-picker
v-model=
'msg.UseETime'
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
@
change=
"resetPageIndex()"
clearable
@
clear=
"resetPageIndex()"
></el-date-picker>
</span>
</li>
<li><span><em>
是否完结
</em></span>
<li
style=
"display:none;"
><span><em>
是否完结
</em></span>
<el-select
v-model=
'msg.IsFinish'
>
<el-option
label=
'全部'
value=
'0'
key=
'0'
></el-option>
<el-option
label=
'是'
value=
'1'
key=
'1'
></el-option>
</el-select>
</li>
<!--
<li><span><em>
状态
</em></span>
<el-select
v-model=
'msg.PriceStatus'
>
<el-option
label=
'正常'
value=
'0'
key=
'0'
></el-option>
<el-option
label=
'取消'
value=
'1'
key=
'1'
></el-option>
</el-select>
</li>
-->
<li>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"
getList();
resetPageIndex()"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"resetPageIndex()"
/>
</li>
</ul>
</div>
<div
class=
"mt10 fz14 color333 busIconStyle"
>
车辆状态
已确定:
<span
style=
"color:#4BCA81 ;"
>
√
</span>
未确定
:
<span
style=
"color:
#ff6600;"
>
O
</span>
未分配:
<span
style=
"color:
#E95252 ;"
>
X
</span>
车辆状态
确定:
<span
style=
"color:#4BCA81 ;"
>
√
</span>
暂定:
<span
style=
"color: #ff6600;"
>
O
</span>
未操作
:
<span
style=
"color:#E95252 ;"
>
X
</span>
</div>
<div
style=
"width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; "
class=
"ownScrollbarStyle"
:style=
"
{height: boxHeight + 'px'}">
<OrderList
:pagesTitle=
"Title"
:OrderList=
"DataList"
:loading=
"loading"
@
success=
"msg.pageIndex=1,GetList()"
>
</OrderList>
<OrderList
:pagesTitle=
"Title"
:OrderList=
"DataList"
:loading=
"loading"
@
success=
"msg.pageIndex=1,GetList()"
>
</OrderList>
</div>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"total"
></el-pagination>
...
...
@@ -59,11 +56,9 @@
<
script
>
import
OrderList
from
'./BookAcar/components/JapanOrderDetailList'
;
export
default
{
data
()
{
return
{
userInfo
:
{},
//用户信息
loading
:
false
,
currentPage
:
1
,
total
:
0
,
...
...
@@ -76,34 +71,18 @@
IsFinish
:
"0"
,
TCNUM
:
""
},
Title
:
'日本车行运行统计表
'
,
Title
:
'印象车行派车单统计
'
,
queryCommonData
:
{
PlaceList
:
[],
LineList
:
[],
LineTeamList
:
[],
CustomerList
:
[],
},
thLengthTitle
:
[],
DataList
:
[],
colspanTotal
:
0
,
isCha
:
0
,
boxHeight
:
0
,
showHotelObj
:
{
showPrice
:
false
,
//是否显示价格
showPay
:
false
,
//是否显示支付方式
showZhan
:
false
,
//占房时间
showBtnList
:
false
,
//是否下载、确认按钮
ShowTaxType
:
false
,
//显示税入税别
ShowRebateRatio
:
false
,
//显示返佣比列
ShowSupplier
:
false
,
//是否显示供应商
showCaozuoTime
:
false
,
//操作时间
colspanLength
:
6
//跨行
}
}
},
components
:
{
OrderList
components
:
{
OrderList
},
methods
:
{
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
...
...
@@ -111,9 +90,10 @@
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
;
this
.
getList
();
},
getList
()
{
this
.
loading
=
true
this
.
loading
=
true
;
this
.
apipost
(
'JapanCar_get_GetJapanOrderCarDayPageList'
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
@@ -122,22 +102,22 @@
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
,
err
=>
{}
)
})
},
getCustomerList
(
CustomerKeyWord
){
this
.
apipost
(
'JapanCar_get_GetJapanCarCustomerList'
,
{
keyWord
:
CustomerKeyWord
},
res
=>
{
getCustomerList
(
CustomerKeyWord
)
{
this
.
apipost
(
'JapanCar_get_GetJapanCarCustomerList'
,
{
keyWord
:
CustomerKeyWord
},
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
Line
List
=
res
.
data
.
data
;
this
.
queryCommonData
.
Customer
List
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
,
err
=>
{}
)
},
})
},
},
mounted
()
{
this
.
userInfo
=
this
.
getLocalStorage
();
let
myDate
=
new
Date
();
let
nowDate
=
myDate
.
getFullYear
()
+
...
...
@@ -146,7 +126,7 @@
"-"
+
myDate
.
getDate
();
this
.
msg
.
UseSTime
=
nowDate
;
this
.
msg
.
UseETime
=
myDate
.
getFullYear
()
+
"-"
+
parseInt
(
myDate
.
getMonth
()
+
2
)
+
"-"
+
myDate
.
getDate
();
this
.
msg
.
UseETime
=
myDate
.
getFullYear
()
+
"-"
+
parseInt
(
myDate
.
getMonth
()
+
2
)
+
"-"
+
myDate
.
getDate
();
let
width
=
window
.
innerWidth
-
50
;
let
height
=
window
.
innerHeight
-
65
-
210
;
this
.
boxHeight
=
height
;
...
...
src/router/config.js
View file @
05fd5d49
...
...
@@ -2071,7 +2071,7 @@ export default {
},
},
{
path
:
'/JapanBusOrderStatistics'
,
//派車單統計
(財務單據)
path
:
'/JapanBusOrderStatistics'
,
//派車單統計
name
:
'JapanBusOrderStatistics'
,
component
:
resolve
=>
require
([
'@/components/busManagement/JapanBusOrderStatistics'
],
resolve
),
meta
:
{
...
...
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