Commit 5224ebb0 authored by 黄奎's avatar 黄奎

页面修改

parent 2f2de9c4
...@@ -173,6 +173,7 @@ ...@@ -173,6 +173,7 @@
:props="props" :props="props"
:colspan="x.DetailList.length" :colspan="x.DetailList.length"
v-if="props.rowIndex == 0" v-if="props.rowIndex == 0"
:rowspan="x.DetailList.length"
> >
{{ moneyFormat(x.HandFittingFee) }} {{ moneyFormat(x.HandFittingFee) }}
<div class="q-mt-sm" v-if="x.OrderStatus == 2"> <div class="q-mt-sm" v-if="x.OrderStatus == 2">
...@@ -207,7 +208,6 @@ ...@@ -207,7 +208,6 @@
</q-table> </q-table>
</div> </div>
</div> </div>
<div <div
class="q-mt-md" class="q-mt-md"
v-if="x.OrderStatus != 3" v-if="x.OrderStatus != 3"
...@@ -245,7 +245,6 @@ ...@@ -245,7 +245,6 @@
:label="$t('hotelorder.payinfo')" :label="$t('hotelorder.payinfo')"
@click="ViewPayment" @click="ViewPayment"
></q-btn> ></q-btn>
<!-- <q-btn dense unelevated color="accent" size="sm" class="q-mt-sm q-ml-sm" :label="$t('hotelorder.sendpay')"></q-btn> -->
</div> </div>
<div v-if="x.CustomerPayType == 1 || x.CustomerPayType == 3"> <div v-if="x.CustomerPayType == 1 || x.CustomerPayType == 3">
<div class="f12"> <div class="f12">
...@@ -327,7 +326,6 @@ ...@@ -327,7 +326,6 @@
> >
<div class="f12 text-grey">{{ $t("hotelorder.orderMoney") }}</div> <div class="f12 text-grey">{{ $t("hotelorder.orderMoney") }}</div>
<div class="dark q-ml-xl"> <div class="dark q-ml-xl">
<!-- <span class="f12">{{ $t('unit.jpc') }}</span> -->
<span class="din text-subtitle1">{{ moneyFormat(x.Money) }}</span> <span class="din text-subtitle1">{{ moneyFormat(x.Money) }}</span>
<span class="f12">{{ $t("unit.jp") }}</span> <span class="f12">{{ $t("unit.jp") }}</span>
</div> </div>
...@@ -400,11 +398,6 @@ ...@@ -400,11 +398,6 @@
<q-item-label>{{ $t("v101.Listofquotation.baojiadan") }}</q-item-label> <q-item-label>{{ $t("v101.Listofquotation.baojiadan") }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<!-- <q-item class="text-dark" clickable v-close-popup>
<q-item-section>
<q-item-label>{{ $t('hotelorder.opera.view') }}</q-item-label>
</q-item-section>
</q-item> -->
</q-list> </q-list>
<div v-else> <div v-else>
<div class="f12 text-green-4">{{ $t("hotelorder.payed") }}</div> <div class="f12 text-green-4">{{ $t("hotelorder.payed") }}</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment