@kmkf-fe-packages/kmkf-work-order-service-component 0.19.0-alpha.5 → 0.19.0

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 (6) hide show
  1. package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.js +9 -7
  2. package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentFormModal/index.js +4 -9
  3. package/dist/esm/WorkOrder/components/Reminder/index.js +2 -6
  4. package/dist/esm/WorkOrder/components/Reminder/index.module.less +1 -3
  5. package/dist/esm/WorkOrder/index.js +3 -4
  6. package/package.json +6 -6
package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.js CHANGED
@@ -33,7 +33,7 @@ import styles from "./index.module.less";
33
33
  import { PlatForm } from "../../../WorkOrder/types";
34
34
  import { useSignal } from "../../../hooks/useSignal";
35
35
  var CurrentNode = function CurrentNode(props) {
36
- var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$wo17;
36
+ var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$wo18;
37
37
  var shopList = props.shopList,
38
38
  form = props.form,
39
39
  onOpenWangWang = props.onOpenWangWang,
@@ -202,15 +202,17 @@ var CurrentNode = function CurrentNode(props) {
202
202
  return _ref.apply(this, arguments);
203
203
  };
204
204
  }();
205
+ var isArtificialNode = tag === 'artificial';
206
+ var showEdit = isArtificialNode && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.completedUserName) === plat.accountName && !readonly && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.flowStatus) === FlowStatus.COMPLETED;
205
207
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
206
208
  tag: tag,
207
209
  nodeName: nodeName,
208
- showEdit: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.flowStatus) === FlowStatus.COMPLETED && !readonly,
210
+ showEdit: showEdit,
209
211
  showLook: false,
210
- handler: tag === 'artificial' ? currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : (_currentNodeDetail$wo11 = _currentNodeDetail$wo10.handlerList) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : (_currentNodeDetail$wo12 = _currentNodeDetail$wo11[0]) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.account : '',
211
- showWithdraw: tag === 'artificial' && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo13 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.flowStatus) === FlowStatus.COMPLETED && isCurrentNodeHandler && !readonly,
212
- showReminder: tag === 'artificial' && [NodeStatus.WAITING, NodeStatus.STOPPING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.flowStatus) && isCurrentNodeHandler && !readonly,
213
- isReminder: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : (_currentNodeDetail$wo16 = _currentNodeDetail$wo15.jsonMap) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : _currentNodeDetail$wo16.flowTags) || '[]').includes('REMINDER'),
212
+ handler: isArtificialNode ? currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : (_currentNodeDetail$wo12 = _currentNodeDetail$wo11.handlerList) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : (_currentNodeDetail$wo13 = _currentNodeDetail$wo12[0]) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.account : '',
213
+ showWithdraw: isArtificialNode && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.flowStatus) === FlowStatus.COMPLETED && isCurrentNodeHandler && !readonly,
214
+ showReminder: isArtificialNode && [NodeStatus.WAITING, NodeStatus.STOPPING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : _currentNodeDetail$wo15.flowStatus) && isCurrentNodeHandler && !readonly,
215
+ isReminder: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo16 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : (_currentNodeDetail$wo17 = _currentNodeDetail$wo16.jsonMap) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : _currentNodeDetail$wo17.flowTags) || '[]').includes('REMINDER'),
214
216
  handleWithdraw: handleWithdraw,
215
217
  handleReminder: onReminder,
216
218
  editing: editing,
@@ -229,7 +231,7 @@ var CurrentNode = function CurrentNode(props) {
229
231
  templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
230
232
  shopList: shopList,
231
233
  record: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder,
232
- shopId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo17 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : _currentNodeDetail$wo17.shopId) || plat.shopId || defaultShopId,
234
+ shopId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo18 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : _currentNodeDetail$wo18.shopId) || plat.shopId || defaultShopId,
233
235
  accountName: plat === null || plat === void 0 ? void 0 : plat.accountName,
234
236
  onOpenWangWang: onOpenWangWang,
235
237
  onUpdateRemark: onUpdateRemark,
package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentFormModal/index.js CHANGED
@@ -85,8 +85,7 @@ function ModifyModal(props) {
85
85
  var handleOk = function handleOk() {
86
86
  form.validateFields().then( /*#__PURE__*/function () {
87
87
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
88
- var _record$shopList$find;
89
- var shopSource, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
88
+ var newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
90
89
  return _regeneratorRuntime().wrap(function _callee$(_context) {
91
90
  while (1) switch (_context.prev = _context.next) {
92
91
  case 0:
@@ -102,9 +101,6 @@ function ModifyModal(props) {
102
101
  message.error('支付宝姓名/账号都要填写');
103
102
  return _context.abrupt("return");
104
103
  case 5:
105
- shopSource = (_record$shopList$find = record.shopList.find(function (t) {
106
- return t.shopId === record.shopId;
107
- })) === null || _record$shopList$find === void 0 ? void 0 : _record$shopList$find.shopSource;
108
104
  newValue = {};
109
105
  api = type === 'edit' ? editRemitOrder : addPaymentOrder;
110
106
  if (type === 'edit') {
@@ -116,10 +112,9 @@ function ModifyModal(props) {
116
112
  buyerOpenUid: record.buyerOpenUid
117
113
  });
118
114
  }
119
- newValue.shopSource = shopSource;
120
- _context.next = 12;
115
+ _context.next = 10;
121
116
  return api(newValue);
122
- case 12:
117
+ case 10:
123
118
  _yield$api = _context.sent;
124
119
  success = _yield$api.success;
125
120
  if (success) {
@@ -128,7 +123,7 @@ function ModifyModal(props) {
128
123
  afterSuccessUpdateWorkOrder && afterSuccessUpdateWorkOrder(type); // 重新查询表格
129
124
  handleCancel();
130
125
  }
131
- case 15:
126
+ case 13:
132
127
  case "end":
133
128
  return _context.stop();
134
129
  }
package/dist/esm/WorkOrder/components/Reminder/index.js CHANGED
@@ -30,9 +30,7 @@ function Reminder(props) {
30
30
  className: styles.color_F40500
31
31
  }, "\u6388\u6743\u5931\u6548"), "\u6216", /*#__PURE__*/React.createElement("span", {
32
32
  className: styles.color_F40500
33
- }, "\u6CA1\u6709\u5E97\u94FA\u6743\u9650"), "\u6216", /*#__PURE__*/React.createElement("span", {
34
- className: styles.color_F40500
35
- }, "\u5E97\u94FA\u5DF2\u505C\u7528")), /*#__PURE__*/React.createElement("div", {
33
+ }, "\u6CA1\u6709\u5E97\u94FA\u6743\u9650")), /*#__PURE__*/React.createElement("div", {
36
34
  className: styles.title
37
35
  }, "\u672A\u6388\u6743\u6D41\u7A0B"), /*#__PURE__*/React.createElement("div", {
38
36
  className: styles.mb_8
@@ -40,9 +38,7 @@ function Reminder(props) {
40
38
  className: styles.title
41
39
  }, "\u6388\u6743\u5931\u6548\u6D41\u7A0B"), /*#__PURE__*/React.createElement("div", null, "1.\u767B\u5F55\u4F01\u4E1A\u5DE5\u5355", /*#__PURE__*/React.createElement("br", null), "2.\u8FDB\u5165\u7CFB\u7EDF\u8BBE\u7F6E-\u5E97\u94FA\u7BA1\u7406-\u627E\u5230\u5BF9\u5E94\u7684\u5E97\u94FA-\u70B9\u51FB\u3010\u91CD\u65B0\u6388\u6743\u3011"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
42
40
  className: styles.title
43
- }, "\u6CA1\u6709\u5E97\u94FA\u6743\u9650\u6D41\u7A0B"), /*#__PURE__*/React.createElement("div", null, "1.\u767B\u5F55\u4F01\u4E1A\u5DE5\u5355", /*#__PURE__*/React.createElement("br", null), "2.\u8FDB\u5165\u7CFB\u7EDF\u8BBE\u7F6E-\u5458\u5DE5\u6743\u9650-\u3010\u7F16\u8F91\u3011-\u4FEE\u6539\u5E97\u94FA\u6743\u9650"), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("div", {
44
- className: styles.title
45
- }, "\u5E97\u94FA\u5DF2\u505C\u7528"), /*#__PURE__*/React.createElement("div", null, "1.\u767B\u5F55\u4F01\u4E1A\u5DE5\u5355", /*#__PURE__*/React.createElement("br", null), "2.\u8FDB\u5165\u7CFB\u7EDF\u8BBE\u7F6E-\u5E97\u94FA\u7BA1\u7406-\u627E\u5230\u5BF9\u5E94\u7684\u5E97\u94FA-\u70B9\u51FB\u3010\u5DF2\u505C\u7528\uFF0C\u70B9\u51FB\u6FC0\u6D3B\u3011"), /*#__PURE__*/React.createElement("div", {
41
+ }, "\u6CA1\u6709\u5E97\u94FA\u6743\u9650\u6D41\u7A0B"), /*#__PURE__*/React.createElement("div", null, "1.\u767B\u5F55\u4F01\u4E1A\u5DE5\u5355", /*#__PURE__*/React.createElement("br", null), "2.\u8FDB\u5165\u7CFB\u7EDF\u8BBE\u7F6E-\u5458\u5DE5\u6743\u9650-\u3010\u7F16\u8F91\u3011-\u4FEE\u6539\u5E97\u94FA\u6743\u9650"), /*#__PURE__*/React.createElement("div", {
46
42
  className: styles.reminder_footer
47
43
  }, /*#__PURE__*/React.createElement(Button, {
48
44
  type: "primary",
package/dist/esm/WorkOrder/components/Reminder/index.module.less CHANGED
@@ -13,13 +13,11 @@
13
13
 
14
14
  .reminder_box {
15
15
  width: 320px;
16
- height: 80%;
17
- padding: 12px 24px;
16
+ padding: 24px;
18
17
  color: rgba(86, 89, 96, 0.65);
19
18
  font-size: 14px;
20
19
  background-color: #fff;
21
20
  border-radius: 4px;
22
- overflow-y: auto;
23
21
  }
24
22
 
25
23
  .tip_error {
package/dist/esm/WorkOrder/index.js CHANGED
@@ -118,11 +118,10 @@ var WorkOrder = function WorkOrder(props) {
118
118
  //判断是否店铺是否授权
119
119
  useEffect(function () {
120
120
  if (shopList !== null && shopList !== void 0 && shopList.length) {
121
- var shopItem = (shopList || []).find(function (item) {
121
+ var _find;
122
+ var _isEmpower = !!((_find = (shopList || []).find(function (item) {
122
123
  return item.shopId == shopId;
123
- });
124
- //店铺授权失效或停用
125
- var _isEmpower = !!(shopItem !== null && shopItem !== void 0 && shopItem.auditStatus) && !!(shopItem !== null && shopItem !== void 0 && shopItem.useStatus);
124
+ })) !== null && _find !== void 0 && _find.auditStatus);
126
125
  setIsEmpower(_isEmpower);
127
126
  }
128
127
  }, [shopList]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "0.19.0-alpha.5",
3
+ "version": "0.19.0",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,14 +32,13 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "^0.19.0-alpha.5",
36
- "@kmkf-fe-packages/kmkf-utils": "^0.18.0",
37
- "@kmkf-fe-packages/services-components": "^0.19.0-alpha.5",
35
+ "@kmkf-fe-packages/basic-components": "^0.19.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "^0.19.0",
37
+ "@kmkf-fe-packages/services-components": "^0.19.0",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
41
41
  "js-md5": "^0.7.3",
42
- "kmkf-monitor": "^0.8.4",
43
42
  "react-redux": "^7.2.8",
44
43
  "store2": "^2.14.2",
45
44
  "voca": "^1.4.0"
@@ -66,6 +65,7 @@
66
65
  },
67
66
  "peerDependencies": {
68
67
  "antd": "^4.23.0",
68
+ "kmkf-monitor": "^0.7.0",
69
69
  "lodash": "^4.17.21",
70
70
  "react": "^17.0.2",
71
71
  "react-dom": "^17.0.2"
@@ -73,7 +73,7 @@
73
73
  "publishConfig": {
74
74
  "access": "public"
75
75
  },
76
- "gitHead": "546b79ab4661fdd1053816dae6a5b3768efe0cbe",
76
+ "gitHead": "e3ae98a5cc26396c9632efcfac76115bebaf7fb3",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }