@kmkf-fe-packages/basic-components 2.7.3-beta.3 → 2.7.3-beta.4

package/dist/index.esm.js

@@ -15725,6 +15725,122 @@ var jkyColumns = [{
   }
 }];
 
+var getYesOrNo$3 = function getYesOrNo(val) {
+  if (!isBoolean(val)) return null;
+  return val ? '是' : '否';
+};
+var wlnColumns = [{
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 150,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodId',
+  title: '商品ID',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '30px',
+        height: '30px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodBarcode',
+  title: '商品条码',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'propertiesValue',
+  title: '规格值',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specNo',
+  title: "SKU\u7F16\u7801",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specId',
+  title: "SKU ID",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'specImgUrl',
+  title: "SKU \u56FE\u7247",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 30,
+      src: val
+    });
+  }
+}, {
+  dataIndex: 'specBarcode',
+  title: '规格条码',
+  width: 150,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u96F6\u552E\u4EF7",
+  ellipsis: true,
+  width: 100,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'unitName',
+  title: '基本单位',
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'skuType',
+  title: "\u662F\u5426\u7EC4\u5408\u88C5",
+  ellipsis: true,
+  width: 150,
+  render: function render(val) {
+    return renderTextEllipsis(getYesOrNo$3(val === 'combine'));
+  }
+}];
+
 var getColumnsMap = function getColumnsMap() {
   return cloneDeep({
     gy: gyColumns,
@@ -15733,7 +15849,8 @@ var getColumnsMap = function getColumnsMap() {
     bse3: bse3Columns,
     km: kmColumns,
     jy: jyColumns,
-    jky: jkyColumns
+    jky: jkyColumns,
+    wln: wlnColumns
   });
 };
 var getColumnsBaseInfo = function getColumnsBaseInfo() {
@@ -17812,6 +17929,27 @@ var componentMap$1 = {
       onChange: props.handleChange
     }));
   },
+  TagsSelect: function TagsSelect(props) {
+    return "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name).length > 10 ? /*#__PURE__*/React.createElement(Tooltip, {
+      title: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name)
+    }, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+      mode: "tags",
+      placeholder: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name),
+      optionFilterProp: "label",
+      allowClear: true,
+      maxTagCount: "responsive"
+    }, props), {}, {
+      onChange: props.handleChange
+    }))) : /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
+      mode: "tags",
+      placeholder: "\u8BF7\u9009\u62E9".concat(props === null || props === void 0 ? void 0 : props.name),
+      optionFilterProp: "label",
+      allowClear: true,
+      maxTagCount: "responsive"
+    }, props), {}, {
+      onChange: props.handleChange
+    }));
+  },
   Date: function Date(props) {
     return /*#__PURE__*/React.createElement(RangePicker, _objectSpread2(_objectSpread2({
       placeholder: ["".concat(props.name, "\u5F00\u59CB\u65F6\u95F4"), "".concat(props.name, "\u7ED3\u675F\u65F6\u95F4")],
@@ -18803,6 +18941,7 @@ var GoodList$5 = function GoodList(props, ref) {
     columns = _useGetColumns2[0],
     showColumnsDataIndexList = _useGetColumns2[1],
     loading = _useGetColumns2[2];
+  console.log("\uD83D\uDE80 ~ GoodsList.tsx:110 ~ GoodList ~ columns:", columns);
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -20795,7 +20934,7 @@ var getColumns$2 = function getColumns(_ref) {
   };
 };
 
-var getYesOrNo$3 = function getYesOrNo(val) {
+var getYesOrNo$4 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -20981,7 +21120,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       },
       width: 100
     }, {
@@ -21003,7 +21142,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'unit',
@@ -21124,11 +21263,11 @@ var getColumns$3 = function getColumns(_ref) {
       width: 150,
       render: renderTextEllipsis
     }, {
-      dataIndex: 'money',
-      title: "\u5B9E\u4ED8\u91D1\u989D",
+      dataIndex: 'price',
+      title: "\u5355\u4EF7",
       align: 'center',
       ellipsis: true,
-      width: 100,
+      width: 250,
       render: renderTextEllipsis
     }, {
       dataIndex: 'number',
@@ -21150,40 +21289,29 @@ var getColumns$3 = function getColumns(_ref) {
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
-      dataIndex: 'share',
-      title: "\u5E94\u6536\u6B3E",
-      align: 'center',
-      ellipsis: true,
-      width: 70,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'discountedUnitPrice',
-      title: "\u6298\u540E\u5355\u4EF7",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'originPrice',
-      title: "\u539F\u4EF7",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'price',
-      title: "\u5355\u4EF7",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
-    }, {
-      dataIndex: 'receivable',
-      title: "\u9500\u552E\u91D1\u989D",
-      align: 'center',
-      ellipsis: true,
-      width: 250,
-      render: renderTextEllipsis
+      dataIndex: 'outPrice',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      width: 150,
+      render: function render(_, record, index) {
+        var value;
+        if ((typeof record.number === 'number' || record.number) && (typeof record.price === 'number' || record.price)) {
+          value = +(record.number * record.price).toFixed(2);
+        }
+        if (record.canUpdateNumber && !disabled) {
+          return /*#__PURE__*/React.createElement(InputNumber, {
+            style: {
+              width: 70
+            },
+            value: value,
+            min: 1,
+            precision: 0,
+            onChange: function onChange(num) {
+              return updateHandle(num, index, 'total');
+            }
+          });
+        }
+        return value || value === 0 ? value : '';
+      }
     }, {
       dataIndex: 'type',
       title: "\u8D60\u54C1\u7C7B\u578B",
@@ -21209,30 +21337,9 @@ var getColumns$3 = function getColumns(_ref) {
             label: '否',
             value: false
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       },
       width: 100
-    }, {
-      dataIndex: 'hasRefund',
-      title: "\u662F\u5426\u9000\u6B3E",
-      align: 'center',
-      ellipsis: true,
-      width: 100,
-      render: function render(val, record, index) {
-        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
-          value: val,
-          onChange: function onChange(value) {
-            updateHandle(value, index, 'isGift');
-          },
-          options: [{
-            label: '是',
-            value: 1
-          }, {
-            label: '否',
-            value: 0
-          }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$3(val));
-      }
     }, {
       dataIndex: 'unit',
       title: "\u5355\u4F4D",
@@ -21270,7 +21377,7 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$4 = function getYesOrNo(val) {
+var getYesOrNo$5 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
@@ -21385,7 +21492,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -21404,7 +21511,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -21530,7 +21637,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21659,7 +21766,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -24534,35 +24641,51 @@ var processWlnGoods$1 = function processWlnGoods(_ref4) {
   var list = _ref4.list,
     canUpdateNumber = _ref4.canUpdateNumber;
   return list.map(function (item) {
-    // const {
-    //   goodName, // 商品名称
-    //   goodNo, // 商品编码
-    //   goodId, // 商品ID
-    //   specBarcode, // 规格条码
-    //   retailPrice, // 零售价
-    //   isGift, // 是否赠品
-    //   skuType,
-    //   specImgUrl, // 规格图片
-    //   categoryName, //货品分类
-    // } = item;
+    var goodName = item.goodName,
+      goodShortName = item.goodShortName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      goodBarcode = item.goodBarcode,
+      propertiesValue = item.propertiesValue,
+      specNo = item.specNo,
+      specId = item.specId,
+      specImgUrl = item.specImgUrl,
+      specBarcode = item.specBarcode,
+      brandName = item.brandName,
+      retailPrice = item.retailPrice,
+      marketPrice = item.marketPrice,
+      unitName = item.unitName,
+      skuType = item.skuType;
     return _objectSpread2(_objectSpread2({}, item), {}, {
-      // cateName: categoryName,
-      // goodsName: goodName,
-      // goodsNo: goodNo,
-      // goodsId: goodId,
-      // barcode: specBarcode,
-      // skuImgUrl: specImgUrl,
-      // combinationName: goodName,
-      // combinationCode: goodNo,
-      // isGift: isGift ? 1 : 0,
-      // isFit: skuType === 'combine' ? 1 : 0,
+      wlnItemName: goodName,
+      goodsCode: goodNo,
+      wlnSkuName: propertiesValue,
+      skuCode: specNo,
+      // skuName: '', // "线上sku名称",
+      // olnSkuCode: '', // "线上sku编码",
+      // sku: '', // "线上sku id",
+      // name: '', // "线上商品名称",
+      // pic: '', // "线上图片",
+      // olnItemCOde: '', // "线上商品编码",
+      // code: '', // "线上商品id",
+      barCode: goodBarcode,
+      // money: '', // "实付金额",
+      number: 1,
+      share: '',
+      // discountedUnitPrice: '', // "折后单价",
+      originPrice: marketPrice,
+      price: retailPrice,
+      receivable: +((marketPrice || 0) * (retailPrice || 0)).toFixed(2),
+      // type: '', // "赠品类型",
+      isPackage: skuType === 'combine',
+      // hasRefund: '', // 是否退款,
+      unit: unitName,
+      // pkgGoodsName: '', // "原组合商品名称",
+      // pkgGoodsCode: '', // "原组合商品编码",
+      // pkgGoodsId: '', // "原组合商品id",
       uuid: uuid(),
       canDelete: true,
-      sellCount: 1,
-      // sellPrice: retailPrice,
-      // sellTotal: retailPrice ? (retailPrice * 1).toFixed(2) : '',
       canEdit: true
-      // canUpdateNumber,
     });
   });
 };
@@ -25456,6 +25579,7 @@ var GoodItem$1 = function GoodItem(props) {
     templateDetail: templateDetail
   }));
 };
+GoodItem$1.displayName = 'GoodItem';
 
 var BsGoods = function BsGoods(props) {
   var _withInfo$current3, _withInfo$current4;
@@ -29513,9 +29637,9 @@ var typeMap$2 = {
     updateGoodsHandle: updateWlnGoodsHandle,
     alwaysShowChooseErpGoodsBtn: true,
     orderTypeKey: 'orderType',
-    oIdKey: 'tradeNo',
-    outerOiIdKey: 'sourceSubtradeNo',
-    goodDetailsKey: 'goodsDetail',
+    oIdKey: 'billNo',
+    outerOiIdKey: 'tpTid',
+    goodDetailsKey: 'items',
     isShowSelectTradeGoods: true,
     showModeBtn: true
   }
@@ -29577,7 +29701,7 @@ var PublicReissue = function PublicReissue(props) {
           case 0:
             (_typeMap$type5 = typeMap$2[type]) === null || _typeMap$type5 === void 0 ? void 0 : _typeMap$type5.getOrderList(orderNo).then(function (data) {
               var _valueRef$current3, _typeMap$type6, _typeMap$type7, _typeMap$type11, _ref3, _typeMap$type12;
-              var orders = data || [];
+              var orders = (type === 'WLN_REISSUE_GOODS' ? data === null || data === void 0 ? void 0 : data.orders : data) || [];
               var showOrderInfo = orders === null || orders === void 0 ? void 0 : orders.map(function (orderItem) {
                 return _defineProperty({}, typeMap$2[type].oIdKey, orderItem[typeMap$2[type].oIdKey]);
               });
@@ -29626,6 +29750,7 @@ var PublicReissue = function PublicReissue(props) {
       // 切换到非原单，清空列表
       newValue[(_typeMap$type15 = typeMap$2[type]) === null || _typeMap$type15 === void 0 ? void 0 : _typeMap$type15.key] = [];
     }
+    console.log('**** changeTypeHandle', newValue);
     onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
   };
   var handleModeChange = function handleModeChange(mode) {
@@ -29760,6 +29885,7 @@ var PublicReissue = function PublicReissue(props) {
       var _order$typeMap$type$g;
       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;
     });
+    console.log('***** hasGoodDetails', hasGoodDetails);
     var goodDetails = hasGoodDetails ? (!isAllOrders || ((_typeMap$type22 = typeMap$2[type]) === null || _typeMap$type22 === void 0 ? void 0 : _typeMap$type22.isSelectTradeGoodsMerge)) && typeMap$2[type].mergeIdenticalGoods ? typeMap$2[type].mergeIdenticalGoods((_typeMap$type23 = typeMap$2[type]) === null || _typeMap$type23 === void 0 ? void 0 : _typeMap$type23.updateGoodsHandle(orders, orderRest, type)) : (_typeMap$type24 = typeMap$2[type]) === null || _typeMap$type24 === void 0 ? void 0 : _typeMap$type24.updateGoodsHandle(orders, orderRest, type) : [];
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     var list = mode && !isAllOrders ? goodDetails.filter(function (goodItem) {

package/dist/src/bs/component/GoodItem/index.d.ts

@@ -73,5 +73,8 @@ export declare const SelectTradeGoods: {
     ({ columns, dataSource, getDataSourceAsync, selectedRowKeys, onChangeSelectedKeys, uniqueKey, isShowSelect, systemOrders, selectedSystemOrders, validSystemOrder, type, width, isReissueType, isReloadSelectTable, validSystemOrderFn, }: SelectTradeGoodsProps): React.JSX.Element;
     displayName: string;
 };
-declare const GoodItem: (props: MakeRequired<Partial<BsGoodsProps>, 'useGoodsSourceFormat'>) => React.JSX.Element;
+declare const GoodItem: {
+    (props: MakeRequired<Partial<BsGoodsProps>, 'useGoodsSourceFormat'>): React.JSX.Element;
+    displayName: string;
+};
 export default GoodItem;

package/dist/src/bs/component/model/Columns/Erp/wln.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+declare const _default: ({
+    dataIndex: string;
+    title: string;
+    width: number;
+    render: (picUrl: string) => React.JSX.Element;
+    ellipsis?: undefined;
+} | {
+    dataIndex: string;
+    title: string;
+    ellipsis: boolean;
+    width: number;
+    render: (val: string) => React.JSX.Element;
+})[];
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.7.3-beta.3",
+  "version": "2.7.3-beta.4",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.7.3-beta.3",
+    "@kmkf-fe-packages/kmkf-utils": "2.7.3-beta.4",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "17c3e4f893ab465e7dd65db2541ce63d9d9f984d"
+  "gitHead": "006184824679eeb9a994787da6e31518e6d6f981"
 }