对接应收应付账款管理，等待开票管理接口

src/pages/balance/accountsPayable/settlementList/index.tsx

@@ -36,7 +36,12 @@ interface SearchParams {
 
 const SettlementList = () => {
   const ref = useRef<any>({})
-  const fetchListData = async (params) => {
+  
+  /**
+   * 分页查询
+   * @param {params: SearchParams} 
+   */
+  const fetchListData = async (params: any) => {
     const searchParams = {
       ...params,
       orderType: params.orderType || 0,
@@ -52,7 +57,7 @@ const SettlementList = () => {
       dataIndex: 'settlementNo',
       render: (text, record) => {
         const prefix = `/memberCenter/balance/accountsPayable/settlementList/`;
-        const url = record.orderType === 1 ? `logisticsDetail` : `productNoticeSettlementDetail`;
+        const url = record.orderType === 2 ? `logisticsDetail` : `productNoticeSettlementDetail`;
         return (
           <EyePreview url={`${prefix}${url}?id=${record.id}`} >
             {record.settlementNo}
@@ -91,12 +96,9 @@ const SettlementList = () => {
             status={record.status <= 2 ? record.status : 4 } 
             id={record.id}
             excludes={[1, 3]}
-            settlementId={record.settlementID || 1}
+            settlementId={record.memberId || 1}
             handleUpload={handleUploadVoucher}
             type={1}
-            // handleReconciledComfirm={handleConfirm}
-            // handleComfirmInCompletePayment={handleComfirmInCompletePayment}
-            // handleComfirmCompletePayment={handleComfirmCompletePayment}
           />
         )
       }
@@ -119,16 +121,6 @@ const SettlementList = () => {
     })
   }
 
-
-  // const handleComfirmInCompletePayment = (params: any) => {
-  //   console.log(params);
-  //   params.onCancel()
-  // }
-
-  // const handleComfirmCompletePayment = (params: any) => {
-  //   params.onCancel();
-  // }
-
   /**
    * 搜索
    */

src/pages/balance/accountsPayable/settlementList/logisticsDetail.tsx

@@ -116,7 +116,7 @@ const logisticsDetail: React.FC = () => {
               <Descriptions.Item label="结算金额：">{infoDetail?.amount}</Descriptions.Item>
               <Descriptions.Item label="结算方：">{infoDetail?.settlementName}</Descriptions.Item>
               <Descriptions.Item label="结算方式：">{infoDetail?.settlementWayName}</Descriptions.Item>
-              <Descriptions.Item label="外部状态：">{infoDetail?.statusName}</Descriptions.Item>
+              <Descriptions.Item label="外部状态："><StatusTag text={infoDetail?.statusName}></StatusTag></Descriptions.Item>
             </Descriptions>
           </PageHeader>
         </>

src/pages/balance/accountsPayable/settlementList/productNoticeSettlementDetail.tsx

@@ -18,21 +18,22 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { detailSchema } from './schema'
 import { usePageStatus } from '@/hooks/usePageStatus';
 import { PublicApi } from '@/services/api';
-const RangePicker = DatePicker.RangePicker;
+import StatusTag from '../../components/StatusTag'
 
+const RangePicker = DatePicker.RangePicker;
 const formActions = createFormActions();
 
 const columns = [
-  {title: '单据号', dataIndex: 'no'},
-  {title: '单据摘要', dataIndex: 'desc'},
-  {title: '单据类型', dataIndex: 'type'},
-  {title: '单据时间', dataIndex: 'time'},
-  {title: '单据总额', dataIndex: 'total'},
+  {title: '单据号', dataIndex: 'orderNo'},
+  {title: '单据摘要', dataIndex: 'orderAbstract'},
+  {title: '单据类型', dataIndex: 'orderTypeName'},
+  {title: '单据时间', dataIndex: 'orderTime'},
+  {title: '单据总额', dataIndex: 'orderAmount'},
   {title: '收货批次', dataIndex: 'batch'},
   {title: '收货时间', dataIndex: 'receiveTime'},
-  {title: '收货数量', dataIndex: 'receiveCount'},
-  {title: '加工单价', dataIndex: 'unitPrice'},
-  {title: '结算金额', dataIndex: 'payPrice'},
+  {title: '收货数量', dataIndex: 'receiveTime'},
+  {title: '加工单价', dataIndex: 'processPrice'},
+  {title: '结算金额', dataIndex: 'settlementAmount'},
 ]
 
 interface infoType {
@@ -117,7 +118,7 @@ const  ProductNoticeSettlementDetail: React.FC = () => {
               <Descriptions.Item label="结算金额：">{infoDetail?.amount}</Descriptions.Item>
               <Descriptions.Item label="结算方：">{infoDetail?.settlementName}</Descriptions.Item>
               <Descriptions.Item label="结算方式：">{infoDetail?.settlementWayName}</Descriptions.Item>
-              <Descriptions.Item label="外部状态：">{infoDetail?.statusName}</Descriptions.Item>
+              <Descriptions.Item label="外部状态："><StatusTag text={infoDetail?.statusName}></StatusTag></Descriptions.Item>
             </Descriptions>
           </PageHeader>
         </>

src/pages/balance/accountsReceivable/settlementList/index.tsx

@@ -76,10 +76,11 @@ const SettlementList = () => {
         return (
           <StatusActions 
             excludes={[2]}
-            // {...record}
             id={record.id}
             type={2}
             status={record.status} 
+            settlementDate={record.settlementDate}
+            payName={record.payName}
             handleReconciledComfirm={handleConfirm}
             handleComfirmInCompletePayment={handleComfirmInCompletePayment}
             handleComfirmCompletePayment={handleComfirmCompletePayment}
@@ -105,10 +106,16 @@ const SettlementList = () => {
 
   /**
    * 确认未到款
-   * @param params 
+   * @param  {onCancel:function, id: number, status: number}  
    */
   const handleComfirmInCompletePayment = (params: any) => {
-    params.onCancel()
+    PublicApi.postSettleAccountsMemberSettlementConfirmPayProve({id: params.id, status: params.status})
+    .then((data) => {
+      if(data.code === 1000) {
+        formActions.submit();
+        params.onCancel();
+      }
+    })
   }
 
   /**
@@ -116,9 +123,10 @@ const SettlementList = () => {
    * @param  {onCancel:function, id: number, status: number} 
    */
   const handleComfirmCompletePayment = (params: any) => {
-    PublicApi.postSettleAccountsMemberSettlementConfirmPayProve({id: params.id, status: params.id})
+    PublicApi.postSettleAccountsMemberSettlementConfirmPayProve({id: params.id, status: params.status})
     .then((data) => {
       if(data.code === 1000) {
+        formActions.submit();
         params.onCancel();
       }
     })

src/pages/balance/accountsReceivable/settlementList/logisticsDetail.tsx

@@ -24,16 +24,16 @@ const RangePicker = DatePicker.RangePicker;
 const formActions = createFormActions();
 
 const columns = [
-  {title: '单据号', dataIndex: 'no'},
-  {title: '单据摘要', dataIndex: 'desc'},
-  {title: '单据类型', dataIndex: 'type'},
-  {title: '单据时间', dataIndex: 'time'},
-  {title: '总箱数', dataIndex: 'box'},
-  {title: '总重量', dataIndex: 'weight'},
-  {title: '总体积', dataIndex: 'volumn'},
-  {title: '接单金额', dataIndex: 'price'},
-  {title: '支付时间', dataIndex: 'payTime'},
-  {title: '结算金额', dataIndex: 'payPrice'},
+  {title: '单据号', dataIndex: 'orderNo'},
+  {title: '单据摘要', dataIndex: 'orderAbstract'},
+  {title: '单据类型', dataIndex: 'orderTypeName'},
+  {title: '单据时间', dataIndex: 'orderTime'},
+  {title: '总箱数', dataIndex: 'totalCarton'},
+  {title: '总重量', dataIndex: 'totalWeight'},
+  {title: '总体积', dataIndex: 'totalVolume'},
+  {title: '接单金额', dataIndex: 'orderAmount'},
+  {title: '接单时间', dataIndex: 'acceptOrderTime'},
+  {title: '结算金额', dataIndex: 'settlementAmount'},
 ]
 
 interface infoType {
@@ -114,7 +114,7 @@ const logisticsDetail: React.FC = () => {
               <Descriptions.Item label="结算金额：">{infoDetail?.amount}</Descriptions.Item>
               <Descriptions.Item label="结算方：">{infoDetail?.settlementName}</Descriptions.Item>
               <Descriptions.Item label="结算方式：">{infoDetail?.settlementWayName}</Descriptions.Item>
-              <Descriptions.Item label="外部状态：">{infoDetail?.statusName}</Descriptions.Item>
+              <Descriptions.Item label="外部状态："><StatusTag text={infoDetail?.statusName}></StatusTag></Descriptions.Item>
             </Descriptions>
           </PageHeader>
         </>

src/pages/balance/accountsReceivable/settlementList/productNoticeSettlementDetail.tsx

@@ -18,6 +18,7 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { detailSchema } from './schema'
 import { usePageStatus } from '@/hooks/usePageStatus';
 import { PublicApi } from '@/services/api';
+import StatusTag from '../../components/StatusTag';
 
 const RangePicker = DatePicker.RangePicker;
 const formActions = createFormActions();
@@ -117,7 +118,7 @@ const  ProductNoticeSettlementDetail: React.FC = () => {
               <Descriptions.Item label="结算金额：">{infoDetail?.amount}</Descriptions.Item>
               <Descriptions.Item label="结算方：">{infoDetail?.settlementName}</Descriptions.Item>
               <Descriptions.Item label="结算方式：">{infoDetail?.settlementWayName}</Descriptions.Item>
-              <Descriptions.Item label="外部状态：">{infoDetail?.statusName}</Descriptions.Item>
+              <Descriptions.Item label="外部状态："><StatusTag text={infoDetail?.statusName}></StatusTag></Descriptions.Item>
             </Descriptions>
           </PageHeader>
         </>

src/pages/balance/components/StatusActions/index.tsx

@@ -173,7 +173,7 @@ const UploadVoucher: React.FC<UploadVocherProps> = (props) => {
               >
                 <UploadPayVoucher id={settlementId} getFileList={getFileList} />
               </Modal>
-              <div className={styles.modalBtn}  onClick={show}>上传付款凭证</div>
+              <div className={styles.modalBtn}  onClick={show}>付款</div>
             </>
           )
         }

src/pages/balance/components/StatusTag/index.tsx

@@ -29,13 +29,22 @@ const STATUS_TEXT = [
   "已完成"
 ]
 
+const STATUS_TEXT_MAP = {
+  "待对账": 1,
+  "待付款": 2,
+  "待收款": 3,
+  "已完成": 4
+}
+
 interface Iprops {
-  status: StatusEnum
+  status?: StatusEnum,
+  text?: string
 }
 
 const StatusTag: React.FC<Iprops> = (props: Iprops) => {
+  const { status, text } = props
   return (
-    <Tag color={COLOR[props.status]}>{STATUS_TEXT[props.status]}</Tag>
+    <Tag color={ text ? COLOR[STATUS_TEXT_MAP[text]] : COLOR[status]}>{text ? text : STATUS_TEXT[status]}</Tag>
   )
 }