@kmkf-fe-packages/basic-components 1.0.1-rc.0 → 1.0.1-rc.2

package/dist/index.esm.js

@@ -7563,10 +7563,11 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$a = ["value", "onChange"];
+var _excluded$a = ["value", "onChange", "type"];
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
+    type = props.type,
     other = _objectWithoutProperties(props, _excluded$a);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -7579,7 +7580,7 @@ function ApaasLogistics(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            express = ExpressData.getInstance();
+            express = ExpressData.getInstance(type === 'WDT_LOGISTICS' ? 'wdt' : 'default');
             setOptions(express.expressData || []);
           case 2:
           case "end":
@@ -10438,18 +10439,13 @@ var jstGoods = function jstGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    wdtSendOptions = _useState4[0],
-    setSendOptions = _useState4[1];
+  // const { sendData: wdtSendOptions } = useSendData(componentType === 'WDT_SEND_GOOD' ? 'wdt' : '');
   useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length)) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
-  useEffect(function () {
-  }, []);
   var content = function content(item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -10523,7 +10519,8 @@ var jstGoods = function jstGoods(props) {
     style: {
       minWidth: '100px',
       maxWidth: '180px'
-    }
+    },
+    type: componentType
   }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
@@ -10560,7 +10557,7 @@ var jstGoods = function jstGoods(props) {
     disabled: disabled,
     placeholder: "\u53D1\u8D27\u4ED3\u540D\u79F0",
     showSearch: true,
-    options: wdtSendOptions,
+    options: [],
     filterOption: filterOption,
     value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendName,
     onChange: function onChange(value, option) {
@@ -11146,6 +11143,12 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
 var GoodsModal$2 = /*#__PURE__*/forwardRef(GoodsModal$1);
 
 var RangePicker = DatePicker.RangePicker;
+var getWdtListProduct = function getWdtListProduct(data) {
+  return extendRequest('/qy/gdfw/product/wdtListProduct', {
+    method: 'post',
+    data: data
+  });
+};
 var columns$1 = [{
   dataIndex: 'index',
   title: 'NO',
@@ -11220,226 +11223,174 @@ var expandedColumns = [{
   title: '会员价',
   width: 140
 }];
-var dateFormat = 'YYYY-MM-DD HH:mm:ss';
-var GoodsModal$3 = function GoodsModal(props, ref) {
-  var initStartTime = hooks().subtract(30, 'd');
-  var initEndTime = hooks();
-  useImperativeHandle(ref, function () {
-    return {
-      open: function open(shopCode) {
-        setVisible(true);
-        setPageNo(1);
-        setSelect([]);
-        setSelectIds([]);
-        form.setFieldsValue({
-          dateTimePicker: [initStartTime, initEndTime],
-          code: ''
-        });
-        // getShopList();
-      }
-    };
-  });
-
-  var onSubmit = props.onSubmit,
-    shopId = props.shopId,
-    shopList = props.shopList,
-    width = props.width,
-    companyKey = props.companyKey;
-  var _useState = useState(false),
+var getInitTime = function getInitTime() {
+  var initStartTime = hooks().subtract(30, 'd').hours(0).minutes(0).seconds(0);
+  var initEndTime = hooks().hours(23).minutes(59).seconds(59);
+  return [initStartTime, initEndTime];
+};
+var GoodList = function GoodList(props, ref) {
+  var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
-  var _useState3 = useState([]),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = useState(1),
     _useState4 = _slicedToArray(_useState3, 2),
-    selectList = _useState4[0],
-    setSelect = _useState4[1];
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    selectIds = _useState6[0],
-    setSelectIds = _useState6[1];
-  var _useState7 = useState(1),
+    pageNo = _useState4[0],
+    setPageNo = _useState4[1];
+  var _useState5 = useState(10),
+    _useState6 = _slicedToArray(_useState5, 1),
+    pageSize = _useState6[0];
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    pageNo = _useState8[0],
-    setPageNo = _useState8[1];
-  var _useState9 = useState(20),
-    _useState10 = _slicedToArray(_useState9, 1),
-    pageSize = _useState10[0];
-  var _useState11 = useState([]),
+    goodList = _useState8[0],
+    setGoodList = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    loading = _useState10[0],
+    setLoading = _useState10[1];
+  var _useState11 = useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    goodList = _useState12[0],
-    setGoodList = _useState12[1];
-  var _useState13 = useState(false),
+    total = _useState12[0],
+    setTotal = _useState12[1];
+  var _useState13 = useState(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    loading = _useState14[0],
-    setLoading = _useState14[1];
-  var _useState15 = useState(0),
-    _useState16 = _slicedToArray(_useState15, 2),
-    total = _useState16[0],
-    setTotal = _useState16[1];
+    dates = _useState14[0],
+    setDates = _useState14[1];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
   var displaySelectList = useMemo(function () {
     return selectList.map(function (item, i) {
       item.index = i + 1;
       return item;
     });
   }, [selectList]);
-  useEffect(function () {
-    if (visible) {
-      queryItems();
-    }
-  }, [pageNo, visible]);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  //选择页码
-  var pageChange = function pageChange(page) {
-    setPageNo(page);
-  };
   /**
    * 查询商品
    */
   var queryItems = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var search,
-        _formData$dateTimePic,
-        _formData$dateTimePic2,
-        _formData$dateTimePic3,
-        _formData$dateTimePic4,
-        _formData$dateTimePic5,
-        _formData$dateTimePic6,
-        formData,
-        startTime,
-        endTime,
-        params,
-        res,
-        _res$data,
-        _res$data$productList,
-        productList,
-        _res$data$total,
-        _total,
-        errorMsg,
-        newProducts,
-        _args = arguments;
+      var _formData$dateTimePic, _formData$dateTimePic2, _formData$dateTimePic3, _formData$dateTimePic4, _formData$dateTimePic5, _formData$dateTimePic6, formData, _getInitTime, _getInitTime2, start, end, startTime, endTime, newTime, earliest, params;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            _context.prev = 1;
+            _context.prev = 0;
             setLoading(true);
             formData = form.getFieldsValue();
-            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(30, 'd').format(dateFormat);
-            endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, dateFormat)) || hooks().format(dateFormat);
+            _getInitTime = getInitTime(), _getInitTime2 = _slicedToArray(_getInitTime, 2), start = _getInitTime2[0], end = _getInitTime2[1];
+            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, 'YYYY-MM-DD HH:mm:ss')) || start.format('YYYY-MM-DD HH:mm:ss');
+            endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, 'YYYY-MM-DD HH:mm:ss')) || end.format('YYYY-MM-DD HH:mm:ss');
+            endTime = hooks(endTime).hours(23).minutes(59).seconds(59).format('YYYY-MM-DD HH:mm:ss');
+            // PS: 故意推前3分钟，不然极端情况下，接口会报错
+            newTime = hooks().subtract(3, 'm'); // 只能选比现在早的时间
+            if (hooks(endTime).diff(newTime, 'seconds') > 0) {
+              endTime = newTime.format('YYYY-MM-DD HH:mm:ss');
+            }
+            // 30天内
+            earliest = hooks(endTime).subtract(30, 'd');
+            if (earliest.diff(hooks(startTime), 'seconds') > 0) {
+              startTime = earliest.format('YYYY-MM-DD HH:mm:ss');
+            }
             params = {
-              // shopCode: shopCode,
               pageSize: pageSize,
               pageNo: pageNo - 1,
-              goodNo: search.code,
+              goodNo: formData.goodNo || null,
+              specNo: formData.specNo || null,
               startTime: startTime,
               endTime: endTime
             };
-            _context.next = 9;
-            return extendRequest('/qy/gdfw/product/wdtListProduct', {
-              method: 'post',
-              data: params
-            });
-          case 9:
-            res = _context.sent;
-            _res$data = res.data, _res$data$productList = _res$data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList, _res$data$total = _res$data.total, _total = _res$data$total === void 0 ? 0 : _res$data$total, errorMsg = _res$data.errorMsg;
-            if (res.success) {
-              newProducts = productList.map(function (item, index) {
-                return _objectSpread2(_objectSpread2({}, item), {}, {
-                  index: index + 1
+            _context.next = 14;
+            return getWdtListProduct(params).then(function (res) {
+              if (res.success) {
+                var _res$data = res.data,
+                  _res$data$productList = _res$data.productList,
+                  productList = _res$data$productList === void 0 ? [] : _res$data$productList,
+                  _res$data$total = _res$data.total,
+                  _total = _res$data$total === void 0 ? 0 : _res$data$total;
+                var newProducts = productList.map(function (item, index) {
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    index: index + 1
+                  });
                 });
-              });
-              setGoodList(_toConsumableArray(newProducts));
-              if (pageNo === 1) {
-                setTotal(_total);
+                setGoodList(newProducts);
+                if (pageNo === 1) {
+                  setTotal(_total);
+                }
+              } else {
+                var _res$data2;
+                setGoodList([]);
+                setTotal(0);
+                message.error(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.errorMsg) || res.message);
               }
-            } else {
-              setGoodList([]);
-              setTotal(0);
-              message.error(errorMsg || res.message);
-            }
-          case 12:
-            _context.prev = 12;
+            }).catch(function (e) {
+              console.log(e);
+            });
+          case 14:
+            _context.prev = 14;
             setLoading(false);
-            return _context.finish(12);
-          case 15:
+            return _context.finish(14);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 12, 15]]);
+      }, _callee, null, [[0,, 14, 17]]);
     }));
     return function queryItems() {
       return _ref.apply(this, arguments);
     };
   }();
-  var _onCancel = function onCancel() {
-    setVisible(false);
-  };
-  var onOk = function onOk() {
-    onSubmit(selectList);
-    _onCancel();
-  };
-  var onFinish = function onFinish(fieldsValue) {
-    var searchValue = {
-      code: fieldsValue.code
-    };
-    queryItems(searchValue);
+  var disabledDate = function disabledDate(current) {
+    var today = hooks(hooks().format('YYYY-MM-DD'));
+    var currentDay = hooks(current.format('YYYY-MM-DD'));
+    if (currentDay.diff(today, 'days') > 0) {
+      return true;
+    }
+    if (!dates) {
+      return false;
+    }
+    var tooLate = dates[0] && current.diff(dates[0], 'days') > 30;
+    var tooEarly = dates[1] && dates[1].diff(current, 'days') > 30;
+    return !!tooEarly || !!tooLate;
+  };
+  var onOpenChange = function onOpenChange(open) {
+    if (open) {
+      setDates([null, null]);
+    } else {
+      setDates(null);
+    }
   };
   var onReset = function onReset() {
-    form.resetFields();
     form.setFieldsValue({
-      dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
-      code: ''
+      dateTimePicker: getInitTime(),
+      goodNo: '',
+      specNo: ''
     });
     setPageNo(function (prev) {
-      if (prev === 1 && visible) {
+      if (prev === 1) {
         queryItems();
       }
       return 1;
     });
   };
-  // const getShopList = async () => {
-  //   const { success, data } = await request('/qy/diamond/getConfigInfo', {
-  //     method: 'get',
-  //     params: {
-  //       key: 'company-third-shop-info',
-  //     },
-  //   });
-  //   const obj: any = JSON.parse(data || '{}');
-  //   if (success) {
-  //     const list = (obj?.[companyKey] || []).map((item: any) => {
-  //       return {
-  //         label: item.shopName,
-  //         value: item.shopCode,
-  //       };
-  //     });
-  //     setShopList(list);
-  //   }
-  // };
-  var onValuesChange = function onValuesChange(changedValues) {
-    if (changedValues === null || changedValues === void 0 ? void 0 : changedValues['shopId']) {
-      queryItems(changedValues === null || changedValues === void 0 ? void 0 : changedValues.shopId);
-      pubsub.publish('changeShopCode', {
-        shopCode: changedValues.shopId
-      });
-    }
-  };
-  var handleDelete = function handleDelete(record, index) {
+  var handleDelete = function handleDelete(record) {
     var newSelectList = selectList.filter(function (item) {
       return item.specId !== record.specId;
     });
     setSelect(_toConsumableArray(newSelectList));
-    setSelectIds(_toConsumableArray(newSelectList.map(function (item) {
-      return item.specId;
-    })));
   };
   var displaySelectedColumns = [{
     dataIndex: 'operation',
     title: '',
     ellipsis: true,
     width: 50,
-    render: function render(_, record, index) {
+    render: function render(_, record) {
       return /*#__PURE__*/React.createElement(DeleteOutlined, {
         onClick: function onClick() {
           return handleDelete(record);
@@ -11470,8 +11421,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   }];
   var expandedRowSelection = {
     fixed: true,
-    selectedRowKeys: selectIds,
-    onSelect: function onSelect(record, selected, selectedRows, nativeEvent) {
+    selectedRowKeys: selectList.map(function (item) {
+      return item.specId;
+    }),
+    onSelect: function onSelect(record, selected) {
       var tempList = [];
       if (selected) {
         tempList = [].concat(_toConsumableArray(selectList), [record]);
@@ -11481,9 +11434,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         });
       }
       setSelect(_toConsumableArray(tempList));
-      setSelectIds(_toConsumableArray(tempList.map(function (item) {
-        return item.specId;
-      })));
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       var tempAllList = [];
@@ -11497,15 +11447,12 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         });
       }
       setSelect(_toConsumableArray(tempAllList));
-      setSelectIds(_toConsumableArray(tempAllList.map(function (item) {
-        return item.specId;
-      })));
     }
   };
-  var expandedRowRender = function expandedRowRender(record, index, indent, expanded) {
+  var expandedRowRender = function expandedRowRender(record) {
     return /*#__PURE__*/React.createElement(Table, {
-      rowKey: 'specId',
-      size: 'small',
+      rowKey: "specId",
+      size: "small",
       columns: expandedColumns,
       dataSource: record.itemDetailList || [],
       pagination: false,
@@ -11515,43 +11462,61 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       }
     });
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Modal, {
-    title: '选择商品',
-    okText: '确认',
-    cancelText: '取消',
-    visible: visible,
-    width: width || 850,
-    onCancel: function onCancel() {
-      _onCancel();
-    },
-    onOk: onOk,
-    wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(Form, {
+  React.useEffect(function () {
+    queryItems();
+  }, []);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, {
     layout: "inline",
     form: form,
-    onFinish: onFinish,
-    onValuesChange: onValuesChange,
+    onFinish: queryItems,
     initialValues: {
-      code: ''
+      goodNo: '',
+      specNo: '',
+      dateTimePicker: getInitTime()
     }
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "dateTimePicker"
+    name: "dateTimePicker",
+    style: {
+      marginBottom: '12px'
+    }
   }, /*#__PURE__*/React.createElement(RangePicker, {
     style: {
-      width: '350px'
+      width: '240px'
     },
     placeholder: ['开始日期', '结束日期'],
-    showTime: true,
-    defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
+    showTime: false,
+    disabledDate: disabledDate,
+    onCalendarChange: function onCalendarChange(val) {
+      return setDates(val);
+    },
+    onOpenChange: onOpenChange
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "code"
+    name: "goodNo",
+    style: {
+      marginBottom: '12px'
+    }
   }, /*#__PURE__*/React.createElement(Input, {
     placeholder: "\u5546\u54C1SPU\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
     }
-  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    name: "specNo",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
+    placeholder: "\u5546\u54C1SKU\u7F16\u7801",
+    allowClear: true,
+    style: {
+      width: 150
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     htmlType: "submit",
     style: {
@@ -11561,10 +11526,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     onClick: onReset
   }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement("div", {
     style: {
-      marginTop: '16px'
+      marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, {
-    rowKey: 'goodNo',
+    rowKey: "goodNo",
     columns: columns$1,
     dataSource: goodList,
     loading: loading,
@@ -11581,14 +11546,14 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       current: pageNo,
       pageSize: pageSize,
       pageSizeOptions: [],
-      onChange: pageChange
+      onChange: setPageNo
     }
   })), !!selectList.length && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, "\u5DF2\u7ECF\u9009\u62E9\u5546\u54C1\uFF08", selectList.length, "\uFF09"), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '16px'
     }
   }, /*#__PURE__*/React.createElement(Table, {
-    rowKey: 'specId',
+    rowKey: "specId",
     columns: [].concat(displaySelectedColumns, expandedColumns),
     dataSource: displaySelectList,
     pagination: false,
@@ -11599,7 +11564,48 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     style: {
       width: '100%'
     }
-  })))));
+  }))));
+};
+var WdtGoodList = /*#__PURE__*/forwardRef(GoodList);
+
+var GoodsModal$3 = function GoodsModal(props, ref) {
+  useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        setVisible(true);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var wdtGoodListRef = useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _wdtGoodListRef$curre;
+    var selectedList = ((_wdtGoodListRef$curre = wdtGoodListRef.current) === null || _wdtGoodListRef$curre === void 0 ? void 0 : _wdtGoodListRef$curre.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React.createElement(WdtGoodList, {
+    ref: wdtGoodListRef
+  })));
 };
 var WdtGoodsModal = /*#__PURE__*/forwardRef(GoodsModal$3);
 
@@ -13988,4 +13994,4 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, wdtReissue as WdtReissue, WlnGoods };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$1 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$2 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods };

package/dist/index.js

@@ -7574,10 +7574,11 @@ function ApaasPosting(props) {
   });
 }
 
-var _excluded$a = ["value", "onChange"];
+var _excluded$a = ["value", "onChange", "type"];
 function ApaasLogistics(props) {
   var value = props.value,
     onChange = props.onChange,
+    type = props.type,
     other = _objectWithoutProperties(props, _excluded$a);
   var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -7590,7 +7591,7 @@ function ApaasLogistics(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            express = kmkfUtils.ExpressData.getInstance();
+            express = kmkfUtils.ExpressData.getInstance(type === 'WDT_LOGISTICS' ? 'wdt' : 'default');
             setOptions(express.expressData || []);
           case 2:
           case "end":
@@ -10449,18 +10450,13 @@ var jstGoods = function jstGoods(props) {
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
     setChangeIndex = _useState2[1]; //选中的包裹
-  var _useState3 = React.useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    wdtSendOptions = _useState4[0],
-    setSendOptions = _useState4[1];
+  // const { sendData: wdtSendOptions } = useSendData(componentType === 'WDT_SEND_GOOD' ? 'wdt' : '');
   React.useEffect(function () {
     //没有值塞个默认值
     if (!(value === null || value === void 0 ? void 0 : value.length)) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
-  React.useEffect(function () {
-  }, []);
   var content = function content(item, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -10534,7 +10530,8 @@ var jstGoods = function jstGoods(props) {
     style: {
       minWidth: '100px',
       maxWidth: '180px'
-    }
+    },
+    type: componentType
   }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u7269\u6D41\u5355\u53F7",
@@ -10571,7 +10568,7 @@ var jstGoods = function jstGoods(props) {
     disabled: disabled,
     placeholder: "\u53D1\u8D27\u4ED3\u540D\u79F0",
     showSearch: true,
-    options: wdtSendOptions,
+    options: [],
     filterOption: filterOption,
     value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendName,
     onChange: function onChange(value, option) {
@@ -11157,6 +11154,12 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
 var GoodsModal$2 = /*#__PURE__*/React.forwardRef(GoodsModal$1);
 
 var RangePicker = antd.DatePicker.RangePicker;
+var getWdtListProduct = function getWdtListProduct(data) {
+  return extendRequest('/qy/gdfw/product/wdtListProduct', {
+    method: 'post',
+    data: data
+  });
+};
 var columns$1 = [{
   dataIndex: 'index',
   title: 'NO',
@@ -11231,226 +11234,174 @@ var expandedColumns = [{
   title: '会员价',
   width: 140
 }];
-var dateFormat = 'YYYY-MM-DD HH:mm:ss';
-var GoodsModal$3 = function GoodsModal(props, ref) {
-  var initStartTime = hooks().subtract(30, 'd');
-  var initEndTime = hooks();
-  React.useImperativeHandle(ref, function () {
-    return {
-      open: function open(shopCode) {
-        setVisible(true);
-        setPageNo(1);
-        setSelect([]);
-        setSelectIds([]);
-        form.setFieldsValue({
-          dateTimePicker: [initStartTime, initEndTime],
-          code: ''
-        });
-        // getShopList();
-      }
-    };
-  });
-
-  var onSubmit = props.onSubmit,
-    shopId = props.shopId,
-    shopList = props.shopList,
-    width = props.width,
-    companyKey = props.companyKey;
-  var _useState = React.useState(false),
+var getInitTime = function getInitTime() {
+  var initStartTime = hooks().subtract(30, 'd').hours(0).minutes(0).seconds(0);
+  var initEndTime = hooks().hours(23).minutes(59).seconds(59);
+  return [initStartTime, initEndTime];
+};
+var GoodList = function GoodList(props, ref) {
+  var _useState = React.useState([]),
     _useState2 = _slicedToArray(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
-  var _useState3 = React.useState([]),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = React.useState(1),
     _useState4 = _slicedToArray(_useState3, 2),
-    selectList = _useState4[0],
-    setSelect = _useState4[1];
-  var _useState5 = React.useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    selectIds = _useState6[0],
-    setSelectIds = _useState6[1];
-  var _useState7 = React.useState(1),
+    pageNo = _useState4[0],
+    setPageNo = _useState4[1];
+  var _useState5 = React.useState(10),
+    _useState6 = _slicedToArray(_useState5, 1),
+    pageSize = _useState6[0];
+  var _useState7 = React.useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    pageNo = _useState8[0],
-    setPageNo = _useState8[1];
-  var _useState9 = React.useState(20),
-    _useState10 = _slicedToArray(_useState9, 1),
-    pageSize = _useState10[0];
-  var _useState11 = React.useState([]),
+    goodList = _useState8[0],
+    setGoodList = _useState8[1];
+  var _useState9 = React.useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    loading = _useState10[0],
+    setLoading = _useState10[1];
+  var _useState11 = React.useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    goodList = _useState12[0],
-    setGoodList = _useState12[1];
-  var _useState13 = React.useState(false),
+    total = _useState12[0],
+    setTotal = _useState12[1];
+  var _useState13 = React.useState(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    loading = _useState14[0],
-    setLoading = _useState14[1];
-  var _useState15 = React.useState(0),
-    _useState16 = _slicedToArray(_useState15, 2),
-    total = _useState16[0],
-    setTotal = _useState16[1];
+    dates = _useState14[0],
+    setDates = _useState14[1];
+  React.useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
   var displaySelectList = React.useMemo(function () {
     return selectList.map(function (item, i) {
       item.index = i + 1;
       return item;
     });
   }, [selectList]);
-  React.useEffect(function () {
-    if (visible) {
-      queryItems();
-    }
-  }, [pageNo, visible]);
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  //选择页码
-  var pageChange = function pageChange(page) {
-    setPageNo(page);
-  };
   /**
    * 查询商品
    */
   var queryItems = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var search,
-        _formData$dateTimePic,
-        _formData$dateTimePic2,
-        _formData$dateTimePic3,
-        _formData$dateTimePic4,
-        _formData$dateTimePic5,
-        _formData$dateTimePic6,
-        formData,
-        startTime,
-        endTime,
-        params,
-        res,
-        _res$data,
-        _res$data$productList,
-        productList,
-        _res$data$total,
-        _total,
-        errorMsg,
-        newProducts,
-        _args = arguments;
+      var _formData$dateTimePic, _formData$dateTimePic2, _formData$dateTimePic3, _formData$dateTimePic4, _formData$dateTimePic5, _formData$dateTimePic6, formData, _getInitTime, _getInitTime2, start, end, startTime, endTime, newTime, earliest, params;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            _context.prev = 1;
+            _context.prev = 0;
             setLoading(true);
             formData = form.getFieldsValue();
-            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, dateFormat)) || hooks().subtract(30, 'd').format(dateFormat);
-            endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, dateFormat)) || hooks().format(dateFormat);
+            _getInitTime = getInitTime(), _getInitTime2 = _slicedToArray(_getInitTime, 2), start = _getInitTime2[0], end = _getInitTime2[1];
+            startTime = ((_formData$dateTimePic = formData.dateTimePicker) === null || _formData$dateTimePic === void 0 ? void 0 : (_formData$dateTimePic2 = _formData$dateTimePic[0]) === null || _formData$dateTimePic2 === void 0 ? void 0 : (_formData$dateTimePic3 = _formData$dateTimePic2.format) === null || _formData$dateTimePic3 === void 0 ? void 0 : _formData$dateTimePic3.call(_formData$dateTimePic2, 'YYYY-MM-DD HH:mm:ss')) || start.format('YYYY-MM-DD HH:mm:ss');
+            endTime = ((_formData$dateTimePic4 = formData.dateTimePicker) === null || _formData$dateTimePic4 === void 0 ? void 0 : (_formData$dateTimePic5 = _formData$dateTimePic4[1]) === null || _formData$dateTimePic5 === void 0 ? void 0 : (_formData$dateTimePic6 = _formData$dateTimePic5.format) === null || _formData$dateTimePic6 === void 0 ? void 0 : _formData$dateTimePic6.call(_formData$dateTimePic5, 'YYYY-MM-DD HH:mm:ss')) || end.format('YYYY-MM-DD HH:mm:ss');
+            endTime = hooks(endTime).hours(23).minutes(59).seconds(59).format('YYYY-MM-DD HH:mm:ss');
+            // PS: 故意推前3分钟，不然极端情况下，接口会报错
+            newTime = hooks().subtract(3, 'm'); // 只能选比现在早的时间
+            if (hooks(endTime).diff(newTime, 'seconds') > 0) {
+              endTime = newTime.format('YYYY-MM-DD HH:mm:ss');
+            }
+            // 30天内
+            earliest = hooks(endTime).subtract(30, 'd');
+            if (earliest.diff(hooks(startTime), 'seconds') > 0) {
+              startTime = earliest.format('YYYY-MM-DD HH:mm:ss');
+            }
             params = {
-              // shopCode: shopCode,
               pageSize: pageSize,
               pageNo: pageNo - 1,
-              goodNo: search.code,
+              goodNo: formData.goodNo || null,
+              specNo: formData.specNo || null,
               startTime: startTime,
               endTime: endTime
             };
-            _context.next = 9;
-            return extendRequest('/qy/gdfw/product/wdtListProduct', {
-              method: 'post',
-              data: params
-            });
-          case 9:
-            res = _context.sent;
-            _res$data = res.data, _res$data$productList = _res$data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList, _res$data$total = _res$data.total, _total = _res$data$total === void 0 ? 0 : _res$data$total, errorMsg = _res$data.errorMsg;
-            if (res.success) {
-              newProducts = productList.map(function (item, index) {
-                return _objectSpread2(_objectSpread2({}, item), {}, {
-                  index: index + 1
+            _context.next = 14;
+            return getWdtListProduct(params).then(function (res) {
+              if (res.success) {
+                var _res$data = res.data,
+                  _res$data$productList = _res$data.productList,
+                  productList = _res$data$productList === void 0 ? [] : _res$data$productList,
+                  _res$data$total = _res$data.total,
+                  _total = _res$data$total === void 0 ? 0 : _res$data$total;
+                var newProducts = productList.map(function (item, index) {
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    index: index + 1
+                  });
                 });
-              });
-              setGoodList(_toConsumableArray(newProducts));
-              if (pageNo === 1) {
-                setTotal(_total);
+                setGoodList(newProducts);
+                if (pageNo === 1) {
+                  setTotal(_total);
+                }
+              } else {
+                var _res$data2;
+                setGoodList([]);
+                setTotal(0);
+                antd.message.error(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.errorMsg) || res.message);
               }
-            } else {
-              setGoodList([]);
-              setTotal(0);
-              antd.message.error(errorMsg || res.message);
-            }
-          case 12:
-            _context.prev = 12;
+            }).catch(function (e) {
+              console.log(e);
+            });
+          case 14:
+            _context.prev = 14;
             setLoading(false);
-            return _context.finish(12);
-          case 15:
+            return _context.finish(14);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1,, 12, 15]]);
+      }, _callee, null, [[0,, 14, 17]]);
     }));
     return function queryItems() {
       return _ref.apply(this, arguments);
     };
   }();
-  var _onCancel = function onCancel() {
-    setVisible(false);
-  };
-  var onOk = function onOk() {
-    onSubmit(selectList);
-    _onCancel();
-  };
-  var onFinish = function onFinish(fieldsValue) {
-    var searchValue = {
-      code: fieldsValue.code
-    };
-    queryItems(searchValue);
+  var disabledDate = function disabledDate(current) {
+    var today = hooks(hooks().format('YYYY-MM-DD'));
+    var currentDay = hooks(current.format('YYYY-MM-DD'));
+    if (currentDay.diff(today, 'days') > 0) {
+      return true;
+    }
+    if (!dates) {
+      return false;
+    }
+    var tooLate = dates[0] && current.diff(dates[0], 'days') > 30;
+    var tooEarly = dates[1] && dates[1].diff(current, 'days') > 30;
+    return !!tooEarly || !!tooLate;
+  };
+  var onOpenChange = function onOpenChange(open) {
+    if (open) {
+      setDates([null, null]);
+    } else {
+      setDates(null);
+    }
   };
   var onReset = function onReset() {
-    form.resetFields();
     form.setFieldsValue({
-      dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
-      code: ''
+      dateTimePicker: getInitTime(),
+      goodNo: '',
+      specNo: ''
     });
     setPageNo(function (prev) {
-      if (prev === 1 && visible) {
+      if (prev === 1) {
         queryItems();
       }
       return 1;
     });
   };
-  // const getShopList = async () => {
-  //   const { success, data } = await request('/qy/diamond/getConfigInfo', {
-  //     method: 'get',
-  //     params: {
-  //       key: 'company-third-shop-info',
-  //     },
-  //   });
-  //   const obj: any = JSON.parse(data || '{}');
-  //   if (success) {
-  //     const list = (obj?.[companyKey] || []).map((item: any) => {
-  //       return {
-  //         label: item.shopName,
-  //         value: item.shopCode,
-  //       };
-  //     });
-  //     setShopList(list);
-  //   }
-  // };
-  var onValuesChange = function onValuesChange(changedValues) {
-    if (changedValues === null || changedValues === void 0 ? void 0 : changedValues['shopId']) {
-      queryItems(changedValues === null || changedValues === void 0 ? void 0 : changedValues.shopId);
-      pubsub__default['default'].publish('changeShopCode', {
-        shopCode: changedValues.shopId
-      });
-    }
-  };
-  var handleDelete = function handleDelete(record, index) {
+  var handleDelete = function handleDelete(record) {
     var newSelectList = selectList.filter(function (item) {
       return item.specId !== record.specId;
     });
     setSelect(_toConsumableArray(newSelectList));
-    setSelectIds(_toConsumableArray(newSelectList.map(function (item) {
-      return item.specId;
-    })));
   };
   var displaySelectedColumns = [{
     dataIndex: 'operation',
     title: '',
     ellipsis: true,
     width: 50,
-    render: function render(_, record, index) {
+    render: function render(_, record) {
       return /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, {
         onClick: function onClick() {
           return handleDelete(record);
@@ -11481,8 +11432,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   }];
   var expandedRowSelection = {
     fixed: true,
-    selectedRowKeys: selectIds,
-    onSelect: function onSelect(record, selected, selectedRows, nativeEvent) {
+    selectedRowKeys: selectList.map(function (item) {
+      return item.specId;
+    }),
+    onSelect: function onSelect(record, selected) {
       var tempList = [];
       if (selected) {
         tempList = [].concat(_toConsumableArray(selectList), [record]);
@@ -11492,9 +11445,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         });
       }
       setSelect(_toConsumableArray(tempList));
-      setSelectIds(_toConsumableArray(tempList.map(function (item) {
-        return item.specId;
-      })));
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       var tempAllList = [];
@@ -11508,15 +11458,12 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
         });
       }
       setSelect(_toConsumableArray(tempAllList));
-      setSelectIds(_toConsumableArray(tempAllList.map(function (item) {
-        return item.specId;
-      })));
     }
   };
-  var expandedRowRender = function expandedRowRender(record, index, indent, expanded) {
+  var expandedRowRender = function expandedRowRender(record) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-      rowKey: 'specId',
-      size: 'small',
+      rowKey: "specId",
+      size: "small",
       columns: expandedColumns,
       dataSource: record.itemDetailList || [],
       pagination: false,
@@ -11526,43 +11473,61 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       }
     });
   };
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
-    title: '选择商品',
-    okText: '确认',
-    cancelText: '取消',
-    visible: visible,
-    width: width || 850,
-    onCancel: function onCancel() {
-      _onCancel();
-    },
-    onOk: onOk,
-    wrapClassName: "goodModal"
-  }, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
+  React__default['default'].useEffect(function () {
+    queryItems();
+  }, []);
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
     layout: "inline",
     form: form,
-    onFinish: onFinish,
-    onValuesChange: onValuesChange,
+    onFinish: queryItems,
     initialValues: {
-      code: ''
+      goodNo: '',
+      specNo: '',
+      dateTimePicker: getInitTime()
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "dateTimePicker"
+    name: "dateTimePicker",
+    style: {
+      marginBottom: '12px'
+    }
   }, /*#__PURE__*/React__default['default'].createElement(RangePicker, {
     style: {
-      width: '350px'
+      width: '240px'
     },
     placeholder: ['开始日期', '结束日期'],
-    showTime: true,
-    defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
+    showTime: false,
+    disabledDate: disabledDate,
+    onCalendarChange: function onCalendarChange(val) {
+      return setDates(val);
+    },
+    onOpenChange: onOpenChange
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "code"
+    name: "goodNo",
+    style: {
+      marginBottom: '12px'
+    }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     placeholder: "\u5546\u54C1SPU\u7F16\u7801",
     allowClear: true,
     style: {
       width: 150
     }
-  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    name: "specNo",
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    placeholder: "\u5546\u54C1SKU\u7F16\u7801",
+    allowClear: true,
+    style: {
+      width: 150
+    }
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+    style: {
+      marginBottom: '12px'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "primary",
     htmlType: "submit",
     style: {
@@ -11572,10 +11537,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     onClick: onReset
   }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
-      marginTop: '16px'
+      marginTop: '4px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-    rowKey: 'goodNo',
+    rowKey: "goodNo",
     columns: columns$1,
     dataSource: goodList,
     loading: loading,
@@ -11592,14 +11557,14 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       current: pageNo,
       pageSize: pageSize,
       pageSizeOptions: [],
-      onChange: pageChange
+      onChange: setPageNo
     }
   })), !!selectList.length && /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, "\u5DF2\u7ECF\u9009\u62E9\u5546\u54C1\uFF08", selectList.length, "\uFF09"), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       marginTop: '16px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-    rowKey: 'specId',
+    rowKey: "specId",
     columns: [].concat(displaySelectedColumns, expandedColumns),
     dataSource: displaySelectList,
     pagination: false,
@@ -11610,7 +11575,48 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     style: {
       width: '100%'
     }
-  })))));
+  }))));
+};
+var WdtGoodList = /*#__PURE__*/React.forwardRef(GoodList);
+
+var GoodsModal$3 = function GoodsModal(props, ref) {
+  React.useImperativeHandle(ref, function () {
+    return {
+      open: function open() {
+        setVisible(true);
+      }
+    };
+  });
+  var onSubmit = props.onSubmit,
+    width = props.width;
+  var _useState = React.useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var wdtGoodListRef = React.useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _wdtGoodListRef$curre;
+    var selectedList = ((_wdtGoodListRef$curre = wdtGoodListRef.current) === null || _wdtGoodListRef$curre === void 0 ? void 0 : _wdtGoodListRef$curre.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, visible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React__default['default'].createElement(WdtGoodList, {
+    ref: wdtGoodListRef
+  })));
 };
 var WdtGoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$3);
 
@@ -14053,5 +14059,6 @@ exports.Supplier = Supplier;
 exports.TBGoodId = TBGoodId;
 exports.TBGoodSerial = TBGoodSerial;
 exports.TradeId = TradeId;
+exports.WdtGoodList = WdtGoodList;
 exports.WdtReissue = wdtReissue;
 exports.WlnGoods = WlnGoods;

package/dist/src/bs/component/model/WdtGoodList.d.ts

@@ -0,0 +1,40 @@
+import React from 'react';
+export declare namespace WdtGoods {
+    interface GoodsInfo {
+        deleted: 0 | 1;
+        goodId: number;
+        goodName: string;
+        goodNo: string;
+        imgKey: string;
+        imgUrl: string;
+        marketPrice: number;
+        memberPrice: number;
+        retailPrice: number;
+        specCode: string;
+        specId: string;
+        specName: string;
+        specNo: string;
+        unit: string;
+        unitName: string;
+        index: number;
+        uuid: string;
+        canDelete: boolean;
+        num: number;
+        orderPrice: number;
+        sharePrice: number;
+        canUpdateNumber: boolean;
+    }
+    interface SelectDrawerRefObject {
+        getSelectGoodList: () => WdtGoods.GoodsInfo[];
+    }
+}
+export declare const getWdtListProduct: (data: {
+    pageSize: number;
+    pageNo: number;
+    goodNo: string | null;
+    specNo: string | null;
+    startTime: string;
+    endTime: string;
+}) => Promise<any>;
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<WdtGoods.SelectDrawerRefObject>>;
+export default _default;

package/dist/src/index.d.ts

@@ -54,3 +54,5 @@ export { default as MsgStatus } from './common/MsgStatus';
 export { default as ParseLogistics } from './common/ParseLogistics';
 export { default as IdentifyAddress } from './common/IdentifyAddress';
 export { default as CalculationInput } from './apaas/CalculationInput';
+export { default as WdtGoodList } from './bs/component/model/WdtGoodList';
+export type { WdtGoods } from './bs/component/model/WdtGoodList';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.0.1-rc.0",
+  "version": "1.0.1-rc.2",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "^1.0.1-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "^1.0.1-rc.2",
     "ahooks": "^3.7.4",
     "kmkf-monitor": "^0.8.8",
     "lodash": "^4.17.21",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ede17f45daed4f2c60dee005f0e83f5b257a4755"
+  "gitHead": "08bef10431ab0ca406a675aab12639a855185601"
 }