@kmkf-fe-packages/basic-components 2.2.38 → 2.2.39-beta.0

package/README.md

@@ -19,4 +19,4 @@ yarn start
 - config 公共方法
 - assets 静态资源
 
-111111
+1111111

package/dist/index.esm.js

@@ -8101,6 +8101,8 @@ var updateWorkTypeKeys = {
   BS_DEPOSIT: 'bsDeposit',
   NEW_PAYMENT_STATUS: 'newPaymentStatus',
   BUSINESS_ORDER_NO: 'businessOrderNo',
+  REPAIR_ORDER_SN: 'repairOrderSn',
+  REPAIR_ORDER_ID: 'repairOrderId',
   PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
   ACTUAL_RECEIPT_PAYMENT: 'actualReceiptPayment',
   WDT_SHOP: 'shopCode'
@@ -8580,6 +8582,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
       RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
         status: 'returnExchangeGoodsReviewStatusValue',
         reason: 'returnExchangeGoodsReviewStatusReason'
+      },
+      REPAIR_ORDER_STATUS: {
+        status: 'repairOrderStatusValue',
+        reason: 'repairOrderStatusReason'
       }
     };
     return _defineProperty({}, nex.uniqueKey, {
@@ -9344,6 +9350,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       AGREE_RETURN_GOODS_STATUS: processCallBackStatus,
       REJECT_RETURN_GOODS_STATUS: processCallBackStatus,
       RETURN_EXCHANGE_GOODS_REVIEW_STATUS: processCallBackStatus,
+      REPAIR_ORDER_STATUS: processCallBackStatus,
       RETURN_GOODS_STATUS: processSceneStatus,
       EXCHANGE_STATUS: processSceneStatus,
       WAREHOUSING_STATUS: processSceneStatus,
@@ -9423,6 +9430,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_DEPOSIT: processSingleField,
       NEW_PAYMENT_STATUS: processSingleField,
       BUSINESS_ORDER_NO: processSingleField,
+      REPAIR_ORDER_SN: processSingleField,
+      REPAIR_ORDER_ID: processSingleField,
       PAYMENT_VOUCHER_CODE: processSingleField,
       BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
       ACTUAL_RECEIPT_PAYMENT: processSingleField,
@@ -9998,8 +10007,8 @@ var SubForm = function SubForm(props) {
     tableHeader = props.tableHeader,
     disabled = props.disabled,
     platform = props.platform,
-    manual = props.manual,
-    maxCount = props.maxCount;
+    maxCount = props.maxCount,
+    manual = props.manual;
   var ref = useRef(null);
   var isRequest = useRef(false);
   var _useState = useState(false),
@@ -13442,7 +13451,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     if (disabled) {
       return;
     }
-    if (['SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
+    if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
       return;
     } else if (!(newCompany && trajectoryCode)) {
       return;
@@ -13578,7 +13587,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React.createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO', 'KYE'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React.createElement(LogisticsSnapshot, null) : null);
 };
 
 var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -14806,6 +14815,16 @@ var wdtColumns = [{
   render: function render(price) {
     return price || price === 0 ? Number(price).toFixed(2) : '';
   }
+}, {
+  dataIndex: 'unitName',
+  title: '基本单位',
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'auxUnitName',
+  title: '辅助单位',
+  width: 150,
+  render: renderTextEllipsis
 }];
 
 var bse3Columns = [{
@@ -15950,6 +15969,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
+    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -18927,7 +18947,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -18971,6 +18992,20 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u8D60\u54C1\u65B9\u5F0F",
       width: 100,
       render: renderGiftType
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }],
     //旺店通商品信息
     WDT_GOODS: [{
@@ -19047,7 +19082,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19095,6 +19131,20 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }],
     //旺店通退货商品信息
     WDT_RETURN_GOODS: [{
@@ -19171,7 +19221,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19258,6 +19309,20 @@ var getColumns$2 = function getColumns(_ref) {
           }
         }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }],
     //旺店通换出商品信息
     WDT_EXCHANGE_GOODS: [{
@@ -19334,7 +19399,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19421,6 +19487,20 @@ var getColumns$2 = function getColumns(_ref) {
           }
         }) : /*#__PURE__*/React.createElement("span", null, typeMap[val]);
       }
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }],
     // 旺店通售后商品信息
     WDT_AFTERSALE_GOODS: [{
@@ -19576,6 +19656,20 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }]
   };
 };
@@ -20258,7 +20352,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -20546,7 +20640,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -20661,7 +20755,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -21529,6 +21623,12 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'bfit');
@@ -21558,6 +21658,12 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'gift');
@@ -22316,7 +22422,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }, isShowSelect && /*#__PURE__*/React.createElement(Row, {
     style: {
-      marginBottom: '20px'
+      marginBottom: '12px'
     }
   }, /*#__PURE__*/React.createElement(Col, {
     span: 12
@@ -27231,7 +27337,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key], item.ruleName);
+    }, msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -27809,7 +27915,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {
@@ -28112,7 +28218,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React.createElement(Cascader, {
     style: {

package/dist/index.js

@@ -8116,6 +8116,8 @@ var updateWorkTypeKeys = {
   BS_DEPOSIT: 'bsDeposit',
   NEW_PAYMENT_STATUS: 'newPaymentStatus',
   BUSINESS_ORDER_NO: 'businessOrderNo',
+  REPAIR_ORDER_SN: 'repairOrderSn',
+  REPAIR_ORDER_ID: 'repairOrderId',
   PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
   ACTUAL_RECEIPT_PAYMENT: 'actualReceiptPayment',
   WDT_SHOP: 'shopCode'
@@ -8595,6 +8597,10 @@ var processCallBackStatus = function processCallBackStatus(getValue) {
       RETURN_EXCHANGE_GOODS_REVIEW_STATUS: {
         status: 'returnExchangeGoodsReviewStatusValue',
         reason: 'returnExchangeGoodsReviewStatusReason'
+      },
+      REPAIR_ORDER_STATUS: {
+        status: 'repairOrderStatusValue',
+        reason: 'repairOrderStatusReason'
       }
     };
     return _defineProperty({}, nex.uniqueKey, {
@@ -9359,6 +9365,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       AGREE_RETURN_GOODS_STATUS: processCallBackStatus,
       REJECT_RETURN_GOODS_STATUS: processCallBackStatus,
       RETURN_EXCHANGE_GOODS_REVIEW_STATUS: processCallBackStatus,
+      REPAIR_ORDER_STATUS: processCallBackStatus,
       RETURN_GOODS_STATUS: processSceneStatus,
       EXCHANGE_STATUS: processSceneStatus,
       WAREHOUSING_STATUS: processSceneStatus,
@@ -9438,6 +9445,8 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_DEPOSIT: processSingleField,
       NEW_PAYMENT_STATUS: processSingleField,
       BUSINESS_ORDER_NO: processSingleField,
+      REPAIR_ORDER_SN: processSingleField,
+      REPAIR_ORDER_ID: processSingleField,
       PAYMENT_VOUCHER_CODE: processSingleField,
       BS_E3_REISSUE_GOODS: processBsE3ReissueGoods(templateColumns),
       ACTUAL_RECEIPT_PAYMENT: processSingleField,
@@ -10013,8 +10022,8 @@ var SubForm = function SubForm(props) {
     tableHeader = props.tableHeader,
     disabled = props.disabled,
     platform = props.platform,
-    manual = props.manual,
-    maxCount = props.maxCount;
+    maxCount = props.maxCount,
+    manual = props.manual;
   var ref = React.useRef(null);
   var isRequest = React.useRef(false);
   var _useState = React.useState(false),
@@ -13457,7 +13466,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
     if (disabled) {
       return;
     }
-    if (['SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
+    if (['KYE', 'SF', 'ZTO'].includes(newCompany) && !(newCompany && trajectoryCode && trajectoryPhone)) {
       return;
     } else if (!(newCompany && trajectoryCode)) {
       return;
@@ -13593,7 +13602,7 @@ var LogisticsTrajectory = function LogisticsTrajectory(props) {
       value: value === null || value === void 0 ? void 0 : value.trajectorySnapshot
     });
   };
-  return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
+  return /*#__PURE__*/React__default['default'].createElement("div", null, LogisticsCompany(), LogisticsCode(), ['SF', 'ZTO', 'KYE'].includes(value === null || value === void 0 ? void 0 : value.trajectoryCompany) ? LogisticsPhone(value === null || value === void 0 ? void 0 : value.trajectoryCompany) : null, trajectoryApiStatus && isSingle && LogisticsApiStatus(), showField && showField.includes('snapshot') ? /*#__PURE__*/React__default['default'].createElement(LogisticsSnapshot, null) : null);
 };
 
 var LogisticsMoreTrajectory = function LogisticsMoreTrajectory(props) {
@@ -14821,6 +14830,16 @@ var wdtColumns = [{
   render: function render(price) {
     return price || price === 0 ? Number(price).toFixed(2) : '';
   }
+}, {
+  dataIndex: 'unitName',
+  title: '基本单位',
+  width: 150,
+  render: renderTextEllipsis
+}, {
+  dataIndex: 'auxUnitName',
+  title: '辅助单位',
+  width: 150,
+  render: renderTextEllipsis
 }];
 
 var bse3Columns = [{
@@ -15965,6 +15984,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
+    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -18942,7 +18962,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -18986,6 +19007,20 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u8D60\u54C1\u65B9\u5F0F",
       width: 100,
       render: renderGiftType
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }],
     //旺店通商品信息
     WDT_GOODS: [{
@@ -19062,7 +19097,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19110,6 +19146,20 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }],
     //旺店通退货商品信息
     WDT_RETURN_GOODS: [{
@@ -19186,7 +19236,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19273,6 +19324,20 @@ var getColumns$2 = function getColumns(_ref) {
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
       }
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }],
     //旺店通换出商品信息
     WDT_EXCHANGE_GOODS: [{
@@ -19349,7 +19414,8 @@ var getColumns$2 = function getColumns(_ref) {
       title: "\u5E73\u53F0\u89C4\u683CID",
       width: 180,
       align: 'center',
-      ellipsis: true
+      ellipsis: true,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'brandName',
       title: "\u54C1\u724C\u540D\u79F0",
@@ -19436,6 +19502,20 @@ var getColumns$2 = function getColumns(_ref) {
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, typeMap[val]);
       }
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }],
     // 旺店通售后商品信息
     WDT_AFTERSALE_GOODS: [{
@@ -19591,6 +19671,20 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'unitName',
+      title: "\u57FA\u672C\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
+    }, {
+      dataIndex: 'auxUnitName',
+      title: "\u8F85\u52A9\u5355\u4F4D",
+      ellipsis: true,
+      width: 150,
+      align: 'center',
+      render: renderTextEllipsis
     }]
   };
 };
@@ -20273,7 +20367,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -20561,7 +20655,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'batchId',
@@ -20676,7 +20770,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        return ((record.qty || 0) * (+record.salePrice || 0)).toFixed(2);
       }
     }, {
       dataIndex: 'isGift',
@@ -21544,6 +21638,12 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'bfit');
@@ -21573,6 +21673,12 @@ var getColumns$7 = function getColumns(_ref) {
       width: 150,
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          dropdownStyle: {
+            zIndex: 2000
+          },
+          getPopupContainer: function getPopupContainer() {
+            return document.body;
+          },
           value: val,
           onChange: function onChange(value) {
             updateHandle(value, index, 'gift');
@@ -22331,7 +22437,7 @@ var SelectTradeGoods = function SelectTradeGoods(_ref) {
     }
   }, isShowSelect && /*#__PURE__*/React__default['default'].createElement(antd.Row, {
     style: {
-      marginBottom: '20px'
+      marginBottom: '12px'
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Col, {
     span: 12
@@ -27246,7 +27352,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, kmkfUtils.msgTypeCh[key], item.ruleName);
+    }, kmkfUtils.msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -27824,7 +27930,7 @@ var GyReissue = function GyReissue(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {
@@ -28127,7 +28233,7 @@ var GyReturnGoods = function GyReturnGoods(props) {
       span: 12
     },
     sm: {
-      span: 6
+      span: 4
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Cascader, {
     style: {

package/dist/src/apaas/SubForm/index.d.ts

@@ -26,8 +26,8 @@ type SubFormProps = {
     tableHeader: subConfigType[];
     disabled: boolean;
     platform: string;
-    manual?: boolean;
     maxCount?: number;
+    manual?: boolean;
 };
 declare const SubForm: (props: SubFormProps) => React.JSX.Element;
 export default SubForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.38",
+  "version": "2.2.39-beta.0",
   "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.2.36",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.0",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "741f07c6a183ec58d39233a2eded57eb1f782fa1"
+  "gitHead": "9017c5c2ff27a176e9ff269593336782f990383b"
 }