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
4d9426bd
Commit
4d9426bd
authored
Mar 06, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
72f19a57
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1140 additions
and
521 deletions
+1140
-521
CharteredBusOrderHeader.vue
...components/CharteredBus/order/CharteredBusOrderHeader.vue
+239
-97
CharteredBusOrderList.vue
src/components/CharteredBus/order/CharteredBusOrderList.vue
+389
-174
OrderList.vue
src/components/hotel/order/list/OrderList.vue
+494
-246
vehicleOrder.vue
src/pages/vehicle/vehicleOrder.vue
+18
-4
No files found.
src/components/CharteredBus/order/CharteredBusOrderHeader.vue
View file @
4d9426bd
This diff is collapsed.
Click to expand it.
src/components/CharteredBus/order/CharteredBusOrderList.vue
View file @
4d9426bd
This diff is collapsed.
Click to expand it.
src/components/hotel/order/list/OrderList.vue
View file @
4d9426bd
This diff is collapsed.
Click to expand it.
src/pages/vehicle/vehicleOrder.vue
View file @
4d9426bd
...
@@ -15,7 +15,9 @@
...
@@ -15,7 +15,9 @@
<q-tab
:name=
"2"
:label=
"$t('v102.vehicle.tabtitle2')"
></q-tab>
<q-tab
:name=
"2"
:label=
"$t('v102.vehicle.tabtitle2')"
></q-tab>
<q-tab
:name=
"3"
:label=
"$t('v102.vehicle.tabtitle3')"
></q-tab>
<q-tab
:name=
"3"
:label=
"$t('v102.vehicle.tabtitle3')"
></q-tab>
</q-tabs>
</q-tabs>
<teamOrder
v-if=
"tab == 0"
:OrderId=
"OrderId"
></teamOrder>
<
template
v-if=
"b2bUserInfo && b2bUserInfo.groupId == 2"
>
<teamOrder
v-if=
"tab == 0"
:OrderId=
"OrderId"
></teamOrder>
</
template
>
<CharteredBusOrder
:type=
"tab"
:OrderId=
"OrderId"
v-if=
"tab != 0"
></CharteredBusOrder>
<CharteredBusOrder
:type=
"tab"
:OrderId=
"OrderId"
v-if=
"tab != 0"
></CharteredBusOrder>
</div>
</div>
</template>
</template>
...
@@ -33,7 +35,7 @@ import {
...
@@ -33,7 +35,7 @@ import {
import
useMetaModule
from
"../../module/meta/metaModule"
;
import
useMetaModule
from
"../../module/meta/metaModule"
;
import
{
useI18n
}
from
"vue-i18n"
;
import
{
useI18n
}
from
"vue-i18n"
;
import
teamOrder
from
"./teamOrder.vue"
;
import
teamOrder
from
"./teamOrder.vue"
;
import
CharteredBusOrder
from
"../CharteredBus/
/
CharteredBusOrder.vue"
;
import
CharteredBusOrder
from
"../CharteredBus/CharteredBusOrder.vue"
;
import
{
DirtionmaryHelper
}
from
"../../config/dictionary"
;
import
{
DirtionmaryHelper
}
from
"../../config/dictionary"
;
import
{
currentRouter
}
from
"src/router"
;
import
{
currentRouter
}
from
"src/router"
;
import
{
getStoreGetter
}
from
"../../store/utils"
;
import
{
getStoreGetter
}
from
"../../store/utils"
;
...
@@ -47,7 +49,7 @@ export default defineComponent({
...
@@ -47,7 +49,7 @@ export default defineComponent({
const
b2bUserInfo
=
getStoreGetter
<
UserGetter
>
(
"user"
,
"getUser"
);
const
b2bUserInfo
=
getStoreGetter
<
UserGetter
>
(
"user"
,
"getUser"
);
setTitle
(
pageTitle
.
value
);
setTitle
(
pageTitle
.
value
);
const
data
=
reactive
({
const
data
=
reactive
({
tab
:
0
,
tab
:
1
,
OrderId
:
null
as
any
,
OrderId
:
null
as
any
,
});
});
if
(
b2bUserInfo
&&
b2bUserInfo
.
groupId
==
2
)
{
if
(
b2bUserInfo
&&
b2bUserInfo
.
groupId
==
2
)
{
...
@@ -55,6 +57,7 @@ export default defineComponent({
...
@@ -55,6 +57,7 @@ export default defineComponent({
}
else
{
}
else
{
data
.
tab
=
1
;
data
.
tab
=
1
;
}
}
watch
(
watch
(
()
=>
data
.
tab
,
()
=>
data
.
tab
,
(
o
,
n
)
=>
{}
(
o
,
n
)
=>
{}
...
@@ -63,11 +66,22 @@ export default defineComponent({
...
@@ -63,11 +66,22 @@ export default defineComponent({
if
(
currentRouter
.
currentRoute
.
value
.
params
.
OrderId
)
{
if
(
currentRouter
.
currentRoute
.
value
.
params
.
OrderId
)
{
data
.
OrderId
=
currentRouter
.
currentRoute
.
value
.
params
.
OrderId
;
data
.
OrderId
=
currentRouter
.
currentRoute
.
value
.
params
.
OrderId
;
}
}
if
(
currentRouter
.
currentRoute
.
value
.
params
.
pages
<
4
)
{
if
(
currentRouter
.
currentRoute
.
value
.
params
.
pages
<
4
)
{
data
.
tab
=
Number
(
currentRouter
.
currentRoute
.
value
.
params
.
pages
);
console
.
log
(
"11"
,
currentRouter
.
currentRoute
.
value
.
params
.
pages
);
if
(
b2bUserInfo
&&
b2bUserInfo
.
groupId
==
100
&&
currentRouter
.
currentRoute
.
value
.
params
.
pages
==
0
)
{
data
.
tab
=
1
;
}
else
{
data
.
tab
=
Number
(
currentRouter
.
currentRoute
.
value
.
params
.
pages
);
}
}
else
{
}
else
{
data
.
tab
=
0
;
data
.
tab
=
0
;
}
}
console
.
log
(
"currentRouter.tab"
,
data
.
tab
);
}
}
const
menu
=
inject
(
DirtionmaryHelper
.
MENU_KEYS
)
as
any
;
const
menu
=
inject
(
DirtionmaryHelper
.
MENU_KEYS
)
as
any
;
menu
.
value
=
6
;
menu
.
value
=
6
;
...
...
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