Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
shenshaokai
jinfa-platform
Commits
e558e14d
Commit
e558e14d
authored
Apr 14, 2022
by
Gavin Peng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复bug
parent
a2e51744
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
index.ts
config/routes/index.ts
+2
-2
deliveryNotice.ts
src/pages/order/constants/deliveryNotice.ts
+2
-2
index.tsx
src/pages/order/receivingNote/deliveryNoteQuery/index.tsx
+1
-1
status.ts
src/pages/order/utils/status.ts
+1
-1
No files found.
config/routes/index.ts
View file @
e558e14d
...
...
@@ -29,7 +29,7 @@ import ProcurementRoute from './procurementRoute'; // todo wuting
// import contracRoute from './contracRoute';
// export const routes = [CommodityRoute, MemberRoute, ShopRoute, ChannelRoute, TranactionRoute, AfterService, PayandSettleRoute, LogisticsRoute, AuthConfigRoute, HandlingRoute, BalaceRoute]
const
isDev
=
false
;
const
isDev
=
!
false
;
const
homeRoute
=
{
path
:
`/memberCenter/home`
,
name
:
'home'
,
...
...
@@ -39,7 +39,7 @@ const homeRoute = {
};
// isDev ? [ homeRoute, OrderRoute ] :
// const routes = asyncRoutes;
const
routes
=
isDev
?
[
homeRoute
,
OrderRoute
,
supplierRoute
,
memberRoute
]
:
asyncRoutes
;
const
routes
=
isDev
?
[
homeRoute
,
OrderRoute
]
:
asyncRoutes
;
const
memberCenterRoute
=
{
path
:
'/memberCenter'
,
...
...
src/pages/order/constants/deliveryNotice.ts
View file @
e558e14d
...
...
@@ -40,7 +40,7 @@ export enum STATUS {
// 已确认
[
STATUS
.
HAD_CONFIRM
]:
'已确认'
,
// 已生产送货单
[
STATUS
.
HAD_GENERATE
]:
'已生
产
送货单'
,
[
STATUS
.
HAD_GENERATE
]:
'已生
成
送货单'
,
// 已作废
[
STATUS
.
HAD_TO_VOID
]:
'已作废'
,
}
...
...
@@ -56,7 +56,7 @@ export const TAG_STATUS_COLOR = {
// 已确认
[
STATUS
.
HAD_CONFIRM
]:
{
color
:
'#ebf9f6'
,
fontColor
:
'#00a98f'
},
// 已生产送货单
[
STATUS
.
HAD_GENERATE
]:
{
color
:
'#
f0f5ff'
,
fontColor
:
'#f0f5f
f'
},
[
STATUS
.
HAD_GENERATE
]:
{
color
:
'#
ebf9f6'
,
fontColor
:
'#00a98
f'
},
// 已作废
[
STATUS
.
HAD_TO_VOID
]:
{
color
:
'#fff2f0'
,
fontColor
:
'#ff4d4f'
},
}
src/pages/order/receivingNote/deliveryNoteQuery/index.tsx
View file @
e558e14d
...
...
@@ -141,7 +141,7 @@ const DeliveryNoteQuery: React.FC = () => {
useStateFilterSearchLinkageEffect
(
$
,
actions
,
'
planCode
'
,
'
deliveryNo
'
,
FORM_FILTER_PATH
,
)
}
}
...
...
src/pages/order/utils/status.ts
View file @
e558e14d
...
...
@@ -63,7 +63,7 @@ class TagStatus {
}
generatedStyle
()
{
return
{
bgColor
:
'#
f0f5ff'
,
fontColor
:
'#f0f5f
f'
,
txt
:
'已确认'
}
return
{
bgColor
:
'#
ebf9f6'
,
fontColor
:
'#00a98
f'
,
txt
:
'已确认'
}
}
voidedStyle
()
{
...
...
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