Merge branch 'v2-220418-order' into 'v2-220418'

src/pages/order/constants/deliveryNotice.ts

@@ -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' },
 }

src/pages/order/receivingNote/deliveryNoteQuery/index.tsx

@@ -141,7 +141,7 @@ const DeliveryNoteQuery: React.FC = () => {
                 useStateFilterSearchLinkageEffect(
                   $,
                   actions,
-                  'planCode',
+                  'deliveryNo',
                   FORM_FILTER_PATH,
                 )
               }}

src/pages/order/utils/status.ts

@@ -63,7 +63,7 @@ class TagStatus {
   }
 
   generatedStyle() {
-    return { bgColor: '#f0f5ff', fontColor: '#f0f5ff', txt: '已确认' }
+    return { bgColor: '#ebf9f6', fontColor: '#00a98f', txt: '已确认' }
   }
 
   voidedStyle() {