Merge branch 'jinfa-20221102' into 'jinfa-20221102'

src/pages/transaction/saleOrder/index.tsx

@@ -73,6 +73,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
   const pauseRef = useRef<any>({})
   const orderIds = useRef<number[]>([])
   const [pageLoading, setPageLoding] = useState<boolean>(false)
+  const [orderId, setOrderId] = useState<any>()
   const [payChartVisible, setPayChartVisible] = useState<boolean>(false)
   const [payForm] = Form.useForm();
   const [payModel, setPayModel] = useState<'web'|'app'|'miniapp'|null>('web')
@@ -147,7 +148,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
   // 提交中止
   const handleSubmitPause = () => {
     pauseActions.submit().then(async ({values}: any) => {
-      const result = await runPause({ orderId: values.id, reason: values.auditOpinion })
+      const result = await runPause({ orderId: orderId, reason: values.auditOpinion })
       if (result.code === 1000) {
         pauseRef.current.setVisible(false)
         setTimeout(() => {
@@ -240,6 +241,7 @@ const SaleOrder: React.FC<SaleOrderProps> = () => {
   const handleSuspend = (r) => {
     pauseRef.current.setVisible(true)
     pauseActions.setFieldValue('id', r.orderId)
+    setOrderId(r.orderId)
     pauseActions.setFieldValue('state', 1)
   }
 

src/utils/downloads.ts

@@ -29,6 +29,10 @@ interface ExportFileProps {
 export const handleExportFile = async (props: ExportFileProps) => {
   const { api, params, options } = props
   let exportParams = ''
+  if(params?.categoryCode){
+    let list = params?.categoryCode
+    params.categoryCode = list[list.length - 1]
+  }
   Object.keys(params).forEach(item => {
     if (params[item]) {
       exportParams += `&${item}=${params[item]}`