Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bigwood
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
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
罗超
bigwood
Commits
059cabb1
Commit
059cabb1
authored
Feb 21, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
b4e74a9d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
OrderList.vue
src/components/hotel/order/list/OrderList.vue
+2
-2
ListTable.vue
src/components/vehicle/list/ListTable.vue
+13
-3
No files found.
src/components/hotel/order/list/OrderList.vue
View file @
059cabb1
...
...
@@ -88,7 +88,7 @@
</q-td>
</
template
>
<
template
v-slot:body-cell-HandFittingFee=
"props"
>
<q-td
:props=
"props"
:colspan=
"x.DetailList.length"
v-if=
"props.rowIndex == 0"
>
<q-td
:props=
"props"
:colspan=
"x.DetailList.length"
v-if=
"props.rowIndex == 0"
>
{{
moneyFormat
(
x
.
HandFittingFee
)
}}
<div
class=
"q-mt-sm"
v-if=
"x.OrderStatus == 2"
>
<q-btn
size=
"sm"
dense
outline
color=
"primary"
v-if=
"x.ContractUrl"
>
...
...
@@ -268,7 +268,7 @@
</div>
</q-dialog> -->
<q-dialog
v-model=
"showBankAccount"
>
<BankAccount></BankAccount>
<BankAccount
@
change=
"showBankAccount=false"
></BankAccount>
</q-dialog>
</template>
...
...
src/components/vehicle/list/ListTable.vue
View file @
059cabb1
...
...
@@ -3,7 +3,7 @@
<q-card
class=
"light-shadow q-pa-md bg-white rounded-borders q-mb-md"
flat
v-for=
"(x,index) in orders"
>
<div
class=
"row items-center desktop-only"
>
<div
class=
"q-mr-md"
>
<q-btn
:color=
"search.OrderType == 4 ?'cyan' : (search.OrderType == 2 ?'negative':'positive')
"
unelevated
disable
size=
"sm"
>
<q-btn
color=
"cyan
"
unelevated
disable
size=
"sm"
>
{{
$t
(
'v102.vehicle.travelvehicle'
)
}}
</q-btn>
</div>
...
...
@@ -26,7 +26,7 @@
<div
class=
"mobile-only"
>
<div
class=
"row justify-between"
>
<div
class=
"q-mr-md"
>
<q-btn
:color=
"search.OrderType == 4 ?'cyan' : (search.OrderType == 2 ?'negative':'positive')
"
unelevated
disable
size=
"sm"
:label=
"$t('v102.vehicle.travelvehicle')"
></q-btn>
<q-btn
color=
"cyan
"
unelevated
disable
size=
"sm"
:label=
"$t('v102.vehicle.travelvehicle')"
></q-btn>
</div>
<div
class=
"q-ml-md f12"
:class=
"[x.typeInfo.Color]"
>
<q-icon
:name=
"x.typeInfo.Icon"
/>
...
...
@@ -125,7 +125,7 @@
</div>
</div>
<div
class=
"rounded-borders q-pa-sm justify-between"
:class=
"{ column: $q.platform.is.desktop, 'row items-center': $q.platform.is.mobile, 'bg-green-1': x.OfferState != 1, 'bg-grey-2': x.OfferState == 1 }"
>
<q-list
dense
:class=
"{ 'row items-center justify-between full-width': $q.platform.is.mobile }"
>
<q-list
dense
v-if=
"x.OfferState != 3"
:class=
"{ 'row items-center justify-between full-width': $q.platform.is.mobile }"
>
<q-item
v-if=
"x.OfferState == 2"
class=
"text-negative"
clickable
v-close-popup
@
click=
"cancel(x.Id)"
>
<q-item-section>
<q-item-label>
{{ $t('hotelorder.opera.cancel') }}
</q-item-label>
...
...
@@ -143,6 +143,16 @@
</q-item-section>
</q-item>
</q-list>
<div
v-else
>
<div
class=
"f12 text-green-4"
>
{{ $t('hotelorder.payed') }}
</div>
<div
class=
"text-subtitle1 din text-green-14"
>
{{ x.totalMoney.toFixed(2) }}
<span
class=
"text-green-4 f12"
>
<!-- {{ $t('unit.jp') }} -->
{{x.CurrencyName}}
</span>
</div>
</div>
</div>
</div>
<div
v-if=
"x.OfferState == 5"
>
...
...
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