@kmkf-fe-packages/basic-components 2.2.13-beta.10 → 2.2.13-beta.11

package/dist/index.esm.js

@@ -14890,17 +14890,17 @@ var getYesOrNo$1 = function getYesOrNo(val) {
   return val ? '是' : '否';
 };
 var jyColumns = [{
-  dataIndex: 'productName',
+  dataIndex: 'goodName',
   title: '商品名称',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'productCode',
+  dataIndex: 'goodNo',
   title: '商品编码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'productId',
+  dataIndex: 'goodId',
   title: '商品ID',
   width: 150,
   ellipsis: true
@@ -14909,22 +14909,22 @@ var jyColumns = [{
   title: '商品图片',
   width: 100,
   render: function render(picUrl) {
-    return /*#__PURE__*/React.createElement("img", {
+    return picUrl ? /*#__PURE__*/React.createElement("img", {
       style: {
         width: '40px',
         height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
-    });
+    }) : null;
   }
 }, {
-  dataIndex: 'productShortName',
+  dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
   width: 150
 }, {
-  dataIndex: 'productGroupName',
+  dataIndex: 'categoryName',
   title: "\u5546\u54C1\u7EC4",
   ellipsis: true,
   width: 150
@@ -14934,56 +14934,56 @@ var jyColumns = [{
   width: 200,
   ellipsis: true
 }, {
-  dataIndex: 'skuName',
+  dataIndex: 'specName',
   title: '规格名称',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'skuCode',
+  dataIndex: 'specNo',
   title: '规格编码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'skuId',
+  dataIndex: 'specId',
   title: '规格ID',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'barcode',
+  dataIndex: 'specBarcode',
   title: '规格条码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'skuImage',
+  dataIndex: 'specImgUrl',
   title: '规格图片',
   width: 100,
   render: function render(picUrl) {
-    return /*#__PURE__*/React.createElement("img", {
+    return picUrl ? /*#__PURE__*/React.createElement("img", {
       style: {
         width: '40px',
         height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
-    });
+    }) : null;
   }
 }, {
-  dataIndex: 'color',
+  dataIndex: 'colorName',
   title: "\u989C\u8272",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'size',
+  dataIndex: 'sizeName',
   title: "\u5C3A\u7801",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'markedPrice',
+  dataIndex: 'marketPrice',
   title: "\u5E02\u573A\u4EF7",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'sellingPrice',
+  dataIndex: 'retailPrice',
   title: "\u96F6\u552E\u4EF7",
   ellipsis: true,
   width: 100
@@ -14993,7 +14993,7 @@ var jyColumns = [{
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'gift',
+  dataIndex: 'isGift',
   title: "\u662F\u5426\u8D60\u54C1",
   ellipsis: true,
   width: 150,
@@ -15001,12 +15001,12 @@ var jyColumns = [{
     return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
   }
 }, {
-  dataIndex: 'combination',
+  dataIndex: 'skuType',
   title: "\u662F\u5426\u7EC4\u5408\u88C5",
   ellipsis: true,
   width: 150,
   render: function render(val) {
-    return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val));
+    return /*#__PURE__*/React.createElement("span", null, getYesOrNo$1(val === 'combine'));
   }
 }];
 
@@ -17821,16 +17821,16 @@ var getTableData$5 = function getTableData(_ref, formData) {
 };
 var searchFormData$4 = [{
   label: '规格名称',
-  name: 'skuName'
+  name: 'specName'
 }, {
   label: '规格编码',
-  name: 'skuCode'
+  name: 'specNo'
 }, {
   label: '商品名称',
-  name: 'productName'
+  name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'productCode'
+  name: 'goodNo'
 }];
 var GoodList$5 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -20281,19 +20281,23 @@ var getColumns$7 = function getColumns(_ref) {
     updateDataHandle = _ref.updateDataHandle;
   return {
     //巨益商品信息
-    JY_GOODS: [{
-      dataIndex: 'goodsName',
-      title: "\u8D27\u54C1\u540D\u79F0",
-      width: 250
-    }, {
-      dataIndex: 'goodsCode',
-      title: "\u8D27\u54C1\u7F16\u53F7",
-      width: 200
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u54C1ID",
-      width: 150
-    }, {
+    JY_GOODS: [
+    // {
+    //   dataIndex: 'goodsName',
+    //   title: `货品名称`,
+    //   width: 250,
+    // },
+    // {
+    //   dataIndex: 'goodsCode',
+    //   title: `货品编号`,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'goodsId',
+    //   title: `货品ID`,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'goodsClass',
       title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150
@@ -20301,19 +20305,22 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'code',
       title: "\u6761\u7801",
       width: 150
-    }, {
-      dataIndex: 'specName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 200
-    }, {
-      dataIndex: 'specCode',
-      title: "\u89C4\u683C\u7F16\u53F7",
-      align: 'center',
-      ellipsis: true,
-      width: 150
-    }, {
+    },
+    // {
+    //   dataIndex: 'specName',
+    //   title: `规格名称`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'specCode',
+    //   title: `规格编号`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'specId',
       title: "\u89C4\u683CID",
       align: 'center',
@@ -20393,9 +20400,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 0,
           onChange: function onChange(num) {
             updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20414,8 +20420,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 2,
           onChange: function onChange(num) {
             updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
@@ -20448,12 +20454,12 @@ var getColumns$7 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 1
+            value: 'True'
           }, {
             label: '否',
-            value: 0
+            value: 'False'
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
       dataIndex: 'combinationName',
@@ -20475,12 +20481,12 @@ var getColumns$7 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 1
+            value: '1'
           }, {
             label: '否',
-            value: 0
+            value: '0'
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, val === '1' ? '是' : '否');
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20878,7 +20884,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
   })), getColumns$7({
     text: text,
     disabled: disabled,
-    updateHandle: updateHandle
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), getColumns$8({
     text: text,
     disabled: disabled,
@@ -21097,12 +21104,35 @@ var processJyGoods = function processJyGoods(_ref2) {
   var list = _ref2.list,
     canUpdateNumber = _ref2.canUpdateNumber;
   return list.map(function (item) {
+    var goodName = item.goodName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      specName = item.specName,
+      specNo = item.specNo,
+      specBarcode = item.specBarcode,
+      retailPrice = item.retailPrice,
+      isGift = item.isGift,
+      skuType = item.skuType;
     return _objectSpread2(_objectSpread2({}, item), {}, {
+      goodsName: goodName,
+      goodsCode: goodNo,
+      goodsId: goodId,
+      code: specBarcode,
+      specCode: specNo,
+      productName: goodName,
+      productCode: goodNo,
+      productId: goodId,
+      skuName: specName,
+      skuCode: specNo,
+      combinationName: goodName,
+      combinationCode: goodNo,
+      gift: isGift ? '1' : '0',
+      bfit: skuType === 'combine' ? 'True' : 'False',
       uuid: uuid(),
       canDelete: true,
       sellCount: 1,
-      sellPrice: 0,
-      sellTotal: 0,
+      sellPrice: retailPrice,
+      sellTotal: retailPrice * 1,
       canEdit: true,
       canUpdateNumber: canUpdateNumber
     });

package/dist/index.js

@@ -14905,17 +14905,17 @@ var getYesOrNo$1 = function getYesOrNo(val) {
   return val ? '是' : '否';
 };
 var jyColumns = [{
-  dataIndex: 'productName',
+  dataIndex: 'goodName',
   title: '商品名称',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'productCode',
+  dataIndex: 'goodNo',
   title: '商品编码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'productId',
+  dataIndex: 'goodId',
   title: '商品ID',
   width: 150,
   ellipsis: true
@@ -14924,22 +14924,22 @@ var jyColumns = [{
   title: '商品图片',
   width: 100,
   render: function render(picUrl) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
+    return picUrl ? /*#__PURE__*/React__default['default'].createElement("img", {
       style: {
         width: '40px',
         height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
-    });
+    }) : null;
   }
 }, {
-  dataIndex: 'productShortName',
+  dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
   width: 150
 }, {
-  dataIndex: 'productGroupName',
+  dataIndex: 'categoryName',
   title: "\u5546\u54C1\u7EC4",
   ellipsis: true,
   width: 150
@@ -14949,56 +14949,56 @@ var jyColumns = [{
   width: 200,
   ellipsis: true
 }, {
-  dataIndex: 'skuName',
+  dataIndex: 'specName',
   title: '规格名称',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'skuCode',
+  dataIndex: 'specNo',
   title: '规格编码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'skuId',
+  dataIndex: 'specId',
   title: '规格ID',
   width: 250,
   ellipsis: true
 }, {
-  dataIndex: 'barcode',
+  dataIndex: 'specBarcode',
   title: '规格条码',
   width: 150,
   ellipsis: true
 }, {
-  dataIndex: 'skuImage',
+  dataIndex: 'specImgUrl',
   title: '规格图片',
   width: 100,
   render: function render(picUrl) {
-    return /*#__PURE__*/React__default['default'].createElement("img", {
+    return picUrl ? /*#__PURE__*/React__default['default'].createElement("img", {
       style: {
         width: '40px',
         height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
-    });
+    }) : null;
   }
 }, {
-  dataIndex: 'color',
+  dataIndex: 'colorName',
   title: "\u989C\u8272",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'size',
+  dataIndex: 'sizeName',
   title: "\u5C3A\u7801",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'markedPrice',
+  dataIndex: 'marketPrice',
   title: "\u5E02\u573A\u4EF7",
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'sellingPrice',
+  dataIndex: 'retailPrice',
   title: "\u96F6\u552E\u4EF7",
   ellipsis: true,
   width: 100
@@ -15008,7 +15008,7 @@ var jyColumns = [{
   ellipsis: true,
   width: 100
 }, {
-  dataIndex: 'gift',
+  dataIndex: 'isGift',
   title: "\u662F\u5426\u8D60\u54C1",
   ellipsis: true,
   width: 150,
@@ -15016,12 +15016,12 @@ var jyColumns = [{
     return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
   }
 }, {
-  dataIndex: 'combination',
+  dataIndex: 'skuType',
   title: "\u662F\u5426\u7EC4\u5408\u88C5",
   ellipsis: true,
   width: 150,
   render: function render(val) {
-    return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val));
+    return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$1(val === 'combine'));
   }
 }];
 
@@ -17836,16 +17836,16 @@ var getTableData$5 = function getTableData(_ref, formData) {
 };
 var searchFormData$4 = [{
   label: '规格名称',
-  name: 'skuName'
+  name: 'specName'
 }, {
   label: '规格编码',
-  name: 'skuCode'
+  name: 'specNo'
 }, {
   label: '商品名称',
-  name: 'productName'
+  name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'productCode'
+  name: 'goodNo'
 }];
 var GoodList$5 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -20296,19 +20296,23 @@ var getColumns$7 = function getColumns(_ref) {
     updateDataHandle = _ref.updateDataHandle;
   return {
     //巨益商品信息
-    JY_GOODS: [{
-      dataIndex: 'goodsName',
-      title: "\u8D27\u54C1\u540D\u79F0",
-      width: 250
-    }, {
-      dataIndex: 'goodsCode',
-      title: "\u8D27\u54C1\u7F16\u53F7",
-      width: 200
-    }, {
-      dataIndex: 'goodsId',
-      title: "\u8D27\u54C1ID",
-      width: 150
-    }, {
+    JY_GOODS: [
+    // {
+    //   dataIndex: 'goodsName',
+    //   title: `货品名称`,
+    //   width: 250,
+    // },
+    // {
+    //   dataIndex: 'goodsCode',
+    //   title: `货品编号`,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'goodsId',
+    //   title: `货品ID`,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'goodsClass',
       title: "\u8D27\u54C1\u7C7B\u522B",
       width: 150
@@ -20316,19 +20320,22 @@ var getColumns$7 = function getColumns(_ref) {
       dataIndex: 'code',
       title: "\u6761\u7801",
       width: 150
-    }, {
-      dataIndex: 'specName',
-      title: "\u89C4\u683C\u540D\u79F0",
-      align: 'center',
-      ellipsis: true,
-      width: 200
-    }, {
-      dataIndex: 'specCode',
-      title: "\u89C4\u683C\u7F16\u53F7",
-      align: 'center',
-      ellipsis: true,
-      width: 150
-    }, {
+    },
+    // {
+    //   dataIndex: 'specName',
+    //   title: `规格名称`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 200,
+    // },
+    // {
+    //   dataIndex: 'specCode',
+    //   title: `规格编号`,
+    //   align: 'center',
+    //   ellipsis: true,
+    //   width: 150,
+    // },
+    {
       dataIndex: 'specId',
       title: "\u89C4\u683CID",
       align: 'center',
@@ -20408,9 +20415,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 0,
           onChange: function onChange(num) {
             updateDataHandle({
-              qty: num,
-              amount: num && isNumberOrNumberString$1(record.price) ? num * record.price : null,
-              originAmount: num && isNumberOrNumberString$1(record.originPrice) ? num * record.originPrice : null
+              sellCount: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellPrice) ? num * record.sellPrice : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -20429,8 +20435,8 @@ var getColumns$7 = function getColumns(_ref) {
           precision: 2,
           onChange: function onChange(num) {
             updateDataHandle({
-              price: num,
-              amount: num && isNumberOrNumberString$1(record.qty) ? num * record.qty : null
+              sellPrice: num,
+              sellTotal: num && isNumberOrNumberString$1(record.sellCount) ? num * record.sellCount : null
             }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
@@ -20463,12 +20469,12 @@ var getColumns$7 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 1
+            value: 'True'
           }, {
             label: '否',
-            value: 0
+            value: 'False'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === 'True' ? '是' : '否');
       }
     }, {
       dataIndex: 'combinationName',
@@ -20490,12 +20496,12 @@ var getColumns$7 = function getColumns(_ref) {
           },
           options: [{
             label: '是',
-            value: 1
+            value: '1'
           }, {
             label: '否',
-            value: 0
+            value: '0'
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val === '1' ? '是' : '否');
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -20893,7 +20899,8 @@ var getColumnsMap$1 = function getColumnsMap(args) {
   })), getColumns$7({
     text: text,
     disabled: disabled,
-    updateHandle: updateHandle
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), getColumns$8({
     text: text,
     disabled: disabled,
@@ -21112,12 +21119,35 @@ var processJyGoods = function processJyGoods(_ref2) {
   var list = _ref2.list,
     canUpdateNumber = _ref2.canUpdateNumber;
   return list.map(function (item) {
+    var goodName = item.goodName,
+      goodNo = item.goodNo,
+      goodId = item.goodId,
+      specName = item.specName,
+      specNo = item.specNo,
+      specBarcode = item.specBarcode,
+      retailPrice = item.retailPrice,
+      isGift = item.isGift,
+      skuType = item.skuType;
     return _objectSpread2(_objectSpread2({}, item), {}, {
+      goodsName: goodName,
+      goodsCode: goodNo,
+      goodsId: goodId,
+      code: specBarcode,
+      specCode: specNo,
+      productName: goodName,
+      productCode: goodNo,
+      productId: goodId,
+      skuName: specName,
+      skuCode: specNo,
+      combinationName: goodName,
+      combinationCode: goodNo,
+      gift: isGift ? '1' : '0',
+      bfit: skuType === 'combine' ? 'True' : 'False',
       uuid: kmkfUtils.uuid(),
       canDelete: true,
       sellCount: 1,
-      sellPrice: 0,
-      sellTotal: 0,
+      sellPrice: retailPrice,
+      sellTotal: retailPrice * 1,
       canEdit: true,
       canUpdateNumber: canUpdateNumber
     });

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

@@ -9,7 +9,7 @@ declare const _default: ({
     dataIndex: string;
     title: string;
     width: number;
-    render: (picUrl: string) => React.JSX.Element;
+    render: (picUrl: string) => React.JSX.Element | null;
     ellipsis?: undefined;
 } | {
     dataIndex: string;
@@ -17,5 +17,11 @@ declare const _default: ({
     ellipsis: boolean;
     width: number;
     render: (val: boolean) => React.JSX.Element;
+} | {
+    dataIndex: string;
+    title: string;
+    ellipsis: boolean;
+    width: number;
+    render: (val: string) => React.JSX.Element;
 })[];
 export default _default;

package/dist/src/bs/component/model/JyGoodsModal/GoodsList.d.ts

@@ -4,24 +4,24 @@ export declare namespace JyGoods {
         companyKey: string;
         id: number;
         platform: 'JY_ERP';
-        productCode: string;
-        productName: string;
+        goodNo: string;
+        goodName: string;
         imageUrl: string;
-        productShortName: string;
-        productGroupName: string;
+        goodShortName: string;
+        categoryName: string;
         productType: string;
         brandName: string;
-        skuName: string;
-        skuCode: string;
-        barcode: string;
-        skuImage: string;
-        color: string;
-        size: string;
-        markedPrice: string;
-        sellingPrice: string;
+        specName: string;
+        specNo: string;
+        specBarcode: string;
+        specImgUrl: string;
+        colorName: string;
+        sizeName: string;
+        marketPrice: string;
+        retailPrice: string;
         costPrice: string;
-        gift: number;
-        combination: number;
+        isGift: boolean;
+        skuType: string;
     }
     interface SelectDrawerRefObject {
         getSelectGoodList: () => JyGoods.GoodsInfo[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.13-beta.10",
+  "version": "2.2.13-beta.11",
   "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.13-beta.10",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.13-beta.11",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8f6077349ef6d949a0f53969632fb5c3a93231e8"
+  "gitHead": "08f751ed4f907685178ea27d4fba6111a4b42f48"
 }