@kmkf-fe-packages/basic-components 2.2.13-beta.6 → 2.2.13-beta.62

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.
Files changed (14) hide show
  1. package/dist/index.esm.js +840 -624
  2. package/dist/index.js +839 -622
  3. package/dist/src/bs/SystemOrder/index.d.ts +5 -0
  4. package/dist/src/bs/component/GoodItem/index.d.ts +1 -0
  5. package/dist/src/bs/component/model/Columns/Erp/jy.d.ts +7 -1
  6. package/dist/src/bs/component/model/Columns/Erp/wdt.d.ts +1 -1
  7. package/dist/src/bs/component/model/GyGoodsList.d.ts +1 -0
  8. package/dist/src/bs/component/model/JyGoodsModal/GoodsList.d.ts +14 -14
  9. package/dist/src/bs/component/model/WorkOrderList/index.d.ts +1 -0
  10. package/dist/src/bs/component/model/WorkOrderList/useDefaultSearchValue.d.ts +10 -0
  11. package/dist/src/bs/component/model/type.d.ts +3 -0
  12. package/dist/src/constants/systemOrderColumnsMap.d.ts +68 -0
  13. package/dist/src/index.d.ts +1 -0
  14. package/package.json +3 -3
package/dist/index.esm.js CHANGED
@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
3
3
  import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
4
4
  import request, { extend as extend$1 } from 'umi-request';
5
5
  import { CopyToClipboard } from 'react-copy-to-clipboard';
6
- import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
6
+ import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
7
7
  import every from 'lodash/every';
8
8
  import maxBy from 'lodash/maxBy';
9
9
  import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -9559,7 +9559,7 @@ var renderMap = {
9559
9559
  return /*#__PURE__*/React.createElement(FileRender, {
9560
9560
  id: "fileRender",
9561
9561
  fileList: value,
9562
- canDownload: !['ks', 'fxg'].includes(platform || '')
9562
+ canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform || '')
9563
9563
  });
9564
9564
  },
9565
9565
  CHECKBOX: function CHECKBOX(value) {
@@ -9662,7 +9662,7 @@ var EditFileRender = function EditFileRender(_ref7) {
9662
9662
  })), /*#__PURE__*/React.createElement(FileRender, {
9663
9663
  id: "fileEdit",
9664
9664
  fileList: val,
9665
- canDownload: !['ks', 'fxg'].includes(platform)
9665
+ canDownload: !['ks', 'fxg', 'xiaozhi'].includes(platform)
9666
9666
  }));
9667
9667
  };
9668
9668
  var EditRenderMap = {
@@ -13830,7 +13830,7 @@ var jstGoods = function jstGoods(props) {
13830
13830
  onChange: function onChange(val) {
13831
13831
  changeInputHandle(val, 'logisticsCompany');
13832
13832
  },
13833
- value: platformType === 'gy' ? (expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'], false)) ? (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompanyName'] : (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5['logisticsCompany'],
13833
+ value: ['gy', 'jy'].includes(platformType) ? (expressDateInstance === null || expressDateInstance === void 0 ? void 0 : expressDateInstance.getExpressNameByCode((_value$changeIndex2 = value[changeIndex]) === null || _value$changeIndex2 === void 0 ? void 0 : _value$changeIndex2['logisticsCompany'], false)) ? (_value$changeIndex3 = value[changeIndex]) === null || _value$changeIndex3 === void 0 ? void 0 : _value$changeIndex3['logisticsCompany'] : (_value$changeIndex4 = value[changeIndex]) === null || _value$changeIndex4 === void 0 ? void 0 : _value$changeIndex4['logisticsCompanyName'] : (_value$changeIndex5 = value[changeIndex]) === null || _value$changeIndex5 === void 0 ? void 0 : _value$changeIndex5['logisticsCompany'],
13834
13834
  showSearch: true,
13835
13835
  dropdownMatchSelectWidth: false,
13836
13836
  filterOption: function filterOption(input, option) {
@@ -14650,21 +14650,21 @@ var wdtColumns = [{
14650
14650
  title: '市场价',
14651
14651
  width: 140,
14652
14652
  render: function render(price) {
14653
- return Number(price).toFixed(2);
14653
+ return price || price === 0 ? Number(price).toFixed(2) : '';
14654
14654
  }
14655
14655
  }, {
14656
14656
  dataIndex: 'retailPrice',
14657
14657
  title: '零售价',
14658
14658
  width: 140,
14659
14659
  render: function render(price) {
14660
- return Number(price).toFixed(2);
14660
+ return price || price === 0 ? Number(price).toFixed(2) : '';
14661
14661
  }
14662
14662
  }, {
14663
14663
  dataIndex: 'memberPrice',
14664
14664
  title: '会员价',
14665
14665
  width: 140,
14666
14666
  render: function render(price) {
14667
- return Number(price).toFixed(2);
14667
+ return price || price === 0 ? Number(price).toFixed(2) : '';
14668
14668
  }
14669
14669
  }];
14670
14670
 
@@ -14890,17 +14890,17 @@ var getYesOrNo$1 = function getYesOrNo(val) {
14890
14890
  return val ? '是' : '否';
14891
14891
  };
14892
14892
  var jyColumns = [{
14893
- dataIndex: 'productName',
14893
+ dataIndex: 'goodName',
14894
14894
  title: '商品名称',
14895
14895
  width: 250,
14896
14896
  ellipsis: true
14897
14897
  }, {
14898
- dataIndex: 'productCode',
14898
+ dataIndex: 'goodNo',
14899
14899
  title: '商品编码',
14900
14900
  width: 150,
14901
14901
  ellipsis: true
14902
14902
  }, {
14903
- dataIndex: 'productId',
14903
+ dataIndex: 'goodId',
14904
14904
  title: '商品ID',
14905
14905
  width: 150,
14906
14906
  ellipsis: true
@@ -14909,22 +14909,22 @@ var jyColumns = [{
14909
14909
  title: '商品图片',
14910
14910
  width: 100,
14911
14911
  render: function render(picUrl) {
14912
- return /*#__PURE__*/React.createElement("img", {
14912
+ return picUrl ? /*#__PURE__*/React.createElement("img", {
14913
14913
  style: {
14914
14914
  width: '40px',
14915
14915
  height: '40px',
14916
14916
  objectFit: 'contain'
14917
14917
  },
14918
14918
  src: picUrl
14919
- });
14919
+ }) : null;
14920
14920
  }
14921
14921
  }, {
14922
- dataIndex: 'productShortName',
14922
+ dataIndex: 'goodShortName',
14923
14923
  title: "\u5546\u54C1\u7B80\u79F0",
14924
14924
  ellipsis: true,
14925
14925
  width: 150
14926
14926
  }, {
14927
- dataIndex: 'productGroupName',
14927
+ dataIndex: 'categoryName',
14928
14928
  title: "\u5546\u54C1\u7EC4",
14929
14929
  ellipsis: true,
14930
14930
  width: 150
@@ -14934,56 +14934,56 @@ var jyColumns = [{
14934
14934
  width: 200,
14935
14935
  ellipsis: true
14936
14936
  }, {
14937
- dataIndex: 'skuName',
14937
+ dataIndex: 'specName',
14938
14938
  title: '规格名称',
14939
14939
  width: 250,
14940
14940
  ellipsis: true
14941
14941
  }, {
14942
- dataIndex: 'skuCode',
14942
+ dataIndex: 'specNo',
14943
14943
  title: '规格编码',
14944
14944
  width: 150,
14945
14945
  ellipsis: true
14946
14946
  }, {
14947
- dataIndex: 'skuId',
14947
+ dataIndex: 'specId',
14948
14948
  title: '规格ID',
14949
14949
  width: 250,
14950
14950
  ellipsis: true
14951
14951
  }, {
14952
- dataIndex: 'barcode',
14952
+ dataIndex: 'specBarcode',
14953
14953
  title: '规格条码',
14954
14954
  width: 150,
14955
14955
  ellipsis: true
14956
14956
  }, {
14957
- dataIndex: 'skuImage',
14957
+ dataIndex: 'specImgUrl',
14958
14958
  title: '规格图片',
14959
14959
  width: 100,
14960
14960
  render: function render(picUrl) {
14961
- return /*#__PURE__*/React.createElement("img", {
14961
+ return picUrl ? /*#__PURE__*/React.createElement("img", {
14962
14962
  style: {
14963
14963
  width: '40px',
14964
14964
  height: '40px',
14965
14965
  objectFit: 'contain'
14966
14966
  },
14967
14967
  src: picUrl
14968
- });
14968
+ }) : null;
14969
14969
  }
14970
14970
  }, {
14971
- dataIndex: 'color',
14971
+ dataIndex: 'colorName',
14972
14972
  title: "\u989C\u8272",
14973
14973
  ellipsis: true,
14974
14974
  width: 100
14975
14975
  }, {
14976
- dataIndex: 'size',
14976
+ dataIndex: 'sizeName',
14977
14977
  title: "\u5C3A\u7801",
14978
14978
  ellipsis: true,
14979
14979
  width: 100
14980
14980
  }, {
14981
- dataIndex: 'markedPrice',
14981
+ dataIndex: 'marketPrice',
14982
14982
  title: "\u5E02\u573A\u4EF7",
14983
14983
  ellipsis: true,
14984
14984
  width: 100
14985
14985
  }, {
14986
- dataIndex: 'sellingPrice',
14986
+ dataIndex: 'retailPrice',
14987
14987
  title: "\u96F6\u552E\u4EF7",
14988
14988
  ellipsis: true,
14989
14989
  width: 100
@@ -14993,7 +14993,7 @@ var jyColumns = [{
14993
14993
  ellipsis: true,
14994
14994
  width: 100
14995
14995
  }, {
14996
- dataIndex: 'gift',
14996
+ dataIndex: 'isGift',
14997
14997
  title: "\u662F\u5426\u8D60\u54C1",
14998
14998
  ellipsis: true,
14999
14999
  width: 150,
@@ -15001,12 +15001,12 @@ var jyColumns = [{
15001
15001
  return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
15002
15002
  }
15003
15003
  }, {
15004
- dataIndex: 'combination',
15004
+ dataIndex: 'skuType',
15005
15005
  title: "\u662F\u5426\u7EC4\u5408\u88C5",
15006
15006
  ellipsis: true,
15007
15007
  width: 150,
15008
15008
  render: function render(val) {
15009
- return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
15009
+ return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val === 'combine'));
15010
15010
  }
15011
15011
  }];
15012
15012
 
@@ -17293,11 +17293,12 @@ var SearchHeader = function SearchHeader(_ref) {
17293
17293
  timeOptions = _ref.timeOptions,
17294
17294
  ShopList = _ref.ShopList,
17295
17295
  onSubmit = _ref.onSubmit;
17296
+ console.log('allFields', allFields);
17296
17297
  // const fixedFieldsOptions = useMemo(() => {
17297
17298
  // return allFields.filter(item => fixedFields?.includes(item.id));
17298
17299
  // }, [fixedFields, allFields]);
17299
17300
  return /*#__PURE__*/React.createElement("div", {
17300
- className: 'search-header-wrap'
17301
+ className: "search-header-wrap"
17301
17302
  }, /*#__PURE__*/React.createElement("div", {
17302
17303
  className: "".concat(status ? 'is-open' : 'not-open')
17303
17304
  }, /*#__PURE__*/React.createElement("div", {
@@ -17454,6 +17455,9 @@ var WorkorderList = function WorkorderList(props, ref) {
17454
17455
  return selectedList.map(function (workOrderData) {
17455
17456
  return goodsSourceFormat.workOrderDataToGoods(workOrderData, props.erp);
17456
17457
  });
17458
+ },
17459
+ setDefaultSearchValue: function setDefaultSearchValue(value) {
17460
+ value && form.setFieldsValue(_objectSpread2({}, value));
17457
17461
  }
17458
17462
  };
17459
17463
  });
@@ -17732,21 +17736,116 @@ var WorkorderList = function WorkorderList(props, ref) {
17732
17736
  };
17733
17737
  var WorkorderList$1 = /*#__PURE__*/forwardRef(WorkorderList);
17734
17738
 
17735
- // interface GoodModelProps {
17736
- // shopId: number | string;
17737
- // maxLength: number;
17738
- // shopList: any[];
17739
- // width?: string | number;
17740
- // shopCode?: string;
17741
- // companyKey: string;
17742
- // onSubmit: (...args: any[]) => any;
17743
- // }
17739
+ var goodClassTransformValue = function goodClassTransformValue(value, config) {
17740
+ var label = '';
17741
+ var options = (config === null || config === void 0 ? void 0 : config.options) || [];
17742
+ var labelList = findLabelBySelectValue(value, options);
17743
+ var labelItem = labelList === null || labelList === void 0 ? void 0 : labelList.pop();
17744
+ label = labelItem === null || labelItem === void 0 ? void 0 : labelItem.label;
17745
+ return {
17746
+ type: 'anylike',
17747
+ keywords: label
17748
+ };
17749
+ };
17750
+ var goodTypeTransformValue = function goodTypeTransformValue(value) {
17751
+ return (value === null || value === void 0 ? void 0 : value.value) ? [value === null || value === void 0 ? void 0 : value.value] : '';
17752
+ };
17753
+ var relationComponentUniqueKeyMap = {
17754
+ //小白熊自定义组件
17755
+ PCE2Z5TXEVPL5D26I7KMBKMB: {
17756
+ //补发类型
17757
+ goodType: {
17758
+ relationComponentKey: '6hldjQ9aMz',
17759
+ reflectKey: 'C7M9rWJMjD_radio',
17760
+ transformValue: function transformValue(value) {
17761
+ return goodTypeTransformValue(value);
17762
+ }
17763
+ },
17764
+ // 产品分类
17765
+ goodClass: {
17766
+ relationComponentKey: '8gozpyUFtA',
17767
+ reflectKey: '2h8KRbxMjD_input',
17768
+ transformValue: function transformValue(value, config) {
17769
+ return goodClassTransformValue(value, config);
17770
+ }
17771
+ }
17772
+ },
17773
+ // 测马奔腾
17774
+ SZF4ZGWZSNW6PYXMCIFEWBXT: {
17775
+ goodType: {
17776
+ relationComponentKey: 'abVTwFX34E',
17777
+ reflectKey: 'ipOHnYquYB_radio',
17778
+ transformValue: function transformValue(value) {
17779
+ return goodTypeTransformValue(value);
17780
+ }
17781
+ },
17782
+ goodClass: {
17783
+ relationComponentKey: 'U0es1pIDaE',
17784
+ reflectKey: 'K1puYheEaE_input',
17785
+ transformValue: function transformValue(value, config) {
17786
+ return goodClassTransformValue(value, config);
17787
+ }
17788
+ }
17789
+ }
17790
+ };
17791
+ // 该方法只用于小白熊定制，当管易商品/管易补发/管易退换货组件的数据来源于关联工单数据，且其补发类型自定义组件选了值，根据该值填充到商品库弹框中类型筛选项
17792
+ var useDefaultSearchValue = (function (props) {
17793
+ var _Object$entries;
17794
+ var form = props.form,
17795
+ _props$companyKey = props.companyKey,
17796
+ companyKey = _props$companyKey === void 0 ? '' : _props$companyKey,
17797
+ source = props.source,
17798
+ erp = props.erp,
17799
+ _props$templateDetail = props.templateDetail,
17800
+ templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
17801
+ if (source !== 'workOrder' || erp !== 'gy') {
17802
+ return '';
17803
+ }
17804
+ var result = {};
17805
+ var relationComponentKeyMap = relationComponentUniqueKeyMap === null || relationComponentUniqueKeyMap === void 0 ? void 0 : relationComponentUniqueKeyMap[companyKey];
17806
+ if (!relationComponentKeyMap) {
17807
+ return '';
17808
+ }
17809
+ (_Object$entries = Object.entries(relationComponentKeyMap || {})) === null || _Object$entries === void 0 ? void 0 : _Object$entries.forEach(function (_ref) {
17810
+ var _templateDetail$compo;
17811
+ var _ref2 = _slicedToArray(_ref, 2),
17812
+ key = _ref2[0],
17813
+ value = _ref2[1];
17814
+ var matchComponent = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.find(function (item) {
17815
+ return item.uniqueKey === value.relationComponentKey;
17816
+ });
17817
+ if (!matchComponent) {
17818
+ return;
17819
+ }
17820
+ var relationComponentValue = form === null || form === void 0 ? void 0 : form.getFieldValue(value.relationComponentKey);
17821
+ if (relationComponentValue) {
17822
+ if ((value === null || value === void 0 ? void 0 : value.transformValue) && typeof (value === null || value === void 0 ? void 0 : value.transformValue) === 'function') {
17823
+ var _value$transformValue;
17824
+ var newValue = value === null || value === void 0 ? void 0 : (_value$transformValue = value.transformValue) === null || _value$transformValue === void 0 ? void 0 : _value$transformValue.call(value, relationComponentValue, (matchComponent === null || matchComponent === void 0 ? void 0 : matchComponent.componentConfig) || {});
17825
+ if (newValue) {
17826
+ result[value.reflectKey] = newValue;
17827
+ }
17828
+ } else {
17829
+ result[value.reflectKey] = relationComponentValue;
17830
+ }
17831
+ }
17832
+ });
17833
+ return result;
17834
+ });
17835
+
17744
17836
  var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
17745
- var _props$goodsSource;
17837
+ var _props$goodsSource2;
17746
17838
  var _useState = useState(),
17747
17839
  _useState2 = _slicedToArray(_useState, 2),
17748
17840
  seletedGooods = _useState2[0],
17749
17841
  setSeletedGooods = _useState2[1];
17842
+ var onSubmit = props.onSubmit,
17843
+ width = props.width;
17844
+ var _useState3 = useState(false),
17845
+ _useState4 = _slicedToArray(_useState3, 2),
17846
+ visible = _useState4[0],
17847
+ setVisible = _useState4[1];
17848
+ var goodsListRef = useRef(null);
17750
17849
  useImperativeHandle(ref, function () {
17751
17850
  return {
17752
17851
  open: function open(shopCode, options) {
@@ -17755,19 +17854,28 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
17755
17854
  }
17756
17855
  };
17757
17856
  });
17758
- var onSubmit = props.onSubmit,
17759
- width = props.width;
17760
- var _useState3 = useState(false),
17761
- _useState4 = _slicedToArray(_useState3, 2),
17762
- visible = _useState4[0],
17763
- setVisible = _useState4[1];
17764
- var goodsListRef = useRef(null);
17857
+ useEffect(function () {
17858
+ if (visible && goodsListRef.current) {
17859
+ var _props$goodsSource;
17860
+ var defaultSearchValue = useDefaultSearchValue({
17861
+ form: props === null || props === void 0 ? void 0 : props.form,
17862
+ companyKey: props === null || props === void 0 ? void 0 : props.companyKey,
17863
+ source: (_props$goodsSource = props.goodsSource) === null || _props$goodsSource === void 0 ? void 0 : _props$goodsSource.source,
17864
+ erp: 'gy',
17865
+ templateDetail: props === null || props === void 0 ? void 0 : props.templateDetail
17866
+ });
17867
+ if (defaultSearchValue) {
17868
+ var _goodsListRef$current, _goodsListRef$current2;
17869
+ (_goodsListRef$current = goodsListRef.current) === null || _goodsListRef$current === void 0 ? void 0 : (_goodsListRef$current2 = _goodsListRef$current.setDefaultSearchValue) === null || _goodsListRef$current2 === void 0 ? void 0 : _goodsListRef$current2.call(_goodsListRef$current, defaultSearchValue);
17870
+ }
17871
+ }
17872
+ }, [visible]);
17765
17873
  var _onCancel = function onCancel() {
17766
17874
  setVisible(false);
17767
17875
  };
17768
17876
  var onOk = function onOk() {
17769
- var _goodsListRef$current;
17770
- var selectedList = ((_goodsListRef$current = goodsListRef.current) === null || _goodsListRef$current === void 0 ? void 0 : _goodsListRef$current.getSelectGoodList()) || [];
17877
+ var _goodsListRef$current3;
17878
+ var selectedList = ((_goodsListRef$current3 = goodsListRef.current) === null || _goodsListRef$current3 === void 0 ? void 0 : _goodsListRef$current3.getSelectGoodList()) || [];
17771
17879
  onSubmit(selectedList);
17772
17880
  _onCancel();
17773
17881
  };
@@ -17782,7 +17890,7 @@ var GyGoodsModal$1 = function GyGoodsModal(props, ref) {
17782
17890
  },
17783
17891
  onOk: onOk,
17784
17892
  wrapClassName: "goodModal"
17785
- }, ((_props$goodsSource = props.goodsSource) === null || _props$goodsSource === void 0 ? void 0 : _props$goodsSource.source) === 'workOrder' ? /*#__PURE__*/React.createElement(WorkorderList$1, {
17893
+ }, ((_props$goodsSource2 = props.goodsSource) === null || _props$goodsSource2 === void 0 ? void 0 : _props$goodsSource2.source) === 'workOrder' ? /*#__PURE__*/React.createElement(WorkorderList$1, {
17786
17894
  erp: "gy",
17787
17895
  goodsSource: props.goodsSource,
17788
17896
  seletedGooods: seletedGooods,
@@ -17821,10 +17929,12 @@ var getTableData$5 = function getTableData(_ref, formData) {
17821
17929
  };
17822
17930
  var searchFormData$4 = [{
17823
17931
  label: '规格名称',
17824
- name: 'specName'
17932
+ name: 'skuName',
17933
+ dataIndex: 'specName'
17825
17934
  }, {
17826
17935
  label: '规格编码',
17827
- name: 'specCode'
17936
+ name: 'skuCode',
17937
+ dataIndex: 'specNo'
17828
17938
  }, {
17829
17939
  label: '商品名称',
17830
17940
  name: 'goodName'
@@ -17870,29 +17980,29 @@ var GoodList$5 = function GoodList(props, ref) {
17870
17980
  fixed: true,
17871
17981
  onSelect: function onSelect(record, selected) {
17872
17982
  if (selected) {
17873
- setSelectIds([].concat(_toConsumableArray(selectIds), [record.goodNo]));
17983
+ setSelectIds([].concat(_toConsumableArray(selectIds), [record.id]));
17874
17984
  setSelect([].concat(_toConsumableArray(selectList), [record]));
17875
17985
  } else {
17876
17986
  setSelectIds(selectIds.filter(function (t) {
17877
- return t !== record.goodNo;
17987
+ return t !== record.id;
17878
17988
  }));
17879
17989
  setSelect(selectList.filter(function (t) {
17880
- return t.goodNo !== record.goodNo;
17990
+ return t.id !== record.id;
17881
17991
  }));
17882
17992
  }
17883
17993
  },
17884
17994
  onSelectAll: function onSelectAll(selected, selectedRows, changeRows) {
17885
17995
  if (selected) {
17886
17996
  setSelectIds([].concat(_toConsumableArray(selectIds), _toConsumableArray(changeRows.map(function (t) {
17887
- return t.goodNo;
17997
+ return t.id;
17888
17998
  }))));
17889
17999
  setSelect([].concat(_toConsumableArray(selectList), _toConsumableArray(changeRows)));
17890
18000
  } else {
17891
18001
  setSelectIds(difference(selectIds, changeRows.map(function (t) {
17892
- return t.goodNo;
18002
+ return t.id;
17893
18003
  })));
17894
18004
  var list = differenceWith(selectList, changeRows, function (arrVal, othVal) {
17895
- return arrVal.goodNo !== othVal.goodNo;
18005
+ return arrVal.id !== othVal.id;
17896
18006
  });
17897
18007
  setSelect(list);
17898
18008
  }
@@ -17900,9 +18010,9 @@ var GoodList$5 = function GoodList(props, ref) {
17900
18010
  getCheckboxProps: function getCheckboxProps(record) {
17901
18011
  var options = {
17902
18012
  disabled: (props.selectedRows || []).map(function (row) {
17903
- return row.goodNo || row.skuId;
17904
- }).includes(record.goodNo || record.skuId),
17905
- name: record.goodNo
18013
+ return row.id || row.specId;
18014
+ }).includes(record.id || record.specId),
18015
+ name: record.id
17906
18016
  };
17907
18017
  return options;
17908
18018
  }
@@ -17910,10 +18020,10 @@ var GoodList$5 = function GoodList(props, ref) {
17910
18020
  var showTable = function showTable() {
17911
18021
  var handleDelete = function handleDelete(record) {
17912
18022
  setSelectIds(selectIds.filter(function (t) {
17913
- return t !== record.goodNo;
18023
+ return t !== record.id;
17914
18024
  }));
17915
18025
  setSelect(selectList.filter(function (t) {
17916
- return t.goodNo !== record.goodNo;
18026
+ return t.id !== record.id;
17917
18027
  }));
17918
18028
  };
17919
18029
  var showColumns = [{
@@ -17937,7 +18047,7 @@ var GoodList$5 = function GoodList(props, ref) {
17937
18047
  }
17938
18048
  }, /*#__PURE__*/React.createElement(Table, {
17939
18049
  columns: showColumns,
17940
- rowKey: 'goodNo',
18050
+ rowKey: 'id',
17941
18051
  dataSource: selectList,
17942
18052
  scroll: {
17943
18053
  x: '100%',
@@ -17966,7 +18076,7 @@ var GoodList$5 = function GoodList(props, ref) {
17966
18076
  }
17967
18077
  }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
17968
18078
  rowSelection: rowSelection,
17969
- rowKey: "goodNo",
18079
+ rowKey: "id",
17970
18080
  columns: columns,
17971
18081
  scroll: {
17972
18082
  x: '100%',
@@ -18390,10 +18500,10 @@ var getColumns$1 = function getColumns(_ref) {
18390
18500
  }
18391
18501
  }, {
18392
18502
  dataIndex: 'share',
18393
- title: "\u5206\u644A\u4EF7",
18503
+ title: "\u5747\u644A\u5355\u4EF7",
18394
18504
  align: 'center',
18395
18505
  ellipsis: true,
18396
- width: 70
18506
+ width: 120
18397
18507
  }, {
18398
18508
  dataIndex: 'type',
18399
18509
  title: "\u8D60\u54C1\u7C7B\u578B",
@@ -18448,12 +18558,29 @@ var renderFieldMap = {
18448
18558
  },
18449
18559
  giftType: function giftType() {
18450
18560
  return renderGiftType;
18561
+ },
18562
+ orderPrice: function orderPrice(_ref2) {
18563
+ var disabled = _ref2.disabled,
18564
+ updateHandle = _ref2.updateHandle;
18565
+ return function (val, record, index) {
18566
+ return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
18567
+ style: {
18568
+ width: 70
18569
+ },
18570
+ value: val,
18571
+ min: 1,
18572
+ precision: 0,
18573
+ onChange: function onChange(num) {
18574
+ return updateHandle(num, index, 'orderPrice');
18575
+ }
18576
+ }) : /*#__PURE__*/React.createElement("span", null, (record.num || record.num === 0) && (val || val === 0) ? Number(val * record.num).toFixed(2) : null);
18577
+ };
18451
18578
  }
18452
18579
  };
18453
- var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
18454
- var disabled = _ref2.disabled,
18455
- updateHandle = _ref2.updateHandle,
18456
- operate = _ref2.operate;
18580
+ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref3) {
18581
+ var disabled = _ref3.disabled,
18582
+ updateHandle = _ref3.updateHandle,
18583
+ operate = _ref3.operate;
18457
18584
  return getColumnsMap$1()['WDT_REISSUE_GOODS'].map(function (item) {
18458
18585
  var newItem = _objectSpread2({
18459
18586
  align: 'center',
@@ -18471,6 +18598,15 @@ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
18471
18598
  });
18472
18599
  };
18473
18600
 
18601
+ function toNum(value) {
18602
+ if (typeof value === 'string') {
18603
+ return value ? +value : void 0;
18604
+ }
18605
+ if (typeof value === 'number') {
18606
+ return value;
18607
+ }
18608
+ return void 0;
18609
+ }
18474
18610
  var getColumns$2 = function getColumns(_ref) {
18475
18611
  var _ref$text = _ref.text,
18476
18612
  text = _ref$text === void 0 ? '' : _ref$text,
@@ -18481,7 +18617,7 @@ var getColumns$2 = function getColumns(_ref) {
18481
18617
  WDT_REISSUE_GOODS: [{
18482
18618
  dataIndex: 'goodId',
18483
18619
  title: "\u5546\u54C1ID",
18484
- width: 120,
18620
+ width: 250,
18485
18621
  align: 'center',
18486
18622
  ellipsis: true
18487
18623
  }, {
@@ -18504,12 +18640,14 @@ var getColumns$2 = function getColumns(_ref) {
18504
18640
  dataIndex: 'apiGoodsName',
18505
18641
  title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
18506
18642
  width: 200,
18507
- align: 'center'
18643
+ align: 'center',
18644
+ ellipsis: true
18508
18645
  }, {
18509
18646
  dataIndex: 'platformGoodsId',
18510
18647
  title: "\u5E73\u53F0\u5546\u54C1ID",
18511
18648
  width: 180,
18512
- align: 'center'
18649
+ align: 'center',
18650
+ ellipsis: true
18513
18651
  }, {
18514
18652
  dataIndex: 'specId',
18515
18653
  title: "SKUID",
@@ -18536,23 +18674,47 @@ var getColumns$2 = function getColumns(_ref) {
18536
18674
  dataIndex: 'apiSpecName',
18537
18675
  title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
18538
18676
  width: 200,
18539
- align: 'center'
18677
+ align: 'center',
18678
+ ellipsis: true
18540
18679
  }, {
18541
18680
  dataIndex: 'platformSpecId',
18542
18681
  title: "\u5E73\u53F0\u89C4\u683CID",
18543
18682
  width: 180,
18544
- align: 'center'
18683
+ align: 'center',
18684
+ ellipsis: true
18685
+ }, {
18686
+ dataIndex: 'brandName',
18687
+ title: "\u54C1\u724C\u540D\u79F0",
18688
+ width: 180,
18689
+ align: 'center',
18690
+ ellipsis: true
18545
18691
  }, {
18546
18692
  dataIndex: 'orderPrice',
18547
- title: "\u6210\u4EA4\u603B\u91D1\u989D",
18548
- render: function render(val, record) {
18549
- return (record.num || record.num === 0) && (val || val === 0) ? Number(val * record.num).toFixed(2) : null;
18550
- },
18693
+ title: "\u8865\u53D1\u91D1\u989D",
18694
+ align: 'center',
18695
+ // render: (val: number, record: any) => {
18696
+ // return (record.num || record.num === 0) && (val || val === 0)
18697
+ // ? Number(val * record.num).toFixed(2)
18698
+ // : null;
18699
+ // },
18551
18700
  width: 200
18552
18701
  }, {
18553
18702
  dataIndex: 'num',
18554
18703
  title: "\u6570\u91CF",
18555
- width: 100
18704
+ width: 100,
18705
+ validator: function validator(_rule, value) {
18706
+ var goodsName = '';
18707
+ if (((value === null || value === void 0 ? void 0 : value.wdtReissueGoods) || []).some(function (goods) {
18708
+ var num = toNum(goods === null || goods === void 0 ? void 0 : goods.num);
18709
+ var res = typeof num === 'number' ? num < 1 : true;
18710
+ if (res) {
18711
+ goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
18712
+ }
18713
+ return res;
18714
+ })) {
18715
+ return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
18716
+ }
18717
+ }
18556
18718
  }, {
18557
18719
  dataIndex: 'sharePrice',
18558
18720
  title: "\u5206\u644A\u4EF7",
@@ -18569,7 +18731,7 @@ var getColumns$2 = function getColumns(_ref) {
18569
18731
  title: "\u5546\u54C1ID",
18570
18732
  align: 'center',
18571
18733
  ellipsis: true,
18572
- width: 70
18734
+ width: 250
18573
18735
  }, {
18574
18736
  dataIndex: 'goodNo',
18575
18737
  title: "\u5546\u54C1\u7F16\u7801",
@@ -18590,12 +18752,14 @@ var getColumns$2 = function getColumns(_ref) {
18590
18752
  dataIndex: 'apiGoodsName',
18591
18753
  title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
18592
18754
  width: 200,
18593
- align: 'center'
18755
+ align: 'center',
18756
+ ellipsis: true
18594
18757
  }, {
18595
18758
  dataIndex: 'platformGoodsId',
18596
18759
  title: "\u5E73\u53F0\u5546\u54C1ID",
18597
18760
  width: 180,
18598
- align: 'center'
18761
+ align: 'center',
18762
+ ellipsis: true
18599
18763
  }, {
18600
18764
  dataIndex: 'specId',
18601
18765
  title: "".concat(text, "SKUID"),
@@ -18622,12 +18786,20 @@ var getColumns$2 = function getColumns(_ref) {
18622
18786
  dataIndex: 'apiSpecName',
18623
18787
  title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
18624
18788
  width: 200,
18625
- align: 'center'
18789
+ align: 'center',
18790
+ ellipsis: true
18626
18791
  }, {
18627
18792
  dataIndex: 'platformSpecId',
18628
18793
  title: "\u5E73\u53F0\u89C4\u683CID",
18629
18794
  width: 180,
18630
- align: 'center'
18795
+ align: 'center',
18796
+ ellipsis: true
18797
+ }, {
18798
+ dataIndex: 'brandName',
18799
+ title: "\u54C1\u724C\u540D\u79F0",
18800
+ width: 180,
18801
+ align: 'center',
18802
+ ellipsis: true
18631
18803
  }, {
18632
18804
  dataIndex: 'orderPrice',
18633
18805
  title: "\u6210\u4EA4\u603B\u91D1\u989D",
@@ -18676,7 +18848,7 @@ var getColumns$2 = function getColumns(_ref) {
18676
18848
  title: "\u5546\u54C1ID",
18677
18849
  align: 'center',
18678
18850
  ellipsis: true,
18679
- width: 70
18851
+ width: 250
18680
18852
  }, {
18681
18853
  dataIndex: 'goodNo',
18682
18854
  title: "\u5546\u54C1\u7F16\u7801",
@@ -18697,12 +18869,14 @@ var getColumns$2 = function getColumns(_ref) {
18697
18869
  dataIndex: 'apiGoodsName',
18698
18870
  title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
18699
18871
  width: 200,
18700
- align: 'center'
18872
+ align: 'center',
18873
+ ellipsis: true
18701
18874
  }, {
18702
18875
  dataIndex: 'platformGoodsId',
18703
18876
  title: "\u5E73\u53F0\u5546\u54C1ID",
18704
18877
  width: 180,
18705
- align: 'center'
18878
+ align: 'center',
18879
+ ellipsis: true
18706
18880
  }, {
18707
18881
  dataIndex: 'specId',
18708
18882
  title: "".concat(text, "SKUID"),
@@ -18729,12 +18903,20 @@ var getColumns$2 = function getColumns(_ref) {
18729
18903
  dataIndex: 'apiSpecName',
18730
18904
  title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
18731
18905
  width: 200,
18732
- align: 'center'
18906
+ align: 'center',
18907
+ ellipsis: true
18733
18908
  }, {
18734
18909
  dataIndex: 'platformSpecId',
18735
18910
  title: "\u5E73\u53F0\u89C4\u683CID",
18736
18911
  width: 180,
18737
- align: 'center'
18912
+ align: 'center',
18913
+ ellipsis: true
18914
+ }, {
18915
+ dataIndex: 'brandName',
18916
+ title: "\u54C1\u724C\u540D\u79F0",
18917
+ width: 180,
18918
+ align: 'center',
18919
+ ellipsis: true
18738
18920
  }, {
18739
18921
  dataIndex: 'num',
18740
18922
  title: "".concat(text, "\u9000\u8D27\u6570\u91CF"),
@@ -18821,7 +19003,7 @@ var getColumns$2 = function getColumns(_ref) {
18821
19003
  title: "\u5546\u54C1ID",
18822
19004
  align: 'center',
18823
19005
  ellipsis: true,
18824
- width: 70
19006
+ width: 250
18825
19007
  }, {
18826
19008
  dataIndex: 'goodNo',
18827
19009
  title: "\u5546\u54C1\u7F16\u7801",
@@ -18842,12 +19024,14 @@ var getColumns$2 = function getColumns(_ref) {
18842
19024
  dataIndex: 'apiGoodsName',
18843
19025
  title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
18844
19026
  width: 200,
18845
- align: 'center'
19027
+ align: 'center',
19028
+ ellipsis: true
18846
19029
  }, {
18847
19030
  dataIndex: 'platformGoodsId',
18848
19031
  title: "\u5E73\u53F0\u5546\u54C1ID",
18849
19032
  width: 180,
18850
- align: 'center'
19033
+ align: 'center',
19034
+ ellipsis: true
18851
19035
  }, {
18852
19036
  dataIndex: 'specId',
18853
19037
  title: "".concat(text, "SKUID"),
@@ -18874,12 +19058,20 @@ var getColumns$2 = function getColumns(_ref) {
18874
19058
  dataIndex: 'apiSpecName',
18875
19059
  title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
18876
19060
  width: 200,
18877
- align: 'center'
19061
+ align: 'center',
19062
+ ellipsis: true
18878
19063
  }, {
18879
19064
  dataIndex: 'platformSpecId',
18880
19065
  title: "\u5E73\u53F0\u89C4\u683CID",
18881
19066
  width: 180,
18882
- align: 'center'
19067
+ align: 'center',
19068
+ ellipsis: true
19069
+ }, {
19070
+ dataIndex: 'brandName',
19071
+ title: "\u54C1\u724C\u540D\u79F0",
19072
+ width: 180,
19073
+ align: 'center',
19074
+ ellipsis: true
18883
19075
  }, {
18884
19076
  dataIndex: 'num',
18885
19077
  title: "".concat(text, "\u6362\u51FA\u6570\u91CF"),
@@ -19117,7 +19309,7 @@ var getYesOrNo$3 = function getYesOrNo(val) {
19117
19309
  if (isNull(val)) return null;
19118
19310
  return val ? '是' : '否';
19119
19311
  };
19120
- function toNum(value) {
19312
+ function toNum$1(value) {
19121
19313
  if (typeof value === 'string') {
19122
19314
  return value ? +value : void 0;
19123
19315
  }
@@ -19286,7 +19478,7 @@ var getColumns$4 = function getColumns(_ref) {
19286
19478
  validator: function validator(_rule, value) {
19287
19479
  var goodsName = '';
19288
19480
  if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
19289
- var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
19481
+ var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
19290
19482
  var res = typeof qty === 'number' ? qty < 1 : true;
19291
19483
  if (res) {
19292
19484
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -19402,7 +19594,7 @@ var getColumns$4 = function getColumns(_ref) {
19402
19594
  validator: function validator(_rule, value) {
19403
19595
  var goodsName = '';
19404
19596
  if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
19405
- var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
19597
+ var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
19406
19598
  var res = typeof qty === 'number' ? qty < 1 : true;
19407
19599
  if (res) {
19408
19600
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -19503,7 +19695,7 @@ var fillAttrs = function fillAttrs(item) {
19503
19695
  if (!item.align) item.align = 'center';
19504
19696
  return item;
19505
19697
  };
19506
- function toNum$1(value) {
19698
+ function toNum$2(value) {
19507
19699
  if (typeof value === 'string') {
19508
19700
  return value ? +value : void 0;
19509
19701
  }
@@ -19695,19 +19887,21 @@ var getColumns$5 = function getColumns() {
19695
19887
  ellipsis: true,
19696
19888
  align: 'center',
19697
19889
  width: 120,
19698
- validator: function validator(_rule, value) {
19699
- var goodsName = '';
19700
- if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
19701
- var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
19702
- var res = typeof v === 'number' ? v < 0 : true;
19703
- if (res) {
19704
- goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
19705
- }
19706
- return res;
19707
- })) {
19708
- return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
19709
- }
19710
- },
19890
+ // validator: (_rule: any, value: any) => {
19891
+ // let goodsName = '';
19892
+ // if (
19893
+ // (value?.jstReissueGoods || []).some((goods: any) => {
19894
+ // const v = toNum(goods?.salePrice);
19895
+ // const res = typeof v === 'number' ? v < 0 : true;
19896
+ // if (res) {
19897
+ // goodsName = goods?.name ? `[${goods?.name}]` : '';
19898
+ // }
19899
+ // return res;
19900
+ // })
19901
+ // ) {
19902
+ // return Promise.reject(`${goodsName}单价为大于等于0的数`);
19903
+ // }
19904
+ // },
19711
19905
  render: function render(val, record, index) {
19712
19906
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
19713
19907
  style: {
@@ -19730,7 +19924,7 @@ var getColumns$5 = function getColumns() {
19730
19924
  validator: function validator(_rule, value) {
19731
19925
  var goodsName = '';
19732
19926
  if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
19733
- var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
19927
+ var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
19734
19928
  var res = typeof qty === 'number' ? qty < 1 : true;
19735
19929
  if (res) {
19736
19930
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -19827,7 +20021,7 @@ var getColumns$5 = function getColumns() {
19827
20021
  validator: function validator(_rule, value) {
19828
20022
  var goodsName = '';
19829
20023
  if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
19830
- var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
20024
+ var v = toNum$2(goods === null || goods === void 0 ? void 0 : goods.salePrice);
19831
20025
  var res = typeof v === 'number' ? v < 0 : true;
19832
20026
  if (res) {
19833
20027
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -19857,7 +20051,7 @@ var getColumns$5 = function getColumns() {
19857
20051
  validator: function validator(_rule, value) {
19858
20052
  var goodsName = '';
19859
20053
  if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
19860
- var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
20054
+ var qty = toNum$2(goods === null || goods === void 0 ? void 0 : goods.qty);
19861
20055
  var res = typeof qty === 'number' ? qty < 1 : true;
19862
20056
  if (res) {
19863
20057
  goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
@@ -20032,7 +20226,7 @@ var getColumns$5 = function getColumns() {
20032
20226
  };
20033
20227
  };
20034
20228
 
20035
- function toNum$2(value) {
20229
+ function toNum$3(value) {
20036
20230
  if (typeof value === 'string') {
20037
20231
  return value ? +value : void 0;
20038
20232
  }
@@ -20178,7 +20372,7 @@ var getColumns$6 = function getColumns(_ref) {
20178
20372
  validator: function validator(_rule, value) {
20179
20373
  var title = '';
20180
20374
  if (((value === null || value === void 0 ? void 0 : value.kmReissueGoods) || []).some(function (goods) {
20181
- var realNum = toNum$2(goods === null || goods === void 0 ? void 0 : goods.realNum);
20375
+ var realNum = toNum$3(goods === null || goods === void 0 ? void 0 : goods.realNum);
20182
20376
  var res = typeof realNum === 'number' ? realNum < 1 : true;
20183
20377
  if (res) {
20184
20378
  title = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
@@ -20219,15 +20413,201 @@ var getColumns$6 = function getColumns(_ref) {
20219
20413
  }) : /*#__PURE__*/React.createElement("span", null, val);
20220
20414
  }
20221
20415
  }, {
20222
- dataIndex: 'price',
20223
- title: "\u5546\u54C1\u9500\u552E\u4EF7",
20224
- width: 150,
20225
- render: function render(val) {
20226
- return val || val === 0 ? Number(val).toFixed(2) : '';
20227
- }
20228
- }, {
20229
- dataIndex: 'payment',
20230
- title: "\u5B9E\u4ED8\u91D1\u989D",
20416
+ dataIndex: 'price',
20417
+ title: "\u5546\u54C1\u9500\u552E\u4EF7",
20418
+ width: 150,
20419
+ render: function render(val) {
20420
+ return val || val === 0 ? Number(val).toFixed(2) : '';
20421
+ }
20422
+ }, {
20423
+ dataIndex: 'payment',
20424
+ title: "\u5B9E\u4ED8\u91D1\u989D",
20425
+ width: 150,
20426
+ render: function render(val, record, index) {
20427
+ return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
20428
+ style: {
20429
+ width: 130
20430
+ },
20431
+ value: val,
20432
+ min: 0,
20433
+ precision: 2,
20434
+ onChange: function onChange(num) {
20435
+ return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
20436
+ }
20437
+ }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
20438
+ }
20439
+ }, {
20440
+ dataIndex: 'type',
20441
+ title: "\u5546\u54C1\u7C7B\u578B",
20442
+ width: 150
20443
+ }, {
20444
+ dataIndex: 'sysPicPath',
20445
+ title: "\u5546\u54C1\u56FE\u7247",
20446
+ width: 100,
20447
+ render: function render(val) {
20448
+ return /*#__PURE__*/React.createElement(Image, {
20449
+ width: 60,
20450
+ src: val
20451
+ });
20452
+ }
20453
+ }].map(function (item) {
20454
+ return _objectSpread2(_objectSpread2({}, item), {}, {
20455
+ align: 'center',
20456
+ ellipsis: true
20457
+ });
20458
+ })
20459
+ };
20460
+ };
20461
+
20462
+ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
20463
+ if (typeof value === 'number') return true;
20464
+ if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
20465
+ return false;
20466
+ };
20467
+ function toNum$4(value) {
20468
+ if (typeof value === 'string') {
20469
+ return value ? +value : void 0;
20470
+ }
20471
+ if (typeof value === 'number') {
20472
+ return value;
20473
+ }
20474
+ return void 0;
20475
+ }
20476
+ var getColumns$7 = function getColumns(_ref) {
20477
+ var _ref$text = _ref.text,
20478
+ disabled = _ref.disabled,
20479
+ updateHandle = _ref.updateHandle,
20480
+ updateDataHandle = _ref.updateDataHandle;
20481
+ return {
20482
+ //巨益商品信息
20483
+ JY_GOODS: [{
20484
+ dataIndex: 'productName',
20485
+ title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
20486
+ align: 'center',
20487
+ ellipsis: true,
20488
+ width: 150
20489
+ }, {
20490
+ dataIndex: 'productCode',
20491
+ title: "\u7CFB\u7EDF\u5546\u54C1\u7F16\u7801",
20492
+ align: 'center',
20493
+ ellipsis: true,
20494
+ width: 150
20495
+ }, {
20496
+ dataIndex: 'productId',
20497
+ title: "\u7CFB\u7EDF\u5546\u54C1ID",
20498
+ align: 'center',
20499
+ ellipsis: true,
20500
+ width: 150
20501
+ }, {
20502
+ dataIndex: 'skuName',
20503
+ title: "\u7CFB\u7EDF\u89C4\u683C\u540D\u79F0",
20504
+ align: 'center',
20505
+ ellipsis: true,
20506
+ width: 150
20507
+ }, {
20508
+ dataIndex: 'skuCode',
20509
+ title: "\u7CFB\u7EDF\u89C4\u683C\u7F16\u7801",
20510
+ align: 'center',
20511
+ ellipsis: true,
20512
+ width: 150
20513
+ }, {
20514
+ dataIndex: 'specId',
20515
+ title: "\u89C4\u683CID",
20516
+ align: 'center',
20517
+ ellipsis: true,
20518
+ width: 150
20519
+ },
20520
+ // {
20521
+ // dataIndex: 'goodsName',
20522
+ // title: `货品名称`,
20523
+ // width: 250,
20524
+ // },
20525
+ // {
20526
+ // dataIndex: 'goodsCode',
20527
+ // title: `货品编号`,
20528
+ // width: 200,
20529
+ // },
20530
+ // {
20531
+ // dataIndex: 'goodsId',
20532
+ // title: `货品ID`,
20533
+ // width: 150,
20534
+ // },
20535
+ {
20536
+ dataIndex: 'goodsClass',
20537
+ title: "\u8D27\u54C1\u7C7B\u522B",
20538
+ width: 150
20539
+ }, {
20540
+ dataIndex: 'code',
20541
+ title: "\u6761\u7801",
20542
+ width: 150
20543
+ },
20544
+ // {
20545
+ // dataIndex: 'specName',
20546
+ // title: `规格名称`,
20547
+ // align: 'center',
20548
+ // ellipsis: true,
20549
+ // width: 200,
20550
+ // },
20551
+ // {
20552
+ // dataIndex: 'specCode',
20553
+ // title: `规格编号`,
20554
+ // align: 'center',
20555
+ // ellipsis: true,
20556
+ // width: 150,
20557
+ // },
20558
+ {
20559
+ dataIndex: 'mallProductName',
20560
+ title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
20561
+ align: 'center',
20562
+ ellipsis: true,
20563
+ width: 250
20564
+ }, {
20565
+ dataIndex: 'mallProductOutCode',
20566
+ title: "\u5E73\u53F0\u5546\u54C1\u7F16\u7801",
20567
+ align: 'center',
20568
+ ellipsis: true,
20569
+ width: 150
20570
+ }, {
20571
+ dataIndex: 'mallProductId',
20572
+ title: "\u5E73\u53F0\u5546\u54C1ID",
20573
+ align: 'center',
20574
+ ellipsis: true,
20575
+ width: 250
20576
+ }, {
20577
+ dataIndex: 'mallSkuName',
20578
+ title: "\u5E73\u53F0\u89C4\u683C\u540D\u79F0",
20579
+ align: 'center',
20580
+ ellipsis: true,
20581
+ width: 250
20582
+ }, {
20583
+ dataIndex: 'mallSkuId',
20584
+ title: "\u5E73\u53F0\u89C4\u683CID",
20585
+ align: 'center',
20586
+ ellipsis: true,
20587
+ width: 250
20588
+ }, {
20589
+ dataIndex: 'sellCount',
20590
+ title: "\u6570\u91CF",
20591
+ width: 100,
20592
+ render: function render(val, record, index) {
20593
+ return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
20594
+ style: {
20595
+ width: 70
20596
+ },
20597
+ value: val,
20598
+ min: 1,
20599
+ precision: 0,
20600
+ onChange: function onChange(num) {
20601
+ updateDataHandle({
20602
+ sellCount: num,
20603
+ sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
20604
+ }, index);
20605
+ }
20606
+ }) : /*#__PURE__*/React.createElement("span", null, val);
20607
+ }
20608
+ }, {
20609
+ dataIndex: 'sellPrice',
20610
+ title: "\u5355\u4EF7",
20231
20611
  width: 150,
20232
20612
  render: function render(val, record, index) {
20233
20613
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
@@ -20238,88 +20618,95 @@ var getColumns$6 = function getColumns(_ref) {
20238
20618
  min: 0,
20239
20619
  precision: 2,
20240
20620
  onChange: function onChange(num) {
20241
- return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'payment');
20621
+ updateDataHandle({
20622
+ sellPrice: num,
20623
+ sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
20624
+ }, index);
20242
20625
  }
20243
- }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
20626
+ }) : /*#__PURE__*/React.createElement("span", null, val);
20244
20627
  }
20245
20628
  }, {
20246
- dataIndex: 'type',
20247
- title: "\u5546\u54C1\u7C7B\u578B",
20248
- width: 150
20249
- }, {
20250
- dataIndex: 'sysPicPath',
20251
- title: "\u5546\u54C1\u56FE\u7247",
20252
- width: 100,
20253
- render: function render(val) {
20254
- return /*#__PURE__*/React.createElement(Image, {
20255
- width: 60,
20256
- src: val
20257
- });
20258
- }
20259
- }].map(function (item) {
20260
- return _objectSpread2(_objectSpread2({}, item), {}, {
20261
- align: 'center',
20262
- ellipsis: true
20263
- });
20264
- })
20265
- };
20266
- };
20267
-
20268
- var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
20269
- if (typeof value === 'number') return true;
20270
- if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
20271
- return false;
20272
- };
20273
- var getYesOrNo$4 = function getYesOrNo(val) {
20274
- if (isNull(val)) return null;
20275
- return val ? '是' : '否';
20276
- };
20277
- var getColumns$7 = function getColumns(_ref) {
20278
- var _ref$text = _ref.text,
20279
- disabled = _ref.disabled,
20280
- updateHandle = _ref.updateHandle,
20281
- updateDataHandle = _ref.updateDataHandle;
20282
- return {
20283
- //巨益商品信息
20284
- JY_GOODS: [{
20285
- dataIndex: 'goodsName',
20286
- title: "\u8D27\u54C1\u540D\u79F0",
20629
+ dataIndex: 'mallSellingPrice',
20630
+ title: "\u5E73\u53F0\u5546\u54C1\u4EF7\u683C",
20287
20631
  width: 150
20288
20632
  }, {
20289
- dataIndex: 'goodsCode',
20290
- title: "\u8D27\u54C1\u7F16\u53F7",
20291
- width: 200
20292
- }, {
20293
- dataIndex: 'goodsId',
20294
- title: "\u8D27\u54C1ID",
20633
+ dataIndex: 'sellTotal',
20634
+ title: "\u91D1\u989D",
20295
20635
  width: 150
20296
20636
  }, {
20297
- dataIndex: 'goodsClass',
20298
- title: "\u8D27\u54C1\u7C7B\u522B",
20637
+ dataIndex: 'settlementPrice',
20638
+ title: "\u7ED3\u7B97\u4EF7",
20299
20639
  width: 150
20300
20640
  }, {
20301
- dataIndex: 'code',
20302
- title: "\u6761\u7801",
20641
+ dataIndex: 'divideOrderFee',
20642
+ title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
20303
20643
  width: 150
20304
20644
  }, {
20305
- dataIndex: 'specName',
20306
- title: "\u89C4\u683C\u540D\u79F0",
20307
- align: 'center',
20308
- ellipsis: true,
20309
- width: 200
20645
+ dataIndex: 'bfit',
20646
+ title: "\u662F\u5426\u7EC4\u5408\u88C5",
20647
+ width: 150,
20648
+ render: function render(val, record, index) {
20649
+ return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
20650
+ dropdownStyle: {
20651
+ zIndex: 2000
20652
+ },
20653
+ getPopupContainer: function getPopupContainer() {
20654
+ return document.body;
20655
+ },
20656
+ value: val,
20657
+ onChange: function onChange(value) {
20658
+ updateHandle(value, index, 'bfit');
20659
+ },
20660
+ options: [{
20661
+ label: '是',
20662
+ value: 'True'
20663
+ }, {
20664
+ label: '否',
20665
+ value: 'False'
20666
+ }]
20667
+ }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
20668
+ }
20310
20669
  }, {
20311
- dataIndex: 'specCode',
20312
- title: "\u89C4\u683C\u7F16\u53F7",
20313
- align: 'center',
20314
- ellipsis: true,
20670
+ dataIndex: 'combinationName',
20671
+ title: "\u7EC4\u5408\u5546\u54C1\u540D\u79F0",
20315
20672
  width: 150
20316
20673
  }, {
20317
- dataIndex: 'specId',
20318
- title: "\u89C4\u683CID",
20319
- align: 'center',
20320
- ellipsis: true,
20674
+ dataIndex: 'combinationCode',
20675
+ title: "\u7EC4\u5408\u5546\u54C1\u7F16\u7801",
20321
20676
  width: 150
20322
20677
  }, {
20678
+ dataIndex: 'gift',
20679
+ title: "\u662F\u5426\u8D60\u54C1",
20680
+ width: 150,
20681
+ render: function render(val, record, index) {
20682
+ return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
20683
+ dropdownStyle: {
20684
+ zIndex: 2000
20685
+ },
20686
+ getPopupContainer: function getPopupContainer() {
20687
+ return document.body;
20688
+ },
20689
+ value: val,
20690
+ onChange: function onChange(value) {
20691
+ updateHandle(value, index, 'gift');
20692
+ },
20693
+ options: [{
20694
+ label: '是',
20695
+ value: '1'
20696
+ }, {
20697
+ label: '否',
20698
+ value: '0'
20699
+ }]
20700
+ }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
20701
+ }
20702
+ }].map(function (item) {
20703
+ return _objectSpread2(_objectSpread2({}, item), {}, {
20704
+ align: 'center',
20705
+ ellipsis: true
20706
+ });
20707
+ }),
20708
+ // 巨益补发商品信息
20709
+ JY_REISSUE_GOODS: [{
20323
20710
  dataIndex: 'productName',
20324
20711
  title: "\u7CFB\u7EDF\u5546\u54C1\u540D\u79F0",
20325
20712
  align: 'center',
@@ -20349,6 +20736,20 @@ var getColumns$7 = function getColumns(_ref) {
20349
20736
  align: 'center',
20350
20737
  ellipsis: true,
20351
20738
  width: 150
20739
+ }, {
20740
+ dataIndex: 'specId',
20741
+ title: "\u89C4\u683CID",
20742
+ align: 'center',
20743
+ ellipsis: true,
20744
+ width: 150
20745
+ }, {
20746
+ dataIndex: 'goodsClass',
20747
+ title: "\u8D27\u54C1\u7C7B\u522B",
20748
+ width: 150
20749
+ }, {
20750
+ dataIndex: 'code',
20751
+ title: "\u6761\u7801",
20752
+ width: 150
20352
20753
  }, {
20353
20754
  dataIndex: 'mallProductName',
20354
20755
  title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
@@ -20383,6 +20784,19 @@ var getColumns$7 = function getColumns(_ref) {
20383
20784
  dataIndex: 'sellCount',
20384
20785
  title: "\u6570\u91CF",
20385
20786
  width: 100,
20787
+ validator: function validator(_rule, value) {
20788
+ var productName = '';
20789
+ if (((value === null || value === void 0 ? void 0 : value.jyReissueGoods) || []).some(function (goods) {
20790
+ var qty = toNum$4(goods === null || goods === void 0 ? void 0 : goods.sellCount);
20791
+ var res = typeof qty === 'number' ? qty < 1 : true;
20792
+ if (res) {
20793
+ productName = (goods === null || goods === void 0 ? void 0 : goods.productName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.productName, "]") : '';
20794
+ }
20795
+ return res;
20796
+ })) {
20797
+ return Promise.reject("".concat(productName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
20798
+ }
20799
+ },
20386
20800
  render: function render(val, record, index) {
20387
20801
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
20388
20802
  style: {
@@ -20393,9 +20807,8 @@ var getColumns$7 = function getColumns(_ref) {
20393
20807
  precision: 0,
20394
20808
  onChange: function onChange(num) {
20395
20809
  updateDataHandle({
20396
- qty: num,
20397
- amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
20398
- originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
20810
+ sellCount: num,
20811
+ sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
20399
20812
  }, index);
20400
20813
  }
20401
20814
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20414,8 +20827,8 @@ var getColumns$7 = function getColumns(_ref) {
20414
20827
  precision: 2,
20415
20828
  onChange: function onChange(num) {
20416
20829
  updateDataHandle({
20417
- price: num,
20418
- amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
20830
+ sellPrice: num,
20831
+ sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
20419
20832
  }, index);
20420
20833
  }
20421
20834
  }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20428,32 +20841,30 @@ var getColumns$7 = function getColumns(_ref) {
20428
20841
  dataIndex: 'sellTotal',
20429
20842
  title: "\u91D1\u989D",
20430
20843
  width: 150
20431
- }, {
20432
- dataIndex: 'settlementPrice',
20433
- title: "\u7ED3\u7B97\u4EF7",
20434
- width: 150
20435
- }, {
20436
- dataIndex: 'divideOrderFee',
20437
- title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
20438
- width: 150
20439
20844
  }, {
20440
20845
  dataIndex: 'bfit',
20441
20846
  title: "\u662F\u5426\u7EC4\u5408\u88C5",
20442
20847
  width: 150,
20443
20848
  render: function render(val, record, index) {
20444
20849
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
20850
+ dropdownStyle: {
20851
+ zIndex: 2000
20852
+ },
20853
+ getPopupContainer: function getPopupContainer() {
20854
+ return document.body;
20855
+ },
20445
20856
  value: val,
20446
20857
  onChange: function onChange(value) {
20447
20858
  updateHandle(value, index, 'bfit');
20448
20859
  },
20449
20860
  options: [{
20450
20861
  label: '是',
20451
- value: 1
20862
+ value: 'True'
20452
20863
  }, {
20453
20864
  label: '否',
20454
- value: 0
20865
+ value: 'False'
20455
20866
  }]
20456
- }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
20867
+ }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
20457
20868
  }
20458
20869
  }, {
20459
20870
  dataIndex: 'combinationName',
@@ -20469,18 +20880,24 @@ var getColumns$7 = function getColumns(_ref) {
20469
20880
  width: 150,
20470
20881
  render: function render(val, record, index) {
20471
20882
  return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
20883
+ dropdownStyle: {
20884
+ zIndex: 2000
20885
+ },
20886
+ getPopupContainer: function getPopupContainer() {
20887
+ return document.body;
20888
+ },
20472
20889
  value: val,
20473
20890
  onChange: function onChange(value) {
20474
20891
  updateHandle(value, index, 'gift');
20475
20892
  },
20476
20893
  options: [{
20477
20894
  label: '是',
20478
- value: 1
20895
+ value: '1'
20479
20896
  }, {
20480
20897
  label: '否',
20481
- value: 0
20898
+ value: '0'
20482
20899
  }]
20483
- }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
20900
+ }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
20484
20901
  }
20485
20902
  }].map(function (item) {
20486
20903
  return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20488,300 +20905,6 @@ var getColumns$7 = function getColumns(_ref) {
20488
20905
  ellipsis: true
20489
20906
  });
20490
20907
  })
20491
- //巨益补发商品信息
20492
- // JY_REISSUE_GOODS: [
20493
- // {
20494
- // dataIndex: 'goodName',
20495
- // title: `商品名称`,
20496
- // width: 150,
20497
- // },
20498
- // {
20499
- // dataIndex: 'goodShortName',
20500
- // title: `商品简称`,
20501
- // width: 150,
20502
- // },
20503
- // {
20504
- // dataIndex: 'goodNo',
20505
- // title: `商品编码`,
20506
- // width: 200,
20507
- // },
20508
- // {
20509
- // dataIndex: 'specName',
20510
- // title: `SKU名称`,
20511
- // align: 'center',
20512
- // ellipsis: true,
20513
- // width: 250,
20514
- // },
20515
- // {
20516
- // dataIndex: 'specNo',
20517
- // title: `SKU编码`,
20518
- // align: 'center',
20519
- // ellipsis: true,
20520
- // width: 150,
20521
- // },
20522
- // {
20523
- // dataIndex: 'qty',
20524
- // title: `数量`,
20525
- // width: 100,
20526
- // validator: (_rule: any, value: any) => {
20527
- // let goodsName = '';
20528
- // if (
20529
- // (value?.gyReissueGoods || []).some((goods: any) => {
20530
- // const qty = toNum(goods?.qty);
20531
- // const res = typeof qty === 'number' ? qty < 1 : true;
20532
- // if (res) {
20533
- // goodsName = goods?.goodName ? `[${goods?.goodName}]` : '';
20534
- // }
20535
- // return res;
20536
- // })
20537
- // ) {
20538
- // return Promise.reject(`${goodsName}数量必须大于0`);
20539
- // }
20540
- // },
20541
- // render: (val: any, record: any, index: number) =>
20542
- // !disabled ? (
20543
- // <InputNumber
20544
- // style={{ width: 70 }}
20545
- // value={val}
20546
- // min={1}
20547
- // precision={0}
20548
- // onChange={(num) => {
20549
- // updateDataHandle(
20550
- // {
20551
- // qty: num,
20552
- // amount:
20553
- // num && isNumberOrNumberString(record.price)
20554
- // ? num * record.price
20555
- // : null,
20556
- // originAmount:
20557
- // num && isNumberOrNumberString(record.originPrice)
20558
- // ? num * record.originPrice
20559
- // : null,
20560
- // },
20561
- // index,
20562
- // );
20563
- // }}
20564
- // ></InputNumber>
20565
- // ) : (
20566
- // <span>{val}</span>
20567
- // ),
20568
- // },
20569
- // {
20570
- // dataIndex: 'price',
20571
- // title: `实际单价`,
20572
- // width: 150,
20573
- // render: (val: any, record: any, index: number) =>
20574
- // !disabled ? (
20575
- // <InputNumber
20576
- // style={{ width: 130 }}
20577
- // value={val}
20578
- // min={0}
20579
- // precision={2}
20580
- // onChange={(num) => {
20581
- // updateDataHandle(
20582
- // {
20583
- // price: num,
20584
- // amount:
20585
- // num && isNumberOrNumberString(record.qty)
20586
- // ? num * record.qty
20587
- // : null,
20588
- // },
20589
- // index,
20590
- // );
20591
- // }}
20592
- // ></InputNumber>
20593
- // ) : (
20594
- // <span>{val}</span>
20595
- // ),
20596
- // },
20597
- // {
20598
- // dataIndex: 'amount',
20599
- // title: `实际金额`,
20600
- // width: 150,
20601
- // },
20602
- // {
20603
- // dataIndex: 'originPrice',
20604
- // title: `标准单价`,
20605
- // width: 150,
20606
- // },
20607
- // {
20608
- // dataIndex: 'originAmount',
20609
- // title: `标准金额`,
20610
- // width: 150,
20611
- // },
20612
- // {
20613
- // dataIndex: 'isGift',
20614
- // title: `是否赠品`,
20615
- // width: 150,
20616
- // render: (val: number, record: any, index: number) =>
20617
- // record.canEdit && !disabled ? (
20618
- // <Select
20619
- // value={val}
20620
- // onChange={(value) => {
20621
- // updateHandle(value, index, 'isGift');
20622
- // }}
20623
- // options={[
20624
- // { label: '是', value: 1 },
20625
- // { label: '否', value: 0 },
20626
- // ]}
20627
- // />
20628
- // ) : (
20629
- // <span>{getYesOrNo(val)}</span>
20630
- // ),
20631
- // },
20632
- // ].map((item) => ({ ...item, align: 'center', ellipsis: true })),
20633
- // //巨益退货商品信息
20634
- // JY_RETURN_GOODS: [
20635
- // {
20636
- // dataIndex: 'goodName',
20637
- // title: `商品名称`,
20638
- // width: 150,
20639
- // },
20640
- // {
20641
- // dataIndex: 'goodShortName',
20642
- // title: `商品简称`,
20643
- // width: 150,
20644
- // },
20645
- // {
20646
- // dataIndex: 'goodNo',
20647
- // title: `商品编码`,
20648
- // width: 200,
20649
- // },
20650
- // {
20651
- // dataIndex: 'specName',
20652
- // title: `SKU名称`,
20653
- // align: 'center',
20654
- // ellipsis: true,
20655
- // width: 250,
20656
- // },
20657
- // {
20658
- // dataIndex: 'specNo',
20659
- // title: `SKU编码`,
20660
- // align: 'center',
20661
- // ellipsis: true,
20662
- // width: 150,
20663
- // },
20664
- // {
20665
- // dataIndex: 'qty',
20666
- // title: `数量`,
20667
- // width: 100,
20668
- // validator: (_rule: any, value: any) => {
20669
- // let goodsName = '';
20670
- // if (
20671
- // (value?.gyReturnGoods || []).some((goods: any) => {
20672
- // const qty = toNum(goods?.qty);
20673
- // const res = typeof qty === 'number' ? qty < 1 : true;
20674
- // if (res) {
20675
- // goodsName = goods?.goodName ? `[${goods?.goodName}]` : '';
20676
- // }
20677
- // return res;
20678
- // })
20679
- // ) {
20680
- // return Promise.reject(`${goodsName}数量必须大于0`);
20681
- // }
20682
- // },
20683
- // render: (val: any, record: any, index: number) =>
20684
- // !disabled ? (
20685
- // <InputNumber
20686
- // style={{ width: 70 }}
20687
- // value={val}
20688
- // min={1}
20689
- // precision={0}
20690
- // onChange={(num) => {
20691
- // updateDataHandle(
20692
- // {
20693
- // qty: num,
20694
- // amount:
20695
- // num && isNumberOrNumberString(record.price)
20696
- // ? num * record.price
20697
- // : null,
20698
- // originAmount:
20699
- // num && isNumberOrNumberString(record.originPrice)
20700
- // ? num * record.originPrice
20701
- // : null,
20702
- // },
20703
- // index,
20704
- // );
20705
- // }}
20706
- // ></InputNumber>
20707
- // ) : (
20708
- // <span>{val}</span>
20709
- // ),
20710
- // },
20711
- // {
20712
- // dataIndex: 'price',
20713
- // title: `实际单价`,
20714
- // width: 150,
20715
- // render: (val: any, record: any, index: number) =>
20716
- // !disabled ? (
20717
- // <InputNumber
20718
- // style={{ width: 130 }}
20719
- // value={val}
20720
- // min={0}
20721
- // precision={2}
20722
- // onChange={(num) => {
20723
- // updateDataHandle(
20724
- // {
20725
- // price: num,
20726
- // amount:
20727
- // num && isNumberOrNumberString(record.qty)
20728
- // ? num * record.qty
20729
- // : null,
20730
- // },
20731
- // index,
20732
- // );
20733
- // }}
20734
- // ></InputNumber>
20735
- // ) : (
20736
- // <span>{val}</span>
20737
- // ),
20738
- // },
20739
- // {
20740
- // dataIndex: 'amount',
20741
- // title: `实际金额`,
20742
- // width: 150,
20743
- // },
20744
- // {
20745
- // dataIndex: 'originPrice',
20746
- // title: `标准单价`,
20747
- // width: 150,
20748
- // },
20749
- // {
20750
- // dataIndex: 'originAmount',
20751
- // title: `标准金额`,
20752
- // width: 150,
20753
- // },
20754
- // {
20755
- // dataIndex: 'discountFee',
20756
- // title: `让利金额`,
20757
- // width: 150,
20758
- // },
20759
- // {
20760
- // dataIndex: 'amountAfter',
20761
- // title: `让利后金额`,
20762
- // width: 150,
20763
- // },
20764
- // {
20765
- // dataIndex: 'isGift',
20766
- // title: `是否赠品`,
20767
- // width: 150,
20768
- // render: (val: number, record: any, index: number) =>
20769
- // record.canEdit && !disabled ? (
20770
- // <Select
20771
- // value={val}
20772
- // onChange={(value) => {
20773
- // updateHandle(value, index, 'isGift');
20774
- // }}
20775
- // options={[
20776
- // { label: '是', value: 1 },
20777
- // { label: '否', value: 0 },
20778
- // ]}
20779
- // />
20780
- // ) : (
20781
- // <span>{getYesOrNo(val)}</span>
20782
- // ),
20783
- // },
20784
- // ].map((item) => ({ ...item, align: 'center', ellipsis: true })),
20785
20908
  };
20786
20909
  };
20787
20910
 
@@ -20972,7 +21095,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
20972
21095
  })), getColumns$7({
20973
21096
  text: text,
20974
21097
  disabled: disabled,
20975
- updateHandle: updateHandle
21098
+ updateHandle: updateHandle,
21099
+ updateDataHandle: updateDataHandle
20976
21100
  })), getColumns$8({
20977
21101
  text: text,
20978
21102
  disabled: disabled,
@@ -21191,12 +21315,35 @@ var processJyGoods = function processJyGoods(_ref2) {
21191
21315
  var list = _ref2.list,
21192
21316
  canUpdateNumber = _ref2.canUpdateNumber;
21193
21317
  return list.map(function (item) {
21318
+ var goodName = item.goodName,
21319
+ goodNo = item.goodNo,
21320
+ goodId = item.goodId,
21321
+ specName = item.specName,
21322
+ specNo = item.specNo,
21323
+ specBarcode = item.specBarcode,
21324
+ retailPrice = item.retailPrice,
21325
+ isGift = item.isGift,
21326
+ skuType = item.skuType;
21194
21327
  return _objectSpread2(_objectSpread2({}, item), {}, {
21328
+ goodsName: goodName,
21329
+ goodsCode: goodNo,
21330
+ goodsId: goodId,
21331
+ code: specBarcode,
21332
+ specCode: specNo,
21333
+ productName: goodName,
21334
+ productCode: goodNo,
21335
+ productId: goodId,
21336
+ skuName: specName,
21337
+ skuCode: specNo,
21338
+ combinationName: goodName,
21339
+ combinationCode: goodNo,
21340
+ gift: isGift ? '1' : '0',
21341
+ bfit: skuType === 'combine' ? 'True' : 'False',
21195
21342
  uuid: uuid(),
21196
21343
  canDelete: true,
21197
21344
  sellCount: 1,
21198
- sellPrice: 0,
21199
- sellTotal: 0,
21345
+ sellPrice: retailPrice,
21346
+ sellTotal: (retailPrice * 1).toFixed(2),
21200
21347
  canEdit: true,
21201
21348
  canUpdateNumber: canUpdateNumber
21202
21349
  });
@@ -21387,6 +21534,7 @@ var GoodsModalMap = {
21387
21534
  KM_GOODS: KmGoodsModal,
21388
21535
  KM_REISSUE_GOODS: KmGoodsModal,
21389
21536
  JY_GOODS: JyGoodsModal$1,
21537
+ JY_REISSUE_GOODS: JyGoodsModal$1,
21390
21538
  OTHER_GOODS: GoodsModal$2
21391
21539
  };
21392
21540
  var systemOrderNoMap = {
@@ -21396,7 +21544,8 @@ var systemOrderNoMap = {
21396
21544
  BS_E3_GOODS: 'orderSn',
21397
21545
  JST_GOODS: 'oId',
21398
21546
  WLN_GOODS: 'tradeNo',
21399
- JY_GOODS: 'tradeNo'
21547
+ JY_GOODS: 'tradeNo',
21548
+ JY_REISSUE_GOODS: 'tradeNo'
21400
21549
  };
21401
21550
  var SelectTradeGoods = function SelectTradeGoods(_ref) {
21402
21551
  var columns = _ref.columns,
@@ -21454,6 +21603,12 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
21454
21603
  return item === null || item === void 0 ? void 0 : item[uniqueKey];
21455
21604
  }));
21456
21605
  var handleChangeSelectedKeys = function handleChangeSelectedKeys(keys) {
21606
+ console.log('handleChangeSelectedKeys', keys, unCurrentTradeOriginGoods);
21607
+ console.log('filterDataSource', filterDataSource === null || filterDataSource === void 0 ? void 0 : filterDataSource.map(function (item) {
21608
+ return item === null || item === void 0 ? void 0 : item[uniqueKey];
21609
+ }));
21610
+ console.log('selectedRowKeys', selectedRowKeys);
21611
+ console.log('currentTradeOriginGoods', currentTradeOriginGoods);
21457
21612
  onChangeSelectedKeys(keys.concat(unCurrentTradeOriginGoods));
21458
21613
  };
21459
21614
  var rowSelection = {
@@ -21577,13 +21732,15 @@ var GoodItem$1 = function GoodItem(props) {
21577
21732
  tradeGoods = props.tradeGoods,
21578
21733
  form = props.form,
21579
21734
  systemOrders = props.systemOrders,
21580
- selectedSystemOrders = props.selectedSystemOrders;
21735
+ selectedSystemOrders = props.selectedSystemOrders,
21736
+ _props$templateDetail = props.templateDetail,
21737
+ templateDetail = _props$templateDetail === void 0 ? {} : _props$templateDetail;
21581
21738
  var uniqueKey = (tradeGoods === null || tradeGoods === void 0 ? void 0 : tradeGoods.uniqueKey) || 'uuid';
21582
21739
  // 监听聚水潭退货商品
21583
21740
  var jstReturnGoods = Form === null || Form === void 0 ? void 0 : Form.useWatch('3979edfd6d', form);
21584
21741
  var isShowSelectTradeGoods = type !== 'JST_EXCHANGE_GOODS' || (jstReturnGoods === null || jstReturnGoods === void 0 ? void 0 : jstReturnGoods.jstSystemOrderNo);
21585
21742
  // 判断是否为商品信息组件
21586
- var isGoods = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS'].includes(type) || false;
21743
+ var isGoods = type && ['WDT_GOODS', 'BS_E3_GOODS', 'GY_GOODS', 'JST_GOODS', 'WLN_GOODS', 'KM_GOODS', 'JY_GOODS', 'JY_REISSUE_GOODS'].includes(type) || false;
21587
21744
  var refModal = useRef();
21588
21745
  console.debug('表格数据', value);
21589
21746
  var handleDelete = function handleDelete(record, index) {
@@ -21671,6 +21828,7 @@ var GoodItem$1 = function GoodItem(props) {
21671
21828
  case 'KM_GOODS':
21672
21829
  case 'KM_REISSUE_GOODS':
21673
21830
  case 'JY_GOODS':
21831
+ case 'JY_REISSUE_GOODS':
21674
21832
  case 'SKX_GOODS':
21675
21833
  case 'SKX_RETURN_GOODS':
21676
21834
  {
@@ -21717,8 +21875,9 @@ var GoodItem$1 = function GoodItem(props) {
21717
21875
  var COLUMNS_INFO = COLUMNS_MAP(text);
21718
21876
  return COLUMNS_INFO(type);
21719
21877
  };
21720
- var newColumns = useMemo(function () {
21721
- var initBaseInfoColumns = GOODS_INFO_COLUMNS();
21878
+ var getShowFilterColumns = useCallback(function (_ref2) {
21879
+ var showHeader = _ref2.showHeader,
21880
+ initBaseInfoColumns = _ref2.initBaseInfoColumns;
21722
21881
  var baseInfoColumns = [];
21723
21882
  var isStringArray = Array.isArray(showHeader) && typeof showHeader[0] === 'string';
21724
21883
  var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
@@ -21738,6 +21897,14 @@ var GoodItem$1 = function GoodItem(props) {
21738
21897
  return undefined;
21739
21898
  }).filter(Boolean);
21740
21899
  }
21900
+ return baseInfoColumns;
21901
+ }, [showHeader]);
21902
+ var newColumns = useMemo(function () {
21903
+ var initBaseInfoColumns = GOODS_INFO_COLUMNS();
21904
+ var baseInfoColumns = getShowFilterColumns({
21905
+ showHeader: showHeader,
21906
+ initBaseInfoColumns: initBaseInfoColumns
21907
+ });
21741
21908
  var columnList = [{
21742
21909
  dataIndex: '',
21743
21910
  title: '序号',
@@ -21774,8 +21941,16 @@ var GoodItem$1 = function GoodItem(props) {
21774
21941
  return columnList;
21775
21942
  }, [showHeader, value, disabled, hoveredRowIndex]);
21776
21943
  var orderModalColumns = useMemo(function () {
21777
- var list = newColumns.filter(function (col) {
21778
- return !['操作', '序号'].includes(col.title);
21944
+ var initBaseInfoColumns = COLUMNS_MAP('', {
21945
+ operate: false,
21946
+ disabled: true
21947
+ })(type);
21948
+ var baseInfoColumns = getShowFilterColumns({
21949
+ showHeader: showHeader,
21950
+ initBaseInfoColumns: initBaseInfoColumns
21951
+ });
21952
+ var list = baseInfoColumns.filter(function (col) {
21953
+ return !['操作'].includes(col.title);
21779
21954
  });
21780
21955
  return [{
21781
21956
  dataIndex: '',
@@ -21787,7 +21962,7 @@ var GoodItem$1 = function GoodItem(props) {
21787
21962
  return /*#__PURE__*/React.createElement("span", null, index + 1);
21788
21963
  }
21789
21964
  }].concat(_toConsumableArray(list));
21790
- }, [newColumns]);
21965
+ }, [showHeader, value, disabled, hoveredRowIndex]);
21791
21966
  var orderColumns = useMemo(function () {
21792
21967
  var columns = COLUMNS_MAP('', {
21793
21968
  operate: false,
@@ -21900,7 +22075,9 @@ var GoodItem$1 = function GoodItem(props) {
21900
22075
  maxLength: maxLength,
21901
22076
  companyKey: companyKey,
21902
22077
  goodsSource: goodsSource,
21903
- useGoodsSourceFormat: useGoodsSourceFormat
22078
+ useGoodsSourceFormat: useGoodsSourceFormat,
22079
+ form: form,
22080
+ templateDetail: templateDetail
21904
22081
  }));
21905
22082
  };
21906
22083
 
@@ -22535,7 +22712,7 @@ var getWdtOrderListSingleton = function getWdtOrderListSingleton(orderNo) {
22535
22712
  return _objectSpread2(_objectSpread2({}, item), {}, {
22536
22713
  billNo: item.tradeNo,
22537
22714
  billType: WDT_ORDER_TYPE_MAP[item.tradeType],
22538
- billTag: item.tagName,
22715
+ billTag: item.tagName || item.tags,
22539
22716
  tradeStatusValue: tradeStatusMap === null || tradeStatusMap === void 0 ? void 0 : (_tradeStatusMap$data$ = tradeStatusMap[data.data.version]) === null || _tradeStatusMap$data$ === void 0 ? void 0 : _tradeStatusMap$data$[item.tradeStatus]
22540
22717
  });
22541
22718
  });
@@ -22779,13 +22956,19 @@ var getJyOrderListSingleton = function getJyOrderListSingleton(orderNo) {
22779
22956
  extendRequest('/qy/gdfw/order/jyOrderDetail', {
22780
22957
  method: 'post',
22781
22958
  data: {
22782
- tid: orderNo
22959
+ billNo: orderNo
22783
22960
  }
22784
22961
  }).then(function (res) {
22785
22962
  if (res === null || res === void 0 ? void 0 : res.success) {
22786
- var _res$data;
22787
- if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.length) {
22788
- res.data.trades = filterJyOrders(res === null || res === void 0 ? void 0 : res.data, orderNo);
22963
+ var _res$data, _res$data$tradeOrderD;
22964
+ if (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$tradeOrderD = _res$data.tradeOrderDetails) === null || _res$data$tradeOrderD === void 0 ? void 0 : _res$data$tradeOrderD.length) {
22965
+ var _filterJyOrders, _res$data2;
22966
+ res.data.trades = (_filterJyOrders = filterJyOrders(res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.tradeOrderDetails, orderNo)) === null || _filterJyOrders === void 0 ? void 0 : _filterJyOrders.map(function (item) {
22967
+ return _objectSpread2(_objectSpread2({}, item), {}, {
22968
+ tradeType: JY_ORDER_TYPE_MAP[item.tradeType],
22969
+ tradeStatus: JY_ORDER_STATUS_MAP[item.tradeStatus]
22970
+ });
22971
+ });
22789
22972
  }
22790
22973
  resolve(res.data);
22791
22974
  // 延迟10秒清除,保证订单的时效性
@@ -22878,7 +23061,9 @@ var index$2 = (function (props) {
22878
23061
  var value = props.value,
22879
23062
  _onChange = props.onChange,
22880
23063
  disabled = props.disabled,
22881
- type = props.type;
23064
+ type = props.type,
23065
+ _props$showHeader = props.showHeader,
23066
+ showHeader = _props$showHeader === void 0 ? [] : _props$showHeader;
22882
23067
  var onceRef = useRef(false);
22883
23068
  var valueRef = useRef(null);
22884
23069
  useEffect(function () {
@@ -22906,8 +23091,12 @@ var index$2 = (function (props) {
22906
23091
  }
22907
23092
  }, [value, type]);
22908
23093
  var columns = useMemo(function () {
22909
- return columnsMap[type] || [];
22910
- }, [type]);
23094
+ var baseInfoColumns = getSystemShowHead({
23095
+ columns: columnsMap[type] || [],
23096
+ showHeader: showHeader
23097
+ });
23098
+ return baseInfoColumns || [];
23099
+ }, [type, showHeader]);
22911
23100
  var getOrderList = /*#__PURE__*/function () {
22912
23101
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
22913
23102
  return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -22987,17 +23176,8 @@ var index$2 = (function (props) {
22987
23176
  });
22988
23177
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
22989
23178
  orders: trades,
22990
- showOrderInfo: trades.map(function (_ref4) {
22991
- var billNo = _ref4.billNo,
22992
- billType = _ref4.billType,
22993
- billTag = _ref4.billTag,
22994
- tradeStatusValue = _ref4.tradeStatusValue;
22995
- return {
22996
- billNo: billNo,
22997
- billType: billType,
22998
- billTag: billTag,
22999
- tradeStatusValue: tradeStatusValue
23000
- };
23179
+ showOrderInfo: trades.map(function (item) {
23180
+ return _objectSpread2({}, item);
23001
23181
  })
23002
23182
  }));
23003
23183
  });
@@ -23013,7 +23193,7 @@ var index$2 = (function (props) {
23013
23193
  };
23014
23194
  }();
23015
23195
  var getBsE3OrderList = /*#__PURE__*/function () {
23016
- var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(orderNo) {
23196
+ var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(orderNo) {
23017
23197
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
23018
23198
  while (1) switch (_context4.prev = _context4.next) {
23019
23199
  case 0:
@@ -23034,11 +23214,11 @@ var index$2 = (function (props) {
23034
23214
  }, _callee4);
23035
23215
  }));
23036
23216
  return function getBsE3OrderList(_x4) {
23037
- return _ref5.apply(this, arguments);
23217
+ return _ref4.apply(this, arguments);
23038
23218
  };
23039
23219
  }();
23040
23220
  var getJstOrderList = /*#__PURE__*/function () {
23041
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
23221
+ var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(orderNo) {
23042
23222
  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
23043
23223
  while (1) switch (_context5.prev = _context5.next) {
23044
23224
  case 0:
@@ -23057,21 +23237,21 @@ var index$2 = (function (props) {
23057
23237
  }, _callee5);
23058
23238
  }));
23059
23239
  return function getJstOrderList(_x5) {
23060
- return _ref6.apply(this, arguments);
23240
+ return _ref5.apply(this, arguments);
23061
23241
  };
23062
23242
  }();
23063
23243
  var getKmOrderList = /*#__PURE__*/function () {
23064
- var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
23244
+ var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(orderNo) {
23065
23245
  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
23066
23246
  while (1) switch (_context6.prev = _context6.next) {
23067
23247
  case 0:
23068
23248
  kmUtils.getOrderListSingleton(orderNo).then(function (trades) {
23069
23249
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
23070
23250
  orders: trades,
23071
- showOrderInfo: trades.map(function (_ref8) {
23072
- var billNo = _ref8.billNo,
23073
- billType = _ref8.billType,
23074
- billTag = _ref8.billTag;
23251
+ showOrderInfo: trades.map(function (_ref7) {
23252
+ var billNo = _ref7.billNo,
23253
+ billType = _ref7.billType,
23254
+ billTag = _ref7.billTag;
23075
23255
  return {
23076
23256
  billNo: billNo,
23077
23257
  billType: billType,
@@ -23088,11 +23268,11 @@ var index$2 = (function (props) {
23088
23268
  }, _callee6);
23089
23269
  }));
23090
23270
  return function getKmOrderList(_x6) {
23091
- return _ref7.apply(this, arguments);
23271
+ return _ref6.apply(this, arguments);
23092
23272
  };
23093
23273
  }();
23094
23274
  var getGyOrderList = /*#__PURE__*/function () {
23095
- var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderNo) {
23275
+ var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(orderNo) {
23096
23276
  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
23097
23277
  while (1) switch (_context7.prev = _context7.next) {
23098
23278
  case 0:
@@ -23102,16 +23282,16 @@ var index$2 = (function (props) {
23102
23282
  });
23103
23283
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
23104
23284
  orders: trades,
23105
- showOrderInfo: trades.map(function (_ref10) {
23106
- var billNo = _ref10.billNo,
23107
- billType = _ref10.billType,
23108
- billTag = _ref10.billTag,
23109
- tradeTagName = _ref10.tradeTagName,
23110
- deliveryState = _ref10.deliveryState,
23111
- vipCode = _ref10.vipCode,
23112
- shopCode = _ref10.shopCode,
23113
- cancel = _ref10.cancel,
23114
- rest = _objectWithoutProperties(_ref10, _excluded$k);
23285
+ showOrderInfo: trades.map(function (_ref9) {
23286
+ var billNo = _ref9.billNo,
23287
+ billType = _ref9.billType,
23288
+ billTag = _ref9.billTag,
23289
+ tradeTagName = _ref9.tradeTagName,
23290
+ deliveryState = _ref9.deliveryState,
23291
+ vipCode = _ref9.vipCode,
23292
+ shopCode = _ref9.shopCode,
23293
+ cancel = _ref9.cancel,
23294
+ rest = _objectWithoutProperties(_ref9, _excluded$k);
23115
23295
  return _objectSpread2(_objectSpread2({}, rest), {}, {
23116
23296
  billNo: billNo,
23117
23297
  billType: billType,
@@ -23134,11 +23314,11 @@ var index$2 = (function (props) {
23134
23314
  }, _callee7);
23135
23315
  }));
23136
23316
  return function getGyOrderList(_x7) {
23137
- return _ref9.apply(this, arguments);
23317
+ return _ref8.apply(this, arguments);
23138
23318
  };
23139
23319
  }();
23140
23320
  var getJyOrderList = /*#__PURE__*/function () {
23141
- var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(orderNo) {
23321
+ var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(orderNo) {
23142
23322
  return _regeneratorRuntime().wrap(function _callee8$(_context8) {
23143
23323
  while (1) switch (_context8.prev = _context8.next) {
23144
23324
  case 0:
@@ -23148,9 +23328,9 @@ var index$2 = (function (props) {
23148
23328
  });
23149
23329
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(_objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, {
23150
23330
  orders: trades,
23151
- showOrderInfo: trades.map(function (_ref12) {
23152
- var shopCode = _ref12.shopCode,
23153
- rest = _objectWithoutProperties(_ref12, _excluded2);
23331
+ showOrderInfo: trades.map(function (_ref11) {
23332
+ var shopCode = _ref11.shopCode,
23333
+ rest = _objectWithoutProperties(_ref11, _excluded2);
23154
23334
  return _objectSpread2(_objectSpread2({}, rest), {}, {
23155
23335
  shopCode: shopCode
23156
23336
  });
@@ -23165,7 +23345,7 @@ var index$2 = (function (props) {
23165
23345
  }, _callee8);
23166
23346
  }));
23167
23347
  return function getJyOrderList(_x8) {
23168
- return _ref11.apply(this, arguments);
23348
+ return _ref10.apply(this, arguments);
23169
23349
  };
23170
23350
  }();
23171
23351
  var rowSelection = {
@@ -23209,7 +23389,8 @@ var index$2 = (function (props) {
23209
23389
  size: "small",
23210
23390
  pagination: false,
23211
23391
  scroll: {
23212
- x: 'max-content'
23392
+ x: '100%',
23393
+ y: 500
23213
23394
  },
23214
23395
  locale: {
23215
23396
  emptyText: '暂无数据'
@@ -25006,21 +25187,12 @@ var wdtReissue = function wdtReissue(props) {
25006
25187
  while (1) switch (_context.prev = _context.next) {
25007
25188
  case 0:
25008
25189
  (_typeMap$type5 = typeMap$1[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.getOrderList(orderNo).then(function (data) {
25009
- var _typeMap$type6, _ref3, _typeMap$type7;
25190
+ var _typeMap$type6, _ref2, _typeMap$type7;
25010
25191
  var orders = (data === null || data === void 0 ? void 0 : data.trades) || [];
25011
- var showOrderInfo = orders.map(function (_ref2) {
25012
- var billNo = _ref2.billNo,
25013
- billType = _ref2.billType,
25014
- billTag = _ref2.billTag,
25015
- tradeStatusValue = _ref2.tradeStatusValue;
25016
- return {
25017
- billNo: billNo,
25018
- billType: billType,
25019
- billTag: billTag,
25020
- tradeStatusValue: tradeStatusValue
25021
- };
25192
+ var showOrderInfo = orders.map(function (item) {
25193
+ return _objectSpread2({}, item);
25022
25194
  });
25023
- var newValue = _objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref3 = valueRef.current || {}) === null || _ref3 === void 0 ? void 0 : _ref3[(_typeMap$type7 = typeMap$1[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder]) || {}), {}, {
25195
+ var newValue = _objectSpread2(_objectSpread2({}, valueRef.current || {}), {}, _defineProperty({}, (_typeMap$type6 = typeMap$1[type]) === null || _typeMap$type6 === void 0 ? void 0 : _typeMap$type6.systemOrder, _objectSpread2(_objectSpread2({}, ((_ref2 = valueRef.current || {}) === null || _ref2 === void 0 ? void 0 : _ref2[(_typeMap$type7 = typeMap$1[type]) === null || _typeMap$type7 === void 0 ? void 0 : _typeMap$type7.systemOrder]) || {}), {}, {
25024
25196
  showOrderInfo: showOrderInfo,
25025
25197
  orders: orders
25026
25198
  })));
@@ -25066,10 +25238,10 @@ var wdtReissue = function wdtReissue(props) {
25066
25238
  mode: mode
25067
25239
  }))));
25068
25240
  };
25069
- var getGoodDetails = function getGoodDetails(_ref4) {
25241
+ var getGoodDetails = function getGoodDetails(_ref3) {
25070
25242
  var _typeMap$type14, _typeMap$type15, _order$goodDetails;
25071
- var mode = _ref4.mode,
25072
- sysOrderNo = _ref4.sysOrderNo;
25243
+ var mode = _ref3.mode,
25244
+ sysOrderNo = _ref3.sysOrderNo;
25073
25245
  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type14 = typeMap$1[type]) === null || _typeMap$type14 === void 0 ? void 0 : _typeMap$type14.systemOrder];
25074
25246
  var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type15 = typeMap$1[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.systemOrderNo];
25075
25247
  var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
@@ -25123,6 +25295,9 @@ var wdtReissue = function wdtReissue(props) {
25123
25295
  return !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type25 = typeMap$1[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderNo]);
25124
25296
  }, [value === null || value === void 0 ? void 0 : value[(_typeMap$type26 = typeMap$1[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrderNo]]);
25125
25297
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
25298
+ style: {
25299
+ width: '100%'
25300
+ },
25126
25301
  gutter: 8,
25127
25302
  wrap: true
25128
25303
  }, /*#__PURE__*/React.createElement(Col, {
@@ -25252,10 +25427,25 @@ var typeMap$2 = {
25252
25427
  outerOiIdKey: '',
25253
25428
  goodDetailsKey: 'subOrders',
25254
25429
  uniqueKey: 'id'
25430
+ },
25431
+ JY_REISSUE_GOODS: {
25432
+ compType: '补发',
25433
+ key: 'jyReissueGoods',
25434
+ typeName: 'jyReissueType',
25435
+ systemOrder: 'jySystemOrder',
25436
+ systemOrderNo: 'jySystemOrderNo',
25437
+ getOrderList: jyUtils.getJyOrderListSingleton,
25438
+ updateGoodsHandle: updateJyGoodsHandle,
25439
+ alwaysShowChooseErpGoodsBtn: true,
25440
+ orderTypeKey: 'orderType',
25441
+ oIdKey: 'tradeNo',
25442
+ outerOiIdKey: '',
25443
+ goodDetailsKey: 'subOrderDetails',
25444
+ isShowSelectTradeGoods: true
25255
25445
  }
25256
25446
  };
25257
25447
  var PublicReissue = function PublicReissue(props) {
25258
- var _typeMap$type33, _typeMap$type38, _typeMap$type39, _typeMap$type40, _typeMap$type41, _value$typeMap$type$s7, _typeMap$type42, _typeMap$type43, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49;
25448
+ var _typeMap$type34, _typeMap$type40, _typeMap$type41, _typeMap$type42, _typeMap$type43, _value$typeMap$type$s8, _typeMap$type44, _typeMap$type45, _typeMap$type46, _typeMap$type47, _typeMap$type48, _typeMap$type49, _typeMap$type50, _typeMap$type51, _typeMap$type52, _value$typeMap$type$s9, _typeMap$type53, _typeMap$type54, _typeMap$type55;
25259
25449
  var value = props.value,
25260
25450
  onChange = props.onChange,
25261
25451
  _props$reasonList = props.reasonList,
@@ -25372,9 +25562,11 @@ var PublicReissue = function PublicReissue(props) {
25372
25562
  }))));
25373
25563
  };
25374
25564
  var getGoodDetails = function getGoodDetails(_ref4) {
25375
- var _typeMap$type18, _typeMap$type19, _order$typeMap$type$g, _typeMap$type20, _typeMap$type21;
25565
+ var _typeMap$type18, _typeMap$type19, _value$typeMap$type$s6, _typeMap$type20, _typeMap$type21, _typeMap$type22;
25376
25566
  var mode = _ref4.mode,
25377
- sysOrderNo = _ref4.sysOrderNo;
25567
+ sysOrderNo = _ref4.sysOrderNo,
25568
+ _ref4$isAllOrders = _ref4.isAllOrders,
25569
+ isAllOrders = _ref4$isAllOrders === void 0 ? false : _ref4$isAllOrders;
25378
25570
  var systemOrder = value === null || value === void 0 ? void 0 : value[(_typeMap$type18 = typeMap$2[type]) === null || _typeMap$type18 === void 0 ? void 0 : _typeMap$type18.systemOrder];
25379
25571
  var systemOrderNo = sysOrderNo !== null && sysOrderNo !== void 0 ? sysOrderNo : value === null || value === void 0 ? void 0 : value[(_typeMap$type19 = typeMap$2[type]) === null || _typeMap$type19 === void 0 ? void 0 : _typeMap$type19.systemOrderNo];
25380
25572
  var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
@@ -25388,39 +25580,48 @@ var PublicReissue = function PublicReissue(props) {
25388
25580
  orderBackGoodsLevel: props.orderBackGoodsLevel,
25389
25581
  canEdit: true
25390
25582
  };
25583
+ } else if (['JY_REISSUE_GOODS', 'JY_RETURN_GOODS'].includes(type)) {
25584
+ orderRest = {
25585
+ canEdit: true
25586
+ };
25391
25587
  }
25392
- var goodDetails = (order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length) ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.updateGoodsHandle([order], orderRest)) : (_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle([order], orderRest) : [];
25588
+ var orders = isAllOrders ? (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type20 = typeMap$2[type]) === null || _typeMap$type20 === void 0 ? void 0 : _typeMap$type20.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [] : [order];
25589
+ var hasGoodDetails = orders === null || orders === void 0 ? void 0 : orders.some(function (order) {
25590
+ var _order$typeMap$type$g;
25591
+ return order === null || order === void 0 ? void 0 : (_order$typeMap$type$g = order[typeMap$2[type].goodDetailsKey]) === null || _order$typeMap$type$g === void 0 ? void 0 : _order$typeMap$type$g.length;
25592
+ });
25593
+ var goodDetails = hasGoodDetails ? typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type21 = typeMap$2[type]) === null || _typeMap$type21 === void 0 ? void 0 : _typeMap$type21.updateGoodsHandle(orders, orderRest)) : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.updateGoodsHandle(orders, orderRest) : [];
25393
25594
  var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
25394
- var list = mode ? goodDetails.filter(function (goodItem) {
25595
+ var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {
25395
25596
  return !orderNo || goodItem[typeMap$2[type].outerOiIdKey] === orderNo;
25396
25597
  }) : goodDetails;
25397
25598
  return list;
25398
25599
  };
25399
25600
  var changeGoodHandle = function changeGoodHandle(val) {
25400
- var _typeMap$type22;
25601
+ var _typeMap$type23;
25401
25602
  var newValue = _objectSpread2({}, value);
25402
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.key)] = val || [];
25603
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.key)] = val || [];
25403
25604
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
25404
25605
  };
25405
25606
  var changeSystemOrderHandle = function changeSystemOrderHandle(val) {
25406
- var _typeMap$type23, _typeMap$type24, _value$typeMap$type$t2, _typeMap$type29, _value$typeMap$type$t3, _typeMap$type31;
25607
+ var _typeMap$type24, _typeMap$type25, _value$typeMap$type$t2, _typeMap$type30, _value$typeMap$type$t3, _typeMap$type32;
25407
25608
  var newValue = _objectSpread2({}, value);
25408
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.systemOrderNo)] = val;
25409
- if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderBillType) {
25410
- var _value$typeMap$type$s6, _typeMap$type25, _typeMap$type27, _typeMap$type28;
25411
- var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s6 = value[(_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrder]) === null || _value$typeMap$type$s6 === void 0 ? void 0 : _value$typeMap$type$s6.orders) || [];
25609
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.systemOrderNo)] = val;
25610
+ if (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type25 = typeMap$2[type]) === null || _typeMap$type25 === void 0 ? void 0 : _typeMap$type25.systemOrderBillType) {
25611
+ var _value$typeMap$type$s7, _typeMap$type26, _typeMap$type28, _typeMap$type29;
25612
+ var orders = (value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.orders) || [];
25412
25613
  var targetOrder = val && orders.find(function (oItem) {
25413
- var _typeMap$type26;
25414
- return oItem[(_typeMap$type26 = typeMap$2[type]) === null || _typeMap$type26 === void 0 ? void 0 : _typeMap$type26.oIdKey] === val;
25614
+ var _typeMap$type27;
25615
+ return oItem[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.oIdKey] === val;
25415
25616
  });
25416
- newValue[(_typeMap$type27 = typeMap$2[type]) === null || _typeMap$type27 === void 0 ? void 0 : _typeMap$type27.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.orderTypeKey];
25417
- }
25418
- if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
25419
- var _typeMap$type30;
25420
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.key)] = [];
25421
- } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
25422
- var _typeMap$type32;
25423
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.key)] = getGoodDetails({
25617
+ newValue[(_typeMap$type28 = typeMap$2[type]) === null || _typeMap$type28 === void 0 ? void 0 : _typeMap$type28.systemOrderBillType] = targetOrder === null || targetOrder === void 0 ? void 0 : targetOrder[(_typeMap$type29 = typeMap$2[type]) === null || _typeMap$type29 === void 0 ? void 0 : _typeMap$type29.orderTypeKey];
25618
+ }
25619
+ if (['2'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t2 = value[(_typeMap$type30 = typeMap$2[type]) === null || _typeMap$type30 === void 0 ? void 0 : _typeMap$type30.typeName]) === null || _value$typeMap$type$t2 === void 0 ? void 0 : _value$typeMap$type$t2[0])) {
25620
+ var _typeMap$type31;
25621
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type31 = typeMap$2[type]) === null || _typeMap$type31 === void 0 ? void 0 : _typeMap$type31.key)] = [];
25622
+ } else if (['1'].includes(value === null || value === void 0 ? void 0 : (_value$typeMap$type$t3 = value[(_typeMap$type32 = typeMap$2[type]) === null || _typeMap$type32 === void 0 ? void 0 : _typeMap$type32.typeName]) === null || _value$typeMap$type$t3 === void 0 ? void 0 : _value$typeMap$type$t3[0])) {
25623
+ var _typeMap$type33;
25624
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.key)] = getGoodDetails({
25424
25625
  mode: isStrict,
25425
25626
  sysOrderNo: val
25426
25627
  });
@@ -25428,26 +25629,27 @@ var PublicReissue = function PublicReissue(props) {
25428
25629
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue, 'systemOrder');
25429
25630
  };
25430
25631
  //显示选择商品按钮
25431
- var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type33 = typeMap$2[type]) === null || _typeMap$type33 === void 0 ? void 0 : _typeMap$type33.systemOrderNo]);
25632
+ var showChangeBtn = !!(value === null || value === void 0 ? void 0 : value[(_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.systemOrderNo]);
25432
25633
  var selectedGoodsChange = useCallback(function (skuList) {
25433
- var _typeMap$type34, _typeMap$type35, _uniqBy, _typeMap$type36;
25634
+ var _typeMap$type35, _typeMap$type36, _typeMap$type37, _uniqBy, _typeMap$type38;
25434
25635
  var newValue = _objectSpread2({}, value);
25435
25636
  // 原订单商品
25436
25637
  var originTradeGoodList = getGoodDetails({
25437
- mode: isStrict
25638
+ mode: isStrict,
25639
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.isShowSelectTradeGoods
25438
25640
  }) || [];
25439
25641
  // 当前选中的所有商品【包含了原订单+商品库】
25440
- var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type34 = typeMap$2[type]) === null || _typeMap$type34 === void 0 ? void 0 : _typeMap$type34.key)]) || [];
25441
- newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type35 = typeMap$2[type]) === null || _typeMap$type35 === void 0 ? void 0 : _typeMap$type35.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
25442
- var _typeMap$type37;
25443
- return skuList.includes(item[typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.uniqueKey]);
25642
+ var currentSelectGoodList = (value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type36 = typeMap$2[type]) === null || _typeMap$type36 === void 0 ? void 0 : _typeMap$type36.key)]) || [];
25643
+ newValue["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type37 = typeMap$2[type]) === null || _typeMap$type37 === void 0 ? void 0 : _typeMap$type37.key)] = (_uniqBy = uniqBy(originTradeGoodList.concat(currentSelectGoodList), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.uniqueKey) || 'uuid')) === null || _uniqBy === void 0 ? void 0 : _uniqBy.filter(function (item) {
25644
+ var _typeMap$type39;
25645
+ return skuList.includes(item[(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.uniqueKey) || 'uuid']);
25444
25646
  });
25445
25647
  onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
25446
- }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type38 = typeMap$2[type]) === null || _typeMap$type38 === void 0 ? void 0 : _typeMap$type38.key)], isStrict]);
25648
+ }, [value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.key)], isStrict]);
25447
25649
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
25448
25650
  gutter: 8,
25449
25651
  wrap: true,
25450
- id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type39 = typeMap$2[type]) === null || _typeMap$type39 === void 0 ? void 0 : _typeMap$type39.key) || "".concat(Date.now())
25652
+ id: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.key) || "".concat(Date.now())
25451
25653
  }, /*#__PURE__*/React.createElement(Col, {
25452
25654
  className: "gutter-row",
25453
25655
  xs: {
@@ -25463,12 +25665,12 @@ var PublicReissue = function PublicReissue(props) {
25463
25665
  },
25464
25666
  disabled: disabled,
25465
25667
  allowClear: false,
25466
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type40 = typeMap$2[type]) === null || _typeMap$type40 === void 0 ? void 0 : _typeMap$type40.systemOrderNo)],
25668
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.systemOrderNo)],
25467
25669
  onChange: function onChange(val) {
25468
25670
  return changeSystemOrderHandle(val);
25469
25671
  },
25470
- placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type41 = typeMap$2[type]) === null || _typeMap$type41 === void 0 ? void 0 : _typeMap$type41.compType) || '', "\u7CFB\u7EDF\u5355")
25471
- }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s7 = value[(_typeMap$type42 = typeMap$2[type]) === null || _typeMap$type42 === void 0 ? void 0 : _typeMap$type42.systemOrder]) === null || _value$typeMap$type$s7 === void 0 ? void 0 : _value$typeMap$type$s7.showOrderInfo) || []).map(function (item) {
25672
+ placeholder: "\u9009\u62E9".concat((typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.compType) || '', "\u7CFB\u7EDF\u5355")
25673
+ }, ((value === null || value === void 0 ? void 0 : (_value$typeMap$type$s8 = value[(_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrder]) === null || _value$typeMap$type$s8 === void 0 ? void 0 : _value$typeMap$type$s8.showOrderInfo) || []).map(function (item) {
25472
25674
  return /*#__PURE__*/React.createElement(Select.Option, {
25473
25675
  key: item[typeMap$2[type].oIdKey],
25474
25676
  value: item[typeMap$2[type].oIdKey],
@@ -25490,11 +25692,11 @@ var PublicReissue = function PublicReissue(props) {
25490
25692
  disabled: isSettingConfig ? !isSettingConfig : disabled,
25491
25693
  allowClear: false,
25492
25694
  options: reasonList,
25493
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type43 = typeMap$2[type]) === null || _typeMap$type43 === void 0 ? void 0 : _typeMap$type43.typeName)],
25695
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.typeName)],
25494
25696
  onChange: function onChange(val) {
25495
25697
  return changeTypeHandle(val);
25496
25698
  }
25497
- })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type44 = typeMap$2[type]) === null || _typeMap$type44 === void 0 ? void 0 : _typeMap$type44.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React.createElement(Col, {
25699
+ })), (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.systemOrderBillType) && !isSettingConfig && /*#__PURE__*/React.createElement(Col, {
25498
25700
  className: "gutter-row",
25499
25701
  xs: {
25500
25702
  span: 11
@@ -25503,7 +25705,7 @@ var PublicReissue = function PublicReissue(props) {
25503
25705
  span: 6
25504
25706
  }
25505
25707
  }, /*#__PURE__*/React.createElement(Input, {
25506
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type45 = typeMap$2[type]) === null || _typeMap$type45 === void 0 ? void 0 : _typeMap$type45.systemOrderBillType)],
25708
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.systemOrderBillType)],
25507
25709
  disabled: disabled,
25508
25710
  readOnly: true
25509
25711
  }))), /*#__PURE__*/React.createElement(GoodItem$1, _objectSpread2(_objectSpread2({
@@ -25512,22 +25714,25 @@ var PublicReissue = function PublicReissue(props) {
25512
25714
  type: type,
25513
25715
  disabled: disabled,
25514
25716
  canUpdateNumber: showChangeBtn,
25515
- showChangeBtn: showChangeBtn,
25516
- alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type46 = typeMap$2[type]) === null || _typeMap$type46 === void 0 ? void 0 : _typeMap$type46.alwaysShowChooseErpGoodsBtn,
25517
- showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type47 = typeMap$2[type]) === null || _typeMap$type47 === void 0 ? void 0 : _typeMap$type47.showErpGoodsBtn,
25717
+ showChangeBtn: showChangeBtn || (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.isShowSelectTradeGoods),
25718
+ alwaysShowChooseErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.alwaysShowChooseErpGoodsBtn,
25719
+ showErpGoodsBtn: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type50 = typeMap$2[type]) === null || _typeMap$type50 === void 0 ? void 0 : _typeMap$type50.showErpGoodsBtn,
25518
25720
  shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
25519
- value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type48 = typeMap$2[type]) === null || _typeMap$type48 === void 0 ? void 0 : _typeMap$type48.key)],
25721
+ value: value === null || value === void 0 ? void 0 : value["".concat(typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type51 = typeMap$2[type]) === null || _typeMap$type51 === void 0 ? void 0 : _typeMap$type51.key)],
25520
25722
  onChange: function onChange(val) {
25521
25723
  return changeGoodHandle(val);
25522
25724
  },
25523
25725
  onModeChange: handleModeChange,
25524
25726
  showModeBtn: false,
25525
25727
  isStrict: isStrict,
25728
+ isShowSelectTradeGoods: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type52 = typeMap$2[type]) === null || _typeMap$type52 === void 0 ? void 0 : _typeMap$type52.isShowSelectTradeGoods,
25729
+ systemOrders: value === null || value === void 0 ? void 0 : (_value$typeMap$type$s9 = value[(_typeMap$type53 = typeMap$2[type]) === null || _typeMap$type53 === void 0 ? void 0 : _typeMap$type53.systemOrder]) === null || _value$typeMap$type$s9 === void 0 ? void 0 : _value$typeMap$type$s9.orders,
25526
25730
  tradeGoods: {
25527
25731
  originDataSource: getGoodDetails({
25528
- mode: isStrict
25732
+ mode: isStrict,
25733
+ isAllOrders: typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type54 = typeMap$2[type]) === null || _typeMap$type54 === void 0 ? void 0 : _typeMap$type54.isShowSelectTradeGoods
25529
25734
  }),
25530
- uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type49 = typeMap$2[type]) === null || _typeMap$type49 === void 0 ? void 0 : _typeMap$type49.uniqueKey) || 'uuid',
25735
+ uniqueKey: (typeMap$2 === null || typeMap$2 === void 0 ? void 0 : (_typeMap$type55 = typeMap$2[type]) === null || _typeMap$type55 === void 0 ? void 0 : _typeMap$type55.uniqueKey) || 'uuid',
25531
25736
  selectedGoodsChange: selectedGoodsChange
25532
25737
  }
25533
25738
  })));
@@ -27788,4 +27993,15 @@ var SkxGoods = function SkxGoods(props) {
27788
27993
  }));
27789
27994
  };
27790
27995
 
27791
- 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, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap };
27996
+ var SYSTEM_ORDER_COLUMNS_MAP = {
27997
+ BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
27998
+ KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
27999
+ WLN_SYSTEM_ORDER: WLN_SYSTEM_ORDER_CONFIG.columns,
28000
+ WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG.columns,
28001
+ BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG.columns,
28002
+ GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns,
28003
+ JST_SYSTEM_ORDER: JST_SYSTEM_ORDER_CONFIG.columns,
28004
+ JY_SYSTEM_ORDER: JY_SYSTEM_ORDER_CONFIG.columns
28005
+ };
28006
+
28007
+ 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, ApaasUploadAsync$1 as ApaasUploadAsync, ApaasUploadFile, index as ApaasUploadProAsync, AsyncSelect, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, KmVideo, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, OrderSubForm, utils as OrderSubFormUtils, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, SYSTEM_ORDER_COLUMNS_MAP, ShopNameSelect as ShopName, SkxGoods, IdInputSelect as SkxIdInputSelect, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$1 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$7 as getJyColumns, getColumns$6 as getKmColumns, getColumns$8 as getSkxColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns, orderSubFormConstants, renderMap };