修改结算和首页bug

src/pages/productionNotice/detail/columns.tsx

@@ -58,16 +58,16 @@ export const columns: ColumnsType<any> = [
     dataIndex: 'action',
     render: (text, record: any) => {
       return (
-        <DrawerProcessDetail 
-          type="view" 
+        <DrawerProcessDetail
+          type="view"
           id={record.productId}
           brand={record.brand}
           category={record.category}
           name={record.productName}
-          productProps={record.property.specs} 
+          productProps={record.property.specs}
           files={record.property.annex}
           unitName={record.unit}
-          quantity={record.processNum} 
+          quantity={record.processNum}
           processUnitPrice={record.processPrice}
         >
           <a>查看加工明细</a>
@@ -146,7 +146,10 @@ export const outerWorkflowRecordsColumn: ColumnsType<any> = [
   },
   {
     title: '操作时间',
-    dataIndex: 'operateTime'
+    dataIndex: 'operateTime',
+    render: (text, record) => {
+      return moment(text).format('YYYY-MM-DD HH:mm:ss')
+    }
   },
   {
     title: '审核意见',
@@ -225,7 +228,7 @@ export const receiveColumns = (type: "order" | 'product'): ColumnsType<any> => {
   ];
   if(type === 'order') {
     return temp
-  } 
+  }
   return temp.slice(1)
 }
 
@@ -262,4 +265,4 @@ export const pnoReceiveDeliverDetailDOListColumns = [
     title: '发货数量',
     dataIndex: 'deliverNum'
   }
-]
\ No newline at end of file
+]

src/pages/productionNotice/detail/index.tsx

@@ -45,7 +45,7 @@ const Detail: React.FC<{}> = () => {
   const [info, setInfo] = useState<any>({})
   const { id } = usePageStatus();
   const [loading, setLoading] = useState<boolean>(false);
-  
+
   useEffect(() => {
     if(id) {
       setLoading(true)
@@ -66,29 +66,28 @@ const Detail: React.FC<{}> = () => {
       <PageHeaderWrapper
         title={
           <>
-            
             <PageHeader
               style={{ padding: '0' }}
               onBack={() => history.goBack()}
               title={
-                <AvatarWrap 
+                <AvatarWrap
                   info={{
                     name: "通知单号："
-                  }} 
+                  }}
                   extra={(
-                    <span style={{ fontSize: 12, fontWeight: 'normal' }}>{info?.noticeNo}</span>
+                    <span style={{ fontSize: 18, fontWeight: 600 }}>{info?.noticeNo}</span>
                   )}
                 />
               }
             >
               <Row>
                 <Col span={22}>
-                  <Descriptions 
-                    column={3} 
+                  <Descriptions
+                    column={3}
                     style={{padding: '0 32px', fontWeight: 400}}
                     colon={false}
                   >
-                    <Descriptions.Item label="通知单摘要:">{info?.summary}</Descriptions.Item>
+                    <Descriptions.Item span={3} label="通知单摘要:"  style={{overflow: 'hidden'}}>{info?.summary}</Descriptions.Item>
                     <Descriptions.Item label="加工企业：">{info?.processName}</Descriptions.Item>
                     <Descriptions.Item label="单据时间：">{info && info.createTime && moment(info.createTime).format('YYYY-MM-DD') || null   }</Descriptions.Item>
                     <Descriptions.Item label="通知单来源：">{info?.source == '1' ? '订单加工': '商品加工'}</Descriptions.Item>
@@ -96,13 +95,17 @@ const Detail: React.FC<{}> = () => {
                       <StatusTag type={STATUS[info.outerStatus] || ''} title={info.outerStatusName} />
                     </Descriptions.Item>
                     <Descriptions.Item label="内部状态：">
-                      <Badge 
-                        color={COLOR[info.innerStatus] || 'success'} 
+                      <Badge
+                        color={COLOR[info.innerStatus] || 'success'}
                         text={info.innerStatusName}></Badge>
                     </Descriptions.Item>
                   </Descriptions>
                 </Col>
-                
+                {
+                  info?.cause
+                  ? <div style={{marginLeft: '32px'}}>不通过原因: <StatusTag type={"danger"} title={info.cause} /></div>
+                  : null
+                }
               </Row>
             </PageHeader>
           </>
@@ -115,31 +118,31 @@ const Detail: React.FC<{}> = () => {
         <div style={{marginTop: '20px'}}>
           <Card>
             <h1 style={{fontSize: '14px', marginBottom: '16px'}}>通知单明细</h1>
-            <Table dataSource={info?.details} columns={info.source === 2 ? orderDetailColumn : columns}/>
-          </Card> 
+            <Table dataSource={info?.details} columns={info.source === 2 ? orderDetailColumn : columns} rowKey={"id"}/>
+          </Card>
         </div>
 
         <div style={{marginTop: '20px'}}>
         <ReceiptDeliveryDetailsCard>
           <StatisticsTab tab="收发货统计" columns={receiveColumns(info.source === 2 ? 'product' : 'order')} dataSource={info.details}></StatisticsTab>
           {
-            info.pnoReceiveDeliverDetailDOList && 
+            info.pnoReceiveDeliverDetailDOList &&
             info.pnoReceiveDeliverDetailDOList.length > 0
-            ?  <DetailTab 
-                tab="收发货明细" 
-                columns={pnoReceiveDeliverDetailDOListColumns} 
+            ?  <DetailTab
+                tab="收发货明细"
+                columns={pnoReceiveDeliverDetailDOListColumns}
                 dataSource={info.pnoReceiveDeliverDetailDOList}
                 // handleConfirm={handleConfirm}
               />
             : null
           }
-          
+
         </ReceiptDeliveryDetailsCard>
       </div>
         <div style={{marginTop: '20px'}}>
-          <DeliveryInfomation 
-            deliveryDate={info.deliveryDate} 
-            deliveryType={info.deliveryType} 
+          <DeliveryInfomation
+            deliveryDate={info.deliveryDate}
+            deliveryType={info.deliveryType}
             receiveAddress={info.receiveAddress}
             receiveUserName={info.receiveUserName}
             receiveUserTel={info.receiveUserTel}
@@ -147,7 +150,7 @@ const Detail: React.FC<{}> = () => {
             deliveryUserName={info.deliveryUserName}
             deliveryUserTel={info.deliveryUserTel}
           />
-        
+
         </div>
         <div style={{marginTop: '20px'}}>
           <Row justify="space-between">
@@ -163,21 +166,21 @@ const Detail: React.FC<{}> = () => {
           <Card bodyStyle={{padding: '10px 24px 24px 24px'}}>
             <Tabs>
               <TabPane tab="外部流转记录" key="1">
-                <Table 
-                  rowKey={"id"} 
-                  columns={outerWorkflowRecordsColumn} 
-                  dataSource={info.outerWorkflowRecordsList} 
+                <Table
+                  rowKey={"id"}
+                  columns={outerWorkflowRecordsColumn}
+                  dataSource={info.outerWorkflowRecordsList}
                 />
               </TabPane>
               <TabPane tab="内部流转记录" key="2">
-                <Table 
-                  rowKey={"id"} 
-                  columns={innerWorkFlowRecordColumn} 
+                <Table
+                  rowKey={"id"}
+                  columns={innerWorkFlowRecordColumn}
                   dataSource={info.innerWorkflowRecordsList}
                 />
               </TabPane>
             </Tabs>
-          </Card> 
+          </Card>
         </div>
         {/* <ProcessDetail /> */}
       </PageHeaderWrapper>
@@ -185,4 +188,4 @@ const Detail: React.FC<{}> = () => {
   )
 }
 
-export default Detail
\ No newline at end of file
+export default Detail

src/pages/productionNotice/query/index.tsx

@@ -27,8 +27,8 @@ export const SUPPLIER_OUTER_STATUS_COLOR = [
 ]
 
 const columns: ColumnsType<any> = [
-  { 
-    title: '通知单号', 
+  {
+    title: '通知单号',
     dataIndex: 'noticeNo',
     render: (text, record) => {
       const url = '/productionNoticeManage/productionNotice/detail';
@@ -40,15 +40,15 @@ const columns: ColumnsType<any> = [
   { title: '通知单摘要', dataIndex: 'summary' },
   { title: '供应会员', dataIndex: 'supplierName' },
   { title: '加工企业名称', dataIndex: 'processName'},
-  { 
+  {
     title: '单据时间',
-    dataIndex: 'createTime', 
+    dataIndex: 'createTime',
     render: (text, record) => {
       return moment(text).format('YYYY-MM-DD HH:mm:ss')
     }
   },
-  { 
-    title: '外部状态', 
+  {
+    title: '外部状态',
     dataIndex: 'outerStatusName',
     render: (text, record) => {
       return <StatusTag type={SUPPLIER_OUTER_STATUS_COLOR[record.outerStatus]} title={text}></StatusTag>
@@ -62,7 +62,7 @@ const Query: React.FC<IProps> = () => {
 
     /**
     * 查询
-    * @params values 表单字段 
+    * @params values 表单字段
     */
   const handleSearch = useCallback((values: any) => {
     const {docTime, ...rest} = values;
@@ -72,15 +72,21 @@ const Query: React.FC<IProps> = () => {
       startTime: st,
       endTtime: et
     }
-    
+
     ref.current.reload(searchData)
   }, [])
 
-  
-  // 初始化高级筛选选项
-  const fetchSelectOptions = async () => {
-    return {};
-  };
+
+// 初始化高级筛选选项
+const fetchSelectOptions = useCallback(async () => {
+  const { data, code } = await PublicApi.getEnhanceSupplierAllOuterAndInner()
+  if(code === 1000) {
+    return {
+      outerStatus: data.outerList.map((item: any) => ({label: item.message, value: item.code})),
+    }
+  }
+  return {}
+}, []);
 
   const fetchData = useCallback(async (params: any) => {
     const service = PublicApi.getEnhancePlatformAllList;
@@ -121,4 +127,4 @@ const Query: React.FC<IProps> = () => {
   )
 }
 
-export default Query
\ No newline at end of file
+export default Query

src/pages/ruleSettingManage/platformSettlementStrategy/info/index.tsx

@@ -238,11 +238,12 @@ const MemberSettleAdd: React.FC = () => {
 
   return (
     <PageHeaderWrapper
-        extra={[
-          <Button loading={submitLoading} key="1" type="primary" onClick={handleClick} >
-            保存
-          </Button>,
-        ]}
+      onBack={() => window.history.back()}
+      extra={[
+        <Button loading={submitLoading} key="1" type="primary" onClick={handleClick} >
+          保存
+        </Button>,
+      ]}
     >
       <Card>
         <NiceForm