kmkf-work-order-service-component 0.0.1-alpha.21 → 0.0.1-alpha.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.
@@ -621,7 +621,7 @@ export var orderBack = /*#__PURE__*/function () {
621
621
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
622
622
  var _shopList$find;
623
623
 
624
- var order_no, form, shopId, shopList, templateDetail, shopSourceStr, _yield$orderDetail, data, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, productId, productCode, transField, finalResponse, formValue, detail, componentsParams, detailsValue, newData;
624
+ var order_no, form, shopId, shopList, templateDetail, shopSourceStr, _yield$orderDetail, data, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue;
625
625
 
626
626
  return _regeneratorRuntime().wrap(function _callee$(_context) {
627
627
  while (1) {
@@ -652,7 +652,7 @@ export var orderBack = /*#__PURE__*/function () {
652
652
  return _context.abrupt("return");
653
653
 
654
654
  case 9:
655
- orderNo = data.orderNo, provinceCode = data.provinceCode, cityCode = data.cityCode, townCode = data.townCode, orderCreateDateTime = data.orderCreateDateTime, orderPaymentDateTime = data.orderPaymentDateTime, orderDeliveryDateTime = data.orderDeliveryDateTime, orderClosingDateTime = data.orderClosingDateTime, productId = data.productId, productCode = data.productCode;
655
+ orderNo = data.orderNo, provinceCode = data.provinceCode, cityCode = data.cityCode, townCode = data.townCode, orderCreateDateTime = data.orderCreateDateTime, orderPaymentDateTime = data.orderPaymentDateTime, orderDeliveryDateTime = data.orderDeliveryDateTime, orderClosingDateTime = data.orderClosingDateTime, itemList = data.itemList;
656
656
  transField = {
657
657
  tradeId: orderNo,
658
658
  province: provinceCode,
@@ -662,8 +662,8 @@ export var orderBack = /*#__PURE__*/function () {
662
662
  tradePaymentDateTime: orderPaymentDateTime,
663
663
  tradeDeliveryDateTime: orderDeliveryDateTime,
664
664
  tradeClosingDateTime: orderClosingDateTime,
665
- goodId: productId,
666
- goodSerial: productCode
665
+ goodId: itemList,
666
+ goodSerial: itemList
667
667
  };
668
668
  finalResponse = _objectSpread(_objectSpread({}, data), transField); //获取当前表单字段
669
669
 
@@ -683,82 +683,58 @@ export var orderBack = /*#__PURE__*/function () {
683
683
  if (detail[next]) {
684
684
  switch (next) {
685
685
  case 'province':
686
- prv[uniqueKey + '_province'] = detail['province'];
687
- prv[uniqueKey + '_city'] = detail['city'] || '';
688
- prv[uniqueKey + '_district'] = detail['district'] || '';
689
- prv[uniqueKey + '_address'] = detail['address'] || '';
686
+ prv[uniqueKey] = {
687
+ address: [detail['province'], detail['city'], detail['district']],
688
+ detail: detail['address'] || ''
689
+ };
690
690
  break;
691
691
 
692
692
  case 'expressLogisticsCompany':
693
- prv[uniqueKey + '_expressLogisticsCompany'] = detail['expressLogisticsCompany'];
694
- prv[uniqueKey + '_expressLogisticsCode'] = detail['expressLogisticsCode'];
693
+ prv[uniqueKey] = {
694
+ company: detail['expressLogisticsCompany'],
695
+ order: detail['expressLogisticsCode']
696
+ };
695
697
  break;
696
698
 
697
699
  case 'alipayName':
698
- prv[uniqueKey + '_alipayName'] = detail['alipayName'];
699
- prv[uniqueKey + '_alipayAccount'] = detail['alipayAccount'];
700
+ prv[uniqueKey] = {
701
+ name: detail['alipayName'],
702
+ user: detail['alipayAccount']
703
+ };
700
704
  break;
701
705
 
702
706
  case 'tradePaymentDateTime':
703
707
  case 'tradeCreateDateTime':
704
708
  case 'tradeClosingDateTime':
705
709
  case 'tradeDeliveryDateTime':
706
- prv["".concat(uniqueKey, "_").concat(key)] = detail[key] ? moment(detail[key]).format('YYYY-MM-DD HH:mm:ss') : '';
710
+ prv[uniqueKey] = detail[key] ? moment(detail[key]).format('YYYY-MM-DD HH:mm:ss') : '';
707
711
  break;
708
712
 
709
713
  case 'remark':
710
- prv[uniqueKey + '_remark'] = detail['remark'] || '';
711
- prv[uniqueKey + '_flag'] = detail['flag'];
714
+ prv[uniqueKey] = {
715
+ remark: detail['remark'] || '',
716
+ flag: detail['flag']
717
+ };
718
+ break;
719
+
720
+ case 'goodId':
721
+ case 'goodSerial':
722
+ case 'itemList':
723
+ prv[uniqueKey] = detail['itemList'];
712
724
  break;
713
725
 
714
726
  default:
715
- prv["".concat(uniqueKey, "_").concat(key)] = detail[key];
727
+ prv["".concat(uniqueKey)] = detail[key];
716
728
  break;
717
729
  }
718
730
  }
719
731
 
720
732
  return prv;
721
- }, {}); //有打款组件返填订单编号
722
-
723
- console.log('formValue', formValue);
724
- ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).forEach(function (item) {
725
- if (item.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
726
- detailsValue["".concat(item.uniqueKey, "_enterprisePaymentTid")] = detail['tradeId'];
727
- detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = formValue[item.uniqueKey]['enterprisePaymentBuyerOpenUid'];
728
- detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerNick")] = formValue[item.uniqueKey]['enterprisePaymentBuyerNick'];
729
- }
733
+ }, {}); // console.log('detailsValue++', formValue, detailsValue);
730
734
 
731
- if (item.workOrderComponentType === 'BUYER_NICK_INPUT') {
732
- detailsValue["".concat(item.uniqueKey, "_buyerNick")] = formValue[item.uniqueKey]['buyerNick'];
733
- detailsValue["".concat(item.uniqueKey, "_buyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
734
- }
735
-
736
- var GOOD_LIST = ['ITEM_ENCODE', 'ITEM_ID', 'ITEM_SELECT', 'ITEM_SELECT_THIRD'];
737
-
738
- if (GOOD_LIST.includes(item.workOrderComponentType)) {
739
- var itemList = detail['itemList'] || []; // let newList = itemList.map((t: any) => {
740
- // const { numIid, outerId, picUrl, platform, price, title } = t
741
- // let value = {
742
- // numIid,
743
- // outerId,
744
- // picUrl,
745
- // platform: platform.toLowerCase(),
746
- // price,
747
- // title
748
- // };
749
- // return value
750
- // })
751
-
752
- detailsValue["".concat(item.uniqueKey, "_itemList")] = JSON.stringify(itemList);
753
- }
754
- });
755
- newData = calcWorkOrderList([{
756
- jsonMap: detailsValue
757
- }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init');
758
- console.log('detailsValue++', detailsValue, newData[0]);
759
- form.setFieldsValue(_objectSpread({}, newData[0]));
735
+ form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
760
736
 
761
- case 22:
737
+ case 18:
762
738
  case "end":
763
739
  return _context.stop();
764
740
  }
@@ -319,8 +319,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
319
319
  setWorkOrderDetail(_workOrderDetail.data);
320
320
 
321
321
  if (workOrderId) {
322
- transData = calcWorkOrderList([(_workOrderDetail3 = _workOrderDetail) === null || _workOrderDetail3 === void 0 ? void 0 : _workOrderDetail3.data], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data = _templateDetail.data) === null || _templateDetail$data === void 0 ? void 0 : _templateDetail$data.componentDtoList); // console.log(transData);
323
-
322
+ transData = calcWorkOrderList([(_workOrderDetail3 = _workOrderDetail) === null || _workOrderDetail3 === void 0 ? void 0 : _workOrderDetail3.data], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data = _templateDetail.data) === null || _templateDetail$data === void 0 ? void 0 : _templateDetail$data.componentDtoList);
323
+ console.log(transData);
324
324
  form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
325
325
  shopId: shopId,
326
326
  shopName: record.shopName,
@@ -27,8 +27,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
27
27
  /*
28
28
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
29
29
  * @Date: 2022-09-16 11:19:43
30
- * @LastEditors: litian
31
- * @LastEditTime: 2022-10-10 17:28:55
30
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
31
+ * @LastEditTime: 2022-10-11 16:54:06
32
32
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
33
33
  * @Description:
34
34
  *
@@ -83,6 +83,19 @@ var WorkOrder = function WorkOrder(props) {
83
83
  tabActive = _useState2[0],
84
84
  setTabActive = _useState2[1];
85
85
 
86
+ useEffect(function () {
87
+ if (buyerNick) {
88
+ dispatch({
89
+ type: 'workOrder/setIsBuyer',
90
+ payload: true
91
+ });
92
+ } else {
93
+ dispatch({
94
+ type: 'workOrder/setIsBuyer',
95
+ payload: false
96
+ });
97
+ }
98
+ }, [buyerNick]);
86
99
  useEffect(function () {
87
100
  if (shopId != platformInfo.shopId) {
88
101
  initHandle();
@@ -188,10 +201,12 @@ var OrderList = function OrderList(tabActive) {
188
201
 
189
202
 
190
203
  var upDateState = function upDateState(type, val) {
204
+ var _objectSpread2;
205
+
191
206
  dispatch({
192
207
  type: 'workOrder/setState',
193
208
  payload: {
194
- customSearch: _objectSpread(_objectSpread({}, customSearch), {}, _defineProperty({}, type, val))
209
+ customSearch: _objectSpread(_objectSpread({}, customSearch), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, type, val), _defineProperty(_objectSpread2, "pageNo", 1), _objectSpread2))
195
210
  }
196
211
  });
197
212
  }; //分页
@@ -368,7 +383,11 @@ var OrderList = function OrderList(tabActive) {
368
383
  className: "custom_box_search_buyer",
369
384
  checked: customSearch.isBuyer,
370
385
  onChange: function onChange(e) {
371
- return upDateState('isBuyer', e.target.checked);
386
+ if (!platformInfo.buyerNick) {
387
+ return message.warning('请先选择买家,再查询工单!');
388
+ }
389
+
390
+ upDateState('isBuyer', e.target.checked);
372
391
  },
373
392
  children: "\u5F53\u524D\u4E70\u5BB6"
374
393
  })]
@@ -529,13 +548,12 @@ var PayOrderList = function PayOrderList(tabActive) {
529
548
 
530
549
 
531
550
  var upDateState = function upDateState(type, value) {
532
- // if(type === 'time'){
533
- // value = value.length ? [value[0].valueOf(), value[1].valueOf()]:[]
534
- // }
551
+ var _objectSpread3;
552
+
535
553
  dispatch({
536
554
  type: 'workOrder/setState',
537
555
  payload: {
538
- paySearch: _objectSpread(_objectSpread({}, paySearch), {}, _defineProperty({}, type, value))
556
+ paySearch: _objectSpread(_objectSpread({}, paySearch), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, type, value), _defineProperty(_objectSpread3, "pageNo", 1), _objectSpread3))
539
557
  }
540
558
  });
541
559
  };
@@ -604,7 +622,11 @@ var PayOrderList = function PayOrderList(tabActive) {
604
622
  className: "custom_box_search_buyer",
605
623
  checked: paySearch.isBuyer,
606
624
  onChange: function onChange(e) {
607
- return upDateState('isBuyer', e.target.checked);
625
+ if (!platformInfo.buyerNick) {
626
+ return message.warning('请先选择买家,再查询工单!');
627
+ }
628
+
629
+ upDateState('isBuyer', e.target.checked);
608
630
  },
609
631
  children: "\u5F53\u524D\u4E70\u5BB6"
610
632
  }), /*#__PURE__*/_jsx(RangePicker, {
@@ -21,6 +21,10 @@ export declare const workOrderSlice: import("@reduxjs/toolkit").Slice<any, {
21
21
  payload: any;
22
22
  type: string;
23
23
  }) => any;
24
+ setIsBuyer: (state: import("immer/dist/internal").WritableDraft<WorkOrderState>, action: {
25
+ payload: any;
26
+ type: string;
27
+ }) => void;
24
28
  }, "workOrder">;
25
29
  export declare const setState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
26
30
  declare const _default: import("redux").Reducer<any, import("redux").AnyAction>;
@@ -29,7 +29,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
29
29
  * @Author: litian
30
30
  * @Date: 2022-09-06 17:44:56
31
31
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
32
- * @LastEditTime: 2022-10-10 15:41:22
32
+ * @LastEditTime: 2022-10-11 16:40:30
33
33
  */
34
34
  import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
35
35
  import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
@@ -58,7 +58,7 @@ var initialState = {
58
58
  pageSize: 20,
59
59
  tempSelect: [],
60
60
  filterDay: 29,
61
- isBuyer: true
61
+ isBuyer: false
62
62
  },
63
63
  paySearch: {
64
64
  //打款工单搜索条件
@@ -67,7 +67,7 @@ var initialState = {
67
67
  time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
68
68
  workPayStatus: '',
69
69
  timeType: 'submitTime',
70
- isBuyer: true
70
+ isBuyer: false
71
71
  },
72
72
  templateDetails: {} //打开的模版
73
73
 
@@ -230,6 +230,10 @@ export var workOrderSlice = createSlice({
230
230
  reducers: {
231
231
  setState: function setState(state, action) {
232
232
  return _objectSpread(_objectSpread({}, state), action.payload);
233
+ },
234
+ setIsBuyer: function setIsBuyer(state, action) {
235
+ state.customSearch.isBuyer = action.payload;
236
+ state.paySearch.isBuyer = action.payload;
233
237
  }
234
238
  },
235
239
  extraReducers: function extraReducers(builder) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kmkf-work-order-service-component",
3
- "version": "0.0.1-alpha.21",
3
+ "version": "0.0.1-alpha.22",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",