Commit e558e14d authored by Gavin Peng's avatar Gavin Peng

fix: 修复bug

parent a2e51744
......@@ -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',
......
......@@ -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: '#f0f5ff' },
[STATUS.HAD_GENERATE]: { color: '#ebf9f6', fontColor: '#00a98f' },
// 已作废
[STATUS.HAD_TO_VOID]: { color: '#fff2f0', fontColor: '#ff4d4f' },
}
......@@ -141,7 +141,7 @@ const DeliveryNoteQuery: React.FC = () => {
useStateFilterSearchLinkageEffect(
$,
actions,
'planCode',
'deliveryNo',
FORM_FILTER_PATH,
)
}}
......
......@@ -63,7 +63,7 @@ class TagStatus {
}
generatedStyle() {
return { bgColor: '#f0f5ff', fontColor: '#f0f5ff', txt: '已确认' }
return { bgColor: '#ebf9f6', fontColor: '#00a98f', txt: '已确认' }
}
voidedStyle() {
......
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