冗余发票信息

src/constants/index.ts

@@ -567,7 +567,7 @@ export enum PurchaseOrderInsideWorkState {
   SUBMIT_ORDER,
 
   /**
-   *  提交订单完成
+   *  待确认电子合同
    */
   SUBMIT_FINISH_ORDER,
 
@@ -665,6 +665,11 @@ export enum SaleOrderInsideWorkState {
   NOT_ACCEPTED_ORDER,
 
   /**
+   * 待确认支付结果
+   */
+  READY_CONFIRM_PAY_RESULT,
+
+  /**
    *  确认支付结果没到账
    */
   CONFIRM_NOT_PAY_RESULT = 17,
@@ -797,6 +802,8 @@ export const SaleOrderInsideWorkStateTexts = {
   7: '提交一级审核订单不通过',
   8: '提交二级审核订单不通过',
   9: '不接受订单',
+  10: '待确认支付结果',
+  
   16: '支付结果确认到账',
   17: '支付结果没到账',
   18: '发货单创建',

src/pages/transaction/purchaseOrder/orderPreview/components/ContractList/index.less → src/pages/transaction/components/ContractList/index.less

-@import '../../../../../../global/styles/utils.less';
+@import '../../../../global/styles/utils.less';
 
 .contractList {
   padding: 0;

src/pages/transaction/purchaseOrder/orderDetail/components/theInvoiceList/index.tsx

@@ -31,15 +31,16 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
   const modalRef = useRef<any>({})
   const { dataSource, showMore } = state
   const { value, mutators, form, editable } = props
+  let useValue = typeof value === 'object' ? value : dataSource.find(v => v.id === value)
   const transformData = transformDefaultData(dataSource)
   const showDataSource = showMore ? [...transformData].splice(0, 3) : transformData
   const handleAdd = () => {
     setMode('add')
     modalRef.current.setVisible(true)
   }
-  const handleCheck = (id) => {
+  const handleCheck = (item) => {
     // 选中的id
-    mutators.change(id)
+    mutators.change(item)
   }
 
   const reload = () => {
@@ -85,11 +86,11 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
   return (
     <div style={{width: '100%'}} className={styles.invoice}>
       { editable && <Button block onClick={handleAdd} icon={<PlusOutlined/>}>新增发票</Button> }
-      <Radio.Group className={styles.raido_group} value={value} onChange={e => handleCheck(e)}>
+      <Radio.Group className={styles.raido_group} value={useValue} onChange={e => handleCheck(e)}>
         <div className={styles.invoice_list}>
           {
             showDataSource.map((item, index) => (
-              <Radio className={styles.list_radio} value={item.id} key={`address_list_radio_${item.id}`}>
+              <Radio className={styles.list_radio} value={item} key={`address_list_radio_${item.id}`}>
                 <div className={styles.invoice_list_item} key={`invoice_list_item_${index}`}>
                   <div className={styles.invoice_list_item_content}>
                     <div className={cx(styles.invoice_list_item_content_tag, item.kind !== 1 ? styles.special : '')}>{item.kind === 1 ? '增值税普通发票' : '增值税专用发票'}</div>
@@ -103,7 +104,7 @@ const TheInvoiceList = (props: ISchemaFieldComponentProps) => {
                     </div>
                   </div>
                   {
-                    value === item.id && (
+                    value.id === item.id && (
                       editable ? 
                       <div className={styles.invoice_list_item_btn_group}>
                         <div className={styles.invoice_list_item_btn} onClick={(e) => handleEdit(item, e)}>编辑</div>

src/pages/transaction/purchaseOrder/orderDetail/effects/index.ts

@@ -155,7 +155,7 @@ export const useInvoiceList = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
     ctx.setFieldState('theInvoiceId', state => {
       if (data.length > 0 && !state.value) {
         // 初始化时存在数据， 默认帮用户选中第一个
-        state.value = data[0].id
+        state.value = data[0]
       }
       state.dataSource = data
       state.showMore = data.length > 3

src/pages/transaction/purchaseOrder/orderDetail/index.tsx

@@ -160,7 +160,10 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
             needTheInvoice: Number(value.needTheInvoice),
             // 冗余交付信息
             deliveryAddresId: value.deliveryAddresId.id,
-            ...omit(value.deliveryAddresId, ['id'])
+            ...omit(value.deliveryAddresId, ['id']),
+            // 冗余发票信息
+            theInvoiceId: value.theInvoiceId ? value.theInvoiceId.id : undefined,
+            theInvoiceInfo: value.theInvoiceId || null
           }
           fnResult = id ? await PublicApi.postOrderProcurementOrderUpdate({...params, id}) : await PublicApi.postOrderProcurementOrderAddReinsurancePolicy(params)
           break;

src/pages/transaction/purchaseOrder/orderPreview/components/orderMergeInfo/index.tsx

@@ -6,7 +6,7 @@ import { formatTimeString } from '@/utils'
 import { DELIVERY_TYPE } from '@/constants'
 import style from './index.less'
 import { PublicApi } from '@/services/api'
-import ContractList from '../ContractList'
+import ContractList from '../../../../components/ContractList'
 
 export interface OrderMergeInfoProps { }
 const payInfo = [
@@ -29,6 +29,7 @@ const payInfo = [
 ]
 
 const otherInfo = [
+  { title: '发票', name: 'theInvoiceInfo' },
   { title: '包装要求', name: 'pageRequire' },
   { title: '其他要求', name: 'restsRequire' },
 ]

src/pages/transaction/saleOrder/orderPreview/components/orderMergeInfo/index.tsx

@@ -6,6 +6,7 @@ import { formatTimeString } from '@/utils'
 import { DELIVERY_TYPE } from '@/constants'
 import style from './index.less'
 import { PublicApi } from '@/services/api'
+import ContractList from '@/pages/transaction/components/ContractList'
 
 export interface OrderMergeInfoProps { }
 const payInfo = [
@@ -28,6 +29,7 @@ const payInfo = [
 ]
 
 const otherInfo = [
+  { title: '发票', name: 'theInvoiceInfo' },
   { title: '包装要求', name: 'pageRequire' },
   { title: '其他要求', name: 'restsRequire' },
 ]
@@ -77,6 +79,18 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
       </Col>
       <Col span={4} push={2}>
         <MellowCard title='电子合同' blockClassName={style.fullHeight} className={style.fullHeight}>
+          <ContractList
+            dataSource={
+              data.electronicContractUrl ?
+                [
+                  {
+                    electronicContractUrl: data.electronicContractUrl,
+                    electronicContractName: data.electronicContractName,
+                  },
+                ] :
+                null
+            }
+          />
           <RenderCard infoList={electronInfo} dataSource={data} />
         </MellowCard>
       </Col>

src/pages/transaction/saleOrder/orderPreview/index.tsx

@@ -180,6 +180,10 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
         text = '确认提交'
         break;
       }
+      case SaleOrderInsideWorkState.READY_CONFIRM_PAY_RESULT: {
+        text = '确认支付结果'
+        break;
+      }
       case SaleOrderInsideWorkState.CONFIRM_RECEIPT: {
         text = '确认全部已回单'
         break;

src/pages/transaction/saleOrder/readyPayResult/model/useSelfTable.tsx

@@ -121,9 +121,9 @@ export const useSelfTable = () => {
     {
       title: '内部状态',
       align: 'center',
-      dataIndex: 'interiorState',
-      key: 'interiorState',
-      render: (text) => <StatusColors status={text} type='inside' />
+      dataIndex: 'purchaseOrderInteriorState',
+      key: 'purchaseOrderInteriorState',
+      render: (text) => <StatusColors status={text} type='saleInside' />
     },
     {
       title: '操作',
@@ -131,7 +131,7 @@ export const useSelfTable = () => {
       dataIndex: 'ctl',
       key: 'ctl',
       render: (text, record) => <>
-        <Button type='link' onClick={() => handleConfirm(record)}>支付</Button>
+        <Button type='link' onClick={() => handleConfirm(record)}>确认</Button>
         <Button type='link' onClick={() => handleCancel(record.id)}>取消订单</Button>
       </>
     }