@kmkf-fe-packages/basic-components 0.27.1-test.0 → 0.28.0-alpha.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
@@ -11091,12 +11091,6 @@ 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
- };
11100
11094
  var columns$1 = [{
11101
11095
  dataIndex: 'index',
11102
11096
  title: 'NO',
@@ -11171,173 +11165,226 @@ var expandedColumns = [{
11171
11165
  title: '会员价',
11172
11166
  width: 140
11173
11167
  }];
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([]),
11181
- _useState2 = _slicedToArray(_useState, 2),
11182
- selectList = _useState2[0],
11183
- setSelect = _useState2[1];
11184
- var _useState3 = useState(1),
11185
- _useState4 = _slicedToArray(_useState3, 2),
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([]),
11192
- _useState8 = _slicedToArray(_useState7, 2),
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),
11200
- _useState12 = _slicedToArray(_useState11, 2),
11201
- total = _useState12[0],
11202
- setTotal = _useState12[1];
11203
- var _useState13 = useState(null),
11204
- _useState14 = _slicedToArray(_useState13, 2),
11205
- dates = _useState14[0],
11206
- setDates = _useState14[1];
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();
11207
11172
  useImperativeHandle(ref, function () {
11208
11173
  return {
11209
- getSelectGoodList: function getSelectGoodList() {
11210
- return selectList;
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();
11211
11184
  }
11212
11185
  };
11213
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),
11194
+ _useState2 = _slicedToArray(_useState, 2),
11195
+ visible = _useState2[0],
11196
+ setVisible = _useState2[1];
11197
+ var _useState3 = useState([]),
11198
+ _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),
11206
+ _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([]),
11213
+ _useState12 = _slicedToArray(_useState11, 2),
11214
+ goodList = _useState12[0],
11215
+ setGoodList = _useState12[1];
11216
+ var _useState13 = useState(false),
11217
+ _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];
11214
11224
  var displaySelectList = useMemo(function () {
11215
11225
  return selectList.map(function (item, i) {
11216
11226
  item.index = i + 1;
11217
11227
  return item;
11218
11228
  });
11219
11229
  }, [selectList]);
11230
+ useEffect(function () {
11231
+ if (visible) {
11232
+ queryItems();
11233
+ }
11234
+ }, [pageNo, visible]);
11220
11235
  var _Form$useForm = Form.useForm(),
11221
11236
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
11222
11237
  form = _Form$useForm2[0];
11238
+ //选择页码
11239
+ var pageChange = function pageChange(page) {
11240
+ setPageNo(page);
11241
+ };
11223
11242
  /**
11224
11243
  * 查询商品
11225
11244
  */
11226
11245
  var queryItems = /*#__PURE__*/function () {
11227
11246
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
11228
- var _formData$dateTimePic, _formData$dateTimePic2, _formData$dateTimePic3, _formData$dateTimePic4, _formData$dateTimePic5, _formData$dateTimePic6, formData, _getInitTime, _getInitTime2, start, end, startTime, endTime, newTime, earliest, params;
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;
11229
11267
  return _regeneratorRuntime().wrap(function _callee$(_context) {
11230
11268
  while (1) switch (_context.prev = _context.next) {
11231
11269
  case 0:
11232
- _context.prev = 0;
11270
+ search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
11271
+ _context.prev = 1;
11233
11272
  setLoading(true);
11234
11273
  formData = form.getFieldsValue();
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
- }
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);
11248
11276
  params = {
11277
+ // shopCode: shopCode,
11249
11278
  pageSize: pageSize,
11250
11279
  pageNo: pageNo - 1,
11251
- goodNo: formData.goodNo || null,
11252
- specNo: formData.specNo || null,
11280
+ goodNo: search.code,
11253
11281
  startTime: startTime,
11254
11282
  endTime: endTime
11255
11283
  };
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
- });
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
11268
11296
  });
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);
11297
+ });
11298
+ setGoodList(_toConsumableArray(newProducts));
11299
+ if (pageNo === 1) {
11300
+ setTotal(_total);
11278
11301
  }
11279
- }).catch(function (e) {
11280
- console.log(e);
11281
- });
11282
- case 14:
11283
- _context.prev = 14;
11302
+ } else {
11303
+ setGoodList([]);
11304
+ setTotal(0);
11305
+ message.error(errorMsg || res.message);
11306
+ }
11307
+ case 12:
11308
+ _context.prev = 12;
11284
11309
  setLoading(false);
11285
- return _context.finish(14);
11286
- case 17:
11310
+ return _context.finish(12);
11311
+ case 15:
11287
11312
  case "end":
11288
11313
  return _context.stop();
11289
11314
  }
11290
- }, _callee, null, [[0,, 14, 17]]);
11315
+ }, _callee, null, [[1,, 12, 15]]);
11291
11316
  }));
11292
11317
  return function queryItems() {
11293
11318
  return _ref.apply(this, arguments);
11294
11319
  };
11295
11320
  }();
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
- }
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);
11315
11333
  };
11316
11334
  var onReset = function onReset() {
11335
+ form.resetFields();
11317
11336
  form.setFieldsValue({
11318
- dateTimePicker: getInitTime(),
11319
- goodNo: '',
11320
- specNo: ''
11337
+ dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
11338
+ code: ''
11321
11339
  });
11322
11340
  setPageNo(function (prev) {
11323
- if (prev === 1) {
11341
+ if (prev === 1 && visible) {
11324
11342
  queryItems();
11325
11343
  }
11326
11344
  return 1;
11327
11345
  });
11328
11346
  };
11329
- var handleDelete = function handleDelete(record) {
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) {
11330
11374
  var newSelectList = selectList.filter(function (item) {
11331
11375
  return item.specId !== record.specId;
11332
11376
  });
11333
11377
  setSelect(_toConsumableArray(newSelectList));
11378
+ setSelectIds(_toConsumableArray(newSelectList.map(function (item) {
11379
+ return item.specId;
11380
+ })));
11334
11381
  };
11335
11382
  var displaySelectedColumns = [{
11336
11383
  dataIndex: 'operation',
11337
11384
  title: '',
11338
11385
  ellipsis: true,
11339
11386
  width: 50,
11340
- render: function render(_, record) {
11387
+ render: function render(_, record, index) {
11341
11388
  return /*#__PURE__*/React.createElement(DeleteOutlined, {
11342
11389
  onClick: function onClick() {
11343
11390
  return handleDelete(record);
@@ -11368,10 +11415,8 @@ var GoodList = function GoodList(props, ref) {
11368
11415
  }];
11369
11416
  var expandedRowSelection = {
11370
11417
  fixed: true,
11371
- selectedRowKeys: selectList.map(function (item) {
11372
- return item.specId;
11373
- }),
11374
- onSelect: function onSelect(record, selected) {
11418
+ selectedRowKeys: selectIds,
11419
+ onSelect: function onSelect(record, selected, selectedRows, nativeEvent) {
11375
11420
  var tempList = [];
11376
11421
  if (selected) {
11377
11422
  tempList = [].concat(_toConsumableArray(selectList), [record]);
@@ -11381,6 +11426,9 @@ var GoodList = function GoodList(props, ref) {
11381
11426
  });
11382
11427
  }
11383
11428
  setSelect(_toConsumableArray(tempList));
11429
+ setSelectIds(_toConsumableArray(tempList.map(function (item) {
11430
+ return item.specId;
11431
+ })));
11384
11432
  },
11385
11433
  onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
11386
11434
  var tempAllList = [];
@@ -11394,12 +11442,15 @@ var GoodList = function GoodList(props, ref) {
11394
11442
  });
11395
11443
  }
11396
11444
  setSelect(_toConsumableArray(tempAllList));
11445
+ setSelectIds(_toConsumableArray(tempAllList.map(function (item) {
11446
+ return item.specId;
11447
+ })));
11397
11448
  }
11398
11449
  };
11399
- var expandedRowRender = function expandedRowRender(record) {
11450
+ var expandedRowRender = function expandedRowRender(record, index, indent, expanded) {
11400
11451
  return /*#__PURE__*/React.createElement(Table, {
11401
- rowKey: "specId",
11402
- size: "small",
11452
+ rowKey: 'specId',
11453
+ size: 'small',
11403
11454
  columns: expandedColumns,
11404
11455
  dataSource: record.itemDetailList || [],
11405
11456
  pagination: false,
@@ -11409,61 +11460,43 @@ var GoodList = function GoodList(props, ref) {
11409
11460
  }
11410
11461
  });
11411
11462
  };
11412
- React.useEffect(function () {
11413
- queryItems();
11414
- }, []);
11415
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, {
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, {
11416
11475
  layout: "inline",
11417
11476
  form: form,
11418
- onFinish: queryItems,
11477
+ onFinish: onFinish,
11478
+ onValuesChange: onValuesChange,
11419
11479
  initialValues: {
11420
- goodNo: '',
11421
- specNo: '',
11422
- dateTimePicker: getInitTime()
11480
+ code: ''
11423
11481
  }
11424
11482
  }, /*#__PURE__*/React.createElement(Form.Item, {
11425
- name: "dateTimePicker",
11426
- style: {
11427
- marginBottom: '12px'
11428
- }
11483
+ name: "dateTimePicker"
11429
11484
  }, /*#__PURE__*/React.createElement(RangePicker, {
11430
11485
  style: {
11431
- width: '240px'
11486
+ width: '350px'
11432
11487
  },
11433
11488
  placeholder: ['开始日期', '结束日期'],
11434
- showTime: false,
11435
- disabledDate: disabledDate,
11436
- onCalendarChange: function onCalendarChange(val) {
11437
- return setDates(val);
11438
- },
11439
- onOpenChange: onOpenChange
11489
+ showTime: true,
11490
+ defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
11440
11491
  })), /*#__PURE__*/React.createElement(Form.Item, {
11441
- name: "goodNo",
11442
- style: {
11443
- marginBottom: '12px'
11444
- }
11492
+ name: "code"
11445
11493
  }, /*#__PURE__*/React.createElement(Input, {
11446
11494
  placeholder: "\u5546\u54C1SPU\u7F16\u7801",
11447
11495
  allowClear: true,
11448
11496
  style: {
11449
11497
  width: 150
11450
11498
  }
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, {
11499
+ })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
11467
11500
  type: "primary",
11468
11501
  htmlType: "submit",
11469
11502
  style: {
@@ -11473,10 +11506,10 @@ var GoodList = function GoodList(props, ref) {
11473
11506
  onClick: onReset
11474
11507
  }, "\u91CD\u7F6E"))), /*#__PURE__*/React.createElement("div", {
11475
11508
  style: {
11476
- marginTop: '4px'
11509
+ marginTop: '16px'
11477
11510
  }
11478
11511
  }, /*#__PURE__*/React.createElement(Table, {
11479
- rowKey: "goodNo",
11512
+ rowKey: 'goodNo',
11480
11513
  columns: columns$1,
11481
11514
  dataSource: goodList,
11482
11515
  loading: loading,
@@ -11493,14 +11526,14 @@ var GoodList = function GoodList(props, ref) {
11493
11526
  current: pageNo,
11494
11527
  pageSize: pageSize,
11495
11528
  pageSizeOptions: [],
11496
- onChange: setPageNo
11529
+ onChange: pageChange
11497
11530
  }
11498
11531
  })), !!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", {
11499
11532
  style: {
11500
11533
  marginTop: '16px'
11501
11534
  }
11502
11535
  }, /*#__PURE__*/React.createElement(Table, {
11503
- rowKey: "specId",
11536
+ rowKey: 'specId',
11504
11537
  columns: [].concat(displaySelectedColumns, expandedColumns),
11505
11538
  dataSource: displaySelectList,
11506
11539
  pagination: false,
@@ -11511,48 +11544,7 @@ var GoodList = function GoodList(props, ref) {
11511
11544
  style: {
11512
11545
  width: '100%'
11513
11546
  }
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
- })));
11547
+ })))));
11556
11548
  };
11557
11549
  var WdtGoodsModal = /*#__PURE__*/forwardRef(GoodsModal$3);
11558
11550
 
@@ -13508,7 +13500,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
13508
13500
  changeOrderInfo[type] = val;
13509
13501
  var newList = _toConsumableArray(value);
13510
13502
  newList[changeIndex] = changeOrderInfo;
13511
- console.log(newList, val, type);
13503
+ // console.log(newList, val, type);
13512
13504
  onChange === null || onChange === void 0 ? void 0 : onChange(newList);
13513
13505
  };
13514
13506
  //判断是否是单个且没有商品数据
@@ -13584,7 +13576,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
13584
13576
  }, [1, 2].includes(type) ? /*#__PURE__*/React.createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
13585
13577
  };
13586
13578
  var changeHandle = function changeHandle(val, valType) {
13587
- console.log(val, valType);
13588
13579
  var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
13589
13580
  changeOrderInfo[valType] = val;
13590
13581
  if (val !== failValue) {
@@ -13717,4 +13708,4 @@ var CalculationInput = function CalculationInput(props) {
13717
13708
  }, config === null || config === void 0 ? void 0 : config.unit));
13718
13709
  };
13719
13710
 
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 };
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, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WlnGoods };
package/dist/index.js CHANGED
@@ -11102,12 +11102,6 @@ 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
- };
11111
11105
  var columns$1 = [{
11112
11106
  dataIndex: 'index',
11113
11107
  title: 'NO',
@@ -11182,173 +11176,226 @@ var expandedColumns = [{
11182
11176
  title: '会员价',
11183
11177
  width: 140
11184
11178
  }];
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([]),
11192
- _useState2 = _slicedToArray(_useState, 2),
11193
- selectList = _useState2[0],
11194
- setSelect = _useState2[1];
11195
- var _useState3 = React.useState(1),
11196
- _useState4 = _slicedToArray(_useState3, 2),
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([]),
11203
- _useState8 = _slicedToArray(_useState7, 2),
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),
11211
- _useState12 = _slicedToArray(_useState11, 2),
11212
- total = _useState12[0],
11213
- setTotal = _useState12[1];
11214
- var _useState13 = React.useState(null),
11215
- _useState14 = _slicedToArray(_useState13, 2),
11216
- dates = _useState14[0],
11217
- setDates = _useState14[1];
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();
11218
11183
  React.useImperativeHandle(ref, function () {
11219
11184
  return {
11220
- getSelectGoodList: function getSelectGoodList() {
11221
- return selectList;
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();
11222
11195
  }
11223
11196
  };
11224
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),
11205
+ _useState2 = _slicedToArray(_useState, 2),
11206
+ visible = _useState2[0],
11207
+ setVisible = _useState2[1];
11208
+ var _useState3 = React.useState([]),
11209
+ _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),
11217
+ _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([]),
11224
+ _useState12 = _slicedToArray(_useState11, 2),
11225
+ goodList = _useState12[0],
11226
+ setGoodList = _useState12[1];
11227
+ var _useState13 = React.useState(false),
11228
+ _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];
11225
11235
  var displaySelectList = React.useMemo(function () {
11226
11236
  return selectList.map(function (item, i) {
11227
11237
  item.index = i + 1;
11228
11238
  return item;
11229
11239
  });
11230
11240
  }, [selectList]);
11241
+ React.useEffect(function () {
11242
+ if (visible) {
11243
+ queryItems();
11244
+ }
11245
+ }, [pageNo, visible]);
11231
11246
  var _Form$useForm = antd.Form.useForm(),
11232
11247
  _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
11233
11248
  form = _Form$useForm2[0];
11249
+ //选择页码
11250
+ var pageChange = function pageChange(page) {
11251
+ setPageNo(page);
11252
+ };
11234
11253
  /**
11235
11254
  * 查询商品
11236
11255
  */
11237
11256
  var queryItems = /*#__PURE__*/function () {
11238
11257
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
11239
- var _formData$dateTimePic, _formData$dateTimePic2, _formData$dateTimePic3, _formData$dateTimePic4, _formData$dateTimePic5, _formData$dateTimePic6, formData, _getInitTime, _getInitTime2, start, end, startTime, endTime, newTime, earliest, params;
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;
11240
11278
  return _regeneratorRuntime().wrap(function _callee$(_context) {
11241
11279
  while (1) switch (_context.prev = _context.next) {
11242
11280
  case 0:
11243
- _context.prev = 0;
11281
+ search = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
11282
+ _context.prev = 1;
11244
11283
  setLoading(true);
11245
11284
  formData = form.getFieldsValue();
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
- }
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);
11259
11287
  params = {
11288
+ // shopCode: shopCode,
11260
11289
  pageSize: pageSize,
11261
11290
  pageNo: pageNo - 1,
11262
- goodNo: formData.goodNo || null,
11263
- specNo: formData.specNo || null,
11291
+ goodNo: search.code,
11264
11292
  startTime: startTime,
11265
11293
  endTime: endTime
11266
11294
  };
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
- });
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
11279
11307
  });
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);
11308
+ });
11309
+ setGoodList(_toConsumableArray(newProducts));
11310
+ if (pageNo === 1) {
11311
+ setTotal(_total);
11289
11312
  }
11290
- }).catch(function (e) {
11291
- console.log(e);
11292
- });
11293
- case 14:
11294
- _context.prev = 14;
11313
+ } else {
11314
+ setGoodList([]);
11315
+ setTotal(0);
11316
+ antd.message.error(errorMsg || res.message);
11317
+ }
11318
+ case 12:
11319
+ _context.prev = 12;
11295
11320
  setLoading(false);
11296
- return _context.finish(14);
11297
- case 17:
11321
+ return _context.finish(12);
11322
+ case 15:
11298
11323
  case "end":
11299
11324
  return _context.stop();
11300
11325
  }
11301
- }, _callee, null, [[0,, 14, 17]]);
11326
+ }, _callee, null, [[1,, 12, 15]]);
11302
11327
  }));
11303
11328
  return function queryItems() {
11304
11329
  return _ref.apply(this, arguments);
11305
11330
  };
11306
11331
  }();
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
- }
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);
11326
11344
  };
11327
11345
  var onReset = function onReset() {
11346
+ form.resetFields();
11328
11347
  form.setFieldsValue({
11329
- dateTimePicker: getInitTime(),
11330
- goodNo: '',
11331
- specNo: ''
11348
+ dateTimePicker: [hooks().subtract(30, 'd'), hooks()],
11349
+ code: ''
11332
11350
  });
11333
11351
  setPageNo(function (prev) {
11334
- if (prev === 1) {
11352
+ if (prev === 1 && visible) {
11335
11353
  queryItems();
11336
11354
  }
11337
11355
  return 1;
11338
11356
  });
11339
11357
  };
11340
- var handleDelete = function handleDelete(record) {
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) {
11341
11385
  var newSelectList = selectList.filter(function (item) {
11342
11386
  return item.specId !== record.specId;
11343
11387
  });
11344
11388
  setSelect(_toConsumableArray(newSelectList));
11389
+ setSelectIds(_toConsumableArray(newSelectList.map(function (item) {
11390
+ return item.specId;
11391
+ })));
11345
11392
  };
11346
11393
  var displaySelectedColumns = [{
11347
11394
  dataIndex: 'operation',
11348
11395
  title: '',
11349
11396
  ellipsis: true,
11350
11397
  width: 50,
11351
- render: function render(_, record) {
11398
+ render: function render(_, record, index) {
11352
11399
  return /*#__PURE__*/React__default['default'].createElement(icons.DeleteOutlined, {
11353
11400
  onClick: function onClick() {
11354
11401
  return handleDelete(record);
@@ -11379,10 +11426,8 @@ var GoodList = function GoodList(props, ref) {
11379
11426
  }];
11380
11427
  var expandedRowSelection = {
11381
11428
  fixed: true,
11382
- selectedRowKeys: selectList.map(function (item) {
11383
- return item.specId;
11384
- }),
11385
- onSelect: function onSelect(record, selected) {
11429
+ selectedRowKeys: selectIds,
11430
+ onSelect: function onSelect(record, selected, selectedRows, nativeEvent) {
11386
11431
  var tempList = [];
11387
11432
  if (selected) {
11388
11433
  tempList = [].concat(_toConsumableArray(selectList), [record]);
@@ -11392,6 +11437,9 @@ var GoodList = function GoodList(props, ref) {
11392
11437
  });
11393
11438
  }
11394
11439
  setSelect(_toConsumableArray(tempList));
11440
+ setSelectIds(_toConsumableArray(tempList.map(function (item) {
11441
+ return item.specId;
11442
+ })));
11395
11443
  },
11396
11444
  onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
11397
11445
  var tempAllList = [];
@@ -11405,12 +11453,15 @@ var GoodList = function GoodList(props, ref) {
11405
11453
  });
11406
11454
  }
11407
11455
  setSelect(_toConsumableArray(tempAllList));
11456
+ setSelectIds(_toConsumableArray(tempAllList.map(function (item) {
11457
+ return item.specId;
11458
+ })));
11408
11459
  }
11409
11460
  };
11410
- var expandedRowRender = function expandedRowRender(record) {
11461
+ var expandedRowRender = function expandedRowRender(record, index, indent, expanded) {
11411
11462
  return /*#__PURE__*/React__default['default'].createElement(antd.Table, {
11412
- rowKey: "specId",
11413
- size: "small",
11463
+ rowKey: 'specId',
11464
+ size: 'small',
11414
11465
  columns: expandedColumns,
11415
11466
  dataSource: record.itemDetailList || [],
11416
11467
  pagination: false,
@@ -11420,61 +11471,43 @@ var GoodList = function GoodList(props, ref) {
11420
11471
  }
11421
11472
  });
11422
11473
  };
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, {
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, {
11427
11486
  layout: "inline",
11428
11487
  form: form,
11429
- onFinish: queryItems,
11488
+ onFinish: onFinish,
11489
+ onValuesChange: onValuesChange,
11430
11490
  initialValues: {
11431
- goodNo: '',
11432
- specNo: '',
11433
- dateTimePicker: getInitTime()
11491
+ code: ''
11434
11492
  }
11435
11493
  }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11436
- name: "dateTimePicker",
11437
- style: {
11438
- marginBottom: '12px'
11439
- }
11494
+ name: "dateTimePicker"
11440
11495
  }, /*#__PURE__*/React__default['default'].createElement(RangePicker, {
11441
11496
  style: {
11442
- width: '240px'
11497
+ width: '350px'
11443
11498
  },
11444
11499
  placeholder: ['开始日期', '结束日期'],
11445
- showTime: false,
11446
- disabledDate: disabledDate,
11447
- onCalendarChange: function onCalendarChange(val) {
11448
- return setDates(val);
11449
- },
11450
- onOpenChange: onOpenChange
11500
+ showTime: true,
11501
+ defaultValue: [hooks(initStartTime.format(dateFormat), dateFormat), hooks(initEndTime.format(dateFormat), dateFormat)]
11451
11502
  })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
11452
- name: "goodNo",
11453
- style: {
11454
- marginBottom: '12px'
11455
- }
11503
+ name: "code"
11456
11504
  }, /*#__PURE__*/React__default['default'].createElement(antd.Input, {
11457
11505
  placeholder: "\u5546\u54C1SPU\u7F16\u7801",
11458
11506
  allowClear: true,
11459
11507
  style: {
11460
11508
  width: 150
11461
11509
  }
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, {
11510
+ })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, null, /*#__PURE__*/React__default['default'].createElement(antd.Button, {
11478
11511
  type: "primary",
11479
11512
  htmlType: "submit",
11480
11513
  style: {
@@ -11484,10 +11517,10 @@ var GoodList = function GoodList(props, ref) {
11484
11517
  onClick: onReset
11485
11518
  }, "\u91CD\u7F6E"))), /*#__PURE__*/React__default['default'].createElement("div", {
11486
11519
  style: {
11487
- marginTop: '4px'
11520
+ marginTop: '16px'
11488
11521
  }
11489
11522
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
11490
- rowKey: "goodNo",
11523
+ rowKey: 'goodNo',
11491
11524
  columns: columns$1,
11492
11525
  dataSource: goodList,
11493
11526
  loading: loading,
@@ -11504,14 +11537,14 @@ var GoodList = function GoodList(props, ref) {
11504
11537
  current: pageNo,
11505
11538
  pageSize: pageSize,
11506
11539
  pageSizeOptions: [],
11507
- onChange: setPageNo
11540
+ onChange: pageChange
11508
11541
  }
11509
11542
  })), !!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", {
11510
11543
  style: {
11511
11544
  marginTop: '16px'
11512
11545
  }
11513
11546
  }, /*#__PURE__*/React__default['default'].createElement(antd.Table, {
11514
- rowKey: "specId",
11547
+ rowKey: 'specId',
11515
11548
  columns: [].concat(displaySelectedColumns, expandedColumns),
11516
11549
  dataSource: displaySelectList,
11517
11550
  pagination: false,
@@ -11522,48 +11555,7 @@ var GoodList = function GoodList(props, ref) {
11522
11555
  style: {
11523
11556
  width: '100%'
11524
11557
  }
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
- })));
11558
+ })))));
11567
11559
  };
11568
11560
  var WdtGoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$3);
11569
11561
 
@@ -13519,7 +13511,7 @@ var CommonSystemOrder = function CommonSystemOrder(props) {
13519
13511
  changeOrderInfo[type] = val;
13520
13512
  var newList = _toConsumableArray(value);
13521
13513
  newList[changeIndex] = changeOrderInfo;
13522
- console.log(newList, val, type);
13514
+ // console.log(newList, val, type);
13523
13515
  onChange === null || onChange === void 0 ? void 0 : onChange(newList);
13524
13516
  };
13525
13517
  //判断是否是单个且没有商品数据
@@ -13595,7 +13587,6 @@ var CommonSystemOrder$1 = function CommonSystemOrder(props) {
13595
13587
  }, [1, 2].includes(type) ? /*#__PURE__*/React__default['default'].createElement("span", null, "\u7CFB\u7EDF\u8BA2\u5355\u53F7", index + 1, "\uFF1A", item.systemOrderId) : null);
13596
13588
  };
13597
13589
  var changeHandle = function changeHandle(val, valType) {
13598
- console.log(val, valType);
13599
13590
  var changeOrderInfo = _objectSpread2({}, value[changeIndex]);
13600
13591
  changeOrderInfo[valType] = val;
13601
13592
  if (val !== failValue) {
@@ -13782,5 +13773,4 @@ exports.Supplier = Supplier;
13782
13773
  exports.TBGoodId = TBGoodId;
13783
13774
  exports.TBGoodSerial = TBGoodSerial;
13784
13775
  exports.TradeId = TradeId;
13785
- exports.WdtGoodList = WdtGoodList;
13786
13776
  exports.WlnGoods = WlnGoods;
@@ -53,5 +53,3 @@ 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.1-test.0",
3
+ "version": "0.28.0-alpha.0",
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.1-test.0",
23
+ "@kmkf-fe-packages/kmkf-utils": "^0.28.0-alpha.0",
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": "9be345ba70fe53f1a10f336a6254a60bb74c568a"
67
+ "gitHead": "5c49133a8513a26c3b8fad1ddf416a3351ac7fe0"
68
68
  }
@@ -1,40 +0,0 @@
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;