feature: 添加订单管理

config/env.config.js

@@ -2,11 +2,12 @@ const isProduction = process.env.NODE_ENV === 'production';
 
 let envAPi = {
   // api: '//backstms-qa.liangkebang.net',
-  api: '//yapi.quantgroups.com/mock/351',
+  // api: '//yapi.quantgroups.com/mock/351',
+  api: '//192.168.28.66:80',
 };
 
 let prodApi = {
-  api: '//backstms.q-gp.com',
+  api: '//kdsp-operation.q-gp.com',
 };
 
 let exportApi;

src/pages/orderManage/pendingDeliveryOrder/components/LogisticsForm.jsx

@@ -31,7 +31,7 @@ const LogisticsForm = props => {
           orderSkuId: orderSkuId,
           expressCompanyCode: data.selectedCompany.split('-')[0],
           expressCompanyName: data.selectedCompany.split('-')[1],
-          delivery_no: data.orderNum,
+          deliveryNo: data.orderNum,
         })
       })
     })
@@ -119,6 +119,7 @@ const LogisticsForm = props => {
                         ],
                       })(
                       <Select
+                        showSearch
                         placeholder="请选择物流公司"
                       >
                         {companys.map(item => (

src/pages/orderManage/pendingDeliveryOrder/index.jsx

@@ -4,7 +4,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import LogisticsForm from './components/LogisticsForm';
 import OrderDetail from './components/OrderDetail';
-import { queryToSend, queryExpress } from './service';
+import { queryToSend, queryExpress, getGoods } from './service';
 
 const TableList = () => {
   const [companys, setCompanys] = useState([]);
@@ -27,9 +27,9 @@ const TableList = () => {
     },
     {
       title: '交易时间',
-      dataIndex: 'payTime',
-      key: 'payTime',
-      valueType: 'dateTime',
+      dataIndex: 'orderTime',
+      key: 'orderTime',
+      valueType: 'date',
       hideInSearch: true,
     },
     {
@@ -46,9 +46,10 @@ const TableList = () => {
     },
     {
       title: '收货地址',
-      dataIndex: 'receiveAddress',
-      key: 'receiveAddress',
-      search: false,
+      dataIndex: 'fullAddress',
+      key: 'fullAddress',
+      hideInSearch: true,
+      width: 160,
     },
     {
       title: '物流状态',
@@ -56,9 +57,9 @@ const TableList = () => {
       key: 'logisticsStatus',
       filters: false,
       valueEnum: {
-        '3': '全部',
-        '1': '未发货',
-        '2': '已发货',
+        '_3': '全部',
+        '_1': '未发货',
+        '_2': '已发货',
       },
       order: 5,
     },
@@ -81,22 +82,36 @@ const TableList = () => {
       dataIndex: 'option',
       key: 'option',
       valueType: 'option',
+      width: 120,
       render: (_, record) => (
+        <React.Fragment>
+          {
+            record.skuSource.value !== 2 && record.logisticsStatus === '_1' ? (
               <React.Fragment>
                 <a
-            onClick={() => {
-              setSkuList(record.skuList || []);
+                  onClick={async () => {
+                    const skuList = await getGoods(record.orderId);
+                    setSkuList(skuList);
                     handleModalVisible(true);
                   }}
                 >
                   更新物流信息
                 </a>
                 <Divider type="vertical" />
+              </React.Fragment>
+            ) : null
+          }
+          {
+            record.logisticsStatus === '_1' ? (
               <a
-            onClick={() => {
-              setSkuList(record.skuList || []);
+                onClick={async () => {
+                  const skuList = await getGoods(record.orderId);
+                  console.log('skuList', skuList);
+                  setSkuList(skuList);
                   handleDetailModalVisible(true);
                 }}>查看订单详情</a>
+            ) : null
+          }
         </React.Fragment>
       ),
     },

src/pages/orderManage/pendingDeliveryOrder/service.js

 import request from '@/utils/request';
+import { stringify } from 'querystring';
+import _ from 'lodash';
 // 待发货订单
 export async function queryToSend(params) {
-  const statusMap = {
-  	'全部': 3,
-  	'未发货': 1,
-  	'已发货': 2,
-  }
   const transformedParam = {
   	...params,
-  	logisticsStatus: statusMap[params.logisticsStatus] || 3,
+    logisticsStatus: params.logisticsStatus ? params.logisticsStatus.slice(1) : '',
+    startTime: params.beginTime,
   	pageNo: params.current,
     pageSize: params.pageSize || 20,
+  };
+  
+  const { data: { current, records, total, size } } = await request.post('/api/kdsp/op/mch-order/list', {
+    data: stringify(_.omitBy(transformedParam, v => !v)),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
     }
-  const { data: { currentPage, dataList, totalCount } } = await request.post('/api/kdsp/op/mch-order/list', {
-    data: transformedParam
   });
   return {
-    current: currentPage,
-    data: dataList,
-    total: totalCount
+    current: current,
+    data: records.map(v => ({...v, logisticsStatus: `_${v.logisticsStatus}`})),
+    total: total,
+    pageSize: size
   }
 }
 
@@ -29,7 +32,12 @@ export async function queryExpress() {
 }
 
 export async function updateExpress(params) {
-  return request.post('/api/kdsp/op/order/update-express-info', {
+  return request.post('/api/kdsp/op/mch-order/update-express-info', {
     data: params
   });
 }
+
+export async function getGoods(orderId) {
+  const { data } = await request.get(`/api/kdsp/op/mch-order/skus?orderId=${orderId}`);
+  return data;
+}
\ No newline at end of file