Commit d9070324 authored by youjie's avatar youjie

no message

parent 62641282
...@@ -14,6 +14,10 @@ class HotelService { ...@@ -14,6 +14,10 @@ class HotelService {
static async getUserCanUseCouponList(param:any): Promise<HttpResponse> { static async getUserCanUseCouponList(param:any): Promise<HttpResponse> {
return requestJava('/api/b2b/user/getUserCanUseCouponList', param) return requestJava('/api/b2b/user/getUserCanUseCouponList', param)
} }
//散客订单详情
static async GetJAPANOrderDetail(param:any): Promise<HttpResponse> {
return request('dmc_post_Get_GetJAPAN_OrderDetail', param)
}
//散客订单列表 //散客订单列表
static async GetB2BJapanHotelOrderList(param:any): Promise<HttpResponse> { static async GetB2BJapanHotelOrderList(param:any): Promise<HttpResponse> {
return request('sellorder_post_GetB2BJapanHotelOrderList', param) return request('sellorder_post_GetB2BJapanHotelOrderList', param)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<q-table separator="cell" :pagination="{rowsPerPage:100}" dense :rows="orders" bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow"> <q-table separator="cell" :pagination="{rowsPerPage:100}" dense :rows="orders" bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow">
<template v-slot:body-cell-HotelName="props"> <template v-slot:body-cell-HotelName="props">
<q-td :props="props"> <q-td :props="props">
<div class="cursor-pointer" @click="Detail(props.row)"> <div class="cursor-pointer" @click="getDetail(props.row.OrderID)">
<q-img :src="props.row.HotelPic" spinner-color="drk" spinner-size="20px" width="50px" height="50px" mode="cover" /> <q-img :src="props.row.HotelPic" spinner-color="drk" spinner-size="20px" width="50px" height="50px" mode="cover" />
<span class="q-mx-md">{{ props.row.HotelName }}</span> <span class="q-mx-md">{{ props.row.HotelName }}</span>
</div> </div>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<q-inner-loading :showing="loading" :label="$t('loading')" label-class="text-grey-6 f12" /> <q-inner-loading :showing="loading" :label="$t('loading')" label-class="text-grey-6 f12" />
</div> </div>
<q-dialog v-model="showOrderdDetail"> <q-dialog v-model="showOrderdDetail">
<OrderdDetail></OrderdDetail> <OrderdDetail :OrderID="OrderID"></OrderdDetail>
</q-dialog> </q-dialog>
</template> </template>
...@@ -40,8 +40,6 @@ import { useI18n } from 'vue-i18n' ...@@ -40,8 +40,6 @@ import { useI18n } from 'vue-i18n'
import svgIcon from '../../../global/svg-icon.vue' import svgIcon from '../../../global/svg-icon.vue'
import { copyToClipboard, useQuasar } from 'quasar' import { copyToClipboard, useQuasar } from 'quasar'
import { currentRouter } from '../../../router' import { currentRouter } from '../../../router'
// import { UploadFileInfo,NTag,NUpload } from 'naive-ui'
// import { slice } from 'lodash'
import OrderdDetail from './OrderdDetail.vue' import OrderdDetail from './OrderdDetail.vue'
export default defineComponent({ export default defineComponent({
...@@ -59,6 +57,7 @@ export default defineComponent({ ...@@ -59,6 +57,7 @@ export default defineComponent({
}) })
const data = reactive({ const data = reactive({
OrderID: '',
showOrderdDetail: false, showOrderdDetail: false,
orders: [] as Array<any>, orders: [] as Array<any>,
status: [] as Array<StandardStatus>, status: [] as Array<StandardStatus>,
...@@ -82,8 +81,9 @@ export default defineComponent({ ...@@ -82,8 +81,9 @@ export default defineComponent({
}) })
const methods = { const methods = {
Detail(row:{}){ getDetail(OrderID){
data.showOrderdDetail = true data.showOrderdDetail = true
data.OrderID = OrderID
}, },
initOrders() { initOrders() {
let param = Object.assign(data.pages, search) let param = Object.assign(data.pages, search)
......
...@@ -737,6 +737,7 @@ export default { ...@@ -737,6 +737,7 @@ export default {
Email: 'Email', Email: 'Email',
dianhua: '電話', dianhua: '電話',
kehuxuqiu: '客戶需求', kehuxuqiu: '客戶需求',
kehubeizhu: '客戶备注',
fangjian: '房間', fangjian: '房間',
chengrennan: '成人男', chengrennan: '成人男',
chengrennv: '成人女', chengrennv: '成人女',
...@@ -762,7 +763,8 @@ export default { ...@@ -762,7 +763,8 @@ export default {
man: '滿', man: '滿',
shiyong: '使用', shiyong: '使用',
youxiaoqi: '有效期', youxiaoqi: '有效期',
notiaojian: '該優惠券不滿足使用條件!' notiaojian: '該優惠券不滿足使用條件!',
dindanhao: '訂單號',
}, },
scatteredOrderList:{ scatteredOrderList:{
state1: '待付款', state1: '待付款',
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import Store from '../../store'
import { defineComponent, inject, provide, reactive, toRefs, onMounted } from 'vue'; import { defineComponent, inject, provide, reactive, toRefs, onMounted } from 'vue';
import { currentRouter } from 'src/router' import { currentRouter } from 'src/router'
import useMetaModule from '../../module/meta/metaModule' import useMetaModule from '../../module/meta/metaModule'
...@@ -24,10 +25,13 @@ export default defineComponent({ ...@@ -24,10 +25,13 @@ export default defineComponent({
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
pageTitle.value = t('hotelorder.pageTitle') pageTitle.value = t('hotelorder.pageTitle')
setTitle(pageTitle.value) setTitle(pageTitle.value)
let CustomerId
if (localStorage.vuex && JSON.parse(localStorage.vuex).user?.userDetail) {
CustomerId = Store.state.user?.userDetail?.customerId
}
const search=reactive({ const search=reactive({
B2BSelectOrderState:0, B2BSelectOrderState:0,
CustomerId: "", CustomerId: '',
HotelName:'' HotelName:''
}) })
// search.OrderId = currentRouter.currentRoute.value.params.orderId // search.OrderId = currentRouter.currentRoute.value.params.orderId
......
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