@kmkf-fe-packages/kmkf-work-order-service-component 1.0.7 → 1.0.8

package/README.md

@@ -39,7 +39,6 @@ Build library via `father`,
 ```bash
 $ npm run build
 ```
-
 11122
 
 ## 企业工单工单项目抽离模块

package/dist/esm/FlowTemplateDetail/components/FormRender/index.js

@@ -690,7 +690,7 @@ var FormRender = function FormRender(props, ref) {
     setShopId(val);
     // 清空表单字段
     var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
-      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
       return cur;
@@ -833,7 +833,6 @@ var FormRender = function FormRender(props, ref) {
   };
   var newRenderColumnItem = function newRenderColumnItem(effects) {
     return function (item) {
-      var _componentConfig$stat, _componentConfig$stat2;
       var _item$componentConfig2 = item.componentConfig,
         componentConfig = _item$componentConfig2 === void 0 ? {} : _item$componentConfig2,
         workOrderComponentType = item.workOrderComponentType,
@@ -847,7 +846,19 @@ var FormRender = function FormRender(props, ref) {
       var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
         disabled: disabled
       });
-      var _getDisplayAndDisable = getDisplayAndDisabledConfig(workOrderId ? componentConfig === null || componentConfig === void 0 ? void 0 : (_componentConfig$stat = componentConfig.status) === null || _componentConfig$stat === void 0 ? void 0 : _componentConfig$stat.upgrade : componentConfig === null || componentConfig === void 0 ? void 0 : (_componentConfig$stat2 = componentConfig.status) === null || _componentConfig$stat2 === void 0 ? void 0 : _componentConfig$stat2.created),
+      var _ref5 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
+        upgrade = _ref5.upgrade,
+        created = _ref5.created;
+      if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID'].includes(workOrderComponentType)) {
+        // 补发单id和换货单id默认值是可见不可编辑（2）
+        if (typeof upgrade !== 'number') {
+          upgrade = 2;
+        }
+        if (typeof created !== 'number') {
+          created = 2;
+        }
+      }
+      var _getDisplayAndDisable = getDisplayAndDisabledConfig(workOrderId ? upgrade : created),
         componentCanEdit = _getDisplayAndDisable.disabled,
         componentCanShow = _getDisplayAndDisable.display;
       // TODO: 非前置节点组件渲染消费是否可以编辑配置
@@ -900,8 +911,8 @@ var FormRender = function FormRender(props, ref) {
           shouldUpdate: function shouldUpdate() {
             return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
           }
-        }, function (_ref5) {
-          var getFieldValue = _ref5.getFieldValue;
+        }, function (_ref6) {
+          var getFieldValue = _ref6.getFieldValue;
           var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
             // 如果有一项满足展示条件则展示
             if (cur) {

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

@@ -926,6 +926,18 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           name: item.name
         });
       }
+    } else if (item.workOrderComponentType === 'WDT_EXCHANGE_GOODS') {
+      var wdtExchange = get(nowData, "".concat(item.uniqueKey), {});
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_wdtExchangeGoods"),
+        content: wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods,
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
+        content: (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '',
+        name: item.name
+      });
     } else if (['BS_REISSUE_GOODS', 'WDT_REISSUE_GOODS'].includes(item.workOrderComponentType)) {
       var reissueMap = {
         BS_REISSUE_GOODS: {
@@ -963,21 +975,34 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
           name: item.name
         });
       }
-    } else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
-      var bsReturn = get(nowData, "".concat(item.uniqueKey), {});
+    } else if (['BS_RETURN_GOODS', 'WDT_RETURN_GOODS'].includes(item.workOrderComponentType)) {
+      var currentReturn = get(nowData, "".concat(item.uniqueKey), {});
+      var compType = item.workOrderComponentType;
+      var returnGoodsMap = {
+        BS_RETURN_GOODS: {
+          returnTypeKey: 'bsReturnType',
+          returnGoodsKey: 'bsReturnGoods',
+          shopCodeKey: 'shopCode'
+        },
+        WDT_RETURN_GOODS: {
+          returnTypeKey: 'wdtReturnType',
+          returnGoodsKey: 'wdtReturnGoods',
+          shopCodeKey: 'shopCode'
+        }
+      };
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_bsReturnType"),
-        content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.bsReturnType,
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].returnTypeKey),
+        content: currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].returnTypeKey],
         name: item.name
       });
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_bsReturnGoods"),
-        content: bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.bsReturnGoods,
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].returnGoodsKey),
+        content: currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].returnGoodsKey],
         name: item.name
       });
       contentVoList.push({
-        uniqueKey: "".concat(item.uniqueKey, "_shopCode"),
-        content: (bsReturn === null || bsReturn === void 0 ? void 0 : bsReturn.shopCode) || '',
+        uniqueKey: "".concat(item.uniqueKey, "_").concat(returnGoodsMap[compType].shopCodeKey),
+        content: (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[returnGoodsMap[compType].shopCodeKey]) || '',
         name: item.name
       });
     } else if (item.workOrderComponentType === 'BS_POSTING') {
@@ -1375,10 +1400,9 @@ var transDataSource = function transDataSource(templateColumns) {
           flag: item.jsonMap["".concat(nex.uniqueKey, "_bsFlag")]
         }));
       } else if (nex.workOrderComponentType === 'REISSUE_LOGISTICS') {
-        var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [{
-          logisticsCompany: null,
-          logisticsCode: null
-        }]);
+        var _itemList6 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_reissueLogisticsList")], [
+          // { logisticsCompany: null, logisticsCode: null },
+        ]);
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList6));
       } else if (['REISSUE_STATUS', 'ADJUST_WORK_ORDER_STATUS', 'CREATE_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS'].includes(nex.workOrderComponentType)) {
         var STATUS_MAP = {
@@ -1414,11 +1438,7 @@ var transDataSource = function transDataSource(templateColumns) {
           WAREHOUSING_STATUS: 'inStockStatusItemList',
           MSG_STATUS: 'msgStatusValues'
         };
-        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], ['WAREHOUSING_STATUS', 'MSG_STATUS'].includes(nex.workOrderComponentType) ? [] : [{
-          status: undefined,
-          reason: '',
-          systemOrderId: ''
-        }])));
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])], [])));
       } else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(nex.workOrderComponentType)) {
         var LogisticsMap = {
           BS_LOGISTICS: {
@@ -1534,12 +1554,27 @@ var transDataSource = function transDataSource(templateColumns) {
           bsExchangeGiftGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsExchangeGiftGoods")], []),
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
-      } else if (nex.workOrderComponentType === 'BS_RETURN_GOODS') {
+      } else if (nex.workOrderComponentType === 'WDT_EXCHANGE_GOODS') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
-          bsReturnType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnType")], []),
-          bsReturnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnGoods")], []),
+          wdtExchangeGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtExchangeGoods")], []),
           shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
+      } else if (['BS_RETURN_GOODS', 'WDT_RETURN_GOODS'].includes(nex.workOrderComponentType)) {
+        var _$concat2;
+        var compType = nex.workOrderComponentType;
+        var returnGoodsMap = {
+          BS_RETURN_GOODS: {
+            returnTypeKey: 'bsReturnType',
+            returnGoodsKey: 'bsReturnGoods',
+            shopCodeKey: 'shopCode'
+          },
+          WDT_RETURN_GOODS: {
+            returnTypeKey: 'wdtReturnType',
+            returnGoodsKey: 'wdtReturnGoods',
+            shopCodeKey: 'shopCode'
+          }
+        };
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), (_$concat2 = {}, _defineProperty(_$concat2, returnGoodsMap[compType].returnTypeKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnTypeKey)], [])), _defineProperty(_$concat2, returnGoodsMap[compType].returnGoodsKey, jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].returnGoodsKey)], [])), _defineProperty(_$concat2, returnGoodsMap[compType].shopCodeKey, item.jsonMap["".concat(nex.uniqueKey, "_").concat(returnGoodsMap[compType].shopCodeKey)]), _$concat2)));
       } else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
         var systemOrderMap = {
           BS_SYSTEM_ORDER: {
@@ -1577,24 +1612,17 @@ var transDataSource = function transDataSource(templateColumns) {
           },
           RETURN_GOODS_TRADE_ID: {
             key: 'returnGoodsTradeItemList',
-            defaultValue: [{
-              returnGoodsTradeId: '',
-              systemOrderId: ''
-            }]
+            defaultValue: []
+            // defaultValue: [{ returnGoodsTradeId: '', systemOrderId: '' }],
           },
+
           REISSUE_TRADE_ID: {
             key: 'tradeItemList',
-            defaultValue: [{
-              billNo: '',
-              tradeId: ''
-            }]
+            defaultValue: []
           },
           EXCHANGE_TRADE_ID: {
             key: 'tradeItemList',
-            defaultValue: [{
-              billNo: '',
-              tradeId: ''
-            }]
+            defaultValue: []
           }
         };
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)], SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue)));
@@ -1611,8 +1639,8 @@ var transDataSource = function transDataSource(templateColumns) {
           wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
         }));
       } else if (nex.workOrderComponentType === 'LABEL') {
-        var _objectSpread54;
-        return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread54 = {}, _defineProperty(_objectSpread54, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _defineProperty(_objectSpread54, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _objectSpread54));
+        var _objectSpread55;
+        return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread55 = {}, _defineProperty(_objectSpread55, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _defineProperty(_objectSpread55, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _objectSpread55));
       }
     }, {});
   };
@@ -1634,7 +1662,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread56, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread57, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1873,7 +1901,7 @@ export var orderBack = /*#__PURE__*/function () {
               sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))))));
             } else {
               _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
-              sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread56 = {}, _defineProperty(_objectSpread56, order_no, values), _defineProperty(_objectSpread56, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread56))));
+              sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread57 = {}, _defineProperty(_objectSpread57, order_no, values), _defineProperty(_objectSpread57, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread57))));
             }
           }
           // console.log('orderback', values);
@@ -2194,6 +2222,8 @@ export var reversalFormValues = function reversalFormValues() {
       case 'BS_EXCHANGE_GOODS':
       case 'BS_RETURN_GOODS':
       case 'WDT_REISSUE_GOODS':
+      case 'WDT_RETURN_GOODS':
+      case 'WDT_EXCHANGE_GOODS':
         prv["".concat(next.uniqueKey, "_shopCode")] = values[next.uniqueKey]['shopCode'];
         break;
       case 'BS_DELIVERY_NO':

package/dist/esm/model/logicFlow/index.js

@@ -89,22 +89,21 @@ export var fetchLogicFlowList = /*#__PURE__*/function () {
               });
             }
             return prv;
-          }, []);
-          console.log(list);
+          }, []); // console.log(list);
           dispatch(setLogicFlowList(list || []));
           dispatch(setGroupLogicFlowList(groupLogicFlowList || []));
           dispatch(setFlowTemplateGroupWorkOrderTemplateList(flowTemplateGroupWOrkOrderTemplateList) || []);
-          _context.next = 18;
+          _context.next = 17;
           break;
-        case 15:
-          _context.prev = 15;
+        case 14:
+          _context.prev = 14;
           _context.t0 = _context["catch"](0);
           console.error(_context.t0);
-        case 18:
+        case 17:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 15]]);
+    }, _callee, null, [[0, 14]]);
   }));
   return function fetchLogicFlowList(_x) {
     return _ref.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "async": "yarn build && yalc push",
-    "build": "father build",
+    "build": "yarn run lint && father build",
     "deploy": "npm run docs:build && npm run docs:deploy",
     "docs:build": "dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "^1.0.7",
-    "@kmkf-fe-packages/kmkf-utils": "^1.0.7",
-    "@kmkf-fe-packages/services-components": "^1.0.7",
+    "@kmkf-fe-packages/basic-components": "^1.0.8",
+    "@kmkf-fe-packages/kmkf-utils": "^1.0.8",
+    "@kmkf-fe-packages/services-components": "^1.0.8",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a53983471f6fe85f518221f0486059c7af0a7869",
+  "gitHead": "6eb0e570e7964688e90706bae1228c8234b47656",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }