@kmkf-fe-packages/basic-components 0.27.1-test.2 → 0.27.1-test.3

package/dist/index.js

@@ -10413,7 +10413,7 @@ var typeInitValueMap = {
   }]
 };
 var jstGoods = function jstGoods(props) {
-  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7;
+  var _value$changeIndex, _value$changeIndex2, _value$changeIndex3, _value$changeIndex4, _value$changeIndex5, _value$changeIndex6, _value$changeIndex7, _value$changeIndex8;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
@@ -10421,7 +10421,9 @@ var jstGoods = function jstGoods(props) {
     _props$type = props.type,
     type = _props$type === void 0 ? 1 : _props$type,
     _props$showField = props.showField,
-    showField = _props$showField === void 0 ? '' : _props$showField;
+    showField = _props$showField === void 0 ? '' : _props$showField,
+    _props$componentType = props.componentType,
+    componentType = _props$componentType === void 0 ? '' : _props$componentType;
   var _useState = React.useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     changeIndex = _useState2[0],
@@ -10452,9 +10454,25 @@ var jstGoods = function jstGoods(props) {
       }), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, t.title), /*#__PURE__*/React__default['default'].createElement("div", null, "\u7F16\u7801\uFF1A", t.skuId))));
     }));
   };
+  var handleSelected = function handleSelected(val, type, option) {
+    console.log('[ val ] >', val);
+    console.log('[ option ] >', option);
+    var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
+    changeOrderInfo[type] = val;
+    changeOrderInfo['sendId'] = option.warehouseNo;
+    var newList = _toConsumableArray(value);
+    newList[changeIndex] = changeOrderInfo;
+    console.log('[ newList ] >', newList);
+    onChange === null || onChange === void 0 ? void 0 : onChange(newList);
+  };
+  var filterOption = function filterOption(input, option) {
+    var _option$label;
+    return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').includes(input);
+  };
   var changeInputHandle = function changeInputHandle(val, type) {
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[type] = val;
+    changeOrderInfo['sendId'] = val;
     var newList = _toConsumableArray(value);
     newList[changeIndex] = changeOrderInfo;
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
@@ -10464,6 +10482,19 @@ var jstGoods = function jstGoods(props) {
     var _value$, _value$$items;
     return value && value.length === 1 && !((_value$ = value[0]) === null || _value$ === void 0 ? void 0 : (_value$$items = _value$.items) === null || _value$$items === void 0 ? void 0 : _value$$items.length);
   }, [value]);
+  var wdtOptions = [{
+    label: '测测你',
+    value: '1',
+    warehouseNo: 111111
+  }, {
+    label: 'ceshi',
+    value: '2222',
+    warehouseNo: 1111112222
+  }, {
+    label: 'hhhhhh',
+    value: '13333',
+    warehouseNo: 1111113333
+  }];
   return /*#__PURE__*/React__default['default'].createElement("div", null, !isSingle ? /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
     wrap: true
   }, (value || []).map(function (item, index) {
@@ -10522,20 +10553,34 @@ var jstGoods = function jstGoods(props) {
       return changeInputHandle(e.target.value, 'sendId');
     },
     value: (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5.sendId
-  }), ['sendName', 'all'].includes(showField) && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+  }), ['sendName', 'all'].includes(showField) && (componentType === 'WDT_SEND_GOOD' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    style: {
+      minWidth: '100px',
+      maxWidth: '180px'
+    },
+    disabled: disabled,
+    placeholder: "\u53D1\u8D27\u4ED3\u540D\u79F0",
+    showSearch: true,
+    options: wdtOptions,
+    filterOption: filterOption,
+    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendName,
+    onChange: function onChange(value, option) {
+      return handleSelected(value, 'sendName', option);
+    }
+  }) : /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u53D1\u8D27\u4ED3\u540D\u79F0",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'sendName');
     },
-    value: (_value$changeIndex6 = value[changeIndex]) === null || _value$changeIndex6 === void 0 ? void 0 : _value$changeIndex6.sendName
-  })) : null, type === 4 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName
+  }))) : null, type === 4 ? /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
     placeholder: "\u8BF7\u8F93\u5165\u51FA\u5E93\u5355\u7F16\u53F7",
     onChange: function onChange(e) {
       return changeInputHandle(e.target.value, 'deliveryNo');
     },
-    value: (_value$changeIndex7 = value[changeIndex]) === null || _value$changeIndex7 === void 0 ? void 0 : _value$changeIndex7.sendName
+    value: (_value$changeIndex8 = value[changeIndex]) === null || _value$changeIndex8 === void 0 ? void 0 : _value$changeIndex8.sendName
   })) : null) : null);
 };
 
@@ -11102,12 +11147,6 @@ 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',
@@ -11182,173 +11221,226 @@ var expandedColumns = [{
   title: '会员价',
   width: 140
 }];
-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),
-    selectList = _useState2[0],
-    setSelect = _useState2[1];
-  var _useState3 = React.useState(1),
-    _useState4 = _slicedToArray(_useState3, 2),
-    pageNo = _useState4[0],
-    setPageNo = _useState4[1];
-  var _useState5 = React.useState(20),
-    _useState6 = _slicedToArray(_useState5, 1),
-    pageSize = _useState6[0];
-  var _useState7 = React.useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    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),
-    total = _useState12[0],
-    setTotal = _useState12[1];
-  var _useState13 = React.useState(null),
-    _useState14 = _slicedToArray(_useState13, 2),
-    dates = _useState14[0],
-    setDates = _useState14[1];
+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 {
-      getSelectGoodList: function getSelectGoodList() {
-        return selectList;
+      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),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useState3 = React.useState([]),
+    _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),
+    _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([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    goodList = _useState12[0],
+    setGoodList = _useState12[1];
+  var _useState13 = React.useState(false),
+    _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];
   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 _formData$dateTimePic, _formData$dateTimePic2, _formData$dateTimePic3, _formData$dateTimePic4, _formData$dateTimePic5, _formData$dateTimePic6, formData, _getInitTime, _getInitTime2, start, end, startTime, endTime, newTime, earliest, params;
+      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;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.prev = 0;
+            search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            _context.prev = 1;
             setLoading(true);
             formData = form.getFieldsValue();
-            _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');
-            newTime = hooks(); // 只能选比现在早的时间
-            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');
-            }
+            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);
             params = {
+              // shopCode: shopCode,
               pageSize: pageSize,
               pageNo: pageNo - 1,
-              goodNo: formData.goodNo || null,
-              specNo: formData.specNo || null,
+              goodNo: search.code,
               startTime: startTime,
               endTime: endTime
             };
-            _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
-                  });
+            _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
                 });
-                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);
+              });
+              setGoodList(_toConsumableArray(newProducts));
+              if (pageNo === 1) {
+                setTotal(_total);
               }
-            }).catch(function (e) {
-              console.log(e);
-            });
-          case 14:
-            _context.prev = 14;
+            } else {
+              setGoodList([]);
+              setTotal(0);
+              antd.message.error(errorMsg || res.message);
+            }
+          case 12:
+            _context.prev = 12;
             setLoading(false);
-            return _context.finish(14);
-          case 17:
+            return _context.finish(12);
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0,, 14, 17]]);
+      }, _callee, null, [[1,, 12, 15]]);
     }));
     return function queryItems() {
       return _ref.apply(this, arguments);
     };
   }();
-  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 _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 onReset = function onReset() {
+    form.resetFields();
     form.setFieldsValue({
-      dateTimePicker: getInitTime(),
-      goodNo: '',
-      specNo: ''
+      dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
+      code: ''
     });
     setPageNo(function (prev) {
-      if (prev === 1) {
+      if (prev === 1 && visible) {
         queryItems();
       }
       return 1;
     });
   };
-  var handleDelete = function handleDelete(record) {
+  // 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 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) {
+    render: function render(_, record, index) {
       return /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, {
         onClick: function onClick() {
           return handleDelete(record);
@@ -11379,10 +11471,8 @@ var GoodList = function GoodList(props, ref) {
   }];
   var expandedRowSelection = {
     fixed: true,
-    selectedRowKeys: selectList.map(function (item) {
-      return item.specId;
-    }),
-    onSelect: function onSelect(record, selected) {
+    selectedRowKeys: selectIds,
+    onSelect: function onSelect(record, selected, selectedRows, nativeEvent) {
       var tempList = [];
       if (selected) {
         tempList = [].concat(_toConsumableArray(selectList), [record]);
@@ -11392,6 +11482,9 @@ var GoodList = function GoodList(props, ref) {
         });
       }
       setSelect(_toConsumableArray(tempList));
+      setSelectIds(_toConsumableArray(tempList.map(function (item) {
+        return item.specId;
+      })));
     },
     onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
       var tempAllList = [];
@@ -11405,12 +11498,15 @@ var GoodList = function GoodList(props, ref) {
         });
       }
       setSelect(_toConsumableArray(tempAllList));
+      setSelectIds(_toConsumableArray(tempAllList.map(function (item) {
+        return item.specId;
+      })));
     }
   };
-  var expandedRowRender = function expandedRowRender(record) {
+  var expandedRowRender = function expandedRowRender(record, index, indent, expanded) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-      rowKey: "specId",
-      size: "small",
+      rowKey: 'specId',
+      size: 'small',
       columns: expandedColumns,
       dataSource: record.itemDetailList || [],
       pagination: false,
@@ -11420,61 +11516,43 @@ var GoodList = function GoodList(props, ref) {
       }
     });
   };
-  React__default['default'].useEffect(function () {
-    queryItems();
-  }, []);
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
+  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, {
     layout: "inline",
     form: form,
-    onFinish: queryItems,
+    onFinish: onFinish,
+    onValuesChange: onValuesChange,
     initialValues: {
-      goodNo: '',
-      specNo: '',
-      dateTimePicker: getInitTime()
+      code: ''
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "dateTimePicker",
-    style: {
-      marginBottom: '12px'
-    }
+    name: "dateTimePicker"
   }, /*#__PURE__*/React__default['default'].createElement(RangePicker, {
     style: {
-      width: '240px'
+      width: '350px'
     },
     placeholder: ['开始日期', '结束日期'],
-    showTime: false,
-    disabledDate: disabledDate,
-    onCalendarChange: function onCalendarChange(val) {
-      return setDates(val);
-    },
-    onOpenChange: onOpenChange
+    showTime: true,
+    defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
+    name: "code"
   }, /*#__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, {
-    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, {
+  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "primary",
     htmlType: "submit",
     style: {
@@ -11484,10 +11562,10 @@ var GoodList = function GoodList(props, ref) {
     onClick: onReset
   }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
-      marginTop: '4px'
+      marginTop: '16px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
-    rowKey: "goodNo",
+    rowKey: 'goodNo',
     columns: columns$1,
     dataSource: goodList,
     loading: loading,
@@ -11504,14 +11582,14 @@ var GoodList = function GoodList(props, ref) {
       current: pageNo,
       pageSize: pageSize,
       pageSizeOptions: [],
-      onChange: setPageNo
+      onChange: pageChange
     }
   })), !!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,
@@ -11522,48 +11600,7 @@ var GoodList = function GoodList(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);
 
@@ -13519,7 +13556,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
     changeOrderInfo[type] = val;
     var newList = _toConsumableArray(value);
     newList[changeIndex] = changeOrderInfo;
-    console.log(newList, val, type);
+    // console.log(newList, val, type);
     onChange === null || onChange === void 0 ? void 0 : onChange(newList);
   };
   //判断是否是单个且没有商品数据
@@ -13595,7 +13632,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
     }, [1, 2].includes(type) ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
   };
   var changeHandle = function changeHandle(val, valType) {
-    console.log(val, valType);
     var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
     changeOrderInfo[valType] = val;
     if (val !== failValue) {
@@ -13782,5 +13818,4 @@ exports.Supplier = Supplier;
 exports.TBGoodId = TBGoodId;
 exports.TBGoodSerial = TBGoodSerial;
 exports.TradeId = TradeId;
-exports.WdtGoodList = WdtGoodList;
 exports.WlnGoods = WlnGoods;