@kmkf-fe-packages/kmkf-work-order-service-component 0.27.1-test.2 → 0.27.1-test.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (29) hide show
  1. package/dist/esm/FlowTemplateDetail/components/PreNodeRender/index.js +4 -1
  2. package/dist/esm/FlowTemplateDetail/components/RemarkShow/index.d.ts +1 -0
  3. package/dist/esm/FlowTemplateDetail/components/RemarkShow/index.js +4 -2
  4. package/dist/esm/FlowTemplateDetail/index.js +2 -1
  5. package/dist/esm/WdtTradeList/components/OrderDrawer.d.ts +5 -2
  6. package/dist/esm/WdtTradeList/components/OrderDrawer.js +17 -7
  7. package/dist/esm/WdtTradeList/components/OrderForm/ReissueItems.d.ts +11 -0
  8. package/dist/esm/WdtTradeList/components/OrderForm/ReissueItems.js +174 -0
  9. package/dist/esm/WdtTradeList/components/{OrderForm.d.ts → OrderForm/index.d.ts} +4 -1
  10. package/dist/esm/WdtTradeList/components/OrderForm/index.js +79 -0
  11. package/dist/esm/WdtTradeList/components/TradeList.d.ts +2 -1
  12. package/dist/esm/WdtTradeList/components/TradeList.js +8 -5
  13. package/dist/esm/WdtTradeList/components/fields/Goods/SelectDrawer.d.ts +1 -1
  14. package/dist/esm/WdtTradeList/components/fields/Goods/SelectDrawer.js +23 -25
  15. package/dist/esm/WdtTradeList/components/fields/Goods/index.d.ts +1 -0
  16. package/dist/esm/WdtTradeList/components/fields/Goods/index.js +82 -45
  17. package/dist/esm/WdtTradeList/components/fields/LogisticsCode.d.ts +6 -0
  18. package/dist/esm/WdtTradeList/components/fields/LogisticsCode.js +48 -0
  19. package/dist/esm/WdtTradeList/components/fields/Warehouse.d.ts +7 -0
  20. package/dist/esm/WdtTradeList/components/fields/Warehouse.js +43 -0
  21. package/dist/esm/WdtTradeList/components/index.less +15 -3
  22. package/dist/esm/WdtTradeList/index.d.ts +2 -0
  23. package/dist/esm/WdtTradeList/index.js +4 -2
  24. package/dist/esm/WdtTradeList/interface.d.ts +15 -2
  25. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js +20 -5
  26. package/dist/esm/WorkOrder/index.js +25 -2
  27. package/dist/esm/common/utils/tools.js +97 -81
  28. package/package.json +5 -5
  29. package/dist/esm/WdtTradeList/components/OrderForm.js +0 -179
@@ -13,7 +13,10 @@ var PreNodeRender = function PreNodeRender(props) {
13
13
  id: t.uniqueKey,
14
14
  name: t.name,
15
15
  componentConfig: t.componentConfig,
16
- type: t.workOrderComponentType
16
+ type: t.workOrderComponentType,
17
+ effects: {
18
+ env: platform
19
+ }
17
20
  });
18
21
  // 淘宝端的买家昵称是需要亮灯展示的
19
22
  if (platform === PlatForm.TB && ['ENTERPRISE_PAYMENT', 'BUYER_NICK_INPUT'].includes(t.workOrderComponentType)) {
@@ -1,5 +1,6 @@
1
1
  import React from 'react';
2
2
  interface RemarkShowProps {
3
+ readonly: boolean;
3
4
  time: string;
4
5
  operator: string;
5
6
  context: string;
@@ -10,7 +10,9 @@ var RemarkShow = function RemarkShow(props) {
10
10
  operatorType = props.operatorType,
11
11
  handleOpenRemarkList = props.handleOpenRemarkList,
12
12
  handleOpenAddRemark = props.handleOpenAddRemark,
13
- imgList = props.imgList;
13
+ imgList = props.imgList,
14
+ _props$readonly = props.readonly,
15
+ readonly = _props$readonly === void 0 ? false : _props$readonly;
14
16
  return /*#__PURE__*/React.createElement("div", {
15
17
  className: styles.remarkContext
16
18
  }, /*#__PURE__*/React.createElement("div", {
@@ -21,7 +23,7 @@ var RemarkShow = function RemarkShow(props) {
21
23
  className: styles.operator
22
24
  }, operator), operatorType && /*#__PURE__*/React.createElement("span", {
23
25
  className: styles.tag
24
- }, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType])), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", {
26
+ }, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType])), /*#__PURE__*/React.createElement("span", null, !readonly && /*#__PURE__*/React.createElement("span", {
25
27
  className: styles.contextBtn,
26
28
  onClick: handleOpenAddRemark
27
29
  }, "\u5907\u6CE8"), /*#__PURE__*/React.createElement("span", {
@@ -980,7 +980,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
980
980
  onUpdateRemark: onUpdateRemark,
981
981
  onReminder: handleReminder,
982
982
  queryRemarkList: queryRemarkList
983
- }))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && !readonly && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
983
+ }))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
984
+ readonly: readonly,
984
985
  handleOpenRemarkList: handleOpenRemarkList,
985
986
  handleOpenAddRemark: handleOpenAddRemark
986
987
  }))), getTag({
@@ -1,4 +1,7 @@
1
1
  import React from 'react';
2
- import type { OrderDrawerRefObject } from '../interface';
3
- declare const _default: React.ForwardRefExoticComponent<React.RefAttributes<OrderDrawerRefObject>>;
2
+ import type { OrderDrawerRefObject, WDTVersionType } from '../interface';
3
+ declare type OrderDrawerPropsType = {
4
+ version: WDTVersionType;
5
+ };
6
+ declare const _default: React.ForwardRefExoticComponent<OrderDrawerPropsType & React.RefAttributes<OrderDrawerRefObject>>;
4
7
  export default _default;
@@ -6,13 +6,14 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
6
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
7
  import React, { useState, forwardRef, useImperativeHandle, useRef } from 'react';
8
8
  import { Drawer, Button } from 'antd';
9
- import OrderForm from "./OrderForm";
9
+ import OrderForm from "./OrderForm/index";
10
10
  var OrderDrawer = function OrderDrawer(props, ref) {
11
+ var version = props.version;
11
12
  var _useState = useState(false),
12
13
  _useState2 = _slicedToArray(_useState, 2),
13
14
  open = _useState2[0],
14
15
  setOpen = _useState2[1];
15
- var _useState3 = useState(''),
16
+ var _useState3 = useState(),
16
17
  _useState4 = _slicedToArray(_useState3, 2),
17
18
  type = _useState4[0],
18
19
  setType = _useState4[1];
@@ -20,14 +21,20 @@ var OrderDrawer = function OrderDrawer(props, ref) {
20
21
  _useState6 = _slicedToArray(_useState5, 2),
21
22
  trade = _useState6[0],
22
23
  setTrade = _useState6[1];
23
- var worderDrawerRef = useRef(null);
24
+ var _useState7 = useState([]),
25
+ _useState8 = _slicedToArray(_useState7, 2),
26
+ tradeList = _useState8[0],
27
+ setTradeList = _useState8[1];
28
+ var orderFormRef = useRef(null);
24
29
  useImperativeHandle(ref, function () {
25
30
  return {
26
31
  open: function open(params) {
27
32
  var type = params.type,
28
- trade = params.trade;
33
+ trade = params.trade,
34
+ tradeList = params.tradeList;
29
35
  setType(type);
30
36
  setTrade(trade);
37
+ setTradeList(tradeList);
31
38
  setOpen(true);
32
39
  }
33
40
  };
@@ -36,8 +43,8 @@ var OrderDrawer = function OrderDrawer(props, ref) {
36
43
  setOpen(false);
37
44
  };
38
45
  var onConfirm = function onConfirm() {
39
- var _worderDrawerRef$curr;
40
- (_worderDrawerRef$curr = worderDrawerRef.current) === null || _worderDrawerRef$curr === void 0 ? void 0 : _worderDrawerRef$curr.submit();
46
+ var _orderFormRef$current;
47
+ (_orderFormRef$current = orderFormRef.current) === null || _orderFormRef$current === void 0 ? void 0 : _orderFormRef$current.submit();
41
48
  };
42
49
  return /*#__PURE__*/React.createElement(Drawer, {
43
50
  title: "\u65B0\u5EFA\u5355\u636E",
@@ -61,8 +68,11 @@ var OrderDrawer = function OrderDrawer(props, ref) {
61
68
  onClick: onConfirm
62
69
  }, "\u4FDD\u5B58"))
63
70
  }, open && trade && /*#__PURE__*/React.createElement(OrderForm, {
71
+ version: version,
64
72
  trade: trade,
65
- ref: worderDrawerRef,
73
+ tradeList: tradeList,
74
+ type: type,
75
+ ref: orderFormRef,
66
76
  onCreate: onClose
67
77
  }));
68
78
  };
@@ -0,0 +1,11 @@
1
+ import React from 'react';
2
+ import type { WdtTrade, OrderFormItemsRefObject, WDTVersionType } from '../../interface';
3
+ import type { FormInstance } from 'antd';
4
+ declare type ReissueItemsProps = {
5
+ trade: WdtTrade.TradeInfo;
6
+ tradeList: WdtTrade.TradeInfo[];
7
+ form: FormInstance;
8
+ version: WDTVersionType;
9
+ };
10
+ declare const _default: React.ForwardRefExoticComponent<ReissueItemsProps & React.RefAttributes<OrderFormItemsRefObject>>;
11
+ export default _default;
@@ -0,0 +1,174 @@
1
+ import React, { useImperativeHandle, forwardRef } from 'react';
2
+ import { Form, Input, Radio, InputNumber } from 'antd';
3
+ import { WdtAddressData } from '@kmkf-fe-packages/kmkf-utils';
4
+ import Address from "../fields/Address";
5
+ import Warehouse from "../fields/Warehouse";
6
+ import Goods from "../fields/Goods";
7
+ import { createWdtReissueOrder } from "../../../model/servers/api";
8
+ import { cloneDeep } from 'lodash';
9
+ var ReissueItems = function ReissueItems(props, ref) {
10
+ var trade = props.trade,
11
+ tradeList = props.tradeList,
12
+ form = props.form,
13
+ version = props.version;
14
+ var addressType = Form.useWatch('addressType', form);
15
+ useImperativeHandle(ref, function () {
16
+ return {
17
+ submit: function submit(params) {
18
+ var onCreate = params.onCreate,
19
+ data = params.data;
20
+ var submitData = cloneDeep(data);
21
+ if (submitData.address) {
22
+ submitData.receiverProvince = submitData.address.address[0];
23
+ submitData.receiverCity = submitData.address.address[1];
24
+ submitData.receiverDistrict = submitData.address.address[2];
25
+ submitData.receiverAddress = submitData.address.detail;
26
+ delete submitData.address;
27
+ }
28
+ // if (submitData.warehouse) {
29
+ // submitData.sendId = submitData.warehouse.value;
30
+ // submitData.sendName = submitData.warehouse.label;
31
+ // delete submitData.warehouse;
32
+ // }
33
+ if (submitData.tradeDetail) {
34
+ submitData.tradeNo = submitData.tradeDetail.sid;
35
+ submitData.specList = submitData.tradeDetail.specList;
36
+ delete submitData.tradeDetail;
37
+ }
38
+ delete submitData.afterSaleType;
39
+ createWdtReissueOrder(submitData).then(function () {
40
+ onCreate === null || onCreate === void 0 ? void 0 : onCreate();
41
+ }).catch(console.log);
42
+ }
43
+ };
44
+ });
45
+ React.useEffect(function () {
46
+ WdtAddressData.initData().then(function (wdt) {
47
+ var _trade$extends;
48
+ var formDefaultData = {
49
+ address: {
50
+ address: [wdt.getProCodeByName(trade.receiverState), wdt.getProCodeByName(trade.receiverCity), wdt.getProCodeByName(trade.receiverDistrict)],
51
+ detail: trade.receiverAddress
52
+ },
53
+ buyerMessage: trade.buyerMessage,
54
+ buyerNick: (_trade$extends = trade.extends) === null || _trade$extends === void 0 ? void 0 : _trade$extends.buyer_nick,
55
+ receiverMobile: trade.receiverMobile,
56
+ receiverName: trade.receiverName,
57
+ csRemark: trade.sellerMemo,
58
+ tradeDetail: {
59
+ // sid: 'JY202401176859', // 旗舰版订单号
60
+ // sid: 'JY2024010116985', // 企业版 快力文订单号
61
+ sid: 'JY2024012813517',
62
+ // 企业版 邹三和订单号
63
+ // sid: trade.sid,
64
+ type: 'original',
65
+ specList: trade.orders.map(function (order) {
66
+ return {
67
+ num: order.num,
68
+ price: order.payment,
69
+ goodsId: 'TODO: 补全货品id',
70
+ specNo: order.sysSkuOuterId,
71
+ goodsName: order.title,
72
+ imgUrl: order.sysPicPath,
73
+ specName: order.sysSkuPropertiesName
74
+ };
75
+ })
76
+ },
77
+ addressType: 'original',
78
+ tradeType: '补发单',
79
+ // TODO: 反填带入数据
80
+ logisticsCode: 'STO',
81
+ warehouseNo: '07'
82
+ };
83
+ form.setFieldsValue(formDefaultData);
84
+ });
85
+ }, []);
86
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, {
87
+ label: "\u8865\u53D1\u5730\u5740\u7C7B\u578B",
88
+ name: "addressType",
89
+ rules: [{
90
+ required: true,
91
+ message: '请选择补发地址类型'
92
+ }]
93
+ }, /*#__PURE__*/React.createElement(Radio.Group, {
94
+ options: [{
95
+ label: '原地址补发',
96
+ value: 'original'
97
+ }, {
98
+ label: '非原地址补发',
99
+ value: 'custom'
100
+ }]
101
+ })), addressType === 'custom' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, {
102
+ label: "\u6536\u8D27\u4EBA\u540D\u5B57",
103
+ name: "receiverName",
104
+ rules: [{
105
+ required: true,
106
+ message: '请填写名字'
107
+ }]
108
+ }, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
109
+ label: "\u6536\u8D27\u4EBA\u7535\u8BDD",
110
+ name: "receiverMobile",
111
+ rules: [{
112
+ required: true,
113
+ message: '请填写手机号'
114
+ }]
115
+ }, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
116
+ label: "\u6536\u8D27\u5730\u5740",
117
+ name: "address",
118
+ rules: [{
119
+ required: true,
120
+ validator: function validator(_, value) {
121
+ if (!value || !value.detail || !value.address.length) {
122
+ return Promise.reject(new Error('请填写收货地址'));
123
+ } else if (value.address.some(function (v) {
124
+ return !v;
125
+ })) {
126
+ return Promise.reject(new Error('请选择完整的省市区信息'));
127
+ }
128
+ return Promise.resolve();
129
+ }
130
+ }]
131
+ }, /*#__PURE__*/React.createElement(Address, null))), version === 'flagship' && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form.Item, {
132
+ label: "\u8BA2\u5355\u7C7B\u578B",
133
+ name: "tradeType"
134
+ }, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
135
+ label: "\u672C\u6B21\u6536\u6B3E",
136
+ name: "directPaid"
137
+ }, /*#__PURE__*/React.createElement(InputNumber, {
138
+ style: {
139
+ width: '100%'
140
+ },
141
+ precision: 2
142
+ }))), /*#__PURE__*/React.createElement(Form.Item, {
143
+ label: "\u53D1\u8D27\u4ED3\u5E93",
144
+ name: "warehouseNo"
145
+ }, /*#__PURE__*/React.createElement(Warehouse, null)), /*#__PURE__*/React.createElement(Form.Item, {
146
+ label: "\u5BA2\u670D\u5907\u6CE8",
147
+ name: "csRemark"
148
+ }, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
149
+ label: "\u4E70\u5BB6\u5907\u6CE8",
150
+ name: "buyerMessage"
151
+ }, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
152
+ name: "tradeDetail",
153
+ labelCol: {
154
+ style: {
155
+ display: 'none'
156
+ }
157
+ },
158
+ rules: [{
159
+ validator: function validator(_, value) {
160
+ var _value$specList;
161
+ if (!value.sid) {
162
+ return Promise.reject(new Error('请选择补发系统订单号'));
163
+ } else if (!(value !== null && value !== void 0 && (_value$specList = value.specList) !== null && _value$specList !== void 0 && _value$specList.length)) {
164
+ return Promise.reject(new Error('请选择补发商品'));
165
+ }
166
+ return Promise.resolve();
167
+ }
168
+ }]
169
+ }, /*#__PURE__*/React.createElement(Goods, {
170
+ trade: trade,
171
+ tradeList: tradeList
172
+ })));
173
+ };
174
+ export default /*#__PURE__*/forwardRef(ReissueItems);
@@ -1,7 +1,10 @@
1
1
  import React from 'react';
2
- import type { OrderFormRefObject, WdtTrade } from '../interface';
2
+ import type { OrderFormRefObject, WdtTrade, AfterSaleTypeType, WDTVersionType } from '../../interface';
3
3
  declare type OrderFormPropsType = {
4
4
  trade: WdtTrade.TradeInfo;
5
+ tradeList: WdtTrade.TradeInfo[];
6
+ type?: AfterSaleTypeType;
7
+ version: WDTVersionType;
5
8
  onCreate?: () => void;
6
9
  };
7
10
  declare const _default: React.ForwardRefExoticComponent<OrderFormPropsType & React.RefAttributes<OrderFormRefObject>>;
@@ -0,0 +1,79 @@
1
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
3
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
4
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
5
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
6
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
+ import React, { forwardRef, useImperativeHandle } from 'react';
8
+ import { Form, Radio, message } from 'antd';
9
+ import { get } from 'lodash';
10
+ import ReissueItems from "./ReissueItems";
11
+ var OrderForm = function OrderForm(props, ref) {
12
+ var trade = props.trade,
13
+ tradeList = props.tradeList,
14
+ type = props.type,
15
+ onCreate = props.onCreate,
16
+ version = props.version;
17
+ var itemsRef = React.useRef(null);
18
+ var _Form$useForm = Form.useForm(),
19
+ _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
20
+ form = _Form$useForm2[0];
21
+ var afterSaleType = Form.useWatch('afterSaleType', form);
22
+ useImperativeHandle(ref, function () {
23
+ return {
24
+ submit: function submit() {
25
+ form.validateFields().then(function (data) {
26
+ var _itemsRef$current;
27
+ (_itemsRef$current = itemsRef.current) === null || _itemsRef$current === void 0 ? void 0 : _itemsRef$current.submit({
28
+ onCreate: onCreate,
29
+ data: data
30
+ });
31
+ }).catch(function (e) {
32
+ message.error(get(e, 'errorFields.0.errors.0', '组件校验失败'));
33
+ setTimeout(function () {
34
+ var _document$querySelect;
35
+ (_document$querySelect = document.querySelector('.ant-form-item-has-error')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.scrollIntoView({
36
+ block: 'center',
37
+ behavior: 'smooth'
38
+ });
39
+ });
40
+ });
41
+ }
42
+ };
43
+ });
44
+ React.useEffect(function () {
45
+ if (type) {
46
+ form.setFieldValue('afterSaleType', type);
47
+ }
48
+ }, []);
49
+ return /*#__PURE__*/React.createElement(Form, {
50
+ layout: "horizontal",
51
+ form: form,
52
+ labelCol: {
53
+ style: {
54
+ width: '110px'
55
+ }
56
+ }
57
+ }, /*#__PURE__*/React.createElement(Form.Item, {
58
+ label: "\u552E\u540E\u7C7B\u578B",
59
+ name: "afterSaleType",
60
+ rules: [{
61
+ required: true,
62
+ message: '请选择售后类型'
63
+ }]
64
+ }, /*#__PURE__*/React.createElement(Radio.Group, {
65
+ options: [{
66
+ label: '补发',
67
+ value: 'reissue'
68
+ }
69
+ // { label: '换货', value: 'change' },
70
+ ]
71
+ })), afterSaleType === 'reissue' && /*#__PURE__*/React.createElement(ReissueItems, {
72
+ form: form,
73
+ trade: trade,
74
+ version: version,
75
+ tradeList: tradeList,
76
+ ref: itemsRef
77
+ }));
78
+ };
79
+ export default /*#__PURE__*/forwardRef(OrderForm);
@@ -1,9 +1,10 @@
1
1
  import React from 'react';
2
- import { WdtTrade } from '../interface';
2
+ import { WdtTrade, WDTVersionType } from '../interface';
3
3
  import './index.less';
4
4
  interface Props {
5
5
  list: Array<WdtTrade.TradeInfo>;
6
6
  loading: boolean;
7
+ version: WDTVersionType;
7
8
  }
8
9
  declare const TradeList: React.FC<Props>;
9
10
  export default TradeList;
@@ -9,16 +9,18 @@ import "./index.less";
9
9
  var TradeList = function TradeList(props) {
10
10
  var _props$list = props.list,
11
11
  list = _props$list === void 0 ? [] : _props$list,
12
- loading = props.loading;
12
+ loading = props.loading,
13
+ version = props.version;
13
14
  var orderDrawerRef = useRef(null);
14
15
  var handleCopy = function handleCopy(text) {
15
16
  copy(text);
16
17
  };
17
- var addNewWorder = function addNewWorder(type, trade) {
18
+ var addNewWorder = function addNewWorder(type, trade, tradeList) {
18
19
  var _orderDrawerRef$curre;
19
20
  (_orderDrawerRef$curre = orderDrawerRef.current) === null || _orderDrawerRef$curre === void 0 ? void 0 : _orderDrawerRef$curre.open({
20
21
  type: type,
21
- trade: trade
22
+ trade: trade,
23
+ tradeList: tradeList
22
24
  });
23
25
  };
24
26
  return /*#__PURE__*/React.createElement("div", {
@@ -139,12 +141,13 @@ var TradeList = function TradeList(props) {
139
141
  }, /*#__PURE__*/React.createElement("button", {
140
142
  className: "next-btn next-btn-secondary next-btn-medium",
141
143
  onClick: function onClick() {
142
- return addNewWorder('reissue', item);
144
+ return addNewWorder('reissue', item, list);
143
145
  }
144
146
  }, "\u8865\u53D1")))))))));
145
147
  }
146
148
  })), /*#__PURE__*/React.createElement(OrderDrawer, {
147
- ref: orderDrawerRef
149
+ ref: orderDrawerRef,
150
+ version: version
148
151
  }));
149
152
  };
150
153
  export default TradeList;
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import type { GoodsSelectDrawerRefObject, GoodsValueType, WdtTrade } from '../../../interface';
3
3
  declare type GoodsSelectDrawerPropsType = {
4
4
  trade: WdtTrade.TradeInfo;
5
- onComfirm?: (goodList: GoodsValueType) => void;
5
+ onComfirm?: (goodList: GoodsValueType['goods']) => void;
6
6
  };
7
7
  declare const _default: React.ForwardRefExoticComponent<GoodsSelectDrawerPropsType & React.RefAttributes<GoodsSelectDrawerRefObject>>;
8
8
  export default _default;
@@ -24,31 +24,6 @@ var GoodsSelectDrawer = function GoodsSelectDrawer(_ref, ref) {
24
24
  _useState6 = _slicedToArray(_useState5, 2),
25
25
  selectedGoodIndexList = _useState6[0],
26
26
  setSelectedGoodIndexList = _useState6[1];
27
- var selectedGoodList = [];
28
- if (type === 'original') {
29
- selectedGoodIndexList.forEach(function (index) {
30
- var good = trade.orders[index];
31
- if (good) {
32
- selectedGoodList.push({
33
- num: good.num,
34
- // 数量
35
- price: good.payment,
36
- // 单价
37
- goodsId: 1101,
38
- // 货品ID 'TODO: 补全货品id'
39
- specNo: good.sysSkuOuterId,
40
- // 规格编码
41
- goodsName: good.title,
42
- // 货品名称
43
-
44
- imgUrl: good.sysPicPath,
45
- // 商品图片地址
46
- specName: good.sysSkuPropertiesName // 规格名称
47
- });
48
- }
49
- });
50
- }
51
-
52
27
  var wdtGoodListRef = useRef(null);
53
28
  useImperativeHandle(ref, function () {
54
29
  return {
@@ -69,6 +44,29 @@ var GoodsSelectDrawer = function GoodsSelectDrawer(_ref, ref) {
69
44
  var handleComfirm = function handleComfirm() {
70
45
  if (type === 'original') {
71
46
  // 原单选
47
+ var selectedGoodList = [];
48
+ selectedGoodIndexList.forEach(function (index) {
49
+ var good = trade.orders[index];
50
+ if (good) {
51
+ selectedGoodList.push({
52
+ num: good.num,
53
+ // 数量
54
+ price: good.payment,
55
+ // 单价
56
+ goodsId: Math.ceil(Math.random() * 10000),
57
+ // 货品ID 'TODO: 补全货品id'
58
+ specNo: good.sysSkuOuterId,
59
+ // 规格编码
60
+ goodsName: good.title,
61
+ // 货品名称
62
+
63
+ imgUrl: good.sysPicPath,
64
+ // 商品图片地址
65
+ specName: good.sysSkuPropertiesName // 规格名称
66
+ });
67
+ }
68
+ });
69
+
72
70
  onComfirm === null || onComfirm === void 0 ? void 0 : onComfirm(selectedGoodList);
73
71
  } else {
74
72
  var _wdtGoodListRef$curre;
@@ -2,6 +2,7 @@ import React from 'react';
2
2
  import type { GoodsValueType, WdtTrade } from '../../../interface';
3
3
  declare const Goods: (props: {
4
4
  trade: WdtTrade.TradeInfo;
5
+ tradeList: WdtTrade.TradeInfo[];
5
6
  onChange?: ((newValue: GoodsValueType) => void) | undefined;
6
7
  value?: GoodsValueType;
7
8
  }) => React.JSX.Element;