@kmkf-fe-packages/services-components 2.10.8 → 2.10.9-beta.1

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

@@ -218,6 +218,29 @@ var typeMap = {
     idKey: "sourceTradeNo",
     failValue: "失败",
     dataType: "array_object"
+  },
+  KM_WAREHOUSING_STATUS: {
+    options: [{
+      value: "0",
+      label: "未入库",
+      color: "#ff4d4f"
+    }, {
+      value: "1",
+      label: "部分入库",
+      color: "#e7780f"
+    }, {
+      value: "2",
+      label: "全部入库",
+      color: "#52c41a"
+    }],
+    key: "kmInStockStatusItemList",
+    code: "kmInStockStatusList",
+    name: "商品入库状态",
+    type: 2,
+    valueKey: "status",
+    idKey: "systemOrderId",
+    failValue: "失败",
+    dataType: "array_object"
   }
 };
 var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(options) {
@@ -322,7 +345,7 @@ var CommonMultiStatus = /*#__PURE__*/_createClass(function CommonMultiStatus(opt
   _defineProperty(this, "filterConfig", function (item) {
     var _typeMap$_this$type21, _item$templateConfig;
     return {
-      searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
+      searchDefaultConditions: ["BS_E3_WAREHOUSING_STATUS", "WAREHOUSING_STATUS", "WDT_WAREHOUSING_STATUS", "WLN_WAREHOUSING_STATUS", "JKY_WAREHOUSING_STATUS", "JST_WAREHOUSING_STATUS", "KM_WAREHOUSING_STATUS"].includes(_this.type) ? SYMBOL.in : SYMBOL.like,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type21 = typeMap[_this.type]) === null || _typeMap$_this$type21 === void 0 ? void 0 : _typeMap$_this$type21.code),
       name: "".concat(_this.name),

package/dist/esm/components/JST/JstSendGood/index.d.ts

@@ -29,7 +29,7 @@ declare class JstSendGood implements ComponentInterface {
     renderExport: (value: any, record: any) => any;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
-        searchDefaultConditions: "like";
+        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;

package/dist/esm/components/JST/JstSendGood/index.js

@@ -198,7 +198,7 @@ var JstSendGood = /*#__PURE__*/_createClass(function JstSendGood(_options) {
   _defineProperty(this, "filterConfig", function (item) {
     var _typeMap$_this$type8, _typeMap$_this$type9, _typeMap$_this$type10, _typeMap$_this$type12;
     return [["WLN_SEND_GOOD"].includes(_this.type) ? {
-      searchDefaultConditions: SYMBOL.like,
+      searchDefaultConditions: SYMBOL.in,
       type: item.type,
       id: "".concat(item.id, "_").concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.sendName),
       name: "".concat(_this.name, "-\u540D\u79F0"),

package/dist/esm/components/StatusSelect/constants.js

@@ -26,6 +26,14 @@ export var getSelectTypeAttribute = function getSelectTypeAttribute(_ref) {
       color: "#1890ff"
     });
   }
+  if (key === "erpAfterSalesOrderReviewStatusValue") {
+    var _dataMap$options2;
+    dataMap === null || dataMap === void 0 ? void 0 : (_dataMap$options2 = dataMap.options) === null || _dataMap$options2 === void 0 ? void 0 : _dataMap$options2.push({
+      value: "\u65E0\u9700\u5BA1\u6838",
+      label: "\u65E0\u9700\u5BA1\u6838",
+      color: "#1890ff"
+    });
+  }
   dataMap["failValue"] = dataMap.options[failValueIndex].value;
   return dataMap;
 };

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, 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, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect, ReturnWarehouse, KmExchange } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => CommonMultiStatus | CommonSystemOrder | MsgStatus | PublicExchange | PublicReissueGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | 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 | ReissueLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
+export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | CommonMultiStatus | CommonSystemOrder | JstSendGood | MsgStatus | PublicExchange | PublicGoods | PublicReissueGoods | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | 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 | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;

package/dist/esm/factory.js

@@ -255,6 +255,7 @@ export var factory = function factory(type, options) {
     case "WLN_WAREHOUSING_STATUS":
     case "JKY_WAREHOUSING_STATUS":
     case "JST_WAREHOUSING_STATUS":
+    case "KM_WAREHOUSING_STATUS":
       return new CommonMultiStatus(options);
     case "MSG_STATUS":
       return new MsgStatus(options);

package/dist/esm/service/api.js

@@ -142,6 +142,7 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
       SF: "顺丰",
       ZTO: "中通",
       JT: "极兔",
+      STO: "申通",
       DEFAULT: ""
     };
     var expressList = data.map(function (item) {
@@ -210,6 +211,7 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
         value: _toConsumableArray(typeObj[key]).join(",")
       };
     });
+    console.log("typeObj---", typeObj, instance.typeOptions, companyTypeMap);
     instance.typeConditionOptions = Object.keys(instance.typeNameMap).map(function (key) {
       var type = key.split("|")[0];
       return {
@@ -237,6 +239,7 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
       }
     });
     instance.statusConditionOptions = tempList;
+    console.log("instance-----2", instance);
   }).catch(function (e) {
     console.log(e);
   });

package/package.json

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