kmkf-work-order-service-component 0.4.10-alpha.4 → 0.4.10-alpha.6

package/dist/esm/WorkOrder/components/Widget/jst/JstLogistics/index.js

@@ -62,20 +62,12 @@ var JstLogistics = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          var companyIndex = (value || []).findIndex(function (item) {
-            return !item.logisticsCompany;
+          var hasNo = (value || []).some(function (item) {
+            return item.logisticsCompany && item.logisticsCode;
           });
 
-          if (companyIndex > -1) {
-            return Promise.reject(new Error("\u8BF7\u9009\u62E9\u5305\u88F9".concat(companyIndex + 1, "\u7269\u6D41\u516C\u53F8")));
-          }
-
-          var codeIndex = (value || []).findIndex(function (item) {
-            return !item.logisticsCode;
-          });
-
-          if (codeIndex > -1) {
-            return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(codeIndex + 1, "\u7269\u6D41\u5355\u53F7")));
+          if (!hasNo) {
+            return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684\u7269\u6D41\u4FE1\u606F"));
           }
 
           return Promise.resolve();

package/dist/esm/WorkOrder/components/Widget/jst/JstSendGood/index.js

@@ -67,20 +67,18 @@ var JstSendGood = /*#__PURE__*/function (_BasicComponent) {
             return Promise.reject(new Error('请选择宝贝'));
           }
 
-          var nameIndex = (value || []).findIndex(function (item) {
-            return !item.sendName;
+          var hasNo = (value || []).some(function (item) {
+            if (['sendName'].includes(showField)) {
+              return item.sendName;
+            } else if (['sendId'].includes(showField)) {
+              return item.sendId;
+            } else {
+              return item.sendId && item.sendName;
+            }
           });
 
-          if (nameIndex > -1 && ['sendName', 'all'].includes(showField)) {
-            return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(nameIndex + 1, "\u53D1\u8D27\u4ED3\u540D\u79F0")));
-          }
-
-          var idIndex = (value || []).findIndex(function (item) {
-            return !item.sendId;
-          });
-
-          if (idIndex > -1 && ['sendId', 'all'].includes(showField)) {
-            return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(idIndex + 1, "\u53D1\u8D27\u4ED3\u7F16\u7801")));
+          if (!hasNo) {
+            return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684\u53D1\u8D27\u4ED3\u4FE1\u606F"));
           }
 
           return Promise.resolve();
@@ -114,7 +112,7 @@ var JstSendGood = /*#__PURE__*/function (_BasicComponent) {
       });
     });
 
-    _this.name = 'jst发货仓名称/编码';
+    _this.name = 'jst发货仓编码/名称';
     _this.width = 340;
     _this.canFilter = false;
     _this.canGroup = false;

package/dist/esm/WorkOrder/components/Widget/jst/JstSupply/index.js

@@ -61,12 +61,12 @@ var JstSupply = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          var idIndex = (value || []).findIndex(function (item) {
-            return !item.supplyId;
+          var hasNo = (value || []).some(function (item) {
+            return item.supplyId;
           });
 
-          if (idIndex > -1) {
-            return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(idIndex + 1, "\u4F9B\u9500\u5546\u7F16\u7801")));
+          if (!hasNo) {
+            return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u4F9B\u9500\u5546\u7F16\u7801"));
           }
 
           return Promise.resolve();

package/dist/esm/common/utils/tools.js

@@ -1129,11 +1129,11 @@ export var taobaoGoodHandle = function taobaoGoodHandle(arr, type, config) {
     }
 
     if (changeSku) {
-      params.propertiesName = item.propertiesName;
+      params.propertiesName = (skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.propertiesName) || '';
     }
 
     if (type === 'ITEM_ENCODE') {
-      params.outerId = outerId;
+      params.outerId = (skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.outerSkuId) || outerId;
     } else if (type === 'ITEM_SELECT_THIRD') {
       params.itemId = '';
       params.supplierName = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.10-alpha.4",
+  "version": "0.4.10-alpha.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.2.0-alpha.4",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.2.0-alpha.6",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",