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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.esm.js CHANGED
@@ -11091,6 +11091,12 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
11091
11091
  var GoodsModal$2 = /*#__PURE__*/forwardRef(GoodsModal$1);
11092
11092
 
11093
11093
  var RangePicker = DatePicker.RangePicker;
11094
+ var getWdtListProduct = function getWdtListProduct(data) {
11095
+ return extendRequest('/qy/gdfw/product/wdtListProduct', {
11096
+ method: 'post',
11097
+ data: data
11098
+ });
11099
+ };
11094
11100
  var columns$1 = [{
11095
11101
  dataIndex: 'index',
11096
11102
  title: 'NO',
@@ -11165,226 +11171,173 @@ var expandedColumns = [{
11165
11171
  title: '会员价',
11166
11172
  width: 140
11167
11173
  }];
11168
- var dateFormat = 'YYYY-MM-DD HH:mm:ss';
11169
- var GoodsModal$3 = function GoodsModal(props, ref) {
11170
- var initStartTime = hooks().subtract(30, 'd');
11171
- var initEndTime = hooks();
11172
- useImperativeHandle(ref, function () {
11173
- return {
11174
- open: function open(shopCode) {
11175
- setVisible(true);
11176
- setPageNo(1);
11177
- setSelect([]);
11178
- setSelectIds([]);
11179
- form.setFieldsValue({
11180
- dateTimePicker: [initStartTime, initEndTime],
11181
- code: ''
11182
- });
11183
- // getShopList();
11184
- }
11185
- };
11186
- });
11187
-
11188
- var onSubmit = props.onSubmit,
11189
- shopId = props.shopId,
11190
- shopList = props.shopList,
11191
- width = props.width,
11192
- companyKey = props.companyKey;
11193
- var _useState = useState(false),
11174
+ var getInitTime = function getInitTime() {
11175
+ var initStartTime = hooks().subtract(30, 'd').hours(0).minutes(0).seconds(0);
11176
+ var initEndTime = hooks().hours(23).minutes(59).seconds(59);
11177
+ return [initStartTime, initEndTime];
11178
+ };
11179
+ var GoodList = function GoodList(props, ref) {
11180
+ var _useState = useState([]),
11194
11181
  _useState2 = _slicedToArray(_useState, 2),
11195
- visible = _useState2[0],
11196
- setVisible = _useState2[1];
11197
- var _useState3 = useState([]),
11182
+ selectList = _useState2[0],
11183
+ setSelect = _useState2[1];
11184
+ var _useState3 = useState(1),
11198
11185
  _useState4 = _slicedToArray(_useState3, 2),
11199
- selectList = _useState4[0],
11200
- setSelect = _useState4[1];
11201
- var _useState5 = useState([]),
11202
- _useState6 = _slicedToArray(_useState5, 2),
11203
- selectIds = _useState6[0],
11204
- setSelectIds = _useState6[1];
11205
- var _useState7 = useState(1),
11186
+ pageNo = _useState4[0],
11187
+ setPageNo = _useState4[1];
11188
+ var _useState5 = useState(20),
11189
+ _useState6 = _slicedToArray(_useState5, 1),
11190
+ pageSize = _useState6[0];
11191
+ var _useState7 = useState([]),
11206
11192
  _useState8 = _slicedToArray(_useState7, 2),
11207
- pageNo = _useState8[0],
11208
- setPageNo = _useState8[1];
11209
- var _useState9 = useState(20),
11210
- _useState10 = _slicedToArray(_useState9, 1),
11211
- pageSize = _useState10[0];
11212
- var _useState11 = useState([]),
11193
+ goodList = _useState8[0],
11194
+ setGoodList = _useState8[1];
11195
+ var _useState9 = useState(false),
11196
+ _useState10 = _slicedToArray(_useState9, 2),
11197
+ loading = _useState10[0],
11198
+ setLoading = _useState10[1];
11199
+ var _useState11 = useState(0),
11213
11200
  _useState12 = _slicedToArray(_useState11, 2),
11214
- goodList = _useState12[0],
11215
- setGoodList = _useState12[1];
11216
- var _useState13 = useState(false),
11201
+ total = _useState12[0],
11202
+ setTotal = _useState12[1];
11203
+ var _useState13 = useState(null),
11217
11204
  _useState14 = _slicedToArray(_useState13, 2),
11218
- loading = _useState14[0],
11219
- setLoading = _useState14[1];
11220
- var _useState15 = useState(0),
11221
- _useState16 = _slicedToArray(_useState15, 2),
11222
- total = _useState16[0],
11223
- setTotal = _useState16[1];
11205
+ dates = _useState14[0],
11206
+ setDates = _useState14[1];
11207
+ useImperativeHandle(ref, function () {
11208
+ return {
11209
+ getSelectGoodList: function getSelectGoodList() {
11210
+ return selectList;
11211
+ }
11212
+ };
11213
+ });
11224
11214
  var displaySelectList = useMemo(function () {
11225
11215
  return selectList.map(function (item, i) {
11226
11216
  item.index = i + 1;
11227
11217
  return item;
11228
11218
  });
11229
11219
  }, [selectList]);
11230
- useEffect(function () {
11231
- if (visible) {
11232
- queryItems();
11233
- }
11234
- }, [pageNo, visible]);
11235
11220
  var _Form$useForm = Form.useForm(),
11236
11221
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
11237
11222
  form = _Form$useForm2[0];
11238
- //选择页码
11239
- var pageChange = function pageChange(page) {
11240
- setPageNo(page);
11241
- };
11242
11223
  /**
11243
11224
  * 查询商品
11244
11225
  */
11245
11226
  var queryItems = /*#__PURE__*/function () {
11246
11227
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
11247
- var search,
11248
- _formData$dateTimePic,
11249
- _formData$dateTimePic2,
11250
- _formData$dateTimePic3,
11251
- _formData$dateTimePic4,
11252
- _formData$dateTimePic5,
11253
- _formData$dateTimePic6,
11254
- formData,
11255
- startTime,
11256
- endTime,
11257
- params,
11258
- res,
11259
- _res$data,
11260
- _res$data$productList,
11261
- productList,
11262
- _res$data$total,
11263
- _total,
11264
- errorMsg,
11265
- newProducts,
11266
- _args = arguments;
11228
+ var _formData$dateTimePic, _formData$dateTimePic2, _formData$dateTimePic3, _formData$dateTimePic4, _formData$dateTimePic5, _formData$dateTimePic6, formData, _getInitTime, _getInitTime2, start, end, startTime, endTime, newTime, earliest, params;
11267
11229
  return _regeneratorRuntime().wrap(function _callee$(_context) {
11268
11230
  while (1) switch (_context.prev = _context.next) {
11269
11231
  case 0:
11270
- search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
11271
- _context.prev = 1;
11232
+ _context.prev = 0;
11272
11233
  setLoading(true);
11273
11234
  formData = form.getFieldsValue();
11274
- 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);
11275
- 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);
11235
+ _getInitTime = getInitTime(), _getInitTime2 = _slicedToArray(_getInitTime, 2), start = _getInitTime2[0], end = _getInitTime2[1];
11236
+ 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');
11237
+ 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');
11238
+ endTime = hooks(endTime).hours(23).minutes(59).seconds(59).format('YYYY-MM-DD HH:mm:ss');
11239
+ newTime = hooks(); // 只能选比现在早的时间
11240
+ if (hooks(endTime).diff(newTime, 'seconds') > 0) {
11241
+ endTime = newTime.format('YYYY-MM-DD HH:mm:ss');
11242
+ }
11243
+ // 30天内
11244
+ earliest = hooks(endTime).subtract(30, 'd');
11245
+ if (earliest.diff(hooks(startTime), 'seconds') > 0) {
11246
+ startTime = earliest.format('YYYY-MM-DD HH:mm:ss');
11247
+ }
11276
11248
  params = {
11277
- // shopCode: shopCode,
11278
11249
  pageSize: pageSize,
11279
11250
  pageNo: pageNo - 1,
11280
- goodNo: search.code,
11251
+ goodNo: formData.goodNo || null,
11252
+ specNo: formData.specNo || null,
11281
11253
  startTime: startTime,
11282
11254
  endTime: endTime
11283
11255
  };
11284
- _context.next = 9;
11285
- return extendRequest('/qy/gdfw/product/wdtListProduct', {
11286
- method: 'post',
11287
- data: params
11288
- });
11289
- case 9:
11290
- res = _context.sent;
11291
- _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;
11292
- if (res.success) {
11293
- newProducts = productList.map(function (item, index) {
11294
- return _objectSpread2(_objectSpread2({}, item), {}, {
11295
- index: index + 1
11256
+ _context.next = 14;
11257
+ return getWdtListProduct(params).then(function (res) {
11258
+ if (res.success) {
11259
+ var _res$data = res.data,
11260
+ _res$data$productList = _res$data.productList,
11261
+ productList = _res$data$productList === void 0 ? [] : _res$data$productList,
11262
+ _res$data$total = _res$data.total,
11263
+ _total = _res$data$total === void 0 ? 0 : _res$data$total;
11264
+ var newProducts = productList.map(function (item, index) {
11265
+ return _objectSpread2(_objectSpread2({}, item), {}, {
11266
+ index: index + 1
11267
+ });
11296
11268
  });
11297
- });
11298
- setGoodList(_toConsumableArray(newProducts));
11299
- if (pageNo === 1) {
11300
- setTotal(_total);
11269
+ setGoodList(newProducts);
11270
+ if (pageNo === 1) {
11271
+ setTotal(_total);
11272
+ }
11273
+ } else {
11274
+ var _res$data2;
11275
+ setGoodList([]);
11276
+ setTotal(0);
11277
+ message.error(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.errorMsg) || res.message);
11301
11278
  }
11302
- } else {
11303
- setGoodList([]);
11304
- setTotal(0);
11305
- message.error(errorMsg || res.message);
11306
- }
11307
- case 12:
11308
- _context.prev = 12;
11279
+ }).catch(function (e) {
11280
+ console.log(e);
11281
+ });
11282
+ case 14:
11283
+ _context.prev = 14;
11309
11284
  setLoading(false);
11310
- return _context.finish(12);
11311
- case 15:
11285
+ return _context.finish(14);
11286
+ case 17:
11312
11287
  case "end":
11313
11288
  return _context.stop();
11314
11289
  }
11315
- }, _callee, null, [[1,, 12, 15]]);
11290
+ }, _callee, null, [[0,, 14, 17]]);
11316
11291
  }));
11317
11292
  return function queryItems() {
11318
11293
  return _ref.apply(this, arguments);
11319
11294
  };
11320
11295
  }();
11321
- var _onCancel = function onCancel() {
11322
- setVisible(false);
11323
- };
11324
- var onOk = function onOk() {
11325
- onSubmit(selectList);
11326
- _onCancel();
11327
- };
11328
- var onFinish = function onFinish(fieldsValue) {
11329
- var searchValue = {
11330
- code: fieldsValue.code
11331
- };
11332
- queryItems(searchValue);
11296
+ var disabledDate = function disabledDate(current) {
11297
+ var today = hooks(hooks().format('YYYY-MM-DD'));
11298
+ var currentDay = hooks(current.format('YYYY-MM-DD'));
11299
+ if (currentDay.diff(today, 'days') > 0) {
11300
+ return true;
11301
+ }
11302
+ if (!dates) {
11303
+ return false;
11304
+ }
11305
+ var tooLate = dates[0] && current.diff(dates[0], 'days') > 30;
11306
+ var tooEarly = dates[1] && dates[1].diff(current, 'days') > 30;
11307
+ return !!tooEarly || !!tooLate;
11308
+ };
11309
+ var onOpenChange = function onOpenChange(open) {
11310
+ if (open) {
11311
+ setDates([null, null]);
11312
+ } else {
11313
+ setDates(null);
11314
+ }
11333
11315
  };
11334
11316
  var onReset = function onReset() {
11335
- form.resetFields();
11336
11317
  form.setFieldsValue({
11337
- dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
11338
- code: ''
11318
+ dateTimePicker: getInitTime(),
11319
+ goodNo: '',
11320
+ specNo: ''
11339
11321
  });
11340
11322
  setPageNo(function (prev) {
11341
- if (prev === 1 && visible) {
11323
+ if (prev === 1) {
11342
11324
  queryItems();
11343
11325
  }
11344
11326
  return 1;
11345
11327
  });
11346
11328
  };
11347
- // const getShopList = async () => {
11348
- // const { success, data } = await request('/qy/diamond/getConfigInfo', {
11349
- // method: 'get',
11350
- // params: {
11351
- // key: 'company-third-shop-info',
11352
- // },
11353
- // });
11354
- // const obj: any = JSON.parse(data || '{}');
11355
- // if (success) {
11356
- // const list = (obj?.[companyKey] || []).map((item: any) => {
11357
- // return {
11358
- // label: item.shopName,
11359
- // value: item.shopCode,
11360
- // };
11361
- // });
11362
- // setShopList(list);
11363
- // }
11364
- // };
11365
- var onValuesChange = function onValuesChange(changedValues) {
11366
- if (changedValues === null || changedValues === void 0 ? void 0 : changedValues['shopId']) {
11367
- queryItems(changedValues === null || changedValues === void 0 ? void 0 : changedValues.shopId);
11368
- pubsub.publish('changeShopCode', {
11369
- shopCode: changedValues.shopId
11370
- });
11371
- }
11372
- };
11373
- var handleDelete = function handleDelete(record, index) {
11329
+ var handleDelete = function handleDelete(record) {
11374
11330
  var newSelectList = selectList.filter(function (item) {
11375
11331
  return item.specId !== record.specId;
11376
11332
  });
11377
11333
  setSelect(_toConsumableArray(newSelectList));
11378
- setSelectIds(_toConsumableArray(newSelectList.map(function (item) {
11379
- return item.specId;
11380
- })));
11381
11334
  };
11382
11335
  var displaySelectedColumns = [{
11383
11336
  dataIndex: 'operation',
11384
11337
  title: '',
11385
11338
  ellipsis: true,
11386
11339
  width: 50,
11387
- render: function render(_, record, index) {
11340
+ render: function render(_, record) {
11388
11341
  return /*#__PURE__*/React.createElement(DeleteOutlined, {
11389
11342
  onClick: function onClick() {
11390
11343
  return handleDelete(record);
@@ -11415,8 +11368,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11415
11368
  }];
11416
11369
  var expandedRowSelection = {
11417
11370
  fixed: true,
11418
- selectedRowKeys: selectIds,
11419
- onSelect: function onSelect(record, selected, selectedRows, nativeEvent) {
11371
+ selectedRowKeys: selectList.map(function (item) {
11372
+ return item.specId;
11373
+ }),
11374
+ onSelect: function onSelect(record, selected) {
11420
11375
  var tempList = [];
11421
11376
  if (selected) {
11422
11377
  tempList = [].concat(_toConsumableArray(selectList), [record]);
@@ -11426,9 +11381,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11426
11381
  });
11427
11382
  }
11428
11383
  setSelect(_toConsumableArray(tempList));
11429
- setSelectIds(_toConsumableArray(tempList.map(function (item) {
11430
- return item.specId;
11431
- })));
11432
11384
  },
11433
11385
  onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
11434
11386
  var tempAllList = [];
@@ -11442,15 +11394,12 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11442
11394
  });
11443
11395
  }
11444
11396
  setSelect(_toConsumableArray(tempAllList));
11445
- setSelectIds(_toConsumableArray(tempAllList.map(function (item) {
11446
- return item.specId;
11447
- })));
11448
11397
  }
11449
11398
  };
11450
- var expandedRowRender = function expandedRowRender(record, index, indent, expanded) {
11399
+ var expandedRowRender = function expandedRowRender(record) {
11451
11400
  return /*#__PURE__*/React.createElement(Table, {
11452
- rowKey: 'specId',
11453
- size: 'small',
11401
+ rowKey: "specId",
11402
+ size: "small",
11454
11403
  columns: expandedColumns,
11455
11404
  dataSource: record.itemDetailList || [],
11456
11405
  pagination: false,
@@ -11460,43 +11409,61 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11460
11409
  }
11461
11410
  });
11462
11411
  };
11463
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Modal, {
11464
- title: '选择商品',
11465
- okText: '确认',
11466
- cancelText: '取消',
11467
- visible: visible,
11468
- width: width || 850,
11469
- onCancel: function onCancel() {
11470
- _onCancel();
11471
- },
11472
- onOk: onOk,
11473
- wrapClassName: "goodModal"
11474
- }, /*#__PURE__*/React.createElement(Form, {
11412
+ React.useEffect(function () {
11413
+ queryItems();
11414
+ }, []);
11415
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, {
11475
11416
  layout: "inline",
11476
11417
  form: form,
11477
- onFinish: onFinish,
11478
- onValuesChange: onValuesChange,
11418
+ onFinish: queryItems,
11479
11419
  initialValues: {
11480
- code: ''
11420
+ goodNo: '',
11421
+ specNo: '',
11422
+ dateTimePicker: getInitTime()
11481
11423
  }
11482
11424
  }, /*#__PURE__*/React.createElement(Form.Item, {
11483
- name: "dateTimePicker"
11425
+ name: "dateTimePicker",
11426
+ style: {
11427
+ marginBottom: '12px'
11428
+ }
11484
11429
  }, /*#__PURE__*/React.createElement(RangePicker, {
11485
11430
  style: {
11486
- width: '350px'
11431
+ width: '240px'
11487
11432
  },
11488
11433
  placeholder: ['开始日期', '结束日期'],
11489
- showTime: true,
11490
- defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
11434
+ showTime: false,
11435
+ disabledDate: disabledDate,
11436
+ onCalendarChange: function onCalendarChange(val) {
11437
+ return setDates(val);
11438
+ },
11439
+ onOpenChange: onOpenChange
11491
11440
  })), /*#__PURE__*/React.createElement(Form.Item, {
11492
- name: "code"
11441
+ name: "goodNo",
11442
+ style: {
11443
+ marginBottom: '12px'
11444
+ }
11493
11445
  }, /*#__PURE__*/React.createElement(Input, {
11494
11446
  placeholder: "\u5546\u54C1SPU\u7F16\u7801",
11495
11447
  allowClear: true,
11496
11448
  style: {
11497
11449
  width: 150
11498
11450
  }
11499
- })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
11451
+ })), /*#__PURE__*/React.createElement(Form.Item, {
11452
+ name: "specNo",
11453
+ style: {
11454
+ marginBottom: '12px'
11455
+ }
11456
+ }, /*#__PURE__*/React.createElement(Input, {
11457
+ placeholder: "\u5546\u54C1SKU\u7F16\u7801",
11458
+ allowClear: true,
11459
+ style: {
11460
+ width: 150
11461
+ }
11462
+ })), /*#__PURE__*/React.createElement(Form.Item, {
11463
+ style: {
11464
+ marginBottom: '12px'
11465
+ }
11466
+ }, /*#__PURE__*/React.createElement(Button, {
11500
11467
  type: "primary",
11501
11468
  htmlType: "submit",
11502
11469
  style: {
@@ -11506,10 +11473,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11506
11473
  onClick: onReset
11507
11474
  }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement("div", {
11508
11475
  style: {
11509
- marginTop: '16px'
11476
+ marginTop: '4px'
11510
11477
  }
11511
11478
  }, /*#__PURE__*/React.createElement(Table, {
11512
- rowKey: 'goodNo',
11479
+ rowKey: "goodNo",
11513
11480
  columns: columns$1,
11514
11481
  dataSource: goodList,
11515
11482
  loading: loading,
@@ -11526,14 +11493,14 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11526
11493
  current: pageNo,
11527
11494
  pageSize: pageSize,
11528
11495
  pageSizeOptions: [],
11529
- onChange: pageChange
11496
+ onChange: setPageNo
11530
11497
  }
11531
11498
  })), !!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", {
11532
11499
  style: {
11533
11500
  marginTop: '16px'
11534
11501
  }
11535
11502
  }, /*#__PURE__*/React.createElement(Table, {
11536
- rowKey: 'specId',
11503
+ rowKey: "specId",
11537
11504
  columns: [].concat(displaySelectedColumns, expandedColumns),
11538
11505
  dataSource: displaySelectList,
11539
11506
  pagination: false,
@@ -11544,7 +11511,48 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11544
11511
  style: {
11545
11512
  width: '100%'
11546
11513
  }
11547
- })))));
11514
+ }))));
11515
+ };
11516
+ var WdtGoodList = /*#__PURE__*/forwardRef(GoodList);
11517
+
11518
+ var GoodsModal$3 = function GoodsModal(props, ref) {
11519
+ useImperativeHandle(ref, function () {
11520
+ return {
11521
+ open: function open() {
11522
+ setVisible(true);
11523
+ }
11524
+ };
11525
+ });
11526
+ var onSubmit = props.onSubmit,
11527
+ width = props.width;
11528
+ var _useState = useState(false),
11529
+ _useState2 = _slicedToArray(_useState, 2),
11530
+ visible = _useState2[0],
11531
+ setVisible = _useState2[1];
11532
+ var wdtGoodListRef = useRef(null);
11533
+ var _onCancel = function onCancel() {
11534
+ setVisible(false);
11535
+ };
11536
+ var onOk = function onOk() {
11537
+ var _wdtGoodListRef$curre;
11538
+ var selectedList = ((_wdtGoodListRef$curre = wdtGoodListRef.current) === null || _wdtGoodListRef$curre === void 0 ? void 0 : _wdtGoodListRef$curre.getSelectGoodList()) || [];
11539
+ onSubmit(selectedList);
11540
+ _onCancel();
11541
+ };
11542
+ return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
11543
+ title: '选择商品',
11544
+ okText: '确认',
11545
+ cancelText: '取消',
11546
+ visible: visible,
11547
+ width: width || 850,
11548
+ onCancel: function onCancel() {
11549
+ _onCancel();
11550
+ },
11551
+ onOk: onOk,
11552
+ wrapClassName: "goodModal"
11553
+ }, /*#__PURE__*/React.createElement(WdtGoodList, {
11554
+ ref: wdtGoodListRef
11555
+ })));
11548
11556
  };
11549
11557
  var WdtGoodsModal = /*#__PURE__*/forwardRef(GoodsModal$3);
11550
11558
 
@@ -13709,4 +13717,4 @@ var CalculationInput = function CalculationInput(props) {
13709
13717
  }, config === null || config === void 0 ? void 0 : config.unit));
13710
13718
  };
13711
13719
 
13712
- 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, WlnGoods };
13720
+ 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, WlnGoods };
package/dist/index.js CHANGED
@@ -11102,6 +11102,12 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
11102
11102
  var GoodsModal$2 = /*#__PURE__*/React.forwardRef(GoodsModal$1);
11103
11103
 
11104
11104
  var RangePicker = antd.DatePicker.RangePicker;
11105
+ var getWdtListProduct = function getWdtListProduct(data) {
11106
+ return extendRequest('/qy/gdfw/product/wdtListProduct', {
11107
+ method: 'post',
11108
+ data: data
11109
+ });
11110
+ };
11105
11111
  var columns$1 = [{
11106
11112
  dataIndex: 'index',
11107
11113
  title: 'NO',
@@ -11176,226 +11182,173 @@ var expandedColumns = [{
11176
11182
  title: '会员价',
11177
11183
  width: 140
11178
11184
  }];
11179
- var dateFormat = 'YYYY-MM-DD HH:mm:ss';
11180
- var GoodsModal$3 = function GoodsModal(props, ref) {
11181
- var initStartTime = hooks().subtract(30, 'd');
11182
- var initEndTime = hooks();
11183
- React.useImperativeHandle(ref, function () {
11184
- return {
11185
- open: function open(shopCode) {
11186
- setVisible(true);
11187
- setPageNo(1);
11188
- setSelect([]);
11189
- setSelectIds([]);
11190
- form.setFieldsValue({
11191
- dateTimePicker: [initStartTime, initEndTime],
11192
- code: ''
11193
- });
11194
- // getShopList();
11195
- }
11196
- };
11197
- });
11198
-
11199
- var onSubmit = props.onSubmit,
11200
- shopId = props.shopId,
11201
- shopList = props.shopList,
11202
- width = props.width,
11203
- companyKey = props.companyKey;
11204
- var _useState = React.useState(false),
11185
+ var getInitTime = function getInitTime() {
11186
+ var initStartTime = hooks().subtract(30, 'd').hours(0).minutes(0).seconds(0);
11187
+ var initEndTime = hooks().hours(23).minutes(59).seconds(59);
11188
+ return [initStartTime, initEndTime];
11189
+ };
11190
+ var GoodList = function GoodList(props, ref) {
11191
+ var _useState = React.useState([]),
11205
11192
  _useState2 = _slicedToArray(_useState, 2),
11206
- visible = _useState2[0],
11207
- setVisible = _useState2[1];
11208
- var _useState3 = React.useState([]),
11193
+ selectList = _useState2[0],
11194
+ setSelect = _useState2[1];
11195
+ var _useState3 = React.useState(1),
11209
11196
  _useState4 = _slicedToArray(_useState3, 2),
11210
- selectList = _useState4[0],
11211
- setSelect = _useState4[1];
11212
- var _useState5 = React.useState([]),
11213
- _useState6 = _slicedToArray(_useState5, 2),
11214
- selectIds = _useState6[0],
11215
- setSelectIds = _useState6[1];
11216
- var _useState7 = React.useState(1),
11197
+ pageNo = _useState4[0],
11198
+ setPageNo = _useState4[1];
11199
+ var _useState5 = React.useState(20),
11200
+ _useState6 = _slicedToArray(_useState5, 1),
11201
+ pageSize = _useState6[0];
11202
+ var _useState7 = React.useState([]),
11217
11203
  _useState8 = _slicedToArray(_useState7, 2),
11218
- pageNo = _useState8[0],
11219
- setPageNo = _useState8[1];
11220
- var _useState9 = React.useState(20),
11221
- _useState10 = _slicedToArray(_useState9, 1),
11222
- pageSize = _useState10[0];
11223
- var _useState11 = React.useState([]),
11204
+ goodList = _useState8[0],
11205
+ setGoodList = _useState8[1];
11206
+ var _useState9 = React.useState(false),
11207
+ _useState10 = _slicedToArray(_useState9, 2),
11208
+ loading = _useState10[0],
11209
+ setLoading = _useState10[1];
11210
+ var _useState11 = React.useState(0),
11224
11211
  _useState12 = _slicedToArray(_useState11, 2),
11225
- goodList = _useState12[0],
11226
- setGoodList = _useState12[1];
11227
- var _useState13 = React.useState(false),
11212
+ total = _useState12[0],
11213
+ setTotal = _useState12[1];
11214
+ var _useState13 = React.useState(null),
11228
11215
  _useState14 = _slicedToArray(_useState13, 2),
11229
- loading = _useState14[0],
11230
- setLoading = _useState14[1];
11231
- var _useState15 = React.useState(0),
11232
- _useState16 = _slicedToArray(_useState15, 2),
11233
- total = _useState16[0],
11234
- setTotal = _useState16[1];
11216
+ dates = _useState14[0],
11217
+ setDates = _useState14[1];
11218
+ React.useImperativeHandle(ref, function () {
11219
+ return {
11220
+ getSelectGoodList: function getSelectGoodList() {
11221
+ return selectList;
11222
+ }
11223
+ };
11224
+ });
11235
11225
  var displaySelectList = React.useMemo(function () {
11236
11226
  return selectList.map(function (item, i) {
11237
11227
  item.index = i + 1;
11238
11228
  return item;
11239
11229
  });
11240
11230
  }, [selectList]);
11241
- React.useEffect(function () {
11242
- if (visible) {
11243
- queryItems();
11244
- }
11245
- }, [pageNo, visible]);
11246
11231
  var _Form$useForm = antd.Form.useForm(),
11247
11232
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
11248
11233
  form = _Form$useForm2[0];
11249
- //选择页码
11250
- var pageChange = function pageChange(page) {
11251
- setPageNo(page);
11252
- };
11253
11234
  /**
11254
11235
  * 查询商品
11255
11236
  */
11256
11237
  var queryItems = /*#__PURE__*/function () {
11257
11238
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
11258
- var search,
11259
- _formData$dateTimePic,
11260
- _formData$dateTimePic2,
11261
- _formData$dateTimePic3,
11262
- _formData$dateTimePic4,
11263
- _formData$dateTimePic5,
11264
- _formData$dateTimePic6,
11265
- formData,
11266
- startTime,
11267
- endTime,
11268
- params,
11269
- res,
11270
- _res$data,
11271
- _res$data$productList,
11272
- productList,
11273
- _res$data$total,
11274
- _total,
11275
- errorMsg,
11276
- newProducts,
11277
- _args = arguments;
11239
+ var _formData$dateTimePic, _formData$dateTimePic2, _formData$dateTimePic3, _formData$dateTimePic4, _formData$dateTimePic5, _formData$dateTimePic6, formData, _getInitTime, _getInitTime2, start, end, startTime, endTime, newTime, earliest, params;
11278
11240
  return _regeneratorRuntime().wrap(function _callee$(_context) {
11279
11241
  while (1) switch (_context.prev = _context.next) {
11280
11242
  case 0:
11281
- search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
11282
- _context.prev = 1;
11243
+ _context.prev = 0;
11283
11244
  setLoading(true);
11284
11245
  formData = form.getFieldsValue();
11285
- 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);
11286
- 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);
11246
+ _getInitTime = getInitTime(), _getInitTime2 = _slicedToArray(_getInitTime, 2), start = _getInitTime2[0], end = _getInitTime2[1];
11247
+ 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');
11248
+ 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');
11249
+ endTime = hooks(endTime).hours(23).minutes(59).seconds(59).format('YYYY-MM-DD HH:mm:ss');
11250
+ newTime = hooks(); // 只能选比现在早的时间
11251
+ if (hooks(endTime).diff(newTime, 'seconds') > 0) {
11252
+ endTime = newTime.format('YYYY-MM-DD HH:mm:ss');
11253
+ }
11254
+ // 30天内
11255
+ earliest = hooks(endTime).subtract(30, 'd');
11256
+ if (earliest.diff(hooks(startTime), 'seconds') > 0) {
11257
+ startTime = earliest.format('YYYY-MM-DD HH:mm:ss');
11258
+ }
11287
11259
  params = {
11288
- // shopCode: shopCode,
11289
11260
  pageSize: pageSize,
11290
11261
  pageNo: pageNo - 1,
11291
- goodNo: search.code,
11262
+ goodNo: formData.goodNo || null,
11263
+ specNo: formData.specNo || null,
11292
11264
  startTime: startTime,
11293
11265
  endTime: endTime
11294
11266
  };
11295
- _context.next = 9;
11296
- return extendRequest('/qy/gdfw/product/wdtListProduct', {
11297
- method: 'post',
11298
- data: params
11299
- });
11300
- case 9:
11301
- res = _context.sent;
11302
- _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;
11303
- if (res.success) {
11304
- newProducts = productList.map(function (item, index) {
11305
- return _objectSpread2(_objectSpread2({}, item), {}, {
11306
- index: index + 1
11267
+ _context.next = 14;
11268
+ return getWdtListProduct(params).then(function (res) {
11269
+ if (res.success) {
11270
+ var _res$data = res.data,
11271
+ _res$data$productList = _res$data.productList,
11272
+ productList = _res$data$productList === void 0 ? [] : _res$data$productList,
11273
+ _res$data$total = _res$data.total,
11274
+ _total = _res$data$total === void 0 ? 0 : _res$data$total;
11275
+ var newProducts = productList.map(function (item, index) {
11276
+ return _objectSpread2(_objectSpread2({}, item), {}, {
11277
+ index: index + 1
11278
+ });
11307
11279
  });
11308
- });
11309
- setGoodList(_toConsumableArray(newProducts));
11310
- if (pageNo === 1) {
11311
- setTotal(_total);
11280
+ setGoodList(newProducts);
11281
+ if (pageNo === 1) {
11282
+ setTotal(_total);
11283
+ }
11284
+ } else {
11285
+ var _res$data2;
11286
+ setGoodList([]);
11287
+ setTotal(0);
11288
+ antd.message.error(((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.errorMsg) || res.message);
11312
11289
  }
11313
- } else {
11314
- setGoodList([]);
11315
- setTotal(0);
11316
- antd.message.error(errorMsg || res.message);
11317
- }
11318
- case 12:
11319
- _context.prev = 12;
11290
+ }).catch(function (e) {
11291
+ console.log(e);
11292
+ });
11293
+ case 14:
11294
+ _context.prev = 14;
11320
11295
  setLoading(false);
11321
- return _context.finish(12);
11322
- case 15:
11296
+ return _context.finish(14);
11297
+ case 17:
11323
11298
  case "end":
11324
11299
  return _context.stop();
11325
11300
  }
11326
- }, _callee, null, [[1,, 12, 15]]);
11301
+ }, _callee, null, [[0,, 14, 17]]);
11327
11302
  }));
11328
11303
  return function queryItems() {
11329
11304
  return _ref.apply(this, arguments);
11330
11305
  };
11331
11306
  }();
11332
- var _onCancel = function onCancel() {
11333
- setVisible(false);
11334
- };
11335
- var onOk = function onOk() {
11336
- onSubmit(selectList);
11337
- _onCancel();
11338
- };
11339
- var onFinish = function onFinish(fieldsValue) {
11340
- var searchValue = {
11341
- code: fieldsValue.code
11342
- };
11343
- queryItems(searchValue);
11307
+ var disabledDate = function disabledDate(current) {
11308
+ var today = hooks(hooks().format('YYYY-MM-DD'));
11309
+ var currentDay = hooks(current.format('YYYY-MM-DD'));
11310
+ if (currentDay.diff(today, 'days') > 0) {
11311
+ return true;
11312
+ }
11313
+ if (!dates) {
11314
+ return false;
11315
+ }
11316
+ var tooLate = dates[0] && current.diff(dates[0], 'days') > 30;
11317
+ var tooEarly = dates[1] && dates[1].diff(current, 'days') > 30;
11318
+ return !!tooEarly || !!tooLate;
11319
+ };
11320
+ var onOpenChange = function onOpenChange(open) {
11321
+ if (open) {
11322
+ setDates([null, null]);
11323
+ } else {
11324
+ setDates(null);
11325
+ }
11344
11326
  };
11345
11327
  var onReset = function onReset() {
11346
- form.resetFields();
11347
11328
  form.setFieldsValue({
11348
- dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
11349
- code: ''
11329
+ dateTimePicker: getInitTime(),
11330
+ goodNo: '',
11331
+ specNo: ''
11350
11332
  });
11351
11333
  setPageNo(function (prev) {
11352
- if (prev === 1 && visible) {
11334
+ if (prev === 1) {
11353
11335
  queryItems();
11354
11336
  }
11355
11337
  return 1;
11356
11338
  });
11357
11339
  };
11358
- // const getShopList = async () => {
11359
- // const { success, data } = await request('/qy/diamond/getConfigInfo', {
11360
- // method: 'get',
11361
- // params: {
11362
- // key: 'company-third-shop-info',
11363
- // },
11364
- // });
11365
- // const obj: any = JSON.parse(data || '{}');
11366
- // if (success) {
11367
- // const list = (obj?.[companyKey] || []).map((item: any) => {
11368
- // return {
11369
- // label: item.shopName,
11370
- // value: item.shopCode,
11371
- // };
11372
- // });
11373
- // setShopList(list);
11374
- // }
11375
- // };
11376
- var onValuesChange = function onValuesChange(changedValues) {
11377
- if (changedValues === null || changedValues === void 0 ? void 0 : changedValues['shopId']) {
11378
- queryItems(changedValues === null || changedValues === void 0 ? void 0 : changedValues.shopId);
11379
- pubsub__default['default'].publish('changeShopCode', {
11380
- shopCode: changedValues.shopId
11381
- });
11382
- }
11383
- };
11384
- var handleDelete = function handleDelete(record, index) {
11340
+ var handleDelete = function handleDelete(record) {
11385
11341
  var newSelectList = selectList.filter(function (item) {
11386
11342
  return item.specId !== record.specId;
11387
11343
  });
11388
11344
  setSelect(_toConsumableArray(newSelectList));
11389
- setSelectIds(_toConsumableArray(newSelectList.map(function (item) {
11390
- return item.specId;
11391
- })));
11392
11345
  };
11393
11346
  var displaySelectedColumns = [{
11394
11347
  dataIndex: 'operation',
11395
11348
  title: '',
11396
11349
  ellipsis: true,
11397
11350
  width: 50,
11398
- render: function render(_, record, index) {
11351
+ render: function render(_, record) {
11399
11352
  return /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, {
11400
11353
  onClick: function onClick() {
11401
11354
  return handleDelete(record);
@@ -11426,8 +11379,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11426
11379
  }];
11427
11380
  var expandedRowSelection = {
11428
11381
  fixed: true,
11429
- selectedRowKeys: selectIds,
11430
- onSelect: function onSelect(record, selected, selectedRows, nativeEvent) {
11382
+ selectedRowKeys: selectList.map(function (item) {
11383
+ return item.specId;
11384
+ }),
11385
+ onSelect: function onSelect(record, selected) {
11431
11386
  var tempList = [];
11432
11387
  if (selected) {
11433
11388
  tempList = [].concat(_toConsumableArray(selectList), [record]);
@@ -11437,9 +11392,6 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11437
11392
  });
11438
11393
  }
11439
11394
  setSelect(_toConsumableArray(tempList));
11440
- setSelectIds(_toConsumableArray(tempList.map(function (item) {
11441
- return item.specId;
11442
- })));
11443
11395
  },
11444
11396
  onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
11445
11397
  var tempAllList = [];
@@ -11453,15 +11405,12 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11453
11405
  });
11454
11406
  }
11455
11407
  setSelect(_toConsumableArray(tempAllList));
11456
- setSelectIds(_toConsumableArray(tempAllList.map(function (item) {
11457
- return item.specId;
11458
- })));
11459
11408
  }
11460
11409
  };
11461
- var expandedRowRender = function expandedRowRender(record, index, indent, expanded) {
11410
+ var expandedRowRender = function expandedRowRender(record) {
11462
11411
  return /*#__PURE__*/React__default['default'].createElement(antd.Table, {
11463
- rowKey: 'specId',
11464
- size: 'small',
11412
+ rowKey: "specId",
11413
+ size: "small",
11465
11414
  columns: expandedColumns,
11466
11415
  dataSource: record.itemDetailList || [],
11467
11416
  pagination: false,
@@ -11471,43 +11420,61 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11471
11420
  }
11472
11421
  });
11473
11422
  };
11474
- return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
11475
- title: '选择商品',
11476
- okText: '确认',
11477
- cancelText: '取消',
11478
- visible: visible,
11479
- width: width || 850,
11480
- onCancel: function onCancel() {
11481
- _onCancel();
11482
- },
11483
- onOk: onOk,
11484
- wrapClassName: "goodModal"
11485
- }, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
11423
+ React__default['default'].useEffect(function () {
11424
+ queryItems();
11425
+ }, []);
11426
+ return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Form, {
11486
11427
  layout: "inline",
11487
11428
  form: form,
11488
- onFinish: onFinish,
11489
- onValuesChange: onValuesChange,
11429
+ onFinish: queryItems,
11490
11430
  initialValues: {
11491
- code: ''
11431
+ goodNo: '',
11432
+ specNo: '',
11433
+ dateTimePicker: getInitTime()
11492
11434
  }
11493
11435
  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11494
- name: "dateTimePicker"
11436
+ name: "dateTimePicker",
11437
+ style: {
11438
+ marginBottom: '12px'
11439
+ }
11495
11440
  }, /*#__PURE__*/React__default['default'].createElement(RangePicker, {
11496
11441
  style: {
11497
- width: '350px'
11442
+ width: '240px'
11498
11443
  },
11499
11444
  placeholder: ['开始日期', '结束日期'],
11500
- showTime: true,
11501
- defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
11445
+ showTime: false,
11446
+ disabledDate: disabledDate,
11447
+ onCalendarChange: function onCalendarChange(val) {
11448
+ return setDates(val);
11449
+ },
11450
+ onOpenChange: onOpenChange
11502
11451
  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11503
- name: "code"
11452
+ name: "goodNo",
11453
+ style: {
11454
+ marginBottom: '12px'
11455
+ }
11504
11456
  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11505
11457
  placeholder: "\u5546\u54C1SPU\u7F16\u7801",
11506
11458
  allowClear: true,
11507
11459
  style: {
11508
11460
  width: 150
11509
11461
  }
11510
- })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
11462
+ })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11463
+ name: "specNo",
11464
+ style: {
11465
+ marginBottom: '12px'
11466
+ }
11467
+ }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11468
+ placeholder: "\u5546\u54C1SKU\u7F16\u7801",
11469
+ allowClear: true,
11470
+ style: {
11471
+ width: 150
11472
+ }
11473
+ })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11474
+ style: {
11475
+ marginBottom: '12px'
11476
+ }
11477
+ }, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
11511
11478
  type: "primary",
11512
11479
  htmlType: "submit",
11513
11480
  style: {
@@ -11517,10 +11484,10 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11517
11484
  onClick: onReset
11518
11485
  }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement("div", {
11519
11486
  style: {
11520
- marginTop: '16px'
11487
+ marginTop: '4px'
11521
11488
  }
11522
11489
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
11523
- rowKey: 'goodNo',
11490
+ rowKey: "goodNo",
11524
11491
  columns: columns$1,
11525
11492
  dataSource: goodList,
11526
11493
  loading: loading,
@@ -11537,14 +11504,14 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11537
11504
  current: pageNo,
11538
11505
  pageSize: pageSize,
11539
11506
  pageSizeOptions: [],
11540
- onChange: pageChange
11507
+ onChange: setPageNo
11541
11508
  }
11542
11509
  })), !!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", {
11543
11510
  style: {
11544
11511
  marginTop: '16px'
11545
11512
  }
11546
11513
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
11547
- rowKey: 'specId',
11514
+ rowKey: "specId",
11548
11515
  columns: [].concat(displaySelectedColumns, expandedColumns),
11549
11516
  dataSource: displaySelectList,
11550
11517
  pagination: false,
@@ -11555,7 +11522,48 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
11555
11522
  style: {
11556
11523
  width: '100%'
11557
11524
  }
11558
- })))));
11525
+ }))));
11526
+ };
11527
+ var WdtGoodList = /*#__PURE__*/React.forwardRef(GoodList);
11528
+
11529
+ var GoodsModal$3 = function GoodsModal(props, ref) {
11530
+ React.useImperativeHandle(ref, function () {
11531
+ return {
11532
+ open: function open() {
11533
+ setVisible(true);
11534
+ }
11535
+ };
11536
+ });
11537
+ var onSubmit = props.onSubmit,
11538
+ width = props.width;
11539
+ var _useState = React.useState(false),
11540
+ _useState2 = _slicedToArray(_useState, 2),
11541
+ visible = _useState2[0],
11542
+ setVisible = _useState2[1];
11543
+ var wdtGoodListRef = React.useRef(null);
11544
+ var _onCancel = function onCancel() {
11545
+ setVisible(false);
11546
+ };
11547
+ var onOk = function onOk() {
11548
+ var _wdtGoodListRef$curre;
11549
+ var selectedList = ((_wdtGoodListRef$curre = wdtGoodListRef.current) === null || _wdtGoodListRef$curre === void 0 ? void 0 : _wdtGoodListRef$curre.getSelectGoodList()) || [];
11550
+ onSubmit(selectedList);
11551
+ _onCancel();
11552
+ };
11553
+ return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, visible && /*#__PURE__*/React__default['default'].createElement(antd.Modal, {
11554
+ title: '选择商品',
11555
+ okText: '确认',
11556
+ cancelText: '取消',
11557
+ visible: visible,
11558
+ width: width || 850,
11559
+ onCancel: function onCancel() {
11560
+ _onCancel();
11561
+ },
11562
+ onOk: onOk,
11563
+ wrapClassName: "goodModal"
11564
+ }, /*#__PURE__*/React__default['default'].createElement(WdtGoodList, {
11565
+ ref: wdtGoodListRef
11566
+ })));
11559
11567
  };
11560
11568
  var WdtGoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$3);
11561
11569
 
@@ -13774,4 +13782,5 @@ exports.Supplier = Supplier;
13774
13782
  exports.TBGoodId = TBGoodId;
13775
13783
  exports.TBGoodSerial = TBGoodSerial;
13776
13784
  exports.TradeId = TradeId;
13785
+ exports.WdtGoodList = WdtGoodList;
13777
13786
  exports.WlnGoods = WlnGoods;
@@ -0,0 +1,40 @@
1
+ import React from 'react';
2
+ export declare namespace WdtGoods {
3
+ interface GoodsInfo {
4
+ deleted: 0 | 1;
5
+ goodId: number;
6
+ goodName: string;
7
+ goodNo: string;
8
+ imgKey: string;
9
+ imgUrl: string;
10
+ marketPrice: number;
11
+ memberPrice: number;
12
+ retailPrice: number;
13
+ specCode: string;
14
+ specId: string;
15
+ specName: string;
16
+ specNo: string;
17
+ unit: string;
18
+ unitName: string;
19
+ index: number;
20
+ uuid: string;
21
+ canDelete: boolean;
22
+ num: number;
23
+ orderPrice: number;
24
+ sharePrice: number;
25
+ canUpdateNumber: boolean;
26
+ }
27
+ interface SelectDrawerRefObject {
28
+ getSelectGoodList: () => WdtGoods.GoodsInfo[];
29
+ }
30
+ }
31
+ export declare const getWdtListProduct: (data: {
32
+ pageSize: number;
33
+ pageNo: number;
34
+ goodNo: string | null;
35
+ specNo: string | null;
36
+ startTime: string;
37
+ endTime: string;
38
+ }) => Promise<any>;
39
+ declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<WdtGoods.SelectDrawerRefObject>>;
40
+ export default _default;
@@ -53,3 +53,5 @@ export { default as MsgStatus } from './common/MsgStatus';
53
53
  export { default as ParseLogistics } from './common/ParseLogistics';
54
54
  export { default as IdentifyAddress } from './common/IdentifyAddress';
55
55
  export { default as CalculationInput } from './apaas/CalculationInput';
56
+ export { default as WdtGoodList } from './bs/component/model/WdtGoodList';
57
+ export type { WdtGoods } from './bs/component/model/WdtGoodList';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/basic-components",
3
- "version": "0.27.0",
3
+ "version": "0.27.1-test.2",
4
4
  "description": "> TODO: description",
5
5
  "homepage": "",
6
6
  "license": "ISC",
@@ -20,7 +20,7 @@
20
20
  "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
21
21
  },
22
22
  "dependencies": {
23
- "@kmkf-fe-packages/kmkf-utils": "^0.27.0",
23
+ "@kmkf-fe-packages/kmkf-utils": "^0.27.1-test.2",
24
24
  "ahooks": "^3.7.4",
25
25
  "kmkf-monitor": "^0.8.8",
26
26
  "lodash": "^4.17.21",
@@ -64,5 +64,5 @@
64
64
  "publishConfig": {
65
65
  "access": "public"
66
66
  },
67
- "gitHead": "fbdf660cdca0f0c4eaf82d4348aceead7f50fcad"
67
+ "gitHead": "57768fef91fbcc11dc24f7156ba16cc1555aa90a"
68
68
  }