调整订单列表

src/models/order/detail.js

@@ -1,6 +1,6 @@
 import pathToRegexp from 'path-to-regexp';
 import { message } from 'antd';
-import { queryOne, querySubOrder, create, confirmPay, confirmSend, confirmReceive } from '../../services/order';
+import { queryOne, querySubOrder, create, remove, confirmPay, confirmSend, confirmReceive } from '../../services/order';
 
 export default {
   namespace: 'orderDetail',
@@ -58,6 +58,14 @@ export default {
         if (callback) callback();
       }
     },
+    * remove({ payload, callback }, { call }) {
+      console.log(payload);
+      const { success } = yield call(remove, payload);
+      if (success) {
+        message.success('操作成功!');
+        if (callback) callback();
+      }
+    },
     * orderPay({ payload, callback }, { call }) {
       const { success } = yield call(confirmPay, payload);
       if (success) {

src/routes/Order/Add/index.js

@@ -4,7 +4,6 @@ import { routerRedux } from 'dva/router';
 import queryString from 'query-string';
 import {
   Tooltip,
-  Popover,
   Modal,
   Card,
   List,
@@ -14,7 +13,6 @@ import {
   Input,
   InputNumber,
   Select,
-  Icon,
 } from 'antd';
 
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
@@ -32,9 +30,9 @@ import styles from './index.less';
 }))
 export default class CreateOrder extends Component {
   state = {
-    userInfo: {}, //记录终端用户信息
-    products: [], //记录选择的产品
-    tableDatas: [], //记录选择的商品
+    userInfo: {}, // 记录终端用户信息
+    products: [], // 记录选择的产品
+    tableDatas: [], // 记录选择的商品
   };
 
   // 终端选择弹框,显示 -> 加载数据
@@ -45,7 +43,7 @@ export default class CreateOrder extends Component {
       payload: {
         pageNo: 1,
         pageSize,
-      }
+      },
     });
   }
 
@@ -62,7 +60,7 @@ export default class CreateOrder extends Component {
         contactName: record.contactName,
         mobile: record.mobile,
         address: record.address,
-      }
+      },
     });
     this.props.dispatch({ type: 'orderDetail/hideTerminalModal' });
   }
@@ -79,7 +77,7 @@ export default class CreateOrder extends Component {
     delete newData.field;
     delete newData.keyword;
     this.props.dispatch({
-      type: `terminal/query`,
+      type: 'terminal/query',
       payload: { ...newData, pageNo: 1, pageSize },
     });
   }
@@ -99,8 +97,8 @@ export default class CreateOrder extends Component {
     }, {});
 
     const data = { ...newFilters, ...tableFilters, pageNo: pagination.current, pageSize: pagination.pageSize };
-    Object.keys(data).map(key => data[key] ? null : delete data[key]);
-    this.props.dispatch({ type: `terminal/query`, payload: data });
+    Object.keys(data).map(key => (data[key] ? null : delete data[key]));
+    this.props.dispatch({ type: 'terminal/query', payload: data });
   }
 
   // 产品选择弹框
@@ -150,7 +148,7 @@ export default class CreateOrder extends Component {
     }, {});
 
     const data = { ...newFilters, ...tableFilters, pageNo: pagination.current, pageSize: pagination.pageSize, merchantId };
-    Object.keys(data).map(key => data[key] ? null : delete data[key]);
+    Object.keys(data).map(key => (data[key] ? null : delete data[key]));
     this.props.dispatch({ type: 'mporduct/query', payload: data });
   }
 
@@ -172,7 +170,7 @@ export default class CreateOrder extends Component {
   productListFilter = (list) => {
     const newList = [...list];
     newList.map(item =>
-      (!item.goods || item.goods.length == 0) ? item.selectable = true : item.selectable = false);
+      ((!item.goods || item.goods.length == 0) ? item.selectable = true : item.selectable = false));
     return newList;
   }
 
@@ -201,25 +199,25 @@ export default class CreateOrder extends Component {
     );
     // 计算该课程包的价格
     let sumSupportsPrice = 0;
-    subSupports.map(one => {
-      sumSupportsPrice += one.price1 * one.quantity;
+    subSupports.map((one) => {
+      sumSupportsPrice += one.price2 * one.quantity;
     });
-    item.rowSum = item.quantity * item.price3 + sumSupportsPrice;
+    item.rowSum = item.quantity * item.price2 + sumSupportsPrice;
   }
 
   handleInputNumberChange = (record, value) => {
     const { tableDatas } = this.state;
     const newTableDatas = [...tableDatas];
-    newTableDatas.map(item => {
+    newTableDatas.map((item) => {
       if (item.key == record.key) {
         item.quantity = value;
         if (record.type == Codes.CODE_PACKAGE) {
           this.PKGPriceCalculator(item, newTableDatas);
         } else if (record.type == Codes.CODE_SUPPORT && item.parent) {
           const parentId = item.key.split('[sub]')[0];
-          newTableDatas.map(item => item.key == parentId ? this.PKGPriceCalculator(item, newTableDatas) : null);
+          newTableDatas.map(item => (item.key == parentId ? this.PKGPriceCalculator(item, newTableDatas) : null));
         } else {
-          item.rowSum = item.quantity * item.price3;
+          item.rowSum = item.quantity * item.price2;
         }
       }
     });
@@ -229,21 +227,21 @@ export default class CreateOrder extends Component {
   handleSelectChange = (record, value) => {
     const { tableDatas } = this.state;
     const newTableDatas = [...tableDatas];
-    newTableDatas.map(item => {
-      if (item.key == record.key) {
-        const match = item.options.filter(one => one.goodsId == value)[0];
+    newTableDatas.map((item) => {
+      if (item.key === record.key) {
+        const match = item.options.filter(one => one.goodsId === value)[0];
         item.price1 = match.price1;
         item.price2 = match.price2;
         item.price3 = match.price3;
         item.chargeUnit = match.chargeUnit;
         item.goodsId = value;
-        if (record.type == Codes.CODE_PACKAGE) {
+        if (record.type === Codes.CODE_PACKAGE) {
           this.PKGPriceCalculator(item, newTableDatas);
-        } else if (record.type == Codes.CODE_SUPPORT && item.parent) {
+        } else if (record.type === Codes.CODE_SUPPORT && item.parent) {
           const parentId = item.key.split('[sub]')[0];
-          newTableDatas.map(item => item.key == parentId ? this.PKGPriceCalculator(item, newTableDatas) : null);
+          newTableDatas.map(item => (item.key === parentId ? this.PKGPriceCalculator(item, newTableDatas) : null));
         } else {
-          item.rowSum = item.quantity * item.price3;
+          item.rowSum = item.quantity * item.price2;
         }
       }
     });
@@ -269,16 +267,16 @@ export default class CreateOrder extends Component {
       if (errors) return;
       const postData = getFieldsValue();
       const detailList = [];
-      tableDatas.map(item => {
+      tableDatas.map((item) => {
         const { goodsId, quantity } = item;
-        if (!item.parent || item.type == Codes.CODE_SUPPORT) {
+        if (!item.parent || item.type === Codes.CODE_SUPPORT) {
           detailList.push({ goodsId, quantity });
         }
       });
       postData.uid = uid;
       postData.goods = detailList;
       postData.adjustPrice = 0;
-      postData.orderStatus = Codes.CODE_UNPAID,
+      postData.orderStatus = Codes.CODE_UNPAID;
       dispatch({
         type: 'orderDetail/create',
         payload: postData,
@@ -287,7 +285,7 @@ export default class CreateOrder extends Component {
             pathname: '/trade/order',
             search: queryString.stringify(filters),
           }));
-        }
+        },
       });
     });
   }
@@ -299,7 +297,7 @@ export default class CreateOrder extends Component {
    */
   tableDataConventer = (data) => {
     let rowSort = 1;
-    const formatedData = new Array();
+    const formatedData = [];
     const rowDataMaker = (item) => {
       const first = item.goods[0];
       return {
@@ -310,13 +308,13 @@ export default class CreateOrder extends Component {
         price1: first.cpPrice,
         price2: first.merchantPrice,
         price3: first.terminalPrice,
-        rowSum: first.terminalPrice,
+        rowSum: first.merchantPrice,
         chargeUnit: first.chargeUnit,
       };
     };
-    data.map(item => {
+    data.map((item) => {
       if (!item.goods || item.goods.length == 0) return;
-      if (item.type == Codes.CODE_COURSE) {
+      if (item.type === Codes.CODE_COURSE) {
         const newObj = rowDataMaker(item);
         newObj.sumRows = 1;
         newObj.quantity = 1;
@@ -333,7 +331,7 @@ export default class CreateOrder extends Component {
         newObj.rowSort = rowSort;
         rowSort += 1;
         formatedData.push(newObj);
-      } else if (item.type == Codes.CODE_SUPPORT) {
+      } else if (item.type === Codes.CODE_SUPPORT) {
         const newObj = rowDataMaker(item);
         newObj.sumRows = 1;
         newObj.quantity = 1;
@@ -341,9 +339,8 @@ export default class CreateOrder extends Component {
         newObj.rowSort = rowSort;
         rowSort += 1;
         formatedData.push(newObj);
-      } else if (item.type == Codes.CODE_PACKAGE) {
-        const products = item.products;
-        const specials = item.specials;
+      } else if (item.type === Codes.CODE_PACKAGE) {
+        const { products, specials } = item;
         // 产品包为一行
         const newObj = rowDataMaker(item);
         newObj.sumRows = products ? products.length + 1 : 1;
@@ -362,9 +359,9 @@ export default class CreateOrder extends Component {
         rowSort += 1;
         formatedData.push(newObj);
         // 产品包中products每一项为一行
-        products.map(subItem => {
+        products.map((subItem) => {
           const matchGoods = specials.filter(specialsItem => specialsItem.pid == subItem.pid)[0];
-          const newObj = new Object();
+          const newObj = {};
           newObj.sumRows = 0;
           newObj.name = subItem.name;
           newObj.code = subItem.code;
@@ -376,11 +373,11 @@ export default class CreateOrder extends Component {
             newObj.goodsId = matchGoods.id;
             newObj.chargeUnit = '件';
             newObj.price1 = matchGoods.cpPrice;
-            newObj.price2 = '-';
+            newObj.price2 = matchGoods.merchantPrice;
             newObj.price3 = '-';
             newObj.quantity = 0;
           // 产品包中的课程 - 不显示价格并且不支持数量调整
-          } else if (subItem.type == Codes.CODE_COURSE) {
+          } else if (subItem.type === Codes.CODE_COURSE) {
             newObj.parent = true;
             newObj.chargeUnit = '-';
             newObj.price1 = '-';
@@ -421,23 +418,23 @@ export default class CreateOrder extends Component {
       width: '6%',
       key: 0,
       render: (text, row) => ({ children: text, props: { rowSpan: row.sumRows } }),
-    },{
+    }, {
       title: '编号',
       dataIndex: 'code',
       key: 1,
       width: '10%',
-    },{
+    }, {
       title: '名称',
       dataIndex: 'name',
       key: 2,
       width: '10%',
-    },{
+    }, {
       title: '类型',
       dataIndex: 'type',
       key: 3,
-      render: (text) => productType[text],
+      render: text => productType[text],
       width: '10%',
-    },{
+    }, {
       title: '价格类型',
       dataIndex: 'goods',
       key: 4,
@@ -448,72 +445,72 @@ export default class CreateOrder extends Component {
         // 单独的课程
         } else if (row.options) {
           return (
-            <Select style={{ width: '100%' }} value={row.goodsId} onChange={(value) => this.handleSelectChange(row, value)}>
-              {row.options.map(item => <Select.Option key={item.goodsId} value={item.goodsId}>{`¥${item.price3} / ${item.chargeUnit}`}</Select.Option>)}
+            <Select style={{ width: '100%' }} value={row.goodsId} onChange={value => this.handleSelectChange(row, value)}>
+              {row.options.map(item => <Select.Option key={item.goodsId} value={item.goodsId}>{`¥${item.price2} / ${item.chargeUnit}`}</Select.Option>)}
             </Select>
           );
         // 课程包里的配套(显示价格和数量)
-        } else if (!row.options && row.type == Codes.CODE_SUPPORT) {
+        } else if (!row.options && row.type === Codes.CODE_SUPPORT) {
           return `¥${row.price1} / ${row.chargeUnit}`;
         }
       },
       width: '13%',
-    },{
+    }, {
       title: '供应商售价(¥)',
       dataIndex: 'price1',
       key: 5,
       width: '10%',
-    },{
+    }, {
       title: '领教售价(¥)',
       dataIndex: 'price2',
       key: 6,
       width: '10%',
-    },{
+    }, {
       title: '渠道售价(¥)',
       dataIndex: 'price3',
       key: 7,
       width: '10%',
-    },{
+    }, {
       title: '数量',
       dataIndex: 'quantity',
       key: 8,
       render: (text, row) => {
         // 课程
-        if (row.type == Codes.CODE_COURSE && !row.parent) {
+        if (row.type === Codes.CODE_COURSE && !row.parent) {
           return (
             <InputNumber
               value={text}
-              onChange={(value) => this.handleInputNumberChange(row, value)}
+              onChange={value => this.handleInputNumberChange(row, value)}
               min={1}
               placeholder="请填写"
             />
           );
         // 配套
-        } else if (row.type == Codes.CODE_SUPPORT && !row.parent) {
+        } else if (row.type === Codes.CODE_SUPPORT && !row.parent) {
           return (
             <InputNumber
               value={text}
-              onChange={(value) => this.handleInputNumberChange(row, value)}
+              onChange={value => this.handleInputNumberChange(row, value)}
               min={1}
               placeholder="请填写"
             />
           );
         // 课程包
-        } else if (row.type == Codes.CODE_PACKAGE) {
+        } else if (row.type === Codes.CODE_PACKAGE) {
           return (
             <InputNumber
               value={text}
-              onChange={(value) => this.handleInputNumberChange(row, value)}
+              onChange={value => this.handleInputNumberChange(row, value)}
               min={1}
               placeholder="请填写"
             />
           );
         // 课程包内的配套
-        } else if (row.type == Codes.CODE_SUPPORT && row.parent) {
+        } else if (row.type === Codes.CODE_SUPPORT && row.parent) {
           return (
             <InputNumber
               value={text}
-              onChange={(value) => this.handleInputNumberChange(row, value)}
+              onChange={value => this.handleInputNumberChange(row, value)}
               min={0}
               placeholder="请填写"
             />
@@ -523,13 +520,13 @@ export default class CreateOrder extends Component {
         }
       },
       width: '6%',
-    },{
+    }, {
       title: '小计(¥)',
       dataIndex: 'rowSum',
       key: 9,
       render: (text, row) => ({ children: text, props: { rowSpan: row.sumRows } }),
       width: '8%',
-    },{
+    }, {
       title: '操作',
       dataIndex: 'operation',
       key: 10,
@@ -538,7 +535,7 @@ export default class CreateOrder extends Component {
     }];
 
     let total = 0;
-    listData.map(item => item.rowSum ? total += item.rowSum : null);
+    listData.map(item => (item.rowSum ? total += item.rowSum : null));
 
     return (
       <PageHeaderLayout>
@@ -547,18 +544,20 @@ export default class CreateOrder extends Component {
             <Form.Item label="选择终端" {...formItemLayout}>
               <Button onClick={this.handleTerminalSelectBtnClick} type="primary" size="small" icon="plus-circle-o">选择</Button>
               {userInfo.userCode ?
-                <List
-                  size="small"
-                  bordered
-                  style={{ width: '50%' }}
-                  dataSource={[
+                (
+                  <List
+  size="small"
+  bordered
+  style={{ width: '50%' }}
+  dataSource={[
                     `终端编号: ${userInfo.userCode}`,
                     `终端名称: ${userInfo.userName}`,
                     `所属校区: ${userInfo.campusName}`,
                     `所属渠道: ${userInfo.merchantName}`,
                   ]}
-                  renderItem={item => <List.Item>{item}</List.Item>}
-                />
+  renderItem={item => <List.Item>{item}</List.Item>}
+/>
+)
               : null}
             </Form.Item>
             <Form.Item label="收货人" {...formItemLayout}>
@@ -566,7 +565,7 @@ export default class CreateOrder extends Component {
                 rules: [{ required: true, type: 'string', message: '请填写收货人!' }],
                 initialValue: userInfo.contactName,
               })(
-                <Input style={{ width: "50%" }} placeholder="请填写或使用默认"/>
+                <Input style={{ width: '50%' }} placeholder="请填写或使用默认" />
               )}
             </Form.Item>
             <Form.Item label="联系电话" {...formItemLayout}>
@@ -574,7 +573,7 @@ export default class CreateOrder extends Component {
                 rules: [{ required: true, type: 'string', message: '请填写联系电话!' }],
                 initialValue: userInfo.mobile,
               })(
-                <Input style={{ width: "50%" }} placeholder="请填写或使用默认"/>
+                <Input style={{ width: '50%' }} placeholder="请填写或使用默认" />
               )}
             </Form.Item>
             <Form.Item label="收货地址" {...formItemLayout}>
@@ -582,23 +581,25 @@ export default class CreateOrder extends Component {
                 rules: [{ required: true, type: 'string', message: '请填写收货地址!' }],
                 initialValue: userInfo.address,
               })(
-                <Input.TextArea style={{ width: "50%" }} placeholder="请填写或使用默认"/>
+                <Input.TextArea style={{ width: '50%' }} placeholder="请填写或使用默认" />
               )}
             </Form.Item>
             <Form.Item label="添加备注" {...formItemLayout}>
               {getFieldDecorator('note', {
                 initialValue: userInfo.note,
               })(
-                <Input.TextArea style={{ width: "50%" }} placeholder="请输入(选填)" />
+                <Input.TextArea style={{ width: '50%' }} placeholder="请输入(选填)" />
               )}
             </Form.Item>
             <Form.Item label="添加商品" {...formItemLayout}>
               {userInfo.merchantId ?
                 <Button onClick={this.handleProductSelectBtnClick} type="primary" size="small" icon="plus-circle-o">添加</Button>
               :
-                <Tooltip title="先选择终端">
-                  <Button onClick={this.handleProductSelectBtnClick} disabled={true} type="primary" size="small" icon="plus-circle-o">添加</Button>
-                </Tooltip>
+                (
+                  <Tooltip title="先选择终端">
+  <Button onClick={this.handleProductSelectBtnClick} disabled type="primary" size="small" icon="plus-circle-o">添加</Button>
+</Tooltip>
+)
               }
               <Table
                 bordered
@@ -610,7 +611,7 @@ export default class CreateOrder extends Component {
               />
             </Form.Item>
           </Form>
-          {/*终端选择弹框*/}
+          {/* 终端选择弹框 */}
           <TerminalSelectModal
             rowKeyName="id"
             modalVisible={terminalModalShow}
@@ -624,7 +625,7 @@ export default class CreateOrder extends Component {
             fsTablePagination={terminal.pagination}
             fsTableOnChange={this.handleTerminalModalTableChange}
           />
-          {/*渠道产品选择弹框*/}
+          {/* 渠道产品选择弹框 */}
           <MerchantProductSelectModal
             rowKeyName="id"
             modalVisible={productModalShow}

src/routes/Order/Edit/OrderProfile.js

@@ -23,6 +23,29 @@ export default class OrderProfile extends Component {
   }
 
   /**
+   * 取消订单
+   */
+  deleteItem = () => {
+    const { dispatch, orderDetail } = this.props;
+    const { currentItem, filters } = orderDetail;
+    const { id } = currentItem;
+    Modal.confirm({
+      okText: '确认',
+      cancelText: '取消',
+      title: '确定取消该订单?',
+      onOk: () =>
+        dispatch({
+          type: 'orderDetail/remove',
+          payload: { id },
+          callback: () => dispatch(routerRedux.push({
+            pathname: `/trade/order/profile/${id}`,
+            search: queryString.stringify(filters),
+          })),
+        }),
+    });
+  }
+
+  /**
    * 确认支付
    */
   confirmPay = () => {
@@ -55,6 +78,7 @@ export default class OrderProfile extends Component {
         return (
           <FooterToolbar>
             <Button onClick={this.handlePageCancel}>返回订单列表</Button>
+            <Button onClick={this.deleteItem} type="danger">取消订单</Button>
             <Button onClick={this.confirmPay} type="primary">立即支付</Button>
           </FooterToolbar>
         );
@@ -160,12 +184,12 @@ export default class OrderProfile extends Component {
       title: '商品编号',
       dataIndex: 'code',
       key: 1,
-      width: '20%',
+      width: '25%',
     }, {
       title: '商品名称',
       dataIndex: 'name',
       key: 2,
-      width: '20%',
+      width: '25%',
     }, {
       title: '商品类型',
       dataIndex: 'type',
@@ -181,12 +205,6 @@ export default class OrderProfile extends Component {
       title: '商品数量',
       dataIndex: 'quantity',
       key: 5,
-      width: '10%',
-    }, {
-      title: '操作',
-      dataIndex: 'operation',
-      render: () => <a>查看详情</a>,
-      key: 6,
       width: '15%',
     }];
     // 结算信息 - table data
@@ -194,11 +212,11 @@ export default class OrderProfile extends Component {
     (goods || []).forEach(item => strs.push(`${item.merchantPrice}(元) * ${item.quantity}`));
     const accountTableDatas = [{
       field: '商品总价',
-      value: () => `${strs.join(' + ')} = ${originPrice}(元)`,
+      value: `${strs.join(' + ')} = ${originPrice}(元)`,
       key: 1,
     }, {
       field: '支付金额',
-      value: () => (
+      value: (
         <span>
           {`总价：${originPrice}(元) - 商品优惠：${adjustPrice}(元) = 订单总金额：`}
           <strong style={{ color: 'red' }}>{`${finalPrice}(元)`}</strong>

src/routes/Order/Edit/SubOrderProfile.js

@@ -137,9 +137,9 @@ export default class SubOrderProfile extends Component {
       classroomName,
       orderStatus,
       merchantName,
-      originPrice,
-      finalPrice,
-      adjustPrice,
+      // originPrice,
+      // finalPrice,
+      // adjustPrice,
       name,
       type,
       mobile,
@@ -202,12 +202,12 @@ export default class SubOrderProfile extends Component {
       title: '商品编号',
       dataIndex: 'code',
       key: 1,
-      width: '20%',
+      width: '25%',
     }, {
       title: '商品名称',
       dataIndex: 'name',
       key: 2,
-      width: '20%',
+      width: '25%',
     }, {
       title: '商品类型',
       dataIndex: 'type',
@@ -218,20 +218,15 @@ export default class SubOrderProfile extends Component {
       title: '商品售价(元)',
       dataIndex: 'merchantPrice',
       key: 4,
-      width: '20%',
+      width: '25%',
     }, {
       title: '商品数量',
       dataIndex: 'quantity',
       key: 5,
       width: '10%',
-    }, {
-      title: '操作',
-      dataIndex: 'operation',
-      render: () => <a>查看详情</a>,
-      key: 6,
-      width: '15%',
     }];
     // 结算信息 - table data
+    /*
     const strs = [];
     (goods || []).forEach(item => strs.push(`${item.merchantPrice}(元) * ${item.quantity}`));
     const accountTableDatas = [{
@@ -247,6 +242,7 @@ export default class SubOrderProfile extends Component {
   </span>,
       key: 2,
     }];
+    */
 
     const entityStepMap = {
       [Codes.CODE_UNPAID]: 0,
@@ -333,7 +329,7 @@ export default class SubOrderProfile extends Component {
         <Card title="订单备注" bordered={false} style={{ marginBottom: 20 }}>
           {note || '无'}
         </Card>
-        <Card title="结算信息" bordered={false}>
+        {/* <Card title="结算信息" bordered={false}>
           <Table
             size="small"
             columns={simplyTableColumns}
@@ -342,7 +338,7 @@ export default class SubOrderProfile extends Component {
             pagination={false}
             showHeader={false}
           />
-        </Card>
+        </Card> */}
         <Modal
           title="发货信息"
           visible={deliveryModalShow}

src/routes/Order/List/table.js

@@ -81,11 +81,11 @@ export default class TableList extends PureComponent {
       dataIndex: 'operation',
       key: 'operation',
       render: (text, record) => (
-        <div>
-          <a onClick={() => this.handleItemView(record)}>查看</a>
-        </div>
+        record.flag ?
+          <a onClick={() => this.handleItemView(record)}>查看子订单</a> :
+          <a onClick={() => this.handleItemView(record)}>查看母订单</a>
       ),
-      width: 70,
+      width: 100,
       fixed: 'right',
     }];