修改订单编号字段

src/models/mproduct/mproduct.js

@@ -1,6 +1,6 @@
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
-import { query } from '../../services/mproduct';
+import { query, queryFromShopCart } from '../../services/mproduct';
 import { pageModel } from '../common';
 import { pageSize } from '../../utils/config';
 import { checkSearchParams } from '../../utils/utils';
@@ -43,6 +43,24 @@ export default modelExtend(pageModel, {
       }
       yield put({ type: 'changeLoading', payload: { listLoading: false } });
     },
+    * queryBuyMsg({payload}, {call, put}) {
+      yield put({ type: 'changeLoading', payload: { listLoading: true }});
+      const { data, success } = yield call(queryFromShopCart, payload);
+      if (success) {
+        yield put({
+          type: 'querySuccess',
+          payload: {
+            list: data || [],
+            pagination: {
+              current: Number(payload.pageNo) || 1,
+              pageSize: Number(payload.pageSize) || pageSize,
+              total: data.totalSize,
+            }
+          }
+        });
+      }
+      yield put({ type: 'changeLoading', payload: { listLoading: false }});
+    },
   },
 
   reducers: {

src/routes/Order/Add/index.js

@@ -26,6 +26,7 @@ import { productType, pageSize, Codes } from '../../../utils/config';
   terminal: state.terminal,
   orderDetail: state.orderDetail,
   mproduct: state.mproduct,
+  isFromCart: false,
 }))
 export default class CreateOrder extends Component {
   state = {
@@ -100,40 +101,56 @@ export default class CreateOrder extends Component {
     this.props.dispatch({ type: 'terminal/query', payload: data });
   }
 
-  // 产品选择弹框
-  handleProductSelectBtnClick = () => {
+  handleProductSelectBtnClick = (isFromCart) => {
     const { userInfo } = this.state;
-    const { merchantId } = userInfo;
+    const { merchantId, uid } = userInfo;
+    this.setState({ isFromCart });
     this.props.dispatch({ type: 'orderDetail/showProductModal' });
-    this.props.dispatch({
-      type: 'mproduct/query',
-      payload: {
-        pageNo: 1,
-        pageSize,
-        merchantId,
-      },
-    });
+    if (isFromCart) {
+      this.props.dispatch({
+        type: 'mproduct/queryBuyMsg',
+        payload: {
+          pageSize,
+          userId: uid,
+          pageNo: 1,
+        }
+      });
+    } else {
+      this.props.dispatch({
+        type: 'mproduct/query',
+        payload: {
+          pageNo: 1,
+          pageSize,
+          merchantId,
+        },
+      });
+    }
   }
 
   handleProductModalSearch = (data) => {
-    const { userInfo } = this.state;
-    const { merchantId } = userInfo;
+    const { userInfo, isFromCart } = this.state;
+    const { merchantId, id } = userInfo;
     const newData = { ...data };
     if (newData.keyword) {
       newData[newData.field] = newData.keyword;
     }
     delete newData.field;
     delete newData.keyword;
-    this.props.dispatch({
-      type: 'mproduct/query',
-      payload: { ...newData, merchantId, pageNo: 1, pageSize },
-    });
+    if (isFromCart) {
+      console.log('购物车内商品暂不支持查找...');
+    } else {
+      this.props.dispatch({
+        type: 'mproduct/query',
+        payload: { ...newData, merchantId, pageNo: 1, pageSize },
+      });
+    }
   }
 
   handleProductModalTableChange = (pagination, filterArgs, filters) => {
-    const { userInfo } = this.state;
+    const { userInfo, isFromCart } = this.state;
     const { merchantId } = userInfo;
     const newFilters = { ...filters };
+    if (isFromCart) {return;}
     if (newFilters.keyword) {
       newFilters[newFilters.field] = newFilters.keyword;
     }
@@ -258,7 +275,7 @@ export default class CreateOrder extends Component {
 
   handlePageSubmit = () => {
     const { form, dispatch, orderDetail } = this.props;
-    const { userInfo, tableDatas } = this.state;
+    const { userInfo, tableDatas, isFromCart } = this.state;
     const { getFieldsValue, validateFields } = form;
     const { filters } = orderDetail;
     const { uid } = userInfo;
@@ -276,6 +293,7 @@ export default class CreateOrder extends Component {
       postData.goods = detailList;
       postData.adjustPrice = 0;
       postData.orderStatus = Codes.CODE_UNPAID;
+      postData.isFromCart = isFromCart;
       dispatch({
         type: 'orderDetail/create',
         payload: postData,
@@ -298,7 +316,10 @@ export default class CreateOrder extends Component {
     let rowSort = 1;
     const formatedData = [];
     const rowDataMaker = (item) => {
-      const first = item.goods[0];
+      let first = item.goods[0]; //默认选中第一个
+      if (item.goods.filter(a => a.isInCart)[0]) {
+        first = item.goods.filter(a => a.isInCart)[0];
+      }
       return {
         name: item.name,
         code: item.code,
@@ -309,6 +330,7 @@ export default class CreateOrder extends Component {
         price3: first.terminalPrice,
         rowSum: first.merchantPrice,
         chargeUnit: first.chargeUnit,
+        isFromCart: this.state.isFromCart,
       };
     };
     data.map((item) => {
@@ -590,25 +612,32 @@ export default class CreateOrder extends Component {
                 <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 type="primary" size="small" icon="plus-circle-o">添加</Button>
-                  </Tooltip>
-                )
-              }
-              <Table
-                bordered
-                scroll={{ x: 1250 }}
-                pagination={false}
-                columns={columns}
-                dataSource={listData}
-                footer={() => <strong>{`价格总计:  ${total}元`}</strong>}
-              />
-            </Form.Item>
+            {userInfo.merchantId &&
+              <Form.Item label="添加商品" {...formItemLayout}>
+                <Button.Group size="small">
+                  <Button
+                    type={this.state.isFromCart ? 'default' : 'primary'}
+                    onClick={() => this.handleProductSelectBtnClick(false)}
+                    >
+                    产品库
+                  </Button>
+                  <Button
+                    type={this.state.isFromCart? 'primary' : 'default'}
+                    onClick={() => this.handleProductSelectBtnClick(true)}
+                  >
+                    购物车
+                  </Button>
+                </Button.Group>
+                <Table
+                  bordered
+                  scroll={{ x: 1250 }}
+                  pagination={false}
+                  columns={columns}
+                  dataSource={listData}
+                  footer={() => <strong>{`价格总计:  ${total}元`}</strong>}
+                />
+              </Form.Item>
+            }
           </Form>
           {/* 终端选择弹框 */}
           <TerminalSelectModal

src/routes/Order/Edit/orderProfile.js

@@ -97,6 +97,7 @@ export default class OrderProfile extends Component {
     const { currentItem } = orderDetail;
     const {
       id,
+      serialNo,
       gmtCreated,
       userCode,
       provinceCode,
@@ -131,7 +132,7 @@ export default class OrderProfile extends Component {
     // 订单信息 - table data
     const orderInfoTableDatas = [{
       field: '订单编号',
-      value: id,
+      value: serialNo,
       key: 1,
     }, {
       field: '下单时间',

src/routes/Order/List/table.js

@@ -30,10 +30,10 @@ export default class TableList extends PureComponent {
 
     const columns = [{
       title: '订单编号',
-      dataIndex: 'id',
-      key: 'id',
+      dataIndex: 'serialNo',
+      key: 'serialNo',
       fixed: 'left',
-      width: 330,
+      width: 180,
     }, {
       title: '终端编号',
       dataIndex: 'userCode',
@@ -100,7 +100,7 @@ export default class TableList extends PureComponent {
         columns={columns}
         rowKey={record => record.id}
         {...tableProps}
-        scroll={{ x: 1500 }}
+        scroll={{ x: 1300 }}
       />
     );
   }

src/services/mproduct.js

@@ -1,6 +1,6 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
-import { merchantProducts, merchantProduct, merchantProductCreate } from '../utils/api';
+import { merchantProducts, merchantProduct, merchantProductCreate, shopCartProducts } from '../utils/api';
 
 export async function query(params) {
   return request(`${merchantProducts}?${stringify(params)}`);
@@ -10,6 +10,10 @@ export async function queryOne(params) {
   return request(`${merchantProduct}?${stringify(params)}`);
 }
 
+export async function queryFromShopCart(params){
+  return request(`${shopCartProducts}?${stringify(params)}`);
+}
+
 export async function createMerchantProduct(params) {
   const options = {
     method: 'PUT',

src/utils/api.js

@@ -19,4 +19,5 @@ module.exports = {
   orderPay: `${config.apiHost}/order/pay`,
   orderReceive: `${config.apiHost}/order/receive`,
   snapShot: `${config.apiHost}/order/snapshot`,
+  shopCartProducts: `${config.apiHost}/buymsg/list`,
 };

src/utils/config.js

@@ -44,8 +44,8 @@ Codes.CODE_SEASON = '季';
 Codes.CODE_ITEM = '件';
 
 module.exports = {
-  apiHost: '/api/v1',
-  //apiHost: 'http://tt-cms.api.ai160.com',
+  // apiHost: '/api/v1',
+  apiHost: 'http://tt-cms.api.ai160.com',
   ossHost: 'http://efunimgs.oss-cn-beijing.aliyuncs.com',
   // apiHost: '/api',
   // 每页返回数据量