@kmkf-fe-packages/basic-components 0.23.1-beta.14 → 0.23.1-beta.16

package/dist/index.esm.js

@@ -10702,43 +10702,44 @@ var columns$1 = [{
 }, {
   dataIndex: 'goodName',
   title: '商品名称',
-  with: 200,
+  width: 200,
   ellipsis: true
 }, {
   dataIndex: 'goodNo',
   title: '商品spu编码',
-  with: 200,
-  ellipsis: true
+  width: 200
+  // ellipsis: true,
 }, {
   dataIndex: 'goodId',
   title: 'SPUID',
-  with: 200,
-  ellipsis: true
+  width: 200
+  // ellipsis: true,
 }, {
   dataIndex: 'specCount',
   title: '规格数',
-  with: 200,
-  ellipsis: true
+  width: 160
+  // ellipsis: true,
 }];
+
 var expandedColumns = [{
   dataIndex: 'specName',
   title: '商品sku名称',
-  with: 200,
+  width: 200,
   ellipsis: true
 }, {
   dataIndex: 'specNo',
   title: '商品sku编码',
-  with: 200,
-  ellipsis: true
+  width: 200
+  // ellipsis: true,
 }, {
   dataIndex: 'specId',
   title: 'SKUID',
-  with: 200,
-  ellipsis: true
+  width: 200
+  // ellipsis: true,
 }, {
   dataIndex: 'imgUrl',
   title: '商品图片',
-  with: 200,
+  width: 100,
   render: function render(picUrl) {
     return /*#__PURE__*/React.createElement("img", {
       style: {
@@ -10751,13 +10752,16 @@ var expandedColumns = [{
   }
 }, {
   dataIndex: 'marketPrice',
-  title: '市场价'
+  title: '市场价',
+  width: 140
 }, {
   dataIndex: 'retailPrice',
-  title: '零售价'
+  title: '零售价',
+  width: 140
 }, {
   dataIndex: 'memberPrice',
-  title: '会员价'
+  title: '会员价',
+  width: 140
 }];
 var dateFormat = 'YYYY-MM-DD HH:mm:ss';
 var GoodsModal$3 = function GoodsModal(props, ref) {
@@ -10774,6 +10778,8 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     };
   });
 
+  var initStartTime = hooks().subtract(1, 'M').format(dateFormat);
+  var initEndTime = hooks().format(dateFormat);
   var onSubmit = props.onSubmit,
     shopId = props.shopId,
     shopList = props.shopList,
@@ -10810,11 +10816,11 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     total = _useState16[0],
     setTotal = _useState16[1];
-  var _useState17 = useState(hooks().subtract(1, 'M').format(dateFormat)),
+  var _useState17 = useState(initStartTime),
     _useState18 = _slicedToArray(_useState17, 2),
     startTime = _useState18[0],
     setStartTime = _useState18[1];
-  var _useState19 = useState(hooks().format(dateFormat)),
+  var _useState19 = useState(initEndTime),
     _useState20 = _slicedToArray(_useState19, 2),
     endTime = _useState20[0],
     setEndTime = _useState20[1];
@@ -10824,13 +10830,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       return item;
     });
   }, [selectList]);
+  useEffect(function () {
+    queryItems();
+  }, [pageNo]);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   //选择页码
   var pageChange = function pageChange(page) {
     setPageNo(page);
-    queryItems();
   };
   /**
    * 查询商品
@@ -10840,8 +10848,11 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       var search,
         params,
         res,
+        _res$data,
         _res$data$productList,
         productList,
+        _res$data$total,
+        _total,
         newProducts,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -10866,13 +10877,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
           case 6:
             res = _context.sent;
             if (res.success) {
-              _res$data$productList = res.data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList;
+              _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;
               newProducts = productList.map(function (item, index) {
                 return _objectSpread2(_objectSpread2({}, item), {}, {
                   index: index + 1
                 });
               });
-              initData(_toConsumableArray(newProducts));
+              setGoodList(_toConsumableArray(newProducts));
+              if (pageNo === 1) {
+                setTotal(_total);
+              }
             }
           case 8:
             _context.prev = 8;
@@ -10888,11 +10902,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       return _ref.apply(this, arguments);
     };
   }();
-  var initData = function initData(list) {
-    setGoodList(_toConsumableArray(list));
-    setTotal(list.length);
-    setPageNo(1);
-  };
   var _onCancel = function onCancel() {
     onReset();
     setVisible(false);
@@ -10909,7 +10918,8 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   };
   var onReset = function onReset() {
     form.resetFields();
-    initData([]);
+    setPageNo(1);
+    // queryItems()
   };
   // const getShopList = async () => {
   //   const { success, data } = await request('/qy/diamond/getConfigInfo', {
@@ -11012,7 +11022,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       columns: expandedColumns,
       dataSource: record.itemDetailList || [],
       pagination: false,
-      rowSelection: expandedRowSelection
+      rowSelection: expandedRowSelection,
+      scroll: {
+        x: true
+      }
     });
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Modal, {
@@ -11030,7 +11043,11 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     layout: "inline",
     form: form,
     onFinish: onFinish,
-    onValuesChange: onValuesChange
+    onValuesChange: onValuesChange,
+    initialValues: {
+      dateTimePicker: [hooks(initStartTime, dateFormat), hooks(initEndTime, dateFormat)],
+      code: ''
+    }
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "dateTimePicker"
   }, /*#__PURE__*/React.createElement(RangePicker, {
@@ -11050,12 +11067,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     htmlType: "submit"
   }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
     onClick: onReset
-  }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement(Spin, {
-    spinning: loading
+  }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '16px'
+    }
   }, /*#__PURE__*/React.createElement(Table, {
     rowKey: 'goodNo',
     columns: columns$1,
     dataSource: goodList,
+    loading: loading,
     scroll: {
       x: true,
       y: 250
@@ -11164,18 +11184,18 @@ var GoodItem = function GoodItem(props) {
             align: 'center',
             ellipsis: true,
             width: 100
-          }, {
-            dataIndex: 'specId',
-            title: "".concat(text, "SKUID"),
-            align: 'center',
-            ellipsis: true,
-            width: 100
           }, {
             dataIndex: 'goodName',
             title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
             align: 'center',
             ellipsis: true,
             width: 250
+          }, {
+            dataIndex: 'specId',
+            title: "".concat(text, "SKUID"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
           }, {
             dataIndex: 'specNo',
             title: "".concat(text, "sku\u7F16\u7801"),
@@ -11190,7 +11210,7 @@ var GoodItem = function GoodItem(props) {
             width: 250
           }, {
             dataIndex: 'orderPrice',
-            title: "\u5B9E\u4ED8\u91D1\u989D",
+            title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
             align: 'center',
             ellipsis: true,
             width: 100
@@ -11229,7 +11249,7 @@ var GoodItem = function GoodItem(props) {
             width: 70
           }, {
             dataIndex: 'giftType',
-            title: "\u8D60\u54C1\u7C7B\u578B",
+            title: "\u8D60\u54C1\u65B9\u5F0F",
             align: 'center',
             ellipsis: true,
             width: 100,
@@ -11393,8 +11413,8 @@ var GoodItem = function GoodItem(props) {
         item.uuid = uuid();
         item.canDelete = true;
         item.num = 1;
-        item.orderPrice = item.orderPrice || 0;
-        item.sharePrice = item.sharePrice || 0;
+        item.orderPrice = 0;
+        item.sharePrice = 0;
         item.canUpdateNumber = canUpdateNumber;
         return item;
       });
@@ -11865,9 +11885,12 @@ var typeMap = {
     reissueSelectListReturn: 'reissueSelectListReturn',
     reissueDeleteGood: 'reissueDeleteGood',
     changeShopCode: 'changeShopCode',
-    reissueType: 'reissueType' // pubsub 事件
+    reissueType: 'reissueType',
+    formatDefaultField: {
+      money: 'money',
+      share: 'share'
+    }
   },
-
   WDT_REISSUE_GOODS: {
     key: 'wdtReissueGoods',
     name: '旺店通',
@@ -11876,12 +11899,15 @@ var typeMap = {
     reissueSelectListReturn: 'wdtReissueSelectListReturn',
     reissueDeleteGood: 'wdtReissueDeleteGood',
     changeShopCode: 'wdtChangeShopCode',
-    reissueType: 'wdtReissueType' // pubsub 事件
+    reissueType: 'wdtReissueType',
+    formatDefaultField: {
+      money: 'orderPrice',
+      share: 'sharePrice'
+    }
   }
 };
-
 var BsReissue = function BsReissue(props) {
-  var _typeMap$type14, _typeMap$type15, _typeMap$type16;
+  var _typeMap$type20, _typeMap$type21, _typeMap$type22;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -11900,8 +11926,9 @@ var BsReissue = function BsReissue(props) {
         shopCode: data === null || data === void 0 ? void 0 : data.shopCode
       });
       newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type2 = typeMap[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.key)] = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
-        item.money = 0;
-        item.share = 0;
+        var _typeMap$type3, _typeMap$type4;
+        item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type3 = typeMap[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.formatDefaultField.money)] = 0;
+        item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type4 = typeMap[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.formatDefaultField.share)] = 0;
         item.canUpdateNumber = true;
         return item;
       });
@@ -11909,17 +11936,18 @@ var BsReissue = function BsReissue(props) {
     });
   }, []);
   useEffect(function () {
-    var _typeMap$type3;
-    pubsub.subscribe("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type3 = typeMap[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.reissueSelectListReturn), function (_, data) {
-      var _typeMap$type4;
+    var _typeMap$type5;
+    pubsub.subscribe("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type5 = typeMap[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.reissueSelectListReturn), function (_, data) {
+      var _typeMap$type6;
       // console.log('reissueSelectListReturn', data);
       if (disabled) return;
       var newValue = _objectSpread2(_objectSpread2({}, data.goodValue), {}, {
         shopCode: data === null || data === void 0 ? void 0 : data.shopCode
       });
-      newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type4 = typeMap[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.key)] = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
-        item.money = 0;
-        item.share = 0;
+      newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type6 = typeMap[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.key)] = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
+        var _typeMap$type7, _typeMap$type8;
+        item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type7 = typeMap[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.formatDefaultField.money)] = 0;
+        item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type8 = typeMap[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.formatDefaultField.share)] = 0;
         item.canUpdateNumber = true;
         return item;
       });
@@ -11927,54 +11955,55 @@ var BsReissue = function BsReissue(props) {
     });
   }, []);
   useEffect(function () {
-    var _typeMap$type5, _typeMap$type8;
+    var _typeMap$type9, _typeMap$type12;
     valueRef.current = value;
-    pubsub.subscribeOnce("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type5 = typeMap[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.reissueDeleteGood), function (_, data) {
+    pubsub.subscribeOnce("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type9 = typeMap[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.reissueDeleteGood), function (_, data) {
       if (disabled) return;
       if (value) {
-        var _typeMap$type6, _typeMap$type7;
+        var _typeMap$type10, _typeMap$type11;
         var newValue = _objectSpread2({}, value);
-        newValue["".concat((_typeMap$type6 = typeMap[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.key)] = newValue === null || newValue === void 0 ? void 0 : newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type7 = typeMap[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.key)].filter(function (item) {
+        newValue["".concat((_typeMap$type10 = typeMap[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key)] = newValue === null || newValue === void 0 ? void 0 : newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type11 = typeMap[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.key)].filter(function (item) {
           return item.sku !== data;
         });
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
-    pubsub.subscribeOnce("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type8 = typeMap[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.changeShopCode), function (type, data) {
+    pubsub.subscribeOnce("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type12 = typeMap[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.changeShopCode), function (type, data) {
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
         shopCode: data.shopCode
       }));
     });
   }, [value, disabled]);
   var changeTypeHandle = function changeTypeHandle(val) {
-    var _typeMap$type9, _typeMap$type10, _typeMap$type11;
+    var _typeMap$type13, _typeMap$type14, _typeMap$type15;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type9 = typeMap[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.typeName)] = val;
-    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type10 = typeMap[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key)] = [];
+    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type13 = typeMap[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName)] = val;
+    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type14 = typeMap[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key)] = [];
     if (['2', '4'].includes(val[0])) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       valueRef.current = newValue;
     }
-    pubsub.publish("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type11 = typeMap[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.reissueType), {
+    pubsub.publish("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type15 = typeMap[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.reissueType), {
       val: val[0],
       goodValue: newValue
     });
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type12;
+    var _typeMap$type16;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type12 = typeMap[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key)] = (val || []).map(function (item) {
-      item.money = 0;
-      item.share = 0;
+    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type16 = typeMap[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key)] = (val || []).map(function (item) {
+      var _typeMap$type17, _typeMap$type18;
+      item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type17 = typeMap[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.money)] = 0;
+      item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type18 = typeMap[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.formatDefaultField.share)] = 0;
       return item;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = useMemo(function () {
-    var _value, _typeMap$type13;
-    return ['2', '3', '4'].includes(value === null || value === void 0 ? void 0 : (_value = value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type13 = typeMap[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName)]) === null || _value === void 0 ? void 0 : _value[0]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.typeName]]);
+    var _value, _typeMap$type19;
+    return ['2', '3', '4'].includes(value === null || value === void 0 ? void 0 : (_value = value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type19 = typeMap[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName)]) === null || _value === void 0 ? void 0 : _value[0]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.typeName]]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Cascader, {
     style: {
       marginBottom: '8px'
@@ -11982,7 +12011,7 @@ var BsReissue = function BsReissue(props) {
     disabled: disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type15 = typeMap[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type21 = typeMap[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -11994,7 +12023,7 @@ var BsReissue = function BsReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type16 = typeMap[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type22 = typeMap[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     }

package/dist/index.js

@@ -10713,43 +10713,44 @@ var columns$1 = [{
 }, {
   dataIndex: 'goodName',
   title: '商品名称',
-  with: 200,
+  width: 200,
   ellipsis: true
 }, {
   dataIndex: 'goodNo',
   title: '商品spu编码',
-  with: 200,
-  ellipsis: true
+  width: 200
+  // ellipsis: true,
 }, {
   dataIndex: 'goodId',
   title: 'SPUID',
-  with: 200,
-  ellipsis: true
+  width: 200
+  // ellipsis: true,
 }, {
   dataIndex: 'specCount',
   title: '规格数',
-  with: 200,
-  ellipsis: true
+  width: 160
+  // ellipsis: true,
 }];
+
 var expandedColumns = [{
   dataIndex: 'specName',
   title: '商品sku名称',
-  with: 200,
+  width: 200,
   ellipsis: true
 }, {
   dataIndex: 'specNo',
   title: '商品sku编码',
-  with: 200,
-  ellipsis: true
+  width: 200
+  // ellipsis: true,
 }, {
   dataIndex: 'specId',
   title: 'SKUID',
-  with: 200,
-  ellipsis: true
+  width: 200
+  // ellipsis: true,
 }, {
   dataIndex: 'imgUrl',
   title: '商品图片',
-  with: 200,
+  width: 100,
   render: function render(picUrl) {
     return /*#__PURE__*/React__default['default'].createElement("img", {
       style: {
@@ -10762,13 +10763,16 @@ var expandedColumns = [{
   }
 }, {
   dataIndex: 'marketPrice',
-  title: '市场价'
+  title: '市场价',
+  width: 140
 }, {
   dataIndex: 'retailPrice',
-  title: '零售价'
+  title: '零售价',
+  width: 140
 }, {
   dataIndex: 'memberPrice',
-  title: '会员价'
+  title: '会员价',
+  width: 140
 }];
 var dateFormat = 'YYYY-MM-DD HH:mm:ss';
 var GoodsModal$3 = function GoodsModal(props, ref) {
@@ -10785,6 +10789,8 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     };
   });
 
+  var initStartTime = hooks().subtract(1, 'M').format(dateFormat);
+  var initEndTime = hooks().format(dateFormat);
   var onSubmit = props.onSubmit,
     shopId = props.shopId,
     shopList = props.shopList,
@@ -10821,11 +10827,11 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     _useState16 = _slicedToArray(_useState15, 2),
     total = _useState16[0],
     setTotal = _useState16[1];
-  var _useState17 = React.useState(hooks().subtract(1, 'M').format(dateFormat)),
+  var _useState17 = React.useState(initStartTime),
     _useState18 = _slicedToArray(_useState17, 2),
     startTime = _useState18[0],
     setStartTime = _useState18[1];
-  var _useState19 = React.useState(hooks().format(dateFormat)),
+  var _useState19 = React.useState(initEndTime),
     _useState20 = _slicedToArray(_useState19, 2),
     endTime = _useState20[0],
     setEndTime = _useState20[1];
@@ -10835,13 +10841,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       return item;
     });
   }, [selectList]);
+  React.useEffect(function () {
+    queryItems();
+  }, [pageNo]);
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   //选择页码
   var pageChange = function pageChange(page) {
     setPageNo(page);
-    queryItems();
   };
   /**
    * 查询商品
@@ -10851,8 +10859,11 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       var search,
         params,
         res,
+        _res$data,
         _res$data$productList,
         productList,
+        _res$data$total,
+        _total,
         newProducts,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -10877,13 +10888,16 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
           case 6:
             res = _context.sent;
             if (res.success) {
-              _res$data$productList = res.data.productList, productList = _res$data$productList === void 0 ? [] : _res$data$productList;
+              _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;
               newProducts = productList.map(function (item, index) {
                 return _objectSpread2(_objectSpread2({}, item), {}, {
                   index: index + 1
                 });
               });
-              initData(_toConsumableArray(newProducts));
+              setGoodList(_toConsumableArray(newProducts));
+              if (pageNo === 1) {
+                setTotal(_total);
+              }
             }
           case 8:
             _context.prev = 8;
@@ -10899,11 +10913,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       return _ref.apply(this, arguments);
     };
   }();
-  var initData = function initData(list) {
-    setGoodList(_toConsumableArray(list));
-    setTotal(list.length);
-    setPageNo(1);
-  };
   var _onCancel = function onCancel() {
     onReset();
     setVisible(false);
@@ -10920,7 +10929,8 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
   };
   var onReset = function onReset() {
     form.resetFields();
-    initData([]);
+    setPageNo(1);
+    // queryItems()
   };
   // const getShopList = async () => {
   //   const { success, data } = await request('/qy/diamond/getConfigInfo', {
@@ -11023,7 +11033,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
       columns: expandedColumns,
       dataSource: record.itemDetailList || [],
       pagination: false,
-      rowSelection: expandedRowSelection
+      rowSelection: expandedRowSelection,
+      scroll: {
+        x: true
+      }
     });
   };
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
@@ -11041,7 +11054,11 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     layout: "inline",
     form: form,
     onFinish: onFinish,
-    onValuesChange: onValuesChange
+    onValuesChange: onValuesChange,
+    initialValues: {
+      dateTimePicker: [hooks(initStartTime, dateFormat), hooks(initEndTime, dateFormat)],
+      code: ''
+    }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
     name: "dateTimePicker"
   }, /*#__PURE__*/React__default['default'].createElement(RangePicker, {
@@ -11061,12 +11078,15 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     htmlType: "submit"
   }, "\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     onClick: onReset
-  }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement(antd.Spin, {
-    spinning: loading
+  }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      marginTop: '16px'
+    }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     rowKey: 'goodNo',
     columns: columns$1,
     dataSource: goodList,
+    loading: loading,
     scroll: {
       x: true,
       y: 250
@@ -11175,18 +11195,18 @@ var GoodItem = function GoodItem(props) {
             align: 'center',
             ellipsis: true,
             width: 100
-          }, {
-            dataIndex: 'specId',
-            title: "".concat(text, "SKUID"),
-            align: 'center',
-            ellipsis: true,
-            width: 100
           }, {
             dataIndex: 'goodName',
             title: "".concat(text, "\u5546\u54C1\u540D\u79F0"),
             align: 'center',
             ellipsis: true,
             width: 250
+          }, {
+            dataIndex: 'specId',
+            title: "".concat(text, "SKUID"),
+            align: 'center',
+            ellipsis: true,
+            width: 100
           }, {
             dataIndex: 'specNo',
             title: "".concat(text, "sku\u7F16\u7801"),
@@ -11201,7 +11221,7 @@ var GoodItem = function GoodItem(props) {
             width: 250
           }, {
             dataIndex: 'orderPrice',
-            title: "\u5B9E\u4ED8\u91D1\u989D",
+            title: "\u5B9E\u4ED8\u603B\u91D1\u989D",
             align: 'center',
             ellipsis: true,
             width: 100
@@ -11240,7 +11260,7 @@ var GoodItem = function GoodItem(props) {
             width: 70
           }, {
             dataIndex: 'giftType',
-            title: "\u8D60\u54C1\u7C7B\u578B",
+            title: "\u8D60\u54C1\u65B9\u5F0F",
             align: 'center',
             ellipsis: true,
             width: 100,
@@ -11404,8 +11424,8 @@ var GoodItem = function GoodItem(props) {
         item.uuid = kmkfUtils.uuid();
         item.canDelete = true;
         item.num = 1;
-        item.orderPrice = item.orderPrice || 0;
-        item.sharePrice = item.sharePrice || 0;
+        item.orderPrice = 0;
+        item.sharePrice = 0;
         item.canUpdateNumber = canUpdateNumber;
         return item;
       });
@@ -11876,9 +11896,12 @@ var typeMap = {
     reissueSelectListReturn: 'reissueSelectListReturn',
     reissueDeleteGood: 'reissueDeleteGood',
     changeShopCode: 'changeShopCode',
-    reissueType: 'reissueType' // pubsub 事件
+    reissueType: 'reissueType',
+    formatDefaultField: {
+      money: 'money',
+      share: 'share'
+    }
   },
-
   WDT_REISSUE_GOODS: {
     key: 'wdtReissueGoods',
     name: '旺店通',
@@ -11887,12 +11910,15 @@ var typeMap = {
     reissueSelectListReturn: 'wdtReissueSelectListReturn',
     reissueDeleteGood: 'wdtReissueDeleteGood',
     changeShopCode: 'wdtChangeShopCode',
-    reissueType: 'wdtReissueType' // pubsub 事件
+    reissueType: 'wdtReissueType',
+    formatDefaultField: {
+      money: 'orderPrice',
+      share: 'sharePrice'
+    }
   }
 };
-
 var BsReissue = function BsReissue(props) {
-  var _typeMap$type14, _typeMap$type15, _typeMap$type16;
+  var _typeMap$type20, _typeMap$type21, _typeMap$type22;
   var value = props.value,
     onChange = props.onChange,
     _props$reasonList = props.reasonList,
@@ -11911,8 +11937,9 @@ var BsReissue = function BsReissue(props) {
         shopCode: data === null || data === void 0 ? void 0 : data.shopCode
       });
       newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type2 = typeMap[type]) === null || _typeMap$type2 === void 0 ? void 0 : _typeMap$type2.key)] = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
-        item.money = 0;
-        item.share = 0;
+        var _typeMap$type3, _typeMap$type4;
+        item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type3 = typeMap[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.formatDefaultField.money)] = 0;
+        item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type4 = typeMap[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.formatDefaultField.share)] = 0;
         item.canUpdateNumber = true;
         return item;
       });
@@ -11920,17 +11947,18 @@ var BsReissue = function BsReissue(props) {
     });
   }, []);
   React.useEffect(function () {
-    var _typeMap$type3;
-    pubsub__default['default'].subscribe("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type3 = typeMap[type]) === null || _typeMap$type3 === void 0 ? void 0 : _typeMap$type3.reissueSelectListReturn), function (_, data) {
-      var _typeMap$type4;
+    var _typeMap$type5;
+    pubsub__default['default'].subscribe("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type5 = typeMap[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.reissueSelectListReturn), function (_, data) {
+      var _typeMap$type6;
       // console.log('reissueSelectListReturn', data);
       if (disabled) return;
       var newValue = _objectSpread2(_objectSpread2({}, data.goodValue), {}, {
         shopCode: data === null || data === void 0 ? void 0 : data.shopCode
       });
-      newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type4 = typeMap[type]) === null || _typeMap$type4 === void 0 ? void 0 : _typeMap$type4.key)] = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
-        item.money = 0;
-        item.share = 0;
+      newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type6 = typeMap[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.key)] = data === null || data === void 0 ? void 0 : data.list.map(function (item) {
+        var _typeMap$type7, _typeMap$type8;
+        item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type7 = typeMap[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.formatDefaultField.money)] = 0;
+        item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type8 = typeMap[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.formatDefaultField.share)] = 0;
         item.canUpdateNumber = true;
         return item;
       });
@@ -11938,54 +11966,55 @@ var BsReissue = function BsReissue(props) {
     });
   }, []);
   React.useEffect(function () {
-    var _typeMap$type5, _typeMap$type8;
+    var _typeMap$type9, _typeMap$type12;
     valueRef.current = value;
-    pubsub__default['default'].subscribeOnce("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type5 = typeMap[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.reissueDeleteGood), function (_, data) {
+    pubsub__default['default'].subscribeOnce("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type9 = typeMap[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.reissueDeleteGood), function (_, data) {
       if (disabled) return;
       if (value) {
-        var _typeMap$type6, _typeMap$type7;
+        var _typeMap$type10, _typeMap$type11;
         var newValue = _objectSpread2({}, value);
-        newValue["".concat((_typeMap$type6 = typeMap[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.key)] = newValue === null || newValue === void 0 ? void 0 : newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type7 = typeMap[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.key)].filter(function (item) {
+        newValue["".concat((_typeMap$type10 = typeMap[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key)] = newValue === null || newValue === void 0 ? void 0 : newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type11 = typeMap[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.key)].filter(function (item) {
           return item.sku !== data;
         });
         onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       }
     });
-    pubsub__default['default'].subscribeOnce("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type8 = typeMap[type]) === null || _typeMap$type8 === void 0 ? void 0 : _typeMap$type8.changeShopCode), function (type, data) {
+    pubsub__default['default'].subscribeOnce("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type12 = typeMap[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.changeShopCode), function (type, data) {
       onChange(_objectSpread2(_objectSpread2({}, value), {}, {
         shopCode: data.shopCode
       }));
     });
   }, [value, disabled]);
   var changeTypeHandle = function changeTypeHandle(val) {
-    var _typeMap$type9, _typeMap$type10, _typeMap$type11;
+    var _typeMap$type13, _typeMap$type14, _typeMap$type15;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type9 = typeMap[type]) === null || _typeMap$type9 === void 0 ? void 0 : _typeMap$type9.typeName)] = val;
-    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type10 = typeMap[type]) === null || _typeMap$type10 === void 0 ? void 0 : _typeMap$type10.key)] = [];
+    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type13 = typeMap[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName)] = val;
+    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type14 = typeMap[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.key)] = [];
     if (['2', '4'].includes(val[0])) {
       onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
       valueRef.current = newValue;
     }
-    pubsub__default['default'].publish("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type11 = typeMap[type]) === null || _typeMap$type11 === void 0 ? void 0 : _typeMap$type11.reissueType), {
+    pubsub__default['default'].publish("".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type15 = typeMap[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.reissueType), {
       val: val[0],
       goodValue: newValue
     });
   };
   var changeGoodHandle = function changeGoodHandle(val) {
-    var _typeMap$type12;
+    var _typeMap$type16;
     var newValue = _objectSpread2({}, value);
-    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type12 = typeMap[type]) === null || _typeMap$type12 === void 0 ? void 0 : _typeMap$type12.key)] = (val || []).map(function (item) {
-      item.money = 0;
-      item.share = 0;
+    newValue["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type16 = typeMap[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key)] = (val || []).map(function (item) {
+      var _typeMap$type17, _typeMap$type18;
+      item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type17 = typeMap[type]) === null || _typeMap$type17 === void 0 ? void 0 : _typeMap$type17.formatDefaultField.money)] = 0;
+      item["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type18 = typeMap[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.formatDefaultField.share)] = 0;
       return item;
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   //显示选择商品按钮 原单换不显示选择商品
   var showChangeBtn = React.useMemo(function () {
-    var _value, _typeMap$type13;
-    return ['2', '3', '4'].includes(value === null || value === void 0 ? void 0 : (_value = value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type13 = typeMap[type]) === null || _typeMap$type13 === void 0 ? void 0 : _typeMap$type13.typeName)]) === null || _value === void 0 ? void 0 : _value[0]);
-  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.typeName]]);
+    var _value, _typeMap$type19;
+    return ['2', '3', '4'].includes(value === null || value === void 0 ? void 0 : (_value = value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type19 = typeMap[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.typeName)]) === null || _value === void 0 ? void 0 : _value[0]);
+  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type20 = typeMap[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.typeName]]);
   return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
       marginBottom: '8px'
@@ -11993,7 +12022,7 @@ var BsReissue = function BsReissue(props) {
     disabled: disabled,
     allowClear: false,
     options: reasonList,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type15 = typeMap[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.typeName)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type21 = typeMap[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.typeName)],
     onChange: function onChange(val) {
       return changeTypeHandle(val);
     }
@@ -12005,7 +12034,7 @@ var BsReissue = function BsReissue(props) {
     canUpdateNumber: showChangeBtn,
     showChangeBtn: showChangeBtn,
     shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
-    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type16 = typeMap[type]) === null || _typeMap$type16 === void 0 ? void 0 : _typeMap$type16.key)],
+    value: value === null || value === void 0 ? void 0 : value["".concat(typeMap === null || typeMap === void 0 ? void 0 : (_typeMap$type22 = typeMap[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)],
     onChange: function onChange(val) {
       return changeGoodHandle(val);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.23.1-beta.14",
+  "version": "0.23.1-beta.16",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "46a3a01edfbcc0c5b68b3dddf0cbfb4832acd605"
+  "gitHead": "b25d0a7eff9d6692d21f0f554367111c917fd552"
 }