@kmkf-fe-packages/services-components 2.9.1-beta.3 → 2.10.0

package/dist/esm/components/Public/Exchange/index.js

@@ -17,7 +17,6 @@ import { SYMBOL } from "../../../constant";
 // import { BsType, BsMemo } from "../../Bs/common";
 import { CommonExchangeGoods } from '@kmkf-fe-packages/basic-components';
 import CommonHeaderGoods from "../../CommonHeaderGood";
-import { erpFormValidator } from "@kmkf-fe-packages/basic-components";
 function toNum(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
@@ -30,11 +29,28 @@ function toNum(value) {
 var CONF_MAP = {
   JST_EXCHANGE_GOODS: {
     goodsKey: 'jstExchangeGoods',
-    validator: function validator(_rule, value, type) {
+    validator: function validator(_rule, value) {
       if (!_rule.required) return Promise.resolve();
-      var validatorFlag = erpFormValidator(_rule, value, type);
-      if (validatorFlag) {
-        return validatorFlag;
+      var goodsName = '';
+      if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
+        var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
+        var res = typeof qty === 'number' ? qty < 1 : true;
+        if (res) {
+          goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
+        }
+        return res;
+      })) {
+        return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
+      }
+      if (((value === null || value === void 0 ? void 0 : value.jstExchangeGoods) || []).some(function (goods) {
+        var v = toNum(goods === null || goods === void 0 ? void 0 : goods.salePrice);
+        var res = typeof v === 'number' ? v < 0 : true;
+        if (res) {
+          goodsName = goods !== null && goods !== void 0 && goods.name ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
+        }
+        return res;
+      })) {
+        return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
       }
       return Promise.resolve();
     }
@@ -148,11 +164,8 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
     }
   }, {
     required: (_this$componentConfig8 = this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.required,
-    validator: function validator(_rule, value) {
-      var _CONF_MAP$options$typ, _CONF_MAP$options$typ2;
-      return ((_CONF_MAP$options$typ = CONF_MAP[options.type]) === null || _CONF_MAP$options$typ === void 0 ? void 0 : (_CONF_MAP$options$typ2 = _CONF_MAP$options$typ.validator) === null || _CONF_MAP$options$typ2 === void 0 ? void 0 : _CONF_MAP$options$typ2.call(_CONF_MAP$options$typ, _rule, value, options.type, _this.componentConfig)) || function () {
-        return Promise.resolve();
-      };
+    validator: this.config.validator || function () {
+      return Promise.resolve();
     }
   }];
   this.dataType = 'object';

package/dist/esm/components/Public/ReissueGoods/index.js

@@ -43,11 +43,11 @@ var typeMap = {
     typeName: "jstReturnType",
     remark: "jstReturnType_memo",
     systemOrderNo: "jstSystemOrderNo",
-    // systemOrderBillType: "jstSystemOrderBillType",
+    systemOrderBillType: "jstSystemOrderBillType",
     errMsg: "请选择聚水潭退货商品",
     name: "聚水潭",
     compType: "退货",
-    hasSystemOrderType: false,
+    hasSystemOrderType: true,
     validator: function validator(_rule, value, type) {
       if (!_rule.required) return Promise.resolve();
       var validatorFlag = erpFormValidator(_rule, value, type);

package/dist/esm/components/Public/SystemOrderType/index.js

@@ -15,8 +15,8 @@ import React from "react";
 import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 var componentType = {
-  JST_REISSUE_GOODS: "jstSystemOrderBillType"
-  // JST_RETURN_GOODS: "jstSystemOrderBillType",
+  JST_REISSUE_GOODS: "jstSystemOrderBillType",
+  JST_RETURN_GOODS: "jstSystemOrderBillType"
 };
 var SystemOrderType = /*#__PURE__*/_createClass(function SystemOrderType(options) {
   var _this = this;

package/dist/esm/factory.js

@@ -185,7 +185,6 @@ export var factory = function factory(type, options) {
     case "KM_RETURN_GOODS":
     case "JY_REISSUE_GOODS":
     case "JKY_REISSUE_GOODS":
-    case "JST_RETURN_GOODS":
       return new PublicReissueGoods(options);
     case "BS_E3_REISSUE_GOODS":
       return new BsE3Reissue(options);
@@ -209,6 +208,8 @@ export var factory = function factory(type, options) {
       return new WdtReturn(options);
     case "GY_RETURN_GOODS":
       return new GyReturn(options);
+    case "JST_RETURN_GOODS":
+      return new PublicReissueGoods(options);
     case "REISSUE_TRADE_ID":
     case "SWAP_OUT_TRADE_ID":
     case "ERP_AFTER_SALE_TRADE_ID":

package/dist/esm/service/api.js

@@ -142,7 +142,6 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
       SF: "顺丰",
       ZTO: "中通",
       JT: "极兔",
-      STO: "申通",
       DEFAULT: ""
     };
     var expressList = data.map(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.9.1-beta.3",
+  "version": "2.10.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.9.1-beta.0",
-    "@kmkf-fe-packages/kmkf-utils": "2.9.1-beta.0",
+    "@kmkf-fe-packages/basic-components": "2.9.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.9.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": "48bf3378988df967c79a46057da2d5620cd4e032",
+  "gitHead": "7d9711d7dce733298bdd632e730c7af7d16416d8",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }