修改联调问题

src/pages/AfterSaleManage/PassAudit/index.jsx

@@ -2,14 +2,14 @@ import React, { useState, useRef } from 'react';
 import { Button, notification, Popconfirm } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { searchList, shopCheck, jdInfo, trackInfo } from '../services';
+import { searchList, shopCheck, orderDetail, trackInfo } from '../services';
 import { getDetail } from '../../afterSale/appeal/services';
 import { columnPassAudit } from '../data';
 import RejectModal from '../components/rejectModal';
 import DetailTable from '../components/detailTable';
 import ProofsModal from '../components/proofsModal';
 import LogisticsCom from '../../orderManage/pendingDeliveryOrder/components/LogisticsCom';
-import Detail from '../../afterSale/components/detail';
+import AppealDetail from '../../afterSale/components/detail';
 
 export default () => {
   const table = useRef();
@@ -21,11 +21,11 @@ export default () => {
   const [serviceNoInfo, setServiceNoInfo] = useState({});
   const [LogisticsComList, setLogisticsComList] = useState({});
   const [LogisticsComModalVisible, handleComModalVisible] = useState(false);
-  const [detailModal, setDetailModal] = useState(false);
+  const [appealDetailModal, setAppealDetailModal] = useState(false);
   const [selectedRow, setSelectedRow] = useState({});
-  const viewDetail = async ({ serviceNo }) => {
-    const data = await jdInfo({ serviceNo });
-    setDetailInfo(data?.skuQuantity || []);
+  const viewDetail = async ({ orderNo }) => {
+    const data = await orderDetail({ orderNo });
+    setDetailInfo(data || []);
     setDetailVisible(true);
   };
   const closeModal = isReload => {
@@ -37,6 +37,7 @@ export default () => {
     setDetailVisible(false);
     setProofsVisible(false);
     handleComModalVisible(false);
+    setAppealDetailModal(false);
   };
   const reject = async ({ serviceNo }) => {
     setServiceNoInfo(serviceNo);
@@ -80,7 +81,7 @@ export default () => {
   };
   const viewAppeal = async r => {
     const detailData = await getDetail({ appealNo: r.appealNo });
-    setDetailModal(true);
+    setAppealDetailModal(true);
     setSelectedRow(detailData);
   };
   const columns = [
@@ -109,6 +110,7 @@ export default () => {
       title: '操作',
       hideInSearch: true,
       width: 450,
+      dataIndex: 'action',
       fixed: 'right',
       render: (_, r) => [
         <Popconfirm
@@ -116,14 +118,10 @@ export default () => {
           onConfirm={() => refund(r)}
           okText="确认"
           cancelText="取消"
-          disabled={!r.showRefund || !r.showRefunded}
+          key="pop"
+          disabled={!r.showRefund}
         >
-          <Button
-            key="link1"
-            className="mr10"
-            type="primary"
-            disabled={!r.showRefund || !r.showRefunded}
-          >
+          <Button key="link1" className="mr10" type="primary" disabled={!r.showRefund}>
             {r.showRefunded ? '已退款' : '允许退款'}
           </Button>
         </Popconfirm>,
@@ -183,7 +181,11 @@ export default () => {
         value={LogisticsComList}
         key={LogisticsComList.key}
       />
-      <Detail data={selectedRow} modalVisible={detailModal} onCancel={closeModal}></Detail>
+      <AppealDetail
+        data={selectedRow}
+        modalVisible={appealDetailModal}
+        onCancel={closeModal}
+      ></AppealDetail>
     </PageHeaderWrapper>
   );
 };

src/pages/AfterSaleManage/Pending/index.jsx

@@ -2,13 +2,13 @@ import React, { useState, useRef } from 'react';
 import { notification, Button } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { searchList, auditInfoApi, jdInfo } from '../services';
+import { searchList, auditInfoApi, orderDetail } from '../services';
 import { columnSticData, appealType } from '../data';
 import AuditModal from '../components/auditModal';
 import DetailTable from '../components/detailTable';
 import ProofsModal from '../components/proofsModal';
 import { getDetail } from '../../afterSale/appeal/services';
-import Detail from '../../afterSale/components/detail';
+import AppealDetail from '../../afterSale/components/detail';
 
 export default () => {
   const table = useRef();
@@ -18,12 +18,12 @@ export default () => {
   const [proofsVisible, setProofsVisible] = useState(false);
   const [proofsData, setProofsData] = useState([]);
   const [auditInfo, setAuditInfo] = useState({});
-  const [detailModal, setDetailModal] = useState(false);
+  const [appealDetailModal, setAppealDetailModal] = useState(false);
   const [selectedRow, setSelectedRow] = useState({});
 
-  const viewDetail = async ({ serviceNo }) => {
-    const data = await jdInfo({ serviceNo });
-    setDetailInfo(data?.skuQuantity || []);
+  const viewDetail = async ({ orderNo }) => {
+    const data = await orderDetail({ orderNo });
+    setDetailInfo(data || []);
     setDetailVisible(true);
   };
   const closeModal = isReload => {
@@ -34,6 +34,7 @@ export default () => {
     setVisible(false);
     setDetailVisible(false);
     setProofsVisible(false);
+    setAppealDetailModal(false);
   };
   const openAudit = async ({ serviceNo }) => {
     const data = await auditInfoApi({ serviceNo });
@@ -50,7 +51,7 @@ export default () => {
   };
   const viewAppeal = async r => {
     const detailData = await getDetail({ appealNo: r.appealNo });
-    setDetailModal(true);
+    setAppealDetailModal(true);
     setSelectedRow(detailData);
   };
   const columns = [
@@ -78,6 +79,7 @@ export default () => {
     {
       title: '操作',
       hideInSearch: true,
+      dataIndex: 'action',
       width: 250,
       fixed: 'right',
       render: (_, r) => [
@@ -115,7 +117,11 @@ export default () => {
       <AuditModal visible={visible} onCancel={closeModal} formData={auditInfo} />
       <DetailTable visible={detailVisible} onCancel={closeModal} dataSource={detailInfo} />
       <ProofsModal visible={proofsVisible} onCancel={closeModal} data={proofsData} />
-      <Detail data={selectedRow} modalVisible={detailModal} onCancel={closeModal}></Detail>
+      <AppealDetail
+        data={selectedRow}
+        modalVisible={appealDetailModal}
+        onCancel={closeModal}
+      ></AppealDetail>
     </PageHeaderWrapper>
   );
 };

src/pages/AfterSaleManage/components/detailTable.jsx

@@ -9,6 +9,7 @@ export default props => {
   const columns = [
     {
       title: '商品名称',
+      width: 400,
       dataIndex: 'skuName',
     },
     {
@@ -21,7 +22,7 @@ export default props => {
     },
   ];
   return (
-    <Modal title="售后操作确认" visible={visible} onCancel={handleCancel} footer={null}>
+    <Modal title="售后操作确认" visible={visible} onCancel={handleCancel} footer={null} width={800}>
       <Table dataSource={dataSource} columns={columns} key="skuName" pagination={false} />
     </Modal>
   );

src/pages/AfterSaleManage/services.js

@@ -33,15 +33,15 @@ export async function searchList(params, queryStatus) {
 }
 
 // 售后单详情
-export async function jdInfo(params) {
-  const data = await request.get('/api/kdsp/op/afs/jd-info', {
+export async function orderDetail(params) {
+  const data = await request.get('/api/kdsp/op/order/skus', {
     prefix: kdspApi,
     params,
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
     },
   });
-  return data.data || {};
+  return data.data || [];
 }
 // 售后审核
 export async function shopAudit(params) {