@kmkf-fe-packages/services-components 1.17.8-beta.32 → 1.17.8-beta.36

package/dist/esm/components/BS/BsSystemOrder/index.js

@@ -105,7 +105,7 @@ var typeMap = {
       width: 100
     }, {
       title: "是否换货单",
-      dataIndex: "isHH",
+      dataIndex: "isExchangeOrder",
       width: 100
     }, {
       title: "订单备注",

package/dist/esm/components/Common/index.js

@@ -749,6 +749,149 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
             }];
           }
           break;
+        case 'BS_E3_GOODS':
+          {
+            columns = [{
+              dataIndex: 'sku',
+              title: "SKU",
+              align: 'center',
+              ellipsis: true,
+              width: 150
+            }, {
+              dataIndex: 'skuId',
+              title: "SKU ID",
+              align: 'center',
+              ellipsis: true,
+              width: 150
+            }, {
+              dataIndex: 'goodsName',
+              title: "\u5546\u54C1\u540D\u79F0",
+              align: 'center',
+              ellipsis: true,
+              width: 150
+            }, {
+              dataIndex: 'goodsShortName',
+              title: "\u5546\u54C1\u7B80\u79F0",
+              align: 'center',
+              ellipsis: true,
+              width: 100
+            }, {
+              dataIndex: 'picPath',
+              title: "\u5546\u54C1\u56FE\u7247",
+              align: 'center',
+              ellipsis: true,
+              width: 100,
+              render: function render(val) {
+                return /*#__PURE__*/React.createElement(Image, {
+                  width: 60,
+                  src: val
+                });
+              }
+            }, {
+              dataIndex: 'goodsSn',
+              title: "\u8D27\u53F7",
+              align: 'center',
+              ellipsis: true,
+              width: 150
+            }, {
+              dataIndex: 'goodsId',
+              title: "\u8D27\u53F7ID",
+              align: 'center',
+              ellipsis: true,
+              width: 150
+            }, {
+              dataIndex: 'colorName',
+              title: "\u989C\u8272\u540D\u79F0",
+              align: 'center',
+              ellipsis: true,
+              width: 100
+            }, {
+              dataIndex: 'colorCode',
+              title: "\u989C\u8272\u4EE3\u7801",
+              align: 'center',
+              ellipsis: true,
+              width: 150
+            }, {
+              dataIndex: 'sizeName',
+              title: "\u5C3A\u7801\u540D\u79F0",
+              align: 'center',
+              ellipsis: true,
+              width: 100
+            }, {
+              dataIndex: 'sizeCode',
+              title: "\u5C3A\u7801\u4EE3\u7801",
+              align: 'center',
+              ellipsis: true,
+              width: 100
+            }, {
+              dataIndex: 'brandName',
+              title: "\u54C1\u724C\u540D\u79F0",
+              align: 'center',
+              ellipsis: true,
+              width: 150
+            }, {
+              dataIndex: 'goodsNumber',
+              title: "\u5546\u54C1\u6570\u91CF",
+              align: 'center',
+              ellipsis: true,
+              width: 100
+            }, {
+              dataIndex: 'goodsPrice',
+              title: "\u5546\u54C1\u5355\u4EF7",
+              align: 'center',
+              ellipsis: true,
+              width: 120
+            }, {
+              dataIndex: 'shopPrice',
+              title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
+              align: 'center',
+              ellipsis: true,
+              width: 120
+            }, {
+              dataIndex: 'sharePrice',
+              title: "\u5206\u644A\u4EF7",
+              align: 'center',
+              ellipsis: true,
+              width: 120
+            }, {
+              dataIndex: 'sharePayment',
+              title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
+              align: 'center',
+              ellipsis: true,
+              width: 120
+            }, {
+              dataIndex: 'payment',
+              title: "\u5B9E\u4ED8\u91D1\u989D",
+              align: 'center',
+              ellipsis: true,
+              width: 120
+            }, {
+              dataIndex: 'tcSku',
+              title: "\u5957\u9910SKU",
+              align: 'center',
+              ellipsis: true,
+              width: 150
+            }, {
+              dataIndex: 'tcGoodsNumber',
+              title: "\u5957\u9910\u5957\u6570",
+              align: 'center',
+              ellipsis: true,
+              width: 100
+            }, {
+              dataIndex: 'taoCanSingleSl',
+              title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
+              align: 'center',
+              ellipsis: true,
+              width: 100
+            }, {
+              dataIndex: 'isGift',
+              title: "\u662F\u5426\u8D60\u54C1",
+              align: 'center',
+              ellipsis: true,
+              width: 100
+            }];
+          }
+          break;
         default:
           columns = [{
             dataIndex: 'mark',
@@ -1007,7 +1150,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
       dataIndex: 'billTag',
       title: '订单标签'
     }],
-    BS_E3_BS_SYSTEM_ORDER: [{
+    BS_E3_SYSTEM_ORDER: [{
       title: "系统订单号",
       dataIndex: "orderSn",
       width: 150
@@ -1037,7 +1180,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
       width: 100
     }, {
       title: "是否换货单",
-      dataIndex: "isHH",
+      dataIndex: "isExchangeOrder",
       width: 100
     }, {
       title: "订单备注",
@@ -1049,7 +1192,7 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
     BS_SYSTEM_ORDER: 'billNo',
     WLN_SYSTEM_ORDER: 'billNo',
     WDT_SYSTEM_ORDER: 'billNo',
-    BS_E3_BS_SYSTEM_ORDER: 'orderSn'
+    BS_E3_SYSTEM_ORDER: 'orderSn'
   };
   var rowSelection = {
     selectedRowKeys: (value === null || value === void 0 ? void 0 : value.selectIds) || ((value === null || value === void 0 ? void 0 : value.showOrderInfo) || []).reduce(function (prv, next) {

package/dist/esm/components/CommonHeaderGood/index.js

@@ -307,14 +307,14 @@ var GoodHeaderMap = {
         key: "goodsName",
         width: 100
       },
-      goodsSname: {
+      goodsShortName: {
         component: BsHeaderChild,
         name: "商品简称",
-        key: "goodsSname",
+        key: "goodsShortName",
         width: 70
       },
       picPath: {
-        component: BsHeaderChild,
+        component: BsHeaderPic,
         name: "商品图片",
         key: "picPath",
         width: 80
@@ -409,10 +409,10 @@ var GoodHeaderMap = {
         key: "tcGoodsNumber",
         width: 120
       },
-      taocanSingleSl: {
+      taoCanSingleSl: {
         component: BsHeaderChild,
         name: "单个套餐数量",
-        key: "taocanSingleSl",
+        key: "taoCanSingleSl",
         width: 80
       },
       isGift: {
@@ -426,7 +426,7 @@ var GoodHeaderMap = {
       sku: "SKU",
       skuId: "SKU ID",
       goodsName: "商品名称",
-      goodsSname: "商品简称",
+      goodsShortName: "商品简称",
       picPath: "商品图片",
       goodsSn: "货号",
       goodsId: "货号ID",
@@ -443,7 +443,7 @@ var GoodHeaderMap = {
       payment: "实付金额",
       tcSku: "套餐SKU",
       tcGoodsNumber: "套餐套数",
-      taocanSingleSl: "单个套餐数量",
+      taoCanSingleSl: "单个套餐数量",
       isGift: "是否赠品"
     },
     moneyKey: "payment"

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, KmErpSendGood, AfterSalesOrderId, BsE3Goods } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | BsE3Goods | ItemEnCode | JstItemSelect | JstLogistics | JstSendGood | JstSupply | KmErpSendGood | MsgStatus | ThirdItemSelect | BasicDataTime | TradeDateTime | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | SystemOrderNo | Ordinary | Payment | BsGoods | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | AfterSalesOrderId;
+export declare const factory: (type: string, options: PickOption) => BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | KmErpSendGood | AfterSalesOrderId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.17.8-beta.32",
+  "version": "1.17.8-beta.36",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "1.17.8-beta.32",
-    "@kmkf-fe-packages/kmkf-utils": "1.17.8-beta.32",
+    "@kmkf-fe-packages/basic-components": "1.17.8-beta.36",
+    "@kmkf-fe-packages/kmkf-utils": "1.17.8-beta.36",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ffe537760476491163705c7e994073f6e1082cf9",
+  "gitHead": "c6bc7848aac5c80085b1ccc50d9d5c15f594bfe1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }