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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/esm/WorkOrder/components/Widget/jst/JstLogistics/index.js +4 -12
  2. package/dist/esm/WorkOrder/components/Widget/jst/JstSendGood/index.js +10 -12
  3. package/dist/esm/WorkOrder/components/Widget/jst/JstSupply/index.js +4 -4
  4. package/package.json +2 -2
package/dist/esm/WorkOrder/components/Widget/jst/JstLogistics/index.js CHANGED
@@ -62,20 +62,12 @@ var JstLogistics = /*#__PURE__*/function (_BasicComponent) {
62
62
  return [{
63
63
  required: true,
64
64
  validator: function validator(_, value) {
65
- var companyIndex = (value || []).findIndex(function (item) {
66
- return !item.logisticsCompany;
65
+ var hasNo = (value || []).some(function (item) {
66
+ return item.logisticsCompany && item.logisticsCode;
67
67
  });
68
68
 
69
- if (companyIndex > -1) {
70
- return Promise.reject(new Error("\u8BF7\u9009\u62E9\u5305\u88F9".concat(companyIndex + 1, "\u7269\u6D41\u516C\u53F8")));
71
- }
72
-
73
- var codeIndex = (value || []).findIndex(function (item) {
74
- return !item.logisticsCode;
75
- });
76
-
77
- if (codeIndex > -1) {
78
- return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(codeIndex + 1, "\u7269\u6D41\u5355\u53F7")));
69
+ if (!hasNo) {
70
+ return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684\u7269\u6D41\u4FE1\u606F"));
79
71
  }
80
72
 
81
73
  return Promise.resolve();
package/dist/esm/WorkOrder/components/Widget/jst/JstSendGood/index.js CHANGED
@@ -67,20 +67,18 @@ var JstSendGood = /*#__PURE__*/function (_BasicComponent) {
67
67
  return Promise.reject(new Error('请选择宝贝'));
68
68
  }
69
69
 
70
- var nameIndex = (value || []).findIndex(function (item) {
71
- return !item.sendName;
70
+ var hasNo = (value || []).some(function (item) {
71
+ if (['sendName'].includes(showField)) {
72
+ return item.sendName;
73
+ } else if (['sendId'].includes(showField)) {
74
+ return item.sendId;
75
+ } else {
76
+ return item.sendId && item.sendName;
77
+ }
72
78
  });
73
79
 
74
- if (nameIndex > -1 && ['sendName', 'all'].includes(showField)) {
75
- return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(nameIndex + 1, "\u53D1\u8D27\u4ED3\u540D\u79F0")));
76
- }
77
-
78
- var idIndex = (value || []).findIndex(function (item) {
79
- return !item.sendId;
80
- });
81
-
82
- if (idIndex > -1 && ['sendId', 'all'].includes(showField)) {
83
- return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(idIndex + 1, "\u53D1\u8D27\u4ED3\u7F16\u7801")));
80
+ if (!hasNo) {
81
+ return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684\u53D1\u8D27\u4ED3\u4FE1\u606F"));
84
82
  }
85
83
 
86
84
  return Promise.resolve();
package/dist/esm/WorkOrder/components/Widget/jst/JstSupply/index.js CHANGED
@@ -61,12 +61,12 @@ var JstSupply = /*#__PURE__*/function (_BasicComponent) {
61
61
  return [{
62
62
  required: true,
63
63
  validator: function validator(_, value) {
64
- var idIndex = (value || []).findIndex(function (item) {
65
- return !item.supplyId;
64
+ var hasNo = (value || []).some(function (item) {
65
+ return item.supplyId;
66
66
  });
67
67
 
68
- if (idIndex > -1) {
69
- return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(idIndex + 1, "\u4F9B\u9500\u5546\u7F16\u7801")));
68
+ if (!hasNo) {
69
+ return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u4F9B\u9500\u5546\u7F16\u7801"));
70
70
  }
71
71
 
72
72
  return Promise.resolve();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kmkf-work-order-service-component",
3
- "version": "0.4.10-alpha.4",
3
+ "version": "0.4.10-alpha.5",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -39,7 +39,7 @@
39
39
  },
40
40
  "dependencies": {
41
41
  "@ant-design/icons": "^4.7.0",
42
- "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.2.0-alpha.4",
42
+ "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.2.0-alpha.5",
43
43
  "@reduxjs/toolkit": "^1.8.5",
44
44
  "ahooks": "^3.7.4",
45
45
  "copy-to-clipboard": "^3.3.3",