@kmkf-fe-packages/kmkf-utils 2.2.38-rc.1 → 2.2.39-beta.0

package/README.md

@@ -1 +1 @@
-1123111
+1123111144

package/dist/esm/constants/index.d.ts

@@ -1,3 +1,4 @@
+export { default as msgTypeCh } from "./msgTypeMapping";
 export { default as columnsGoodsList } from "./columnsGoodsList";
 export { default as componentsOptionsMapping } from "./componentsOptionsMapping";
 export * from './constant';
@@ -7,4 +8,3 @@ export declare const getMapping: (data: {
 }[]) => {
     [key: string]: string;
 };
-export { default as msgTypeCh } from "./msgTypeMapping";

package/dist/esm/constants/index.js

@@ -1,3 +1,4 @@
+export { default as msgTypeCh } from "./msgTypeMapping";
 export { default as columnsGoodsList } from "./columnsGoodsList";
 export { default as componentsOptionsMapping } from "./componentsOptionsMapping";
 export * from "./constant";
@@ -7,5 +8,4 @@ export var getMapping = function getMapping(data) {
     mapping[item.dataIndex] = item.title;
   });
   return mapping;
-};
-export { default as msgTypeCh } from "./msgTypeMapping";
+};

package/dist/esm/request/index.js

@@ -3,7 +3,7 @@
  * @Author: litian
  * @Date: 2022-09-06 09:29:34
  * @LastEditors: flyingMonkey 760958607@qq.com
- * @LastEditTime: 2025-09-04 18:49:52
+ * @LastEditTime: 2025-09-04 18:51:04
  */
 import { extend } from "umi-request";
 import { message } from "antd";
@@ -27,8 +27,7 @@ var requestApi = function requestApi(_ref) {
     data = _ref.data,
     _ref$headers = _ref.headers,
     headers = _ref$headers === void 0 ? {} : _ref$headers,
-    _ref$handleError = _ref.handleError,
-    handleError = _ref$handleError === void 0 ? message.error : _ref$handleError,
+    handleError = _ref.handleError,
     infoLevel = _ref.infoLevel;
   return new Promise(function (resolve, reject) {
     var params = {

package/dist/esm/servers/index.d.ts

@@ -7,9 +7,9 @@ export * as GY from "./GY";
 export * as JY from "./JY";
 export * as JST from "./JST";
 export * as WLN from "./WLN";
+export * from "./workOrder";
 export * as orderSubForm from "./orderSubForm";
 export * as SKX from "./SKX";
-export * from "./workOrder";
 export * from "./constants";
 export declare const queryWdtAddressData: (instance?: WdtAddressData) => Promise<void>;
 export declare const queryGyAddressData: (instance?: GyAddressData) => Promise<void>;

package/dist/esm/servers/index.js

@@ -17,11 +17,11 @@ import * as _JST from "./JST";
 export { _JST as JST };
 import * as _WLN from "./WLN";
 export { _WLN as WLN };
+export * from "./workOrder";
 import * as _orderSubForm from "./orderSubForm";
 export { _orderSubForm as orderSubForm };
 import * as _SKX from "./SKX";
 export { _SKX as SKX };
-export * from "./workOrder";
 export * from "./constants";
 var transformData = function transformData(list) {
   var map = {};

package/dist/esm/utils/getExpression.js

@@ -52,15 +52,15 @@ var getExpression = function getExpression(condition, l, r) {
     var _intersection3, _intersection4;
     return Array.isArray(l) ? ((_intersection3 = intersection(r, l)) === null || _intersection3 === void 0 ? void 0 : _intersection3.length) > 0 : ((_intersection4 = intersection(r, [l])) === null || _intersection4 === void 0 ? void 0 : _intersection4.length) > 0;
   }
+  if (condition === 'ARRAY_OBJECT_INCLUDE') {
+    var _intersection5;
+    return ((_intersection5 = intersection(extractPrimitiveValues(l), r)) === null || _intersection5 === void 0 ? void 0 : _intersection5.length) > 0;
+  }
   if (condition === 'NINCLUDE') {
-    var _intersection5, _intersection6;
-    var _include = Array.isArray(l) ? ((_intersection5 = intersection(r, l)) === null || _intersection5 === void 0 ? void 0 : _intersection5.length) > 0 : ((_intersection6 = intersection(r, [l])) === null || _intersection6 === void 0 ? void 0 : _intersection6.length) > 0;
+    var _intersection6, _intersection7;
+    var _include = Array.isArray(l) ? ((_intersection6 = intersection(r, l)) === null || _intersection6 === void 0 ? void 0 : _intersection6.length) > 0 : ((_intersection7 = intersection(r, [l])) === null || _intersection7 === void 0 ? void 0 : _intersection7.length) > 0;
     return !_include;
   }
-  if (condition === 'ARRAY_OBJECT_INCLUDE') {
-    var _intersection7;
-    return ((_intersection7 = intersection(extractPrimitiveValues(l), r)) === null || _intersection7 === void 0 ? void 0 : _intersection7.length) > 0;
-  }
   return false;
 };
 export default getExpression;

package/dist/esm/utils/jyOrderBackFormValues.js

@@ -89,6 +89,11 @@ export var updateJyGoodsHandle = function updateJyGoodsHandle() {
     if (next.subOrderDetails && next.subOrderDetails.length) {
       next.subOrderDetails.forEach(function (subItem) {
         subItem.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
+        subItem.divideOrderFee = Number(subItem.divideOrderFee).toFixed(2);
+        subItem.sellTotal = Number(subItem.sellTotal).toFixed(2);
+        subItem.sellPrice = Number(subItem.sellPrice).toFixed(2);
+        subItem.settlementPrice = Number(subItem.settlementPrice).toFixed(2);
+        subItem.mallSellingPrice = Number(subItem.mallSellingPrice).toFixed(2);
         prv.push(subItem);
       });
     }

package/dist/esm/utils/kmOrderBackFormValues.js

@@ -348,7 +348,7 @@ export var filterKmOrders = function filterKmOrders(detail, order_no) {
 
 //km订单信息转换
 export var kmOrderTransform = function kmOrderTransform(detail, form) {
-  var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
+  var _form$getFieldValue, _kmReissueGoodsCompon, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon2, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon3, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
   var trades = (detail === null || detail === void 0 ? void 0 : detail.orderDetailDtoList) || (detail === null || detail === void 0 ? void 0 : detail.trades) || [];
   var _ref = detail || {},
     orderNo = _ref.orderNo,
@@ -356,12 +356,12 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
   var kmGoodsCom = (componentList || []).find(function (com) {
     return com.workOrderComponentType === "KM_GOODS";
   });
-  var kmReissueCom = (componentList || []).find(function (com) {
-    return com.workOrderComponentType === "KM_REISSUE_GOODS";
+  var kmReissueGoodsComponent = componentList.find(function (item) {
+    return item.workOrderComponentType === "KM_REISSUE_GOODS";
   });
   var isStrict = kmGoodsCom ? (_form$getFieldValue = form.getFieldValue(kmGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
   var onlyOneSystemOrder = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
-  var isReissueDefaultSelect = !!(kmReissueCom !== null && kmReissueCom !== void 0 && (_kmReissueCom$compone = kmReissueCom.componentConfig) !== null && _kmReissueCom$compone !== void 0 && _kmReissueCom$compone.showDefaultSelect);
+  var isReissueDefaultSelect = !!(kmReissueGoodsComponent !== null && kmReissueGoodsComponent !== void 0 && (_kmReissueGoodsCompon = kmReissueGoodsComponent.componentConfig) !== null && _kmReissueGoodsCompon !== void 0 && _kmReissueGoodsCompon.showDefaultSelect);
   console.log("kmOrderTransform---", {
     detail: detail,
     componentList: componentList
@@ -369,17 +369,14 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
   var kmGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
     return item.workOrderComponentType === "KM_GOODS";
   })) === null || _componentList$find === void 0 ? void 0 : (_componentList$find$c = _componentList$find.componentConfig) === null || _componentList$find$c === void 0 ? void 0 : _componentList$find$c.orderBackGoodsLevel;
-  var kmReissueGoodsComponent = componentList.find(function (item) {
-    return item.workOrderComponentType === "KM_REISSUE_GOODS";
-  });
-  var kmReissueGoodsOrderBackGoodsLevel = kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon === void 0 ? void 0 : _kmReissueGoodsCompon.orderBackGoodsLevel;
+  var kmReissueGoodsOrderBackGoodsLevel = kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon2 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon2 === void 0 ? void 0 : _kmReissueGoodsCompon2.orderBackGoodsLevel;
   var kmReturnGoodsOrderBackGoodsLevel = (_componentList$find2 = componentList.find(function (item) {
     return item.workOrderComponentType === "KM_RETURN_GOODS";
   })) === null || _componentList$find2 === void 0 ? void 0 : (_componentList$find2$ = _componentList$find2.componentConfig) === null || _componentList$find2$ === void 0 ? void 0 : _componentList$find2$.orderBackGoodsLevel;
   var postingComponent = componentList.find(function (item) {
     return item.workOrderComponentType === "POSTING";
   });
-  var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon2 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon2 === void 0 ? void 0 : _kmReissueGoodsCompon2.initReason) || "1";
+  var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon3 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon3 === void 0 ? void 0 : _kmReissueGoodsCompon3.initReason) || "1";
   var kmPosting;
   if (onlyOneSystemOrder && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
     kmPosting = handleKmAddressIdentify(trades[0]);

package/dist/esm/utils/orderBackFormValues.js

@@ -250,8 +250,8 @@ export default (function (_ref) {
   var wdtValues = detail["wdtOrder"] ? wdtOrderBackFormValues(detail["wdtOrder"], templateDetail) : {};
   var bsE3Values = detail["bsE3Order"] ? bsE3OrderBackFormValues(detail["bsE3Order"], templateDetail) : {};
   var kmValues = detail["kmOrder"] ? kmOrderBackFormValues(detail["kmOrder"], templateDetail) : {};
-  var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
   var gyValues = detail["gyOrder"] ? gyOrderBackFormValues(detail["gyOrder"], templateDetail) : {};
+  var jyValues = detail["jyOrder"] ? jyOrderBackFormValues(detail["jyOrder"], templateDetail) : {};
   //不判断是否存在detail["skxOrder"]，不存在直接清空所有skx相关组件值
   var skxValues = detail["skxOrder"] ? skxOrderBackFormValues(detail["skxOrder"], templateDetail) : {};
   var skxReturnValues = detail["skxReturnOrder"] ? skxReturnOrderBackFormValues(detail["skxReturnOrder"], templateDetail) : {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-utils",
-  "version": "2.2.38-rc.1",
+  "version": "2.2.39-beta.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "115ad7ec702d00f362b955b958149326213a769f",
+  "gitHead": "9017c5c2ff27a176e9ff269593336782f990383b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }