fix: 订单支付对接建行数字人民币支付，调整待新增采购收货/销售发货/物流单页面

src/locales/en-US/order.ts

@@ -334,8 +334,9 @@ export default {
   'purchaseOrder.querenshenhecao': 'Confirm review operation',
   'purchaseOrder.shifouquerenshen': 'Whether to confirm the review of the warehouse receipt number is',
   'purchaseOrder.decaigouruku': 'Purchase receipt order?',
-  'purchaseOrder.bianjixiaoshoufa': 'Edit sales invoices',
-  'purchaseOrder.xinzengxiaoshoufa': 'New sales invoices',
+  'purchaseOrder.bianjicaigoushou': 'Edit the purchase receipt',
+  'purchaseOrder.xinzengcaigoushou': 'New purchase receipt',
+  'purchaseOrder.chakancaigoushou': 'Review the purchase receipt',
   'purchaseOrder.shangpinmingcheng': 'product name',
   'purchaseOrder.pinlei': 'category',
   'purchaseOrder.pinpai': 'brand',
@@ -525,6 +526,7 @@ export default {
   'saleOrder.xiaochengxu': 'mini program',
   'saleOrder.xinzengxiaoshoufahuodan': 'New sales invoices',
   'saleOrder.bianjixiaoshoufahuodan': 'Edit sales invoices',
+  'saleOrder.chakanxiaoshoufahuodan': 'Review sales invoices',
   'saleOrder.baocun': 'save',
   'saleOrder.xuanze': 'select',
   'saleOrder.danjumingxi': 'The documents detailed',

src/locales/en-US/transaction_components.ts

@@ -231,6 +231,7 @@ export default {
   'transaction_components.dakai': 'Open',
   'transaction_components.weixin': 'WeChat',
   'transaction_components.zhifubao': 'Alipay',
+  'transaction_components.jianhang': 'CCB',
   'transaction_components.saomawanchengzhifu': 'Scan the QR code to complete the payment',
   'transaction_components.zhangqizhifuqueren': 'Account payment confirmation',
   'transaction_components.zhangqi': 'Account period',

src/locales/ko-KR/order.ts

@@ -334,8 +334,9 @@ export default {
   'purchaseOrder.querenshenhecao': '감사 작업 확인',
   'purchaseOrder.shifouquerenshen': '감사 입고 양식 번호가',
   'purchaseOrder.decaigouruku': '의 구매 입고서?',
-  'purchaseOrder.bianjixiaoshoufa': '판매 인보이스 편집',
-  'purchaseOrder.xinzengxiaoshoufa': '신규 판매 인보이스',
+  'purchaseOrder.bianjicaigoushou': '编辑采购收货单',
+  'purchaseOrder.xinzengcaigoushou': '新增采购收货单',
+  'purchaseOrder.chakancaigoushou': '查看采购收货单',
   'purchaseOrder.shangpinmingcheng': '상품명',
   'purchaseOrder.pinlei': '종류',
   'purchaseOrder.pinpai': '브랜드',
@@ -523,6 +524,7 @@ export default {
   'saleOrder.xiaochengxu': '애플릿',
   'saleOrder.xinzengxiaoshoufahuodan': '신규 판매 인보이스',
   'saleOrder.bianjixiaoshoufahuodan': '판매 인보이스 편집',
+  'saleOrder.chakanxiaoshoufahuodan': '판매 인보이스를 살펴보다',
   'saleOrder.baocun': '간수하다',
   'saleOrder.xuanze': '고르다',
   'saleOrder.danjumingxi': '증빙서류 명세',

src/locales/ko-KR/transaction_components.ts

@@ -231,6 +231,7 @@ export default {
   'transaction_components.dakai': '열다',
   'transaction_components.weixin': '위챗',
   'transaction_components.zhifubao': '알리페이',
+  'transaction_components.jianhang': '건설 은행',
   'transaction_components.saomawanchengzhifu': '스캔 완료 지불',
   'transaction_components.zhangqizhifuqueren': '지급 확인',
   'transaction_components.zhangqi': '결산기일',

src/locales/zh-CN/order.ts

@@ -334,8 +334,9 @@ export default {
   'purchaseOrder.querenshenhecao': '确认审核操作',
   'purchaseOrder.shifouquerenshen': '是否确认审核入库单号为',
   'purchaseOrder.decaigouruku': '的采购入库单?',
-  'purchaseOrder.bianjixiaoshoufa': '编辑销售发货单',
-  'purchaseOrder.xinzengxiaoshoufa': '新增销售发货单',
+  'purchaseOrder.bianjicaigoushou': '编辑采购收货单',
+  'purchaseOrder.xinzengcaigoushou': '新增采购收货单',
+  'purchaseOrder.chakancaigoushou': '查看采购收货单',
   'purchaseOrder.shangpinmingcheng': '商品名称',
   'purchaseOrder.pinlei': '品类',
   'purchaseOrder.pinpai': '品牌',
@@ -522,6 +523,7 @@ export default {
   'saleOrder.xiaochengxu': '小程序',
   'saleOrder.xinzengxiaoshoufahuodan': '新增销售发货单',
   'saleOrder.bianjixiaoshoufahuodan': '编辑销售发货单',
+  'saleOrder.chakanxiaoshoufahuodan': '查看销售发货单',
   'saleOrder.baocun': '保存',
   'saleOrder.xuanze': '选择',
   'saleOrder.danjumingxi': '单据明细',

src/locales/zh-CN/transaction_components.ts

@@ -231,6 +231,7 @@ export default {
   'transaction_components.dakai': '打开',
   'transaction_components.weixin': '微信',
   'transaction_components.zhifubao': '支付宝',
+  'transaction_components.jianhang': '建行',
   'transaction_components.saomawanchengzhifu': '扫码完成支付',
   'transaction_components.zhangqizhifuqueren': '账期支付确认',
   'transaction_components.zhangqi': '账期',

src/pages/transaction/components/orderPayModal/index.less

@@ -126,6 +126,12 @@
 }
 .qrCodeAlipayImage {
   text-align: center;
+  div {
+    img {
+      width: 224px;
+      height: 224px;
+    }
+  }
 }
 
 .scanTips {

src/pages/transaction/components/orderPayModal/index.tsx

@@ -292,6 +292,15 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
           mobilePayFlag.current = 0
           setCurrent(100)
           setPayStep(1)
+        } else if(checked.id === 17) {
+          console.log('选择了建行【数字人民币】模式')
+          setTonglian(true)
+          setQrCodeIframe('')
+          mobilePayFlag.current = 6
+          setCurrent(6)
+          setPayStep(1)
+          setQrLoading(true)
+          handleSubmitPay()
         }
       } else {
         message.error(intl.formatMessage({id: 'transaction_components.qingxianxuanzezhifufangshi'}))
@@ -692,12 +701,14 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
             <div className={style.qrCodeAlipayImage}>
               <div style={{width: 600, height: 300, margin: '0 auto'}}>
               {
+                // 原支付宝
                 qrCodeIframe && <>
                   <iframe id='alipayIframe' srcDoc={qrCodeIframe} width={600} height={300} frameBorder={0} />
                 </>
               }
               {
-                tonglian && <>
+                // 通联支付宝
+                tonglian && checked.id === 12 && <>
                 <img src={qrCodeInfo.qrUrl} alt={intl.formatMessage({id: 'transaction_components.saomazhifu'})}/>
                   <div className={style.scanTips}>
                     <ScanOutlined className={style.scanIcon} />
@@ -705,6 +716,16 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
                   </div>
                 </>
               }
+              {
+                // 建行 数字人民币
+                tonglian && checked.id === 17 && <>
+                <img src={qrCodeInfo.qrUrl} alt={intl.formatMessage({id: 'transaction_components.saomazhifu'})}/>
+                  <div className={style.scanTips}>
+                    <ScanOutlined className={style.scanIcon} />
+                    <span>{intl.formatMessage({id: 'transaction_components.dakai'})} {intl.formatMessage({id: 'transaction_components.jianhang'})}App<br />{intl.formatMessage({id: 'transaction_components.saomawanchengzhifu'})}</span>
+                  </div>
+                </>
+              }
               </div>
             </div>
           </Spin>

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

@@ -25,7 +25,7 @@ const AddPurchaseReceiveOrder: React.FC<{}> = () => {
   const [formLoading, setFormLoading] = useState(false)
   const [btnLoading, setBtnLoading] = useState(false)
   const update = useUpdate()
-  const { id } = usePageStatus()
+  const { id, preview = null } = usePageStatus()
   const [initFormValue, setInitFormValue] = useState<any>({})
   const { formContext } = useFormDetail()
   const intl = useIntl()
@@ -86,10 +86,20 @@ const AddPurchaseReceiveOrder: React.FC<{}> = () => {
     formContext,
   }
 
+  const renderTitle = () => {
+    // intl.formatMessage({ id: 'purchaseOrder.bianjixiaoshoufa', defaultMessage: '编辑销售发货单' })
+    // intl.formatMessage({ id: 'purchaseOrder.xinzengxiaoshoufa', defaultMessage: '新增销售发货单' })
+    // intl.formatMessage({ id: 'purchaseOrder.xinzengxiaoshoufa', defaultMessage: '新增销售发货单' })
+    if(preview) {
+
+    }
+    return intl.formatMessage({ id: 'purchaseOrder.xinzengxiaoshoufa', defaultMessage: '新增销售发货单' })
+  }
+
   return (<div>
     <FormDetailContext.Provider value={providerValue}>
       <FormDetailHeader
-        title={id ? intl.formatMessage({ id: 'purchaseOrder.bianjixiaoshoufa', defaultMessage: '编辑销售发货单' }) : intl.formatMessage({ id: 'purchaseOrder.xinzengxiaoshoufa', defaultMessage: '新增销售发货单' })}
+        title={renderTitle()}
         schema={increaseSchema}
         extraRight={[
           <Button key="1" onClick={() => addSchemaAction.submit()} loading={btnLoading} type="primary" icon={<SaveOutlined />}>

src/pages/transaction/purchaseOrder/addPurchaseReceiveOrder/model/useModalTable.ts

-import { useState } from 'react'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-
-export const useModalTable = (options?) => {
-  const [visible, setVisible] = useState(false)
-  const [rowSelection, rowSelectionCtl] = useRowSelectionTable(options)
-  return {
-    visible,
-    setVisible,
-    rowSelection,
-    rowSelectionCtl
-  }
-}
\ No newline at end of file

src/pages/transaction/purchaseOrder/addPurchaseReceiveOrder/schema/modal.ts

-import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { ISchema } from '@formily/antd';
-import { getIntl } from 'umi';
-
-/**
- *  新增采购请购单 选择物料的筛选
- */
-export const addRequesitionMaterialSchema: ISchema = {
-  type: 'object',
-  properties: {
-    code: {
-      type: 'string',
-      'x-component': 'ModalSearch',
-      'x-component-props': {
-        placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.qingshuruhuohao', defaultMessage: '请输入货号' }),
-        align: 'flex-start',
-      },
-    },
-    [FORM_FILTER_PATH]: {
-      type: 'object',
-      'x-component': 'flex-layout',
-      'x-component-props': {
-        rowStyle: {
-          // flexWrap: 'nowrap',
-          justifyContent: 'flex-start',
-          style: {
-            marginRight: 0,
-          }
-        },
-        colStyle: {
-          marginTop: 20,
-        },
-      },
-      properties: {
-        name: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.huopinmingcheng', defaultMessage: '货品名称' }),
-            style: { width: '174px' },
-          },
-        },
-        brandId: {
-          type: 'string',
-          'x-component': 'CustomInputSearch',
-          'x-component-props': {
-            placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.shangpinpinpai', defaultMessage: '商品品牌' }),
-            showSearch: true,
-            showArrow: true,
-            defaultActiveFirstOption: false,
-            filterOption: false,
-            notFoundContent: null,
-            style: { width: '174px' },
-            searchValue: null,
-            dataoption: [],
-          },
-        },
-        customerCategoryId: {
-          type: 'string',
-          'x-component': 'CustomCategorySearch',
-          'x-component-props': {
-            placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.shangpinpinlei', defaultMessage: '商品品类' }),
-            showSearch: true,
-            notFoundContent: null,
-            style: { width: '174px' },
-            dataoption: [],
-            fieldNames: { label: 'title', value: 'id', children: 'children' },
-          },
-        },
-        type: {
-          type: 'string',
-          "x-component-props": {
-            placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.guigexinghao', defaultMessage: '规格型号' }),
-            style: { width: '174px' },
-          }
-        },
-        submit: {
-          "x-component": 'Submit',
-          "x-mega-props": {
-            span: 1
-          },
-          "x-component-props": {
-            children: getIntl().formatMessage({ id: 'purchaseRequisition.chaxun', defaultMessage: '查询' })
-          }
-        },
-        submit1: {
-          "x-component": 'Children',
-          "x-component-props": {
-            children: '{{otherHandle}}'
-          }
-        }
-      }
-    }
-  }
-}

src/pages/transaction/purchaseOrder/readyAddPurchaseReceiveOrder/model/useSelfTable.tsx

@@ -37,7 +37,7 @@ export const useSelfTable = () => {
       key: 'orderNo',
       render: (text, record) => {
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/addPurchaseWarehouseOrder/preview?id=${record.id}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderList/preview?id=${record.id}`}>
             {text}
           </EyePreview>
         )
@@ -79,7 +79,7 @@ export const useSelfTable = () => {
       align: 'center',
       dataIndex: 'invoiceNumber',
       key: 'invoiceNumber',
-      render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
+      render: (text, record) => <Link to={`/memberCenter/tranactionAbility/purchaseOrder/ReadyAddPurchaseReceiveOrder/preview?id=${record.orderId}&preview=1`}>{text}</Link>
     },
     {
       title: intl.formatMessage({ id: 'purchaseOrder.dingdanleixing', defaultMessage: '订单类型' }),

src/pages/transaction/purchaseOrder/readyAddPurchaseReceiveOrder/schema/index.ts

@@ -3,7 +3,6 @@ import { useIntl } from 'umi';
 
 export const tableListSchema: any = () => {
   const intl = useIntl()
-  // const OrderType = getOrderType()
 
   return {
     type: 'object',
@@ -43,10 +42,6 @@ export const tableListSchema: any = () => {
             "x-component-props": {
               placeholder: intl.formatMessage({ id: 'purchaseOrder.qingxuanzedingdanOrderType', defaultMessage: '请选择订单类型' })
             },
-            // enum: OrderType.map(item => ({
-            //   label: item['name'],
-            //   value: item['status'],
-            // }))
             enum: []
           },
           "[startCreateTime,endCreateTime]": {

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

@@ -59,12 +59,12 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', () => {
   </RowStyle>
 })
 
-/** 新增物流单 */
+/** 新增/查看物流单 */
 const AddLogisticsOrder:React.FC<{}> = () => {
   const [formLoading, setFormLoading] = useState(false)
   const [btnLoading, setBtnLoading] = useState(false)
   const update = useUpdate()
-  const { id } = usePageStatus()
+  const { id, preview = null } = usePageStatus()
   const [initFormValue, setInitFormValue] = useState<any>({})
   const { formContext } = useFormDetail()
   const intl = useIntl()
@@ -133,12 +133,22 @@ const AddLogisticsOrder:React.FC<{}> = () => {
     return data.data.map(v => ({ label: v.name, value: v.id }))
   }
 
+  const renderTitle = () => {
+    // intl.formatMessage({ id: 'saleOrder.xiugaiwuliudan', defaultMessage: '修改物流单' })
+    // intl.formatMessage({ id: 'saleOrder.xinzengwuliudan', defaultMessage: '新增物流单' })
+    // intl.formatMessage({ id: 'saleOrder.chakanwuliudan', defaultMessage: '查看物流单' })
+    if(preview) {
+      return intl.formatMessage({ id: 'saleOrder.chakanwuliudan', defaultMessage: '查看物流单' })
+    }
+    return intl.formatMessage({ id: 'saleOrder.xinzengwuliudan', defaultMessage: '新增物流单' })
+  }
+
   return (<div>
     <FormDetailContext.Provider value={providerValue}>
       <FormDetailHeader
-        title={id ? intl.formatMessage({ id: 'saleOrder.xiugaiwuliudan', defaultMessage: '修改物流单' }) : intl.formatMessage({ id: 'saleOrder.xinzengwuliudan', defaultMessage: '新增物流单' })}
+        title={renderTitle()}
         schema={increaseSchema}
-        extraRight={[
+        extraRight={!preview && [
           <Button key="1" onClick={() => addSchemaAction.submit()} loading={btnLoading} type="primary" icon={<SaveOutlined />}>
             {intl.formatMessage({ id: 'saleOrder.baocun', defaultMessage: '保存' })}
           </Button>,
@@ -152,6 +162,7 @@ const AddLogisticsOrder:React.FC<{}> = () => {
           value={initFormValue}
           actions={addSchemaAction}
           schema={increaseSchema}
+          editable={!preview}
           onSubmit={handleSubmit}
           effects={($, ctx) => {
             $('onFormMount').subscribe(() => { })

src/pages/transaction/saleOrder/addLogisticsOrder/model/useProductTable.tsx

@@ -7,9 +7,6 @@ import { useModalTable } from './useModalTable';
 import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
 import { useIntl } from 'umi';
 
-const { pageStatus } = usePageStatus()
-
-
 // 对象按key排序（运用于商城传过来的阶梯价格排序）
 export const sortByKey = (params) => {
   let keys = Object.keys(params).sort((x,y)=> parseInt(x) - parseInt(y));
@@ -21,6 +18,8 @@ export const sortByKey = (params) => {
 }
 
 export const getUnitPriceTotal = (record) => {
+  const { pageStatus } = usePageStatus()
+
   const purchaseCount = Number(record['purchaseCount']) || 0
   // fix 当没有传递unitPrice字段时 自动容错， 单价显示为0
   // fix 编辑订单取price
@@ -68,6 +67,7 @@ export const getUnitPriceTotal = (record) => {
  * @param ctx schemaAction
  */
 export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncActions) => {
+  const { pageStatus, preview = null } = usePageStatus()
   const productRef = useRef<any>({})
   const { visible, setVisible, rowSelection, rowSelectionCtl } = useModalTable({type: 'checkbox'})
   const intl = useIntl()
@@ -123,8 +123,8 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
       message.error(intl.formatMessage({id: 'purchaseOrder.orderCollect.model.message'}))
     }
   }
-
-  const productAddButton = <Button onClick={handleShowProduct} block type='default' style={{margin: '24px auto'}}>{intl.formatMessage({ id: 'saleOrder.xuanzeshangpin', defaultMessage: '选择商品' })}</Button>
+console.log(preview, 'ppp')
+  const productAddButton = !preview && <Button onClick={handleShowProduct} block type='default' style={{margin: '24px auto'}}>{intl.formatMessage({ id: 'saleOrder.xuanzeshangpin', defaultMessage: '选择商品' })}</Button>
 
   const productComponents = {
     body: {

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

@@ -20,12 +20,12 @@ import { getOrderVendorDetail } from '@/services/OrderNewV2Api'
 
 const addSchemaAction = createFormActions()
 
-/** 新增销售发货单 */
+/** 新增/查看销售发货单 */
 const AddSaleDelevedOrder:React.FC<{}> = () => {
   const [formLoading, setFormLoading] = useState(false)
   const [btnLoading, setBtnLoading] = useState(false)
   const update = useUpdate()
-  const { id } = usePageStatus()
+  const { id, preview = null } = usePageStatus()
   const [initFormValue, setInitFormValue] = useState<any>({})
   const { formContext } = useFormDetail()
   const intl = useIntl()
@@ -83,10 +83,20 @@ const AddSaleDelevedOrder:React.FC<{}> = () => {
     formContext,
   }
 
+  const renderTitle = () => {
+    // intl.formatMessage({ id: 'saleOrder.bianjixiaoshoufahuodan', defaultMessage: '编辑销售发货单' })
+    // intl.formatMessage({ id: 'saleOrder.xinzengxiaoshoufahuodan', defaultMessage: '新增销售发货单' })
+    // intl.formatMessage({ id: 'saleOrder.chakanxiaoshoufahuodan', defaultMessage: '查看销售发货单' })
+    if(preview) {
+
+    }
+    return intl.formatMessage({ id: 'saleOrder.xinzengxiaoshoufahuodan', defaultMessage: '新增销售发货单' })
+  }
+
   return (<div>
     <FormDetailContext.Provider value={providerValue}>
       <FormDetailHeader
-        title={id ? intl.formatMessage({ id: 'saleOrder.bianjixiaoshoufahuodan', defaultMessage: '编辑销售发货单' }) : intl.formatMessage({ id: 'saleOrder.xinzengxiaoshoufahuodan', defaultMessage: '新增销售发货单' })}
+        title={renderTitle()}
         schema={increaseSchema}
         extraRight={[
           <Button key="1" onClick={() => addSchemaAction.submit()} loading={btnLoading} type="primary" icon={<SaveOutlined />}>

src/pages/transaction/saleOrder/addSaleDelevedOrder/model/useModalTable.ts

-import { useState } from 'react'
-import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
-
-export const useModalTable = (options?) => {
-  const [visible, setVisible] = useState(false)
-  const [rowSelection, rowSelectionCtl] = useRowSelectionTable(options)
-  return {
-    visible,
-    setVisible,
-    rowSelection,
-    rowSelectionCtl
-  }
-}
\ No newline at end of file

src/pages/transaction/saleOrder/addSaleDelevedOrder/schema/modal.ts

-import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { ISchema } from '@formily/antd';
-import { getIntl } from 'umi';
-
-/**
- *  新增采购请购单 选择物料的筛选
- */
- export const addRequesitionMaterialSchema: ISchema = {
-  type: 'object',
-  properties: {
-    code: {
-      type: 'string',
-      'x-component': 'ModalSearch',
-      'x-component-props': {
-        placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.qingshuruhuohao', defaultMessage: '请输入货号' }),
-        align: 'flex-start',
-      },
-    },
-    [FORM_FILTER_PATH]: {
-      type: 'object',
-      'x-component': 'flex-layout',
-      'x-component-props': {
-        rowStyle: {
-          // flexWrap: 'nowrap',
-          justifyContent: 'flex-start',
-          style: {
-            marginRight: 0,
-          }
-        },
-        colStyle: {
-          marginTop: 20,
-        },
-      },
-      properties: {
-        name: {
-          type: 'string',
-          'x-component-props': {
-            placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.huopinmingcheng', defaultMessage: '货品名称' }),
-            style: { width: '174px' },
-          },
-        },
-        brandId: {
-          type: 'string',
-          'x-component': 'CustomInputSearch',
-          'x-component-props': {
-            placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.shangpinpinpai', defaultMessage: '商品品牌' }),
-            showSearch: true,
-            showArrow: true,
-            defaultActiveFirstOption: false,
-            filterOption: false,
-            notFoundContent: null,
-            style: { width: '174px' },
-            searchValue: null,
-            dataoption: [],
-          },
-        },
-        customerCategoryId: {
-          type: 'string',
-          'x-component': 'CustomCategorySearch',
-          'x-component-props': {
-            placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.shangpinpinlei', defaultMessage: '商品品类' }),
-            showSearch: true,
-            notFoundContent: null,
-            style: { width: '174px' },
-            dataoption: [],
-            fieldNames: { label: 'title', value: 'id', children: 'children' },
-          },
-        },
-        type: {
-          type: 'string',
-          "x-component-props": {
-            placeholder: getIntl().formatMessage({ id: 'purchaseRequisition.guigexinghao', defaultMessage: '规格型号' }),
-            style: { width: '174px' },
-          }
-        },
-        submit: {
-          "x-component": 'Submit',
-          "x-mega-props": {
-            span: 1
-          },
-          "x-component-props": {
-            children: getIntl().formatMessage({ id: 'purchaseRequisition.chaxun', defaultMessage: '查询' })
-          }
-        },
-        submit1: {
-          "x-component": 'Children',
-          "x-component-props": {
-            children: '{{otherHandle}}'
-          }
-        }
-      }
-    }
-  }
-}

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

@@ -9,7 +9,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
 import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import '../index.less'
-import { getOrderVendorPage } from '@/services/OrderNewV2Api';
+import { getOrderVendorPage, getOrderVendorSellDeliveryPage } from '@/services/OrderNewV2Api';
 
 export interface AddSaleDelevedOrderProps {}
 

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

@@ -39,9 +39,9 @@ export const useSelfTable = () => {
       dataIndex: 'orderNo',
       key: 'orderNo',
       render: (text, record) => {
-        // 查看订单, 需根据状态显示不同schema
+        // 查看订单
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/addSaleDelevedOrder/preview?id=${record.orderId}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${record.orderId}`}>
             {text}
           </EyePreview>
         )
@@ -74,16 +74,16 @@ export const useSelfTable = () => {
     {
       title: intl.formatMessage({ id: 'saleOrder.yifahuopici', defaultMessage: '已发货批次' }),
       align: 'center',
-      dataIndex: 'shipmentBatch',
-      key: 'shipmentBatch',
+      dataIndex: 'batchNo',
+      key: 'batchNo',
       render: text => text ? `${text}${intl.formatMessage({ id: 'saleOrder.ci', defaultMessage: '次' })}` : ''
     },
     {
       title: intl.formatMessage({ id: 'saleOrder.fahuodanhao', defaultMessage: '发货单号' }),
       align: 'center',
-      dataIndex: 'deliverNo',
-      key: 'deliverNo',
-      render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
+      dataIndex: 'deliveryNo',
+      key: 'deliveryNo',
+      render: (text, record) => <Link to={`/memberCenter/tranactionAbility/saleOrder/readyAddDelevedOrder/preview?id=${record.orderId}&preview=1`}>{text}</Link>
      },
     {
       title: intl.formatMessage({ id: 'saleOrder.dingdanleixing', defaultMessage: '订单类型' }),

src/pages/transaction/saleOrder/readyAddDelevedOrder/schema/index.ts

@@ -3,7 +3,6 @@ import { useIntl } from 'umi';
 
 export const tableListSchema: any = () => {
   const intl = useIntl()
-  // const OrderType = getOrderType()
 
   return {
     type: 'object',
@@ -43,10 +42,6 @@ export const tableListSchema: any = () => {
             "x-component-props": {
               placeholder: intl.formatMessage({ id: 'saleOrder.qingxuanzedingdan', defaultMessage: '请选择订单类型' })
             },
-            // enum: OrderType.map(item => ({
-            //   label: item['name'],
-            //   value: item['status'],
-            // }))
             enum: []
           },
           "[startCreateTime,endCreateTime]": {

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

@@ -4,7 +4,6 @@ import EyePreview from '@/components/EyePreview'
 import { formatTimeString } from '@/utils'
 import StatusColors from '@/pages/transaction/components/statusColors'
 import { FieldTimeOutlined } from '@ant-design/icons'
-import qs from 'querystring'
 import TableOperation from '@/components/TableOperation'
 
 // 待新增物流单
@@ -39,9 +38,9 @@ export const useSelfTable = () => {
       dataIndex: 'orderNo',
       key: 'orderNo',
       render: (text, record) => {
-        // 查看订单, 需根据状态显示不同schema
+        // 查看订单
         return (
-          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder/preview?id=${record.orderId}`}>
+          <EyePreview url={`/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${record.orderId}`}>
             {text}
           </EyePreview>
         )
@@ -83,7 +82,7 @@ export const useSelfTable = () => {
       align: 'center',
       dataIndex: 'deliverNo',
       key: 'deliverNo',
-      render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
+      render: (text, record) => <Link to={`/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder/preview?id=${record.orderId}&preview=1`}>{text}</Link>
     },
     {
       title: intl.formatMessage({ id: 'saleOrder.dingdanleixing', defaultMessage: '订单类型' }),
@@ -119,8 +118,7 @@ export const useSelfTable = () => {
   }
 
   const handlePreview = async (record) => {
-    const logisticsId = record.logisticsId
-    history.push(`/memberCenter/logisticsAbility/logisticsBillSubmit/logisticsBillQuery/preview?id=${logisticsId}&invoicesTypeId=2`)
+    history.push(`/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder/preview?id=${record.orderId}&preview=1`)
   }
 
   const handleModify = async (record) => {

src/pages/transaction/saleOrder/readyAddLogisticsOrder/schema/index.ts

@@ -3,7 +3,6 @@ import { useIntl } from 'umi';
 
 export const tableListSchema: any = () => {
   const intl = useIntl()
-  // const OrderType = getOrderType()
 
   return {
     type: 'object',
@@ -43,10 +42,6 @@ export const tableListSchema: any = () => {
             "x-component-props": {
               placeholder: intl.formatMessage({ id: 'saleOrder.qingxuanzedingdanOrderType', defaultMessage: '请选择订单类型' })
             },
-            // enum: OrderType.map(item => ({
-            //   label: item['name'],
-            //   value: item['status'],
-            // }))
             enum: []
           },
           "[startCreateTime,endCreateTime]": {