kmkf-work-order-service-component 0.0.1-alpha.13 → 0.0.1-alpha.15

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.
@@ -278,13 +278,13 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
278
278
 
279
279
  var queryDetail = /*#__PURE__*/function () {
280
280
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
281
- var templateId, workOrderId, shopId, record, orderNo, buyerId, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _templateDetail$data3, jsonMap, _transData;
281
+ var templateId, workOrderId, shopId, record, orderNo, buyerId, buyerNick, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _templateDetail$data3, jsonMap, _transData;
282
282
 
283
283
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
284
284
  while (1) {
285
285
  switch (_context2.prev = _context2.next) {
286
286
  case 0:
287
- templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId;
287
+ templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId, buyerNick = _ref2.buyerNick;
288
288
  form.resetFields();
289
289
  _context2.prev = 2;
290
290
  setLoading(true);
@@ -331,10 +331,12 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
331
331
  jsonMap = _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data2 = _templateDetail.data) === null || _templateDetail$data2 === void 0 ? void 0 : _templateDetail$data2.componentDtoList.reduce(function (prv, next) {
332
332
  if (next.workOrderComponentType === 'BUYER_NICK_INPUT') {
333
333
  prv["".concat(next.uniqueKey, "_buyerOpenUid")] = buyerId;
334
+ prv["".concat(next.uniqueKey, "_buyerNick")] = buyerNick;
334
335
  }
335
336
 
336
337
  if (next.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
337
338
  prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = buyerId;
339
+ prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerNick")] = buyerNick;
338
340
  }
339
341
 
340
342
  return prv;
@@ -395,7 +397,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
395
397
  _ref4$record = _ref4.record,
396
398
  record = _ref4$record === void 0 ? {} : _ref4$record,
397
399
  orderNo = _ref4.orderNo,
398
- buyerId = _ref4.buyerId;
400
+ buyerId = _ref4.buyerId,
401
+ buyerNick = _ref4.buyerNick;
399
402
  // console.log('openModal---------', templateId, shopId, workOrderId, (record = {}));
400
403
  setVisible(true);
401
404
  setTemplateId(templateId);
@@ -407,7 +410,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
407
410
  shopId: shopId,
408
411
  record: record,
409
412
  orderNo: orderNo,
410
- buyerId: buyerId
413
+ buyerId: buyerId,
414
+ buyerNick: buyerNick
411
415
  });
412
416
  };
413
417
 
@@ -452,7 +456,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
452
456
 
453
457
  return /*#__PURE__*/_jsx(Drawer, {
454
458
  title: (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.name) || '工单录入',
455
- width: '100%',
459
+ width: '90%',
456
460
  open: visible,
457
461
  onClose: closeModal,
458
462
  footer: renderFooter(),
@@ -22,8 +22,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
22
22
  * @Description:
23
23
  * @Author: litian
24
24
  * @Date: 2022-09-09 16:58:00
25
- * @LastEditors: litian
26
- * @LastEditTime: 2022-09-22 16:37:15
25
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
26
+ * @LastEditTime: 2022-10-09 10:03:00
27
27
  */
28
28
  import React, { useImperativeHandle, forwardRef, useState } from 'react';
29
29
  import { Drawer } from 'antd';
@@ -106,6 +106,7 @@ function RecordModal(props, ref) {
106
106
 
107
107
  return /*#__PURE__*/_jsx(Drawer, {
108
108
  title: "\u8BB0\u5F55",
109
+ width: '90%',
109
110
  visible: visible,
110
111
  onClose: function onClose() {
111
112
  return setVisible(false);
@@ -120,6 +120,7 @@ var RecordLog = function RecordLog(props, ref) {
120
120
 
121
121
  return /*#__PURE__*/_jsx(Drawer, {
122
122
  visible: visible,
123
+ width: '90%',
123
124
  title: "\u64CD\u4F5C\u8BB0\u5F55",
124
125
  onClose: function onClose() {
125
126
  return setVisible(false);
@@ -28,7 +28,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
28
28
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
29
29
  * @Date: 2022-09-16 11:19:43
30
30
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
31
- * @LastEditTime: 2022-10-08 16:51:06
31
+ * @LastEditTime: 2022-10-09 16:32:48
32
32
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
33
33
  * @Description:
34
34
  *
@@ -231,7 +231,8 @@ var OrderList = function OrderList(tabActive) {
231
231
  templateId: id,
232
232
  shopId: platformInfo.shopId + '',
233
233
  orderNo: platformInfo.orderNo,
234
- buyerId: platformInfo.buyerId
234
+ buyerId: platformInfo.buyerId,
235
+ buyerNick: platformInfo.buyerNick
235
236
  });
236
237
  }; //编辑
237
238
 
@@ -241,7 +242,8 @@ var OrderList = function OrderList(tabActive) {
241
242
  templateId: item.templateDetailDto.uniqueKey,
242
243
  record: item,
243
244
  shopId: item.shopId,
244
- workOrderId: item.id
245
+ workOrderId: item.id,
246
+ buyerNick: platformInfo.buyerNick
245
247
  });
246
248
  }; //记录
247
249
 
@@ -544,6 +546,7 @@ var PayOrderList = function PayOrderList(tabActive) {
544
546
  var _shopList$find;
545
547
 
546
548
  return handleOpenModify({
549
+ buyerNick: platformInfo.buyerNick,
547
550
  buyerOpenUid: platformInfo.buyerId,
548
551
  shopId: platformInfo.shopId,
549
552
  shopName: (_shopList$find = shopList.find(function (item) {
@@ -56,9 +56,9 @@
56
56
  left: 0;
57
57
  z-index: 3;
58
58
  height: 70px;
59
+ padding: 4px;
59
60
  overflow: auto;
60
61
  background-color: #fff;
61
- padding: 4px;
62
62
  &:hover {
63
63
  height: 200px;
64
64
  box-shadow: 3px 3px 5px #eee;
@@ -114,7 +114,6 @@
114
114
  width: 130px;
115
115
  margin-right: 8px;
116
116
  }
117
-
118
117
 
119
118
  .custom_box_search_buyer {
120
119
  flex: none;
@@ -257,4 +256,4 @@
257
256
 
258
257
  .formDefault {
259
258
  display: none;
260
- }
259
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kmkf-work-order-service-component",
3
- "version": "0.0.1-alpha.13",
3
+ "version": "0.0.1-alpha.15",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",