@kmkf-fe-packages/basic-components 0.11.0-alpha.0 → 0.11.0-alpha.13

package/dist/index.esm.js

@@ -9853,7 +9853,8 @@ var jstGoods = function jstGoods(props) {
       return option.label.includes(input);
     },
     style: {
-      minWidth: '100px'
+      minWidth: '100px',
+      maxWidth: '180px'
     }
   }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React.createElement(Input, {
     disabled: disabled,
@@ -11164,26 +11165,44 @@ 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 () {
+    var _columnsNameMap$type, _columnsNameMap$type2;
+    return [{
+      dataIndex: 'billType',
+      title: columnsNameMap === null || columnsNameMap === void 0 ? void 0 : (_columnsNameMap$type = columnsNameMap[type]) === null || _columnsNameMap$type === void 0 ? void 0 : _columnsNameMap$type.typeName
+    }, {
+      dataIndex: 'billNo',
+      title: '系统订单号'
+    }, {
+      dataIndex: 'billTag',
+      title: columnsNameMap === null || columnsNameMap === void 0 ? void 0 : (_columnsNameMap$type2 = columnsNameMap[type]) === null || _columnsNameMap$type2 === void 0 ? void 0 : _columnsNameMap$type2.tagName
+    }];
+  }, [type]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       var _yield$request, success, data;
@@ -11223,6 +11242,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 +11305,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",
@@ -11259,13 +11323,21 @@ var WlnGoods = function WlnGoods(props) {
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange;
+  var changeHandle = function changeHandle(list) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+      wlnGoods: list
+    }));
+  };
   return /*#__PURE__*/React.createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'wlnGoods'
   }, props), {}, {
     disabled: disabled,
-    value: value,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
+    value: value === null || value === void 0 ? void 0 : value.wlnGoods,
     showChangeBtn: false,
-    onChange: onChange
+    onChange: function onChange(val) {
+      return changeHandle(val);
+    }
   }));
 };
 

package/dist/index.js

@@ -9864,7 +9864,8 @@ var jstGoods = function jstGoods(props) {
       return option.label.includes(input);
     },
     style: {
-      minWidth: '100px'
+      minWidth: '100px',
+      maxWidth: '180px'
     }
   }) : null, !showField || showField === 'logisticsCode' ? /*#__PURE__*/React__default['default'].createElement(antd.Input, {
     disabled: disabled,
@@ -11175,26 +11176,44 @@ 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 () {
+    var _columnsNameMap$type, _columnsNameMap$type2;
+    return [{
+      dataIndex: 'billType',
+      title: columnsNameMap === null || columnsNameMap === void 0 ? void 0 : (_columnsNameMap$type = columnsNameMap[type]) === null || _columnsNameMap$type === void 0 ? void 0 : _columnsNameMap$type.typeName
+    }, {
+      dataIndex: 'billNo',
+      title: '系统订单号'
+    }, {
+      dataIndex: 'billTag',
+      title: columnsNameMap === null || columnsNameMap === void 0 ? void 0 : (_columnsNameMap$type2 = columnsNameMap[type]) === null || _columnsNameMap$type2 === void 0 ? void 0 : _columnsNameMap$type2.tagName
+    }];
+  }, [type]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       var _yield$request, success, data;
@@ -11234,6 +11253,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 +11316,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",
@@ -11270,13 +11334,21 @@ var WlnGoods = function WlnGoods(props) {
   var value = props.value,
     disabled = props.disabled,
     onChange = props.onChange;
+  var changeHandle = function changeHandle(list) {
+    onChange === null || onChange === void 0 ? void 0 : onChange(_objectSpread2(_objectSpread2({}, value), {}, {
+      wlnGoods: list
+    }));
+  };
   return /*#__PURE__*/React__default['default'].createElement(GoodItem, _objectSpread2(_objectSpread2({
     key: 'wlnGoods'
   }, props), {}, {
     disabled: disabled,
-    value: value,
+    shopCode: value === null || value === void 0 ? void 0 : value.shopCode,
+    value: value === null || value === void 0 ? void 0 : value.wlnGoods,
     showChangeBtn: false,
-    onChange: onChange
+    onChange: function onChange(val) {
+      return changeHandle(val);
+    }
   }));
 };
 

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "0.11.0-alpha.0",
+  "version": "0.11.0-alpha.13",
   "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.11.0-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.11.0-alpha.8",
     "lodash": "^4.17.21",
     "pubsub-js": "^1.9.4",
     "react-copy-to-clipboard": "^5.1.0",
@@ -61,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "aeaa0dda1d182b6b2cfaf5b475f2cf77c65b4c5b"
+  "gitHead": "94d336ec667e9c1ed5d32f940d79d9517b88d36c"
 }