修改售后查询条件和展示字段问题

src/pages/AfterSaleManage/Pending/index.jsx

@@ -75,6 +75,12 @@ export default () => {
         return <div>未申诉</div>;
       },
     },
+    {
+      title: '售后状态',
+      dataIndex: 'serviceStatus',
+      hideInSearch: true,
+      width: 100,
+    },
     {
       title: '操作',
       hideInSearch: true,

src/pages/AfterSaleManage/components/auditModal.jsx

 import React from 'react';
-import { Modal, Form, Input, TreeSelect, notification } from 'antd';
+import { Modal, Form, Input, Cascader, notification } from 'antd';
 import { shopAudit } from '../services';
 
 const FormItem = Form.Item;
@@ -18,36 +18,32 @@ const AuditModal = props => {
   };
   const treeData = [
     {
-      title: '同意',
-      value: '1',
+      label: '同意',
+      value: 1,
     },
     {
-      title: '不同意',
-      value: '2',
+      label: '不同意',
+      value: 2,
       children: [
         {
-          title: '商品与出售商品不符',
-          value: '2-1',
+          label: '商品与出售商品不符',
+          value: 1,
         },
         {
-          title: '影响二次销售',
-          value: '2-2',
+          label: '影响二次销售',
+          value: 2,
         },
       ],
     },
   ];
   const handleOk = () => {
-    // 掉接口
-    // 成功后掉取消接口
     validateFields(async (error, fieldsValue) => {
       if (!error) {
-        let { auditResult } = fieldsValue;
-        const refuseCode = auditResult.split('-')?.[1] || '';
-        auditResult = auditResult.split('-')?.[0];
+        const { auditResult } = fieldsValue;
         const data = await shopAudit({
           ...fieldsValue,
-          refuseCode,
-          auditResult,
+          refuseCode: auditResult?.[1],
+          auditResult: auditResult?.[0],
           serviceNo: formData?.serviceNo,
         });
         if (data.code === '0000') {
@@ -62,9 +58,8 @@ const AuditModal = props => {
     labelCol: { span: 6 },
     wrapperCol: { span: 16 },
   };
-  const isAgree = () => getFieldValue('auditResult') === '1';
-  const isRefuse = () => getFieldValue('auditResult') && getFieldValue('auditResult') !== '1';
-
+  const isAgree = () => getFieldValue('auditResult')?.[0] === 1;
+  const isRefuse = () => getFieldValue('auditResult') && getFieldValue('auditResult')[0] !== 1;
   return (
     <Modal
       title="售后操作确认"
@@ -75,10 +70,12 @@ const AuditModal = props => {
       <Form {...layout} name="formData">
         <FormItem label="审核结果">
           {getFieldDecorator('auditResult')(
-            <TreeSelect
+            <Cascader
+              allowClear
+              showSearch
               style={{ width: '315px' }}
               dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-              treeData={treeData}
+              options={treeData}
               placeholder="请选择"
             />,
           )}

src/pages/AfterSaleManage/data.js

@@ -6,6 +6,12 @@ export const appealType = {
   0: '未申诉',
 };
 export const columnSticData = [
+  {
+    title: '订单ID',
+    dataIndex: 'orderNo',
+    hideInTable: true,
+    width: 200,
+  },
   {
     title: '订单ID',
     dataIndex: 'orderNo',
@@ -22,9 +28,33 @@ export const columnSticData = [
   {
     title: '售后单ID',
     dataIndex: 'serviceNo',
-    hideInSearch: true,
     width: 200,
   },
+  {
+    title: '售后状态',
+    dataIndex: 'dealStatus',
+    hideInTable: true,
+    valueEnum: {
+      0: '待审核',
+      10: '三方审核中',
+      11: '三方审核通过',
+      12: '三方审核拒绝',
+      13: '客服审核通过',
+      14: '商户审核中',
+      15: '商户审核通过',
+      16: '商户审核拒绝',
+      20: '审核拒绝',
+      21: '申诉中',
+      30: '待填写退货物流信息',
+      40: '待退货入库',
+      50: '退货拒收',
+      60: '待退款',
+      61: '退货处理中',
+      70: '售后成功',
+      99: '用户取消',
+    },
+    width: 100,
+  },
   {
     title: '收货人姓名',
     dataIndex: 'receiverName',
@@ -41,6 +71,22 @@ export const columnSticData = [
     width: 200,
     hideInSearch: true,
   },
+  {
+    title: '订单开始时间',
+    width: 120,
+    dataIndex: 'startDate',
+    key: 'startDate',
+    valueType: 'date',
+    hideInTable: true,
+  },
+  {
+    title: '订单结束时间',
+    width: 120,
+    dataIndex: 'endDate',
+    key: 'endDate',
+    valueType: 'date',
+    hideInTable: true,
+  },
   {
     title: '售后类型',
     dataIndex: 'serviceType',
@@ -94,6 +140,12 @@ export const columnSticData = [
 ];
 export const columnPassAudit = [
   ...columnSticData,
+  {
+    title: '商品渠道',
+    dataIndex: 'skuSourceName',
+    hideInSearch: true,
+    width: 200,
+  },
   {
     title: '商家退货地址',
     dataIndex: 'merchantAddress',