@kmkf-fe-packages/kmkf-work-order-service-component 0.20.0-alpha.0 → 0.20.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.
@@ -85,7 +85,8 @@ 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 newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
88
+ var _record$shopList$find;
89
+ var shopSource, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
89
90
  return _regeneratorRuntime().wrap(function _callee$(_context) {
90
91
  while (1) switch (_context.prev = _context.next) {
91
92
  case 0:
@@ -101,6 +102,9 @@ function ModifyModal(props) {
101
102
  message.error('支付宝姓名/账号都要填写');
102
103
  return _context.abrupt("return");
103
104
  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;
104
108
  newValue = {};
105
109
  api = type === 'edit' ? editRemitOrder : addPaymentOrder;
106
110
  if (type === 'edit') {
@@ -112,9 +116,10 @@ function ModifyModal(props) {
112
116
  buyerOpenUid: record.buyerOpenUid
113
117
  });
114
118
  }
115
- _context.next = 10;
119
+ newValue.shopSource = shopSource;
120
+ _context.next = 12;
116
121
  return api(newValue);
117
- case 10:
122
+ case 12:
118
123
  _yield$api = _context.sent;
119
124
  success = _yield$api.success;
120
125
  if (success) {
@@ -123,7 +128,7 @@ function ModifyModal(props) {
123
128
  afterSuccessUpdateWorkOrder && afterSuccessUpdateWorkOrder(type); // 重新查询表格
124
129
  handleCancel();
125
130
  }
126
- case 13:
131
+ case 15:
127
132
  case "end":
128
133
  return _context.stop();
129
134
  }
@@ -30,7 +30,9 @@ 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")), /*#__PURE__*/React.createElement("div", {
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", {
34
36
  className: styles.title
35
37
  }, "\u672A\u6388\u6743\u6D41\u7A0B"), /*#__PURE__*/React.createElement("div", {
36
38
  className: styles.mb_8
@@ -38,7 +40,9 @@ function Reminder(props) {
38
40
  className: styles.title
39
41
  }, "\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", {
40
42
  className: styles.title
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", {
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", {
42
46
  className: styles.reminder_footer
43
47
  }, /*#__PURE__*/React.createElement(Button, {
44
48
  type: "primary",
@@ -13,11 +13,13 @@
13
13
 
14
14
  .reminder_box {
15
15
  width: 320px;
16
- padding: 24px;
16
+ height: 80%;
17
+ padding: 12px 24px;
17
18
  color: rgba(86, 89, 96, 0.65);
18
19
  font-size: 14px;
19
20
  background-color: #fff;
20
21
  border-radius: 4px;
22
+ overflow-y: auto;
21
23
  }
22
24
 
23
25
  .tip_error {
@@ -118,10 +118,11 @@ var WorkOrder = function WorkOrder(props) {
118
118
  //判断是否店铺是否授权
119
119
  useEffect(function () {
120
120
  if (shopList !== null && shopList !== void 0 && shopList.length) {
121
- var _find;
122
- var _isEmpower = !!((_find = (shopList || []).find(function (item) {
121
+ var shopItem = (shopList || []).find(function (item) {
123
122
  return item.shopId == shopId;
124
- })) !== null && _find !== void 0 && _find.auditStatus);
123
+ });
124
+ //店铺授权失效或停用
125
+ var _isEmpower = !!(shopItem !== null && shopItem !== void 0 && shopItem.auditStatus) && !!(shopItem !== null && shopItem !== void 0 && shopItem.useStatus);
125
126
  setIsEmpower(_isEmpower);
126
127
  }
127
128
  }, [shopList]);
@@ -90,7 +90,7 @@ var findValueByField = function findValueByField(componentDtoList) {
90
90
  var component = componentDtoList.find(function (item) {
91
91
  return item.workOrderComponentType === type;
92
92
  });
93
- return get(data, "".concat(component.uniqueKey), '');
93
+ return get(data, "".concat(component === null || component === void 0 ? void 0 : component.uniqueKey), '');
94
94
  };
95
95
  };
96
96
 
@@ -6,7 +6,6 @@ export declare const selectFlowList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("./types").LogicFlowState;
9
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
10
9
  }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
11
10
  clearCache: () => void;
12
11
  }> & {
@@ -20,7 +19,6 @@ export declare const selectGroupFlowList: ((state: {
20
19
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
21
20
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
22
21
  logicFlow: import("./types").LogicFlowState;
23
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
24
22
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
25
23
  clearCache: () => void;
26
24
  }> & {
@@ -34,7 +32,6 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
34
32
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
35
33
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
36
34
  logicFlow: import("./types").LogicFlowState;
37
- flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
38
35
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
39
36
  clearCache: () => void;
40
37
  }> & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "0.20.0-alpha.0",
3
+ "version": "0.20.0",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,13 +32,14 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "^0.19.1",
36
- "@kmkf-fe-packages/kmkf-utils": "^0.19.0",
37
- "@kmkf-fe-packages/services-components": "^0.19.1",
35
+ "@kmkf-fe-packages/basic-components": "^0.20.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "^0.20.0",
37
+ "@kmkf-fe-packages/services-components": "^0.20.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",
42
43
  "react-redux": "^7.2.8",
43
44
  "store2": "^2.14.2",
44
45
  "voca": "^1.4.0"
@@ -66,7 +67,6 @@
66
67
  },
67
68
  "peerDependencies": {
68
69
  "antd": "^4.23.0",
69
- "kmkf-monitor": "^0.7.0",
70
70
  "lodash": "^4.17.21",
71
71
  "react": "^17.0.2",
72
72
  "react-dom": "^17.0.2"
@@ -74,7 +74,7 @@
74
74
  "publishConfig": {
75
75
  "access": "public"
76
76
  },
77
- "gitHead": "a878a199d7958a29552e7d5816bd204c9a8e4427",
77
+ "gitHead": "75346badccb57f8596ae486c27789da188f20f9c",
78
78
  "gitHooks": {
79
79
  "pre-commit": "lint-staged"
80
80
  }