@kmkf-fe-packages/basic-components 0.10.3 → 0.11.0-alpha.2

package/dist/index.esm.js

@@ -11164,26 +11164,43 @@ var BsReturnGoods = function BsReturnGoods(props) {
   })));
 };
 
-var columns$1 = [{
-  dataIndex: 'billType',
-  title: '单据类型'
-}, {
-  dataIndex: 'billNo',
-  title: '系统订单号'
-}, {
-  dataIndex: 'billTag',
-  title: '标签'
-}];
+var columnsNameMap = {
+  BS_SYSTEM_ORDER: {
+    typeName: '单据类型',
+    tagName: '标签'
+  },
+  WLN_SYSTEM_ORDER: {
+    typeName: '订单类型',
+    tagName: '标记'
+  }
+};
 var index = (function (props) {
   var value = props.value,
     _onChange = props.onChange,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    type = props.type;
   useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     if (!(value === null || value === void 0 ? void 0 : (_value$orders = value.orders) === null || _value$orders === void 0 ? void 0 : _value$orders.length) && (value === null || value === void 0 ? void 0 : value.orderNo) && (value === null || value === void 0 ? void 0 : (_value$showOrderInfo = value.showOrderInfo) === null || _value$showOrderInfo === void 0 ? void 0 : _value$showOrderInfo.length)) {
-      getOrderList(value.orderNo);
+      if (type === 'BS_SYSTEM_ORDER') {
+        getOrderList(value.orderNo);
+      } else if (type === 'WLN_SYSTEM_ORDER') {
+        getWlnOrderList(value.orderNo);
+      }
     }
-  }, [value]);
+  }, [value, type]);
+  var columns = useMemo(function () {
+    return [{
+      dataIndex: 'billType',
+      title: columnsNameMap[type].typeName
+    }, {
+      dataIndex: 'billNo',
+      title: '系统订单号'
+    }, {
+      dataIndex: 'billTag',
+      title: columnsNameMap[type].tagName
+    }];
+  }, [type]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       var _yield$request, success, data;
@@ -11223,6 +11240,51 @@ var index = (function (props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getWlnOrderList = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
+      var _yield$request2, success, data;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/gdfw/order/wlnOrderList', {
+              method: 'post',
+              data: {
+                billCode: orderNo
+              }
+            });
+          case 2:
+            _yield$request2 = _context2.sent;
+            success = _yield$request2.success;
+            data = _yield$request2.data;
+            if (success) {
+              _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+                orders: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    billNo: item.tradeNo,
+                    billType: item.tradeType,
+                    billTag: item.mark
+                  });
+                }),
+                showOrderInfo: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
+                  return {
+                    billNo: item.tradeNo,
+                    billType: item.tradeType,
+                    billTag: item.mark
+                  };
+                })
+              }));
+            }
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getWlnOrderList(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -11241,7 +11303,7 @@ var index = (function (props) {
   };
   return /*#__PURE__*/React.createElement(Table, {
     dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
-    columns: columns$1,
+    columns: columns,
     rowSelection: rowSelection,
     rowKey: 'billNo',
     size: "small",
@@ -11255,6 +11317,20 @@ var index = (function (props) {
   });
 });
 
+var WlnGoods = function WlnGoods(props) {
+  var value = props.value,
+    disabled = props.disabled,
+    onChange = props.onChange;
+  return /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
+    key: 'wlnGoods'
+  }, props), {}, {
+    disabled: disabled,
+    value: value,
+    showChangeBtn: false,
+    onChange: onChange
+  }));
+};
+
 var css_248z$9 = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$9);
 
@@ -11925,4 +12001,4 @@ var CalculationInput = function CalculationInput(props) {
   }, config === null || config === void 0 ? void 0 : config.unit));
 };
 
-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, ApaasUploadAsync$1 as ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$1 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsTrajectory, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId };
+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, ApaasUploadAsync$1 as ApaasUploadFile, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonSystemOrder$1 as CommonMultiStatus, CommonStatus, CommonSystemOrder, ExpressLogistics, Goods, index$1 as GoodsTable, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsTrajectory, ParseLogistics, Payment, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, Supplier, TBGoodId, TBGoodSerial, TradeId, WlnGoods };

package/dist/index.js

@@ -11175,26 +11175,43 @@ var BsReturnGoods = function BsReturnGoods(props) {
   })));
 };
 
-var columns$1 = [{
-  dataIndex: 'billType',
-  title: '单据类型'
-}, {
-  dataIndex: 'billNo',
-  title: '系统订单号'
-}, {
-  dataIndex: 'billTag',
-  title: '标签'
-}];
+var columnsNameMap = {
+  BS_SYSTEM_ORDER: {
+    typeName: '单据类型',
+    tagName: '标签'
+  },
+  WLN_SYSTEM_ORDER: {
+    typeName: '订单类型',
+    tagName: '标记'
+  }
+};
 var index = (function (props) {
   var value = props.value,
     _onChange = props.onChange,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    type = props.type;
   React.useEffect(function () {
     var _value$orders, _value$showOrderInfo;
     if (!(value === null || value === void 0 ? void 0 : (_value$orders = value.orders) === null || _value$orders === void 0 ? void 0 : _value$orders.length) && (value === null || value === void 0 ? void 0 : value.orderNo) && (value === null || value === void 0 ? void 0 : (_value$showOrderInfo = value.showOrderInfo) === null || _value$showOrderInfo === void 0 ? void 0 : _value$showOrderInfo.length)) {
-      getOrderList(value.orderNo);
+      if (type === 'BS_SYSTEM_ORDER') {
+        getOrderList(value.orderNo);
+      } else if (type === 'WLN_SYSTEM_ORDER') {
+        getWlnOrderList(value.orderNo);
+      }
     }
-  }, [value]);
+  }, [value, type]);
+  var columns = React.useMemo(function () {
+    return [{
+      dataIndex: 'billType',
+      title: columnsNameMap[type].typeName
+    }, {
+      dataIndex: 'billNo',
+      title: '系统订单号'
+    }, {
+      dataIndex: 'billTag',
+      title: columnsNameMap[type].tagName
+    }];
+  }, [type]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       var _yield$request, success, data;
@@ -11234,6 +11251,51 @@ var index = (function (props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var getWlnOrderList = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(orderNo) {
+      var _yield$request2, success, data;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return extendRequest('/qy/gdfw/order/wlnOrderList', {
+              method: 'post',
+              data: {
+                billCode: orderNo
+              }
+            });
+          case 2:
+            _yield$request2 = _context2.sent;
+            success = _yield$request2.success;
+            data = _yield$request2.data;
+            if (success) {
+              _onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+                orders: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
+                  return _objectSpread2(_objectSpread2({}, item), {}, {
+                    billNo: item.tradeNo,
+                    billType: item.tradeType,
+                    billTag: item.mark
+                  });
+                }),
+                showOrderInfo: data === null || data === void 0 ? void 0 : data.orders.map(function (item) {
+                  return {
+                    billNo: item.tradeNo,
+                    billType: item.tradeType,
+                    billTag: item.mark
+                  };
+                })
+              }));
+            }
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getWlnOrderList(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || [],
     fixed: true,
@@ -11252,7 +11314,7 @@ var index = (function (props) {
   };
   return /*#__PURE__*/React__default['default'].createElement(antd.Table, {
     dataSource: (value === null || value === void 0 ? void 0 : value.orders) || [],
-    columns: columns$1,
+    columns: columns,
     rowSelection: rowSelection,
     rowKey: 'billNo',
     size: "small",
@@ -11266,6 +11328,20 @@ var index = (function (props) {
   });
 });
 
+var WlnGoods = function WlnGoods(props) {
+  var value = props.value,
+    disabled = props.disabled,
+    onChange = props.onChange;
+  return /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
+    key: 'wlnGoods'
+  }, props), {}, {
+    disabled: disabled,
+    value: value,
+    showChangeBtn: false,
+    onChange: onChange
+  }));
+};
+
 var css_248z$9 = ".goodsBox {\n  display: flex;\n  flex-wrap: wrap;\n}\n.goods-imgBox {\n  position: relative;\n  width: 80px;\n  height: 80px;\n  border: 1px solid #F2F3F5;\n  margin: 0 10px 10px 0;\n  text-align: center;\n}\n.icon-close {\n  position: absolute;\n  top: -5px;\n  right: -5px;\n  width: 13px;\n  height: 13px;\n  display: flex;\n  justify-content: center;\n  align-items: center;\n  border-radius: 50%;\n  z-index: 3;\n  background-color: #fff;\n  cursor: pointer;\n}\n.img {\n  width: 100%;\n  height: 100%;\n  -o-object-fit: contain;\n     object-fit: contain;\n}\n.goods-title {\n  margin: 0 0 10px 5px;\n  color: #4E5969;\n}\n.deg90 {\n  transform: rotate(90deg);\n}\n.goodMain {\n  display: flex;\n  flex-wrap: wrap;\n  height: 265px;\n  overflow-y: auto;\n  margin-bottom: 10px;\n}\n.goodMain .goodItem {\n  width: 140px;\n  height: 175px;\n  padding: 11px 10px 0;\n  text-align: center;\n  display: inline-block;\n  vertical-align: top;\n  margin-bottom: 10px;\n  margin-right: 30px;\n  border: 1px solid #e6e6e6;\n  cursor: pointer;\n  transition: border 0.3s;\n}\n.goodMain .goodItem .goodImg {\n  width: 120px;\n  height: 120px;\n}\n.goodMain .goodItem .goodText {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.goodMain .goodItem.active {\n  border: 1px solid #3089dc;\n}\n.right-context {\n  display: flex;\n  flex-direction: column;\n}\n";
 styleInject(css_248z$9);
 
@@ -11986,3 +12062,4 @@ exports.Supplier = Supplier;
 exports.TBGoodId = TBGoodId;
 exports.TBGoodSerial = TBGoodSerial;
 exports.TradeId = TradeId;
+exports.WlnGoods = WlnGoods;

package/dist/src/bs/SystemOrder/index.d.ts

@@ -6,6 +6,7 @@ interface BsSystemOrderProps {
         selectIds: string[];
         showOrderInfo: any[];
     };
+    type: string;
     disabled: boolean;
     onChange: (val: any) => void;
     onChangeOrder?: (val: any) => void;

package/dist/src/index.d.ts

@@ -41,6 +41,7 @@ export { default as BsExchange } from './bs/Exchange';
 export { default as BsReissue } from './bs/Reissue';
 export { default as BsReturn } from './bs/Return';
 export { default as BsSystemOrder } from './bs/SystemOrder';
+export { default as WlnGoods } from './wln/Goods';
 export { default as GoodsTable } from './common/GoodsTable';
 export { default as CommonStatus } from './common/CommonStatus';
 export { default as CommonSystemOrder } from './common/CommonSystemOrder';

package/dist/src/wln/Goods/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const WlnGoods: (props: any) => React.JSX.Element;
+export default WlnGoods;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.10.3",
+  "version": "0.11.0-alpha.2",
   "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": "^0.10.3",
+    "@kmkf-fe-packages/kmkf-utils": "^0.11.0-alpha.2",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "react-copy-to-clipboard": "^5.1.0",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1af0c41f4802ef4a21314f67e394d85e7c9a401c"
+  "gitHead": "4082b35353767d77e58b4e29caed4360b03a7d86"
 }