@kmkf-fe-packages/kmkf-work-order-service-component 2.2.39-beta.20 → 2.2.39-beta.22

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.
@@ -236,6 +236,7 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
236
236
  }[];
237
237
  } | undefined;
238
238
  } | undefined;
239
+ uniqueKey: string;
239
240
  } | undefined;
240
241
  } | undefined;
241
242
  export declare const selectTid: (state: FlowTemplateDetailState) => string;
@@ -919,7 +919,7 @@ export var submitParams = function submitParams(_ref5) {
919
919
  }, operateParams)
920
920
  };
921
921
  if (update) {
922
- var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4, _currentNodeDetail$wo5, _currentNodeDetail$wo6, _currentNodeDetail$wo7, _currentNodeDetail$wo8;
922
+ var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4, _currentNodeDetail$wo5, _currentNodeDetail$wo6, _currentNodeDetail$wo7, _currentNodeDetail$wo8, _currentNodeDetail$wo9;
923
923
  params.updateInfo = {
924
924
  templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.templateId,
925
925
  workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo2 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.id,
@@ -971,11 +971,11 @@ export var submitParams = function submitParams(_ref5) {
971
971
  dataValue: false
972
972
  });
973
973
  }
974
- if (shopUniqueKey !== (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : _currentNodeDetail$wo8.shopUniqueKey)) {
975
- var _currentNodeDetail$wo9;
974
+ if (shopUniqueKey && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo8 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo8 !== void 0 && _currentNodeDetail$wo8.shopUniqueKey && shopUniqueKey !== (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.shopUniqueKey)) {
975
+ var _currentNodeDetail$wo10;
976
976
  updateList.push({
977
977
  dataKey: 'userId',
978
- oldValue: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.shopUniqueKey,
978
+ oldValue: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.shopUniqueKey,
979
979
  dataValue: shopUniqueKey
980
980
  });
981
981
  }
@@ -984,20 +984,20 @@ export var submitParams = function submitParams(_ref5) {
984
984
  delete params.workOrderUpdateKeyVos;
985
985
  delete params.needTransForm;
986
986
  } else {
987
- var _Object$keys, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20;
987
+ var _Object$keys, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21;
988
988
  // TODO: 新保存工单
989
989
  // 获取当前表单中非空字段
990
990
  var finalComponentList = (_Object$keys = Object.keys(formData)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.filter(function (i) {
991
991
  return !isNull(formData[i]);
992
992
  });
993
993
  // 获取非空字段对应的组件
994
- var finalDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : (_currentNodeDetail$wo11 = _currentNodeDetail$wo10.componentDtoList) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.filter(function (item) {
994
+ var finalDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : (_currentNodeDetail$wo12 = _currentNodeDetail$wo11.componentDtoList) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.filter(function (item) {
995
995
  return finalComponentList.includes(item.uniqueKey) || item.workOrderComponentType === 'BUYER_MESSAGE_NOTICE';
996
996
  });
997
997
  set(newTemplateDetail, 'componentDtoList', finalDtoList);
998
998
  params.workOrder = {
999
- templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.uniqueKey,
1000
- handleWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo13 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.id,
999
+ templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo13 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.uniqueKey,
1000
+ handleWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.id,
1001
1001
  buyerNick: plat === null || plat === void 0 ? void 0 : plat.buyerNick,
1002
1002
  buyerOpenUid: plat === null || plat === void 0 ? void 0 : plat.buyerId,
1003
1003
  shopUniqueKey: shopUniqueKey,
@@ -1007,13 +1007,13 @@ export var submitParams = function submitParams(_ref5) {
1007
1007
  };
1008
1008
 
1009
1009
  // 判断是否有订单号组建,订单号数据需要特殊处理
1010
- var tradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : (_currentNodeDetail$wo15 = _currentNodeDetail$wo14.componentDtoList) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : (_currentNodeDetail$wo16 = _currentNodeDetail$wo15.find(function (item) {
1010
+ var tradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : (_currentNodeDetail$wo16 = _currentNodeDetail$wo15.componentDtoList) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : (_currentNodeDetail$wo17 = _currentNodeDetail$wo16.find(function (item) {
1011
1011
  return item.workOrderComponentType === 'TRADE_ID_INPUT';
1012
- })) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : _currentNodeDetail$wo16.uniqueKey;
1012
+ })) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : _currentNodeDetail$wo17.uniqueKey;
1013
1013
  // 判断是否有订单号组建,订单号数据需要特殊处理
1014
- var paymentTradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo17 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : (_currentNodeDetail$wo18 = _currentNodeDetail$wo17.componentDtoList) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : (_currentNodeDetail$wo19 = _currentNodeDetail$wo18.find(function (item) {
1014
+ var paymentTradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo18 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : (_currentNodeDetail$wo19 = _currentNodeDetail$wo18.componentDtoList) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : (_currentNodeDetail$wo20 = _currentNodeDetail$wo19.find(function (item) {
1015
1015
  return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
1016
- })) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : _currentNodeDetail$wo19.uniqueKey;
1016
+ })) === null || _currentNodeDetail$wo20 === void 0 ? void 0 : _currentNodeDetail$wo20.uniqueKey;
1017
1017
  if (paymentTradeIdUniqueKey) {
1018
1018
  var _formData;
1019
1019
  params.workOrder.tid = formData === null || formData === void 0 ? void 0 : (_formData = formData["".concat(paymentTradeIdUniqueKey)]) === null || _formData === void 0 ? void 0 : _formData.enterprisePaymentTid;
@@ -1024,7 +1024,7 @@ export var submitParams = function submitParams(_ref5) {
1024
1024
  if (formData !== null && formData !== void 0 && formData['fixed_field_buyerOpenUid']) {
1025
1025
  params.workOrder.buyerOpenUid = formData === null || formData === void 0 ? void 0 : formData['fixed_field_buyerOpenUid'];
1026
1026
  }
1027
- params.workOrder.workOrderComponents = submitDataTransOldFormat(formData, newTemplateDetail, !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo20 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo20 !== void 0 && _currentNodeDetail$wo20.id), currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder, params.workOrder, (plat === null || plat === void 0 ? void 0 : plat.accountName) || '');
1027
+ params.workOrder.workOrderComponents = submitDataTransOldFormat(formData, newTemplateDetail, !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo21 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo21 !== void 0 && _currentNodeDetail$wo21.id), currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder, params.workOrder, (plat === null || plat === void 0 ? void 0 : plat.accountName) || '');
1028
1028
  //端上有买家id 就返填当前买家 即使不是当前买家的订单
1029
1029
  if (plat.platform !== PlatForm.PC && plat !== null && plat !== void 0 && plat.buyerId) {
1030
1030
  params.workOrder.buyerOpenUid = plat === null || plat === void 0 ? void 0 : plat.buyerId;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.2.39-beta.20",
3
+ "version": "2.2.39-beta.22",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "2.2.39-beta.20",
35
+ "@kmkf-fe-packages/basic-components": "2.2.39-beta.21",
36
36
  "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.19",
37
- "@kmkf-fe-packages/services-components": "2.2.39-beta.20",
37
+ "@kmkf-fe-packages/services-components": "2.2.39-beta.21",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
75
75
  "publishConfig": {
76
76
  "access": "public"
77
77
  },
78
- "gitHead": "fb64288929db8e93dcb67cf0e40c5ef59765f15a",
78
+ "gitHead": "c567d7a3b861051698ca7896d1056e7cdca18f2b",
79
79
  "gitHooks": {
80
80
  "pre-commit": "lint-staged"
81
81
  }