完善订单查询页

src/pages/transaction/_public/order/constant.ts

+import { ISchema } from '@formily/antd'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+
 export const orderTypeLabel = ['', 
   '询价采购',
   '需求采购',
@@ -24,4 +27,58 @@ export enum SALE_ORDER_STATUS {
   CONFIRM_DELIVE_GOODS_ORDER,
   CONFIRM_RETURN_ORDER,
   RETURN_DOCUMENT_ORDER
+}
+
+/**
+ * 除了订单必填字段, 默认
+ */
+export const tableListSchema: ISchema = {
+  type: 'object',
+  properties: {
+    orderNo: {
+      type: 'string',
+      "x-component": 'SearchFilter',
+      'x-component-props': {
+        placeholder: '请输入订单编号',
+        align: 'flex-end',
+      },
+    },
+    [FORM_FILTER_PATH]: {
+      type: 'object',
+      'x-component': 'flex-layout',
+      'x-component-props': {
+        inline: true,
+        colStyle: {
+          marginLeft: 20
+        }
+      },
+      properties: {
+        orderThe: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入订单摘要',
+          }
+        },
+        "supplyMembersName": {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '请输入供应会员名称'
+          }
+        },
+        "[startCreateTime,endCreateTime]": {
+          type: 'array',
+          "x-component": 'daterangepicker',
+          'x-component-props': {
+            placeholder: ['开始时间','结束时间'],
+          },
+        },
+        submit: {
+          'x-component': 'Submit',
+          'x-component-props': {
+            children: '查询',
+          },
+        },
+      },
+    },
+  }
 }
\ No newline at end of file

src/pages/transaction/purchaseOrder/index.tsx

@@ -4,6 +4,13 @@ import { StandardTable } from 'god'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { PublicApi } from '@/services/api'
 import { baseOrderListColumns } from './constant'
+import { PurchaseOrderOutWorkState } from '@/constants'
+import { history } from 'umi'
+import { tableListSchema } from '../_public/order/constant'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import { DatePicker } from '@formily/antd-components'
+import Submit from '@/components/NiceForm/components/Submit'
 
 // 订单查询
 
@@ -25,7 +32,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
   }
 
   const handleEvaluate = (id) => {
-
+    history.push(`/memberCenter/tranactionAbility/purchaserEvaluation/unevaluated`)
   }
   
   const secondColumns: any[] = baseOrderListColumns.concat([
@@ -35,7 +42,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
       dataIndex: 'ctl',
       key: 'ctl',
       render: (text, record) => <>
-        <Button type='link' onClick={() => handleEvaluate(record.id)}>评价</Button>
+        { record.externalState === PurchaseOrderOutWorkState.FINISH_ORDER && <Button type='link' onClick={() => handleEvaluate(record.id)}>评价</Button> }
         {/* todo */}
         {/* <Button type='link' onClick={() => handleSaleAfter(record.id)}>售后</Button> */}
       </>
@@ -48,6 +55,37 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
       <StandardTable
         fetchTableData={params => fetchTableData(params)}
         columns={secondColumns}
+        rowKey={'orderNo'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyChilds={{
+          layouts: {
+            order: 2
+          },
+          children: <Button style={{width: 140}} onClick={() => {}} type='default'>导出</Button>
+        }}
+        formilyProps={{
+          layouts: {
+            order: 3
+          },
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePicker: DatePicker.RangePicker,
+              Submit
+            }
+          }
+        }}
       />
     </Card>
   </PageHeaderWrapper>

src/pages/transaction/saleOrder/index.tsx

@@ -4,6 +4,13 @@ import { StandardTable } from 'god'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { PublicApi } from '@/services/api'
 import { baseOrderListColumns } from './constant'
+import { history } from 'umi'
+import { PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState } from '@/constants'
+import { tableListSchema } from '../_public/order/constant'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import { DatePicker } from '@formily/antd-components'
+import Submit from '@/components/NiceForm/components/Submit'
 
 // 销售订单查询
 
@@ -25,7 +32,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
   }
 
   const handleEvaluate = (id) => {
-
+    history.push(`/memberCenter/tranactionAbility/supplierEvaluation/unevaluated`)
   }
   
   const secondColumns: any[] = baseOrderListColumns.concat([
@@ -35,7 +42,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
       dataIndex: 'ctl',
       key: 'ctl',
       render: (text, record) => <>
-        <Button type='link' onClick={() => handleEvaluate(record.id)}>评价</Button>
+        { record.externalState === PurchaseOrderOutWorkState.FINISH_ORDER && <Button type='link' onClick={() => handleEvaluate(record.id)}>评价</Button> }
         {/* todo */}
         {/* <Button type='link' onClick={() => handleSaleAfter(record.id)}>售后</Button> */}
       </>
@@ -47,6 +54,37 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
       <StandardTable
         fetchTableData={params => fetchTableData(params)}
         columns={secondColumns}
+        rowKey={'orderNo'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyChilds={{
+          layouts: {
+            order: 2
+          },
+          children: <Button style={{width: 140}} onClick={() => {}} type='default'>导出</Button>
+        }}
+        formilyProps={{
+          layouts: {
+            order: 3
+          },
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePicker: DatePicker.RangePicker,
+              Submit
+            }
+          }
+        }}
       />
     </Card>
   </PageHeaderWrapper>