@bit-sun/business-component 2.0.40 → 2.0.41-alpha.1

package/dist/index.esm.js

@@ -763,7 +763,7 @@ var luckysheet; // const mapping = [
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
 
-var mapping = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码'], ['realWarehouseCode', '仓库编码'], ['syncRate', '按百分比'], ['assignQuantity', '按指定数量'], ['retainQuantity', ' 按保留数量'], ['priority', ' 优先级']]); // for dnd
+var mapping = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码']]); // for dnd
 
 
 var reorder = function reorder(list, startIndex, endIndex) {
@@ -1073,7 +1073,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     _this.resetData = function () {
       var _this$props = _this.props,
           validDataUrl = _this$props.validDataUrl,
-          validDataParams = _this$props.validDataParams,
           updateData = _this$props.updateData,
           columns = _this$props.columns,
           isBrandAuth = _this$props.isBrandAuth,
@@ -1093,7 +1092,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         };
       }
 
-      axios.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
+      axios.post(validDataUrl, _objectSpread2(_objectSpread2({}, otherParams), {}, {
         columns: columns,
         data: resultData,
         checkStockNum: isCheckStockNum
@@ -1390,7 +1389,7 @@ var luckysheet$1; // const mapping = [
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
 
-var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码'], ['realWarehouseCode', '仓库编码'], ['syncRate', '按百分比'], ['assignQuantity', '按指定数量'], ['retainQuantity', ' 按保留数量'], ['priority', ' 优先级']]); // for dnd
+var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注']]); // for dnd
 
 
 var reorder$1 = function reorder(list, startIndex, endIndex) {
@@ -4021,14 +4020,26 @@ var AddSelect = function AddSelect(props) {
       inputIndex++;
       return _objectSpread2(_objectSpread2({}, item), {}, {
         render: function render(text, record, index) {
+          var _record$packingUnitLi, _record$packingUnitLi2;
+
           // let
           if (record.needFocus === true && currentIndex === 0) ;
 
-          return /*#__PURE__*/React.createElement(InputNumber, {
+          var precisionObj = {};
+          var unitAccuracy = (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi[0]) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.unitAccuracy;
+
+          if (item.dataIndex == 'count' && unitAccuracy !== undefined) {
+            precisionObj = {
+              precision: unitAccuracy
+            };
+          }
+
+          return /*#__PURE__*/React.createElement(InputNumber, _objectSpread2(_objectSpread2({
             defaultValue: text || '',
             min: 0,
             autoFocus: record.needFocus,
-            keyboard: false,
+            keyboard: false
+          }, precisionObj), {}, {
             onChange: function onChange(value) {
               record[item.dataIndex] = value;
             },
@@ -4141,7 +4152,7 @@ var AddSelect = function AddSelect(props) {
                 e.preventDefault();
               }
             }
-          });
+          }));
         }
       });
     }
@@ -4330,6 +4341,8 @@ styleInject(css_248z$5);
 var _this = undefined;
 
 var InputElement = function InputElement(_ref) {
+  var _record$packingUnitLi, _record$packingUnitLi2;
+
   var record = _ref.record,
       text = _ref.text,
       currentIndex = _ref.currentIndex,
@@ -4597,6 +4610,15 @@ var InputElement = function InputElement(_ref) {
     }));
   };
 
+  var precisionObj = {};
+  var unitAccuracy = (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi[0]) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.unitAccuracy;
+
+  if (item.dataIndex == 'count' && unitAccuracy !== undefined) {
+    precisionObj = {
+      precision: unitAccuracy
+    };
+  }
+
   return /*#__PURE__*/React.createElement(Popover, {
     placement: "bottomLeft",
     destroyTooltipOnHide: {
@@ -4740,11 +4762,12 @@ var InputElement = function InputElement(_ref) {
       }
     }
   }) : /*#__PURE__*/React.createElement(InputNumber // onBlur={() => {updateHoverVisibled(false)}}
-  , {
+  , _objectSpread2(_objectSpread2({
     // onBlur={() => {updateHoverVisibled(false)}}
     defaultValue: text || '',
     min: 0,
-    keyboard: false,
+    keyboard: false
+  }, precisionObj), {}, {
     onChange: function onChange(value) {
       record[item.dataIndex] = value;
     },
@@ -4856,7 +4879,7 @@ var InputElement = function InputElement(_ref) {
         }]));
       }
     }
-  }));
+  })));
 };
 
 var BillEntry = function BillEntry(_ref3) {
@@ -4891,9 +4914,9 @@ var BillEntry = function BillEntry(_ref3) {
     dataIndex: 'selectUnitCode',
     width: 100,
     render: function render(text, record) {
-      var _record$packingUnitLi;
+      var _record$packingUnitLi3;
 
-      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi3 = record.packingUnitList) === null || _record$packingUnitLi3 === void 0 ? void 0 : _record$packingUnitLi3.length) {
         var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
         record.selectUnitCode = basePackUnit.unitCode;
         return basePackUnit.name || basePackUnit.unitCode;

package/dist/index.js

@@ -777,7 +777,7 @@ var luckysheet; // const mapping = [
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
 
-var mapping = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码'], ['realWarehouseCode', '仓库编码'], ['syncRate', '按百分比'], ['assignQuantity', '按指定数量'], ['retainQuantity', ' 按保留数量'], ['priority', ' 优先级']]); // for dnd
+var mapping = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码']]); // for dnd
 
 
 var reorder = function reorder(list, startIndex, endIndex) {
@@ -1087,7 +1087,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
     _this.resetData = function () {
       var _this$props = _this.props,
           validDataUrl = _this$props.validDataUrl,
-          validDataParams = _this$props.validDataParams,
           updateData = _this$props.updateData,
           columns = _this$props.columns,
           isBrandAuth = _this$props.isBrandAuth,
@@ -1107,7 +1106,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         };
       }
 
-      axios__default['default'].post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
+      axios__default['default'].post(validDataUrl, _objectSpread2(_objectSpread2({}, otherParams), {}, {
         columns: columns,
         data: resultData,
         checkStockNum: isCheckStockNum
@@ -1404,7 +1403,7 @@ var luckysheet$1; // const mapping = [
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
 
-var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注'], ['externalCode', 'JDE商品编码'], ['realWarehouseCode', '仓库编码'], ['syncRate', '按百分比'], ['assignQuantity', '按指定数量'], ['retainQuantity', ' 按保留数量'], ['priority', ' 优先级']]); // for dnd
+var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号'], ['oldUniqueCode', '原始唯一码'], ['newUniqueCode', '新唯一码'], ['relationRecordCode', '单据编码'], ['remark', '备注']]); // for dnd
 
 
 var reorder$1 = function reorder(list, startIndex, endIndex) {
@@ -4035,14 +4034,26 @@ var AddSelect = function AddSelect(props) {
       inputIndex++;
       return _objectSpread2(_objectSpread2({}, item), {}, {
         render: function render(text, record, index) {
+          var _record$packingUnitLi, _record$packingUnitLi2;
+
           // let
           if (record.needFocus === true && currentIndex === 0) ;
 
-          return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          var precisionObj = {};
+          var unitAccuracy = (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi[0]) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.unitAccuracy;
+
+          if (item.dataIndex == 'count' && unitAccuracy !== undefined) {
+            precisionObj = {
+              precision: unitAccuracy
+            };
+          }
+
+          return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2(_objectSpread2({
             defaultValue: text || '',
             min: 0,
             autoFocus: record.needFocus,
-            keyboard: false,
+            keyboard: false
+          }, precisionObj), {}, {
             onChange: function onChange(value) {
               record[item.dataIndex] = value;
             },
@@ -4155,7 +4166,7 @@ var AddSelect = function AddSelect(props) {
                 e.preventDefault();
               }
             }
-          });
+          }));
         }
       });
     }
@@ -4344,6 +4355,8 @@ styleInject(css_248z$5);
 var _this = undefined;
 
 var InputElement = function InputElement(_ref) {
+  var _record$packingUnitLi, _record$packingUnitLi2;
+
   var record = _ref.record,
       text = _ref.text,
       currentIndex = _ref.currentIndex,
@@ -4611,6 +4624,15 @@ var InputElement = function InputElement(_ref) {
     }));
   };
 
+  var precisionObj = {};
+  var unitAccuracy = (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi[0]) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.unitAccuracy;
+
+  if (item.dataIndex == 'count' && unitAccuracy !== undefined) {
+    precisionObj = {
+      precision: unitAccuracy
+    };
+  }
+
   return /*#__PURE__*/React__default['default'].createElement(antd.Popover, {
     placement: "bottomLeft",
     destroyTooltipOnHide: {
@@ -4754,11 +4776,12 @@ var InputElement = function InputElement(_ref) {
       }
     }
   }) : /*#__PURE__*/React__default['default'].createElement(antd.InputNumber // onBlur={() => {updateHoverVisibled(false)}}
-  , {
+  , _objectSpread2(_objectSpread2({
     // onBlur={() => {updateHoverVisibled(false)}}
     defaultValue: text || '',
     min: 0,
-    keyboard: false,
+    keyboard: false
+  }, precisionObj), {}, {
     onChange: function onChange(value) {
       record[item.dataIndex] = value;
     },
@@ -4870,7 +4893,7 @@ var InputElement = function InputElement(_ref) {
         }]));
       }
     }
-  }));
+  })));
 };
 
 var BillEntry = function BillEntry(_ref3) {
@@ -4905,9 +4928,9 @@ var BillEntry = function BillEntry(_ref3) {
     dataIndex: 'selectUnitCode',
     width: 100,
     render: function render(text, record) {
-      var _record$packingUnitLi;
+      var _record$packingUnitLi3;
 
-      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : _record$packingUnitLi.length) {
+      if (record === null || record === void 0 ? void 0 : (_record$packingUnitLi3 = record.packingUnitList) === null || _record$packingUnitLi3 === void 0 ? void 0 : _record$packingUnitLi3.length) {
         var basePackUnit = record === null || record === void 0 ? void 0 : record.packingUnitList[0];
         record.selectUnitCode = basePackUnit.unitCode;
         return basePackUnit.name || basePackUnit.unitCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.0.40",
+  "version": "2.0.41-alpha.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Functional/AddSelect/index.tsx

@@ -715,6 +715,13 @@ const AddSelect = (props: any) => {
           // let
           if(record.needFocus === true && currentIndex === 0) {
 
+          }
+          let precisionObj={};
+          const unitAccuracy = record.packingUnitList?.[0]?.unitAccuracy
+          if(item.dataIndex =='count' && unitAccuracy !== undefined) {
+            precisionObj = {
+              precision: unitAccuracy
+            }
           }
           return (
             <InputNumber
@@ -722,6 +729,7 @@ const AddSelect = (props: any) => {
               min={0}
               autoFocus={record.needFocus}
               keyboard={false}
+              {...precisionObj}
               onChange={(value) => {
                 record[item.dataIndex] = value
               }}

package/src/components/Functional/BillEntry/index.tsx

@@ -212,6 +212,13 @@ const InputElement = ({
     </div>
   }
 
+  let precisionObj={};
+  const unitAccuracy = record.packingUnitList?.[0]?.unitAccuracy
+  if(item.dataIndex =='count' && unitAccuracy !== undefined) {
+    precisionObj = {
+      precision: unitAccuracy
+    }
+  }
 
   return (
     <Popover placement="bottomLeft" destroyTooltipOnHide={{ keepParent: false }} title="" trigger="" content={SearchDataTable(hoverVisibled)} visible={hoverVisibled} onVisibleChange={(disabled) => { updateHoverVisibled(disabled) }}>
@@ -316,6 +323,7 @@ const InputElement = ({
           defaultValue={text || ''}
           min={0}
           keyboard={false}
+          {...precisionObj}
           onChange={(value) => {
             record[item.dataIndex] = value
           }}

package/src/components/Functional/DataImport/index.tsx

@@ -58,12 +58,6 @@ const mapping = new Map([
   ['newUniqueCode', '新唯一码'],
   ['relationRecordCode', '单据编码'],
   ['remark', '备注'],
-  ['externalCode', 'JDE商品编码'],
-  ['realWarehouseCode', '仓库编码'],
-  ['syncRate', '按百分比'],
-  ['assignQuantity', '按指定数量'],
-  ['retainQuantity', ' 按保留数量'],
-  ['priority', ' 优先级'],
 ]);
 
 // for dnd

package/src/components/Functional/DataValidation/index.md

@@ -26,7 +26,6 @@ export default () => {
         // columns={['skuCode', 'quantity', 'price']}
         columns={["skuCode", "quantity", "price"]}  // 需要哪些列展示，以及展示的顺序
         validDataUrl="/wms-ops/recordDetailImport/check" // 校验的接口url
-        validDataParams={{ recordCode: '111' }}
         onRef={(ref) => {
           dataValidationRef = ref;
         }}

package/src/components/Functional/DataValidation/index.tsx

@@ -58,12 +58,7 @@ const mapping = new Map([
   ['newUniqueCode', '新唯一码'],
   ['relationRecordCode', '单据编码'],
   ['remark', '备注'],
-  ['externalCode', 'JDE商品编码'],
-  ['realWarehouseCode', '仓库编码'],
-  ['syncRate', '按百分比'],
-  ['assignQuantity', '按指定数量'],
-  ['retainQuantity', ' 按保留数量'],
-  ['priority', ' 优先级'],
+  ['externalCode', 'JDE商品编码']
 ]);
 
 // for dnd
@@ -406,7 +401,7 @@ class DataValidation extends React.Component {
   };
 
   resetData = () => {
-    const { validDataUrl, validDataParams, updateData, columns, isBrandAuth, isCheckStockNum = true } = this.props;
+    const { validDataUrl, updateData, columns, isBrandAuth, isCheckStockNum = true } = this.props;
     const resultData = this.getData().filter(d => {
       return _.compact(Object.values(d)).length
     })
@@ -420,7 +415,6 @@ class DataValidation extends React.Component {
     axios
       .post(validDataUrl, {
         ...otherParams,
-        ...validDataParams,
         columns: columns,
         data: resultData,
         checkStockNum: isCheckStockNum