kmkf-work-order-service-component 0.4.13-alpha.1 → 0.4.13-alpha.3

package/dist/esm/FormRender/index.js

@@ -675,7 +675,8 @@ var FormRender = function FormRender(props, ref) {
 
           case 'JST_SUPPLY':
             prv[next.uniqueKey] = [{
-              supplyId: null
+              supplyId: null,
+              supplyName: null
             }];
             break;
 

package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js

@@ -231,6 +231,6 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
         color: '#1890ff',
         cursor: 'pointer'
       }
-    }, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join('/') : company ? company : item.logisticsCode) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyId) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendName, item.sendId].join('/') : item.sendId ? item.sendId : item.sendName) : null));
+    }, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join('/') : company ? company : item.logisticsCode) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyName && item.supplyId ? [item.supplyName, item.supplyId].join('/') : item.supplyId ? item.supplyId : item.supplyName) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendName, item.sendId].join('/') : item.sendId ? item.sendId : item.sendName) : null));
   }) : null;
 };

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

@@ -61,12 +61,24 @@ var JstSupply = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
+          var showField = config.showField;
+
+          if (!value || !value.length) {
+            return Promise.reject(new Error('请选择宝贝'));
+          }
+
           var hasNo = (value || []).some(function (item) {
-            return item.supplyId;
+            if (['supplyName'].includes(showField)) {
+              return item.supplyName;
+            } else if (['supplyId'].includes(showField)) {
+              return item.supplyId;
+            } else {
+              return item.supplyId && item.supplyName;
+            }
           });
 
           if (!hasNo) {
-            return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u4F9B\u9500\u5546\u7F16\u7801"));
+            return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684\u4F9B\u9500\u5546\u4FE1\u606F"));
           }
 
           return Promise.resolve();
@@ -90,7 +102,7 @@ var JstSupply = /*#__PURE__*/function (_BasicComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "renderExport", function (value, record) {
       return value.map(function (item) {
-        return "".concat(item.supplyId || '', "\n");
+        return "".concat(item.supplyName || '', "/").concat(item.supplyId || '');
       });
     });
 

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

@@ -474,16 +474,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         name: item.name
       });
     } else if (item.workOrderComponentType === 'JST_SUPPLY') {
-      var supplyList = get(nowData, "".concat(item.uniqueKey), []); // if (
-      //   supplyList.length === 1 &&
-      //   !supplyList[0]?.items?.length &&
-      //   supplyList.some((t) => {
-      //     return !t.supplyId;
-      //   })
-      // ) {
-      //   supplyList = [];
-      // }
-
+      var supplyList = get(nowData, "".concat(item.uniqueKey), []);
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
         content: JSON.stringify(supplyList),
@@ -496,17 +487,15 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }).join(),
         name: item.name
       });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_supplyName"),
+        content: supplyList.map(function (item) {
+          return item.supplyName;
+        }).join(),
+        name: item.name
+      });
     } else if (item.workOrderComponentType === 'JST_SEND_GOOD') {
-      var sendList = get(nowData, "".concat(item.uniqueKey), []); // if (
-      //   sendList.length === 1 &&
-      //   !sendList[0]?.items?.length &&
-      //   sendList.some((t) => {
-      //     return !t.sendId && !t.sendName;
-      //   })
-      // ) {
-      //   sendList = [];
-      // }
-
+      var sendList = get(nowData, "".concat(item.uniqueKey), []);
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
         content: JSON.stringify(sendList),
@@ -1177,7 +1166,15 @@ export var updateJSTItemListHandle = function updateJSTItemListHandle() {
         params.logisticsCompany = express.getExpressNameByName(item.logisticsCompany);
         params.logisticsCode = item.lId;
       } else if (type === 'supply') {
-        params.supplyId = item.drpCoIdTo;
+        console.log(showField, item);
+
+        if (['supplyId', 'all'].includes(showField)) {
+          params.supplyId = item.drpCoIdTo;
+        }
+
+        if (['supplyName', 'all'].includes(showField)) {
+          params.supplyName = item.drpCoName;
+        }
       } else if (type === 'send') {
         if (['sendId', 'all'].includes(showField)) {
           params.sendId = item.wmsCoId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.13-alpha.1",
+  "version": "0.4.13-alpha.3",
   "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.8",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.2.0-alpha.9",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",