@kmkf-fe-packages/basic-components 0.26.0-alpha.5 → 0.26.0-test.0

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