联调

src/models/menu.js

@@ -46,7 +46,19 @@ const MenuModel = {
           });
         return value;
       };
-      const menuData = initializationData(payload);
+      let menuData = initializationData(payload);
+      menuData = menuData.concat([
+        {
+          path: 'auditPending',
+          icon: 'smile',
+          name: '售后未审核',
+        },
+        {
+          path: 'passAudit',
+          icon: 'smile',
+          name: '售后已审核',
+        },
+      ]);
       return { ...state, menuData };
     },
   },

src/pages/AfterSaleManage/PassAudit/index.jsx

@@ -92,6 +92,7 @@ export default () => {
       title: '售后凭证',
       dataIndex: 'proofs',
       hideInSearch: true,
+      width: 120,
       order: 4,
       render: proofs => <a onClick={() => viewProofs(proofs)}>查看凭证</a>,
     },
@@ -99,6 +100,7 @@ export default () => {
       title: '售后申诉',
       dataIndex: 'appealFlag',
       hideInSearch: true,
+      width: 120,
       render: (appealFlag, r) => {
         if (appealFlag) {
           return <a onClick={() => viewAppeal(r)}>申诉</a>;
@@ -110,6 +112,7 @@ export default () => {
       title: '操作',
       hideInSearch: true,
       width: 450,
+      fixed: 'right',
       render: (_, r) => [
         <Popconfirm
           title="确定允许退款？"
@@ -128,7 +131,7 @@ export default () => {
           </Button>
         </Popconfirm>,
         <Button
-          key="link"
+          key="link2"
           onClick={() => reject(r)}
           type="primary"
           className="mr10"
@@ -136,11 +139,11 @@ export default () => {
         >
           驳回
         </Button>,
-        <Button key="link" onClick={() => viewDetail(r)} type="primary" className="mr10">
+        <Button key="link3" onClick={() => viewDetail(r)} type="primary" className="mr10">
           订单详情
         </Button>,
         <Button
-          key="link"
+          key="link4"
           onClick={() => handleCom(r)}
           type="primary"
           className="mr10"

src/pages/AfterSaleManage/Pending/index.jsx

@@ -60,6 +60,7 @@ export default () => {
       dataIndex: 'proofs',
       hideInSearch: true,
       order: 4,
+      width: 100,
       render: proofs => <a onClick={() => viewProofs(proofs)}>查看凭证</a>,
     },
     {
@@ -67,6 +68,7 @@ export default () => {
       dataIndex: 'appealFlag',
       valueEnum: appealType,
       hideInSearch: true,
+      width: 120,
       render: (appealFlag, r) => {
         if (appealFlag) {
           return <a onClick={() => viewAppeal(r)}>已申诉</a>;
@@ -77,7 +79,8 @@ export default () => {
     {
       title: '操作',
       hideInSearch: true,
-      width: 200,
+      width: 250,
+      fixed: 'right',
       render: (_, r) => [
         <Button key="link1" onClick={() => openAudit(r)} className="mr10" type="primary">
           审核

src/pages/AfterSaleManage/components/auditModal.jsx

@@ -73,7 +73,7 @@ const AuditModal = props => {
       onCancel={() => handleCancel()}
     >
       <Form {...layout} name="formData">
-        <FormItem label="" style={{ marginLeft: '120px' }}>
+        <FormItem label="审核结果">
           {getFieldDecorator('auditResult')(
             <TreeSelect
               style={{ width: '315px' }}

src/pages/AfterSaleManage/data.js

+import { Tag } from 'antd';
+import React from 'react';
+
 export const appealType = {
   1: '已申诉',
   0: '未申诉',
@@ -7,29 +10,42 @@ export const columnSticData = [
     title: '订单ID',
     dataIndex: 'orderNo',
     hideInSearch: true,
+    width: 300,
+    // eslint-disable-next-line no-confusing-arrow
+    render: (orderNo, r) =>
+      r.timeout || r.reminderFlag ? (
+        <Tag color={r.timeout ? 'red' : 'green'}>{orderNo}</Tag>
+      ) : (
+        orderNo
+      ),
   },
   {
     title: '售后单ID',
     dataIndex: 'serviceNo',
     hideInSearch: true,
+    width: 200,
   },
   {
     title: '收货人姓名',
     dataIndex: 'receiverName',
+    width: 200,
   },
   {
     title: '收货人手机号',
     dataIndex: 'receiverPhone',
+    width: 200,
   },
   {
     title: '收货人地址',
     dataIndex: 'receiveAddress',
+    width: 200,
     hideInSearch: true,
   },
   {
     title: '售后类型',
     dataIndex: 'serviceType',
     hideInSearch: true,
+    width: 120,
     valueEnum: {
       1: '退款不退货',
       2: '退货退款',
@@ -39,35 +55,41 @@ export const columnSticData = [
     title: '售后原因',
     dataIndex: 'serviceReason',
     hideInSearch: true,
+    width: 200,
   },
   {
     title: '售后发生时间',
     dataIndex: 'serviceTime',
     hideInSearch: true,
+    width: 200,
   },
   {
     title: '超时时间',
     dataIndex: 'overTime',
     hideInSearch: true,
+    width: 200,
   },
   {
     title: '是否催办',
     dataIndex: 'reminderFlag',
     hideInSearch: true,
+    width: 120,
     valueEnum: {
-      1: '是',
-      2: '否',
+      true: '是',
+      false: '否',
     },
   },
   {
     title: '是否同意售后',
     dataIndex: 'isAgree',
     hideInSearch: true,
+    width: 120,
   },
   {
     title: '拒绝原因',
     dataIndex: 'refuseReason',
     hideInSearch: true,
+    width: 200,
   },
 ];
 export const columnPassAudit = [
@@ -76,20 +98,24 @@ export const columnPassAudit = [
     title: '商家退货地址',
     dataIndex: 'merchantAddress',
     hideInSearch: true,
+    width: 200,
   },
   {
     title: '退回物流',
     dataIndex: 'expressCompanyName',
     hideInSearch: true,
+    width: 150,
   },
   {
     title: '退回物流单号',
     dataIndex: 'deliveryNo',
     hideInSearch: true,
+    width: 200,
   },
   {
     title: '售后状态',
     dataIndex: 'serviceStatus',
     hideInSearch: true,
+    width: 120,
   },
 ];

src/pages/AfterSaleManage/services.js

 import request from '@/utils/request';
 import config from '../../../config/env.config';
+import { stringify } from 'qs';
+import _ from 'lodash';
 
-let { kdspApi } = config;
-kdspApi = 'http://yapi.quantgroups.com/mock/351';
+const { kdspApi } = config;
 
 // 分页查询所有数据
 export async function searchList(params, queryStatus) {
   const param = {
     ...params,
     pageNo: params.current,
+    pageSize: params.pageSize || 20,
     queryStatus,
   };
   const data = await request.post('/api/kdsp/op/afs/shop/list', {
-    data: param,
     prefix: kdspApi,
+    data: stringify(_.omitBy(param, v => !v)),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
   });
   if (data.data) {
     return {
@@ -30,22 +35,28 @@ export async function searchList(params, queryStatus) {
 // 售后单详情
 export async function jdInfo(params) {
   const data = await request.get('/api/kdsp/op/afs/jd-info', {
-    params,
     prefix: kdspApi,
+    params: stringify(params),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
   });
   return data.data || {};
 }
 // 售后审核
 export async function shopAudit(params) {
   return request.post('/api/kdsp/op/afs/shop/audit', {
-    params,
+    data: stringify(params),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
     prefix: kdspApi,
   });
 }
 // 查询审核信息
-export async function auditInfoApi(serviceNo) {
+export async function auditInfoApi(params) {
   return request.get('/api/kdsp/op/afs/back-info', {
-    params: { serviceNo },
+    params,
     prefix: kdspApi,
   });
 }
@@ -53,13 +64,16 @@ export async function auditInfoApi(serviceNo) {
 // 审核核检
 export async function shopCheck(params) {
   return request.post('/api/kdsp/op/afs/shop/check', {
-    params,
+    params: stringify(_.omitBy(params, v => !v)),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
     prefix: kdspApi,
   });
 }
 // 查询物流信息
 export async function trackInfo(params) {
-  const data = await request.get('/api/kdsp/logistics/kd100/track-list', {
+  const data = await request.get('/api/kdsp/op/logistics/kd100/track-list', {
     params,
     prefix: kdspApi,
   });