kmkf-work-order-service-component 0.1.1 → 0.1.3

package/dist/esm/WorkOrder/common/utils/tools.js

@@ -603,7 +603,6 @@ var transDataSource = function transDataSource(templateColumns) {
 };
 
 export var calcWorkOrderList = function calcWorkOrderList(source, templateColumns, type) {
-  console.time('calcWorkOrderList');
   var transDataSourceItem = transDataSource(templateColumns, type);
   var finalSource = source === null || source === void 0 ? void 0 : source.map(function (item) {
     var value = transDataSourceItem(item);
@@ -613,7 +612,6 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
       id: item.id
     });
   });
-  console.timeEnd('calcWorkOrderList');
   return finalSource;
 }; //订单返填
 

package/dist/esm/WorkOrder/components/CustomizeFormModal/index.js

@@ -98,7 +98,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       openModal: openModal,
       closeModal: closeModal
     };
-  }, []);
+  }, [shopList]);
 
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
@@ -360,7 +360,6 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 }], _templateDetail === null || _templateDetail === void 0 ? void 0 : (_templateDetail$data3 = _templateDetail.data) === null || _templateDetail$data3 === void 0 ? void 0 : _templateDetail$data3.componentDtoList, 'init');
                 form.setFieldsValue(_objectSpread({}, get(_transData, '0', {})));
               } //如果有订单号 订单返填
-              // console.log(orderNo);
 
 
               if (orderNo) {

package/dist/esm/WorkOrder/components/CustomizeFormModal/index.module.less

@@ -68,7 +68,11 @@
   }
 
   :global(.ant-form-item) {
-    margin-bottom: 20px;
+    margin-bottom: 8px;
+  }
+
+  :global(.ant-form-item .ant-form-item-label) {
+    padding: 0px;
   }
 
   :global(.ant-form-item-label) {

package/dist/esm/WorkOrder/components/ListOrderItem/index.js

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-07 17:04:02
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-19 18:58:21
+ * @LastEditTime: 2022-10-21 14:39:21
  */
 import React from 'react';
 import { factory } from "../Widget";
@@ -45,9 +45,8 @@ function ListOrderItem(props) {
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], componentDtoList),
       _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
-      transData = _calcWorkOrderList2[0];
+      transData = _calcWorkOrderList2[0]; //列表头部
 
-  console.log('transData', transData); //列表头部
 
   var ItemHeader = function ItemHeader() {
     // 获取工单状态组件自定义文案
@@ -68,38 +67,85 @@ function ListOrderItem(props) {
       }
 
       return status;
-    }; // 判断是否存在工单状态组件，并且未处理
+    }; // 处理工单状态
 
 
-    var showStatusButton = function showStatusButton(jsonMap) {
+    var showTextButton = function showTextButton(jsonMap, status) {
+      var msg = '';
+
       for (var key in jsonMap) {
         if (jsonMap.hasOwnProperty(key)) {
           if (~key.indexOf('_status')) {
             if (jsonMap[key] === '0') {
-              return true;
+              msg = '未' + status;
+            } else if (jsonMap[key] === '1') {
+              msg = '已' + status;
             }
           }
         }
       }
-    }; // 处理工单状态
 
+      return msg;
+    };
 
-    var showTextButton = function showTextButton(jsonMap, status) {
-      var msg = '';
+    var id = item.id,
+        templateDetailDto = item.templateDetailDto,
+        jsonMap = item.jsonMap;
+    var componentDtoList = templateDetailDto ? templateDetailDto.componentDtoList : [];
+    var status = showStatusText(componentDtoList);
+    var showMsg = showTextButton(jsonMap, status);
+    return /*#__PURE__*/_jsx("div", {
+      className: styles.orderItem,
+      children: /*#__PURE__*/_jsx("div", {
+        className: styles.orderItemLeft,
+        children: /*#__PURE__*/_jsxs("div", {
+          className: styles.orderItemType,
+          children: [/*#__PURE__*/_jsx("div", {
+            className: styles.orderItemLeftIcon
+          }), /*#__PURE__*/_jsxs("div", {
+            className: styles.orderItemLeftName,
+            children: [templateDetailDto ? templateDetailDto.name : '', showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
+              className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
+              children: showMsg
+            })]
+          })]
+        })
+      })
+    });
+  };
 
+  var ItemActions = function ItemActions() {
+    // 获取工单状态组件自定义文案
+    var showStatusText = function showStatusText(componentDtoList) {
+      var status = '';
+      var len = componentDtoList.length;
+
+      for (var i = 0; i < len; i++) {
+        var obj = componentDtoList[i];
+
+        if (obj.workOrderComponentType === 'STATUS') {
+          var _obj$componentConfig2 = obj.componentConfig,
+              customStatusText = _obj$componentConfig2.customStatusText,
+              isUseCustomStatus = _obj$componentConfig2.isUseCustomStatus;
+          status = isUseCustomStatus ? customStatusText : '处理';
+          break;
+        }
+      }
+
+      return status;
+    }; // 判断是否存在工单状态组件，并且未处理
+
+
+    var showStatusButton = function showStatusButton(jsonMap) {
       for (var key in jsonMap) {
         if (jsonMap.hasOwnProperty(key)) {
           if (~key.indexOf('_status')) {
             if (jsonMap[key] === '0') {
-              msg = '未' + status;
-            } else if (jsonMap[key] === '1') {
-              msg = '已' + status;
+              return true;
             }
           }
         }
       }
-
-      return msg;
     }; // 售后打款组件
 
 
@@ -176,74 +222,55 @@ function ListOrderItem(props) {
       onTransfer === null || onTransfer === void 0 ? void 0 : onTransfer(item);
     };
 
-    var id = item.id,
-        templateDetailDto = item.templateDetailDto,
+    var templateDetailDto = item.templateDetailDto,
         jsonMap = item.jsonMap;
     var componentDtoList = templateDetailDto ? templateDetailDto.componentDtoList : [];
     var status = showStatusText(componentDtoList);
     var hasStatus = showStatusButton(jsonMap);
-    var showMsg = showTextButton(jsonMap, status);
     var showEditorBtn = isAfterSalePayment(componentDtoList);
     return /*#__PURE__*/_jsxs("div", {
-      className: styles.orderItem,
-      children: [/*#__PURE__*/_jsx("div", {
-        className: styles.orderItemLeft,
-        children: /*#__PURE__*/_jsxs("div", {
-          className: styles.orderItemType,
-          children: [/*#__PURE__*/_jsx("div", {
-            className: styles.orderItemLeftIcon
-          }), /*#__PURE__*/_jsxs("div", {
-            className: styles.orderItemLeftName,
-            children: [templateDetailDto ? templateDetailDto.name : '', showMsg.length > 1 && /*#__PURE__*/_jsx("div", {
-              className: "".concat(styles.orderItemStatus, " ").concat(showMsg.includes('已') ? styles.done : styles.undo),
-              children: showMsg
-            })]
-          })]
-        })
-      }), /*#__PURE__*/_jsxs("div", {
-        className: styles.orderItemRight,
-        children: [hasStatus ? /*#__PURE__*/_jsx("div", {
-          children: /*#__PURE__*/_jsx("span", {
-            className: styles.orderItemOperate,
-            onClick: function onClick() {
-              return upDateState(item, status);
-            },
-            children: status
-          })
-        }) : null, hasStatus ? /*#__PURE__*/_jsx("div", {
-          children: /*#__PURE__*/_jsx("span", {
-            className: styles.orderItemOperate,
-            onClick: function onClick() {
-              return transferOrder(item);
-            },
-            children: "\u8F6C\u4EA4"
-          })
-        }) : null, showEditorBtn ? null : /*#__PURE__*/_jsx("span", {
+      className: styles.orderItemRight,
+      children: [hasStatus ? /*#__PURE__*/_jsx("div", {
+        children: /*#__PURE__*/_jsx("span", {
           className: styles.orderItemOperate,
           onClick: function onClick() {
-            return onEdit(item);
+            return upDateState(item, status);
           },
-          children: "\u4FEE\u6539"
-        }), /*#__PURE__*/_jsx(Popconfirm, {
-          title: "\u5220\u9664\u5DE5\u5355\u540E\u5C06\u65E0\u6CD5\u6062\u590D\uFF0C\u786E\u8BA4\u8981\u5220\u9664\u8BE5\u6761\u6570\u636E\u5417\uFF1F",
-          onConfirm: function onConfirm() {
-            return onDelete(item);
-          },
-          okText: "\u786E\u5B9A",
-          cancelText: "\u53D6\u6D88",
-          children: /*#__PURE__*/_jsx("span", {
-            className: styles.orderItemOperate,
-            children: "\u5220\u9664"
-          })
-        }), /*#__PURE__*/_jsx("span", {
+          children: status
+        })
+      }) : null, hasStatus ? /*#__PURE__*/_jsx("div", {
+        children: /*#__PURE__*/_jsx("span", {
           className: styles.orderItemOperate,
           onClick: function onClick() {
-            return onLog(item);
+            return transferOrder(item);
           },
-          children: "\u8BB0\u5F55"
-        })]
+          children: "\u8F6C\u4EA4"
+        })
+      }) : null, showEditorBtn ? null : /*#__PURE__*/_jsx("span", {
+        className: styles.orderItemOperate,
+        onClick: function onClick() {
+          return onEdit(item);
+        },
+        children: "\u4FEE\u6539"
+      }), /*#__PURE__*/_jsx(Popconfirm, {
+        title: "\u5220\u9664\u5DE5\u5355\u540E\u5C06\u65E0\u6CD5\u6062\u590D\uFF0C\u786E\u8BA4\u8981\u5220\u9664\u8BE5\u6761\u6570\u636E\u5417\uFF1F",
+        onConfirm: function onConfirm() {
+          return onDelete(item);
+        },
+        okText: "\u786E\u5B9A",
+        cancelText: "\u53D6\u6D88",
+        children: /*#__PURE__*/_jsx("span", {
+          className: styles.orderItemOperate,
+          children: "\u5220\u9664"
+        })
+      }), /*#__PURE__*/_jsx("span", {
+        className: styles.orderItemOperate,
+        onClick: function onClick() {
+          return onLog(item);
+        },
+        children: "\u8BB0\u5F55"
       })]
-    }, id);
+    });
   };
 
   var ItemView = function ItemView(_ref) {
@@ -264,7 +291,7 @@ function ListOrderItem(props) {
 
   return /*#__PURE__*/_jsxs("div", {
     className: styles.listOrderItemBox,
-    children: [ItemHeader(), ItemView({
+    children: [/*#__PURE__*/_jsx(ItemHeader, {}), ItemView({
       label: '提交时间',
       value: moment(transData.created).format('YYYY-MM-DD HH:mm:ss'),
       key: 'created'
@@ -300,7 +327,12 @@ function ListOrderItem(props) {
         value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData),
         key: t.uniqueKey
       }) : null;
-    })]
+    }), /*#__PURE__*/_jsx(Divider, {
+      dashed: true,
+      style: {
+        margin: '8px 0'
+      }
+    }), /*#__PURE__*/_jsx(ItemActions, {})]
   });
 }
 

package/dist/esm/WorkOrder/components/ListOrderItem/index.module.less

@@ -18,6 +18,7 @@
 
     .orderItemType {
       display: flex;
+      align-items: center;
       // align-items: center;
       color: rgba(0, 0, 0, 0.85);
       font-weight: normal;
@@ -41,13 +42,14 @@
       display: inline-block;
       box-sizing: border-box;
       height: 24px;
+      margin-left: 8px;
       padding: 0px 4px;
       line-height: 23px;
       white-space: nowrap;
       // align-items: center;
       // justify-content: center;
       text-align: center;
-      border-radius: 2px;
+      border-radius: 4px;
     }
 
     .undo {
@@ -62,11 +64,11 @@
       border: 1px solid #dffacd;
     }
   }
+}
 
-  .orderItemRight {
-    display: flex;
-    justify-content: flex-end;
-  }
+.orderItemRight {
+  display: flex;
+  justify-content: flex-end;
 }
 
 .orderItemOperate {

package/dist/esm/WorkOrder/components/PayListOrderItem/ModifyModal.js

@@ -216,7 +216,7 @@ function ModifyModal(props, ref) {
   }();
 
   return /*#__PURE__*/_jsx(Drawer, {
-    visible: visible,
+    open: visible,
     width: '90%',
     onClose: function onClose() {
       form.resetFields();

package/dist/esm/WorkOrder/components/PayListOrderItem/RecordModal.js

@@ -23,7 +23,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-09 16:58:00
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-09 10:03:00
+ * @LastEditTime: 2022-10-21 11:27:52
  */
 import React, { useImperativeHandle, forwardRef, useState } from 'react';
 import { Drawer } from 'antd';
@@ -107,7 +107,7 @@ function RecordModal(props, ref) {
   return /*#__PURE__*/_jsx(Drawer, {
     title: "\u8BB0\u5F55",
     width: '90%',
-    visible: visible,
+    open: visible,
     onClose: function onClose() {
       return setVisible(false);
     },

package/dist/esm/WorkOrder/components/PayListOrderItem/index.js

@@ -406,9 +406,9 @@ function PayListOrderItem(props) {
 
   return /*#__PURE__*/_jsxs("div", {
     className: styles.listOrderItemBox,
-    children: [/*#__PURE__*/_jsxs("div", {
+    children: [/*#__PURE__*/_jsx("div", {
       className: styles.orderItem,
-      children: [/*#__PURE__*/_jsx("div", {
+      children: /*#__PURE__*/_jsx("div", {
         className: styles.orderItemLeft,
         children: /*#__PURE__*/_jsxs("div", {
           className: styles.orderItemType,
@@ -425,10 +425,7 @@ function PayListOrderItem(props) {
             children: workPayStatusDesc
           })]
         })
-      }), /*#__PURE__*/_jsx("span", {
-        className: styles.orderItemRight,
-        children: btnList
-      })]
+      })
     }), /*#__PURE__*/_jsx("div", {
       className: styles.workOrderInfo,
       children: renderFormItem([{
@@ -464,8 +461,16 @@ function PayListOrderItem(props) {
         label: '支付宝账号：',
         value: accountNoMix
       }])
+    }), /*#__PURE__*/_jsx(Divider, {
+      dashed: true,
+      style: {
+        margin: '12px 0'
+      }
+    }), /*#__PURE__*/_jsx("span", {
+      className: styles.orderItemRight,
+      children: btnList
     })]
-  }, record.id);
+  });
 }
 
 export default PayListOrderItem;

package/dist/esm/WorkOrder/components/RecordLog/index.js

@@ -119,7 +119,7 @@ var RecordLog = function RecordLog(props, ref) {
   }();
 
   return /*#__PURE__*/_jsx(Drawer, {
-    visible: visible,
+    open: visible,
     width: '90%',
     title: "\u64CD\u4F5C\u8BB0\u5F55",
     onClose: function onClose() {

package/dist/esm/WorkOrder/components/TransferOrderModal/index.js

@@ -23,7 +23,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-15 10:51:44
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-11 17:53:02
+ * @LastEditTime: 2022-10-21 11:46:22
  */
 import React, { useState, useImperativeHandle, forwardRef } from 'react';
 import { Modal, Form, Select } from 'antd';
@@ -116,7 +116,7 @@ var TransCustomerModal = function TransCustomerModal(props, ref) {
   return /*#__PURE__*/_jsx(Modal, {
     title: "\u8F6C\u4EA4\u5BA2\u670D",
     centered: true,
-    visible: visible,
+    open: visible,
     width: 400,
     okText: "\u786E\u5B9A",
     cancelText: "\u53D6\u6D88",

package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js

@@ -143,7 +143,7 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
       },
       children: "\u67E5\u770B\u5168\u90E8(".concat(total, ")")
     }), /*#__PURE__*/_jsx(Modal, {
-      visible: visible,
+      open: visible,
       footer: null,
       onCancel: function onCancel() {
         return setVisible(false);

package/dist/esm/WorkOrder/index.js

@@ -28,14 +28,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-20 14:56:08
+ * @LastEditTime: 2022-10-21 14:47:07
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
 import React, { useState, useEffect, useRef } from 'react';
-import Wrapper from "./components/Wrapper";
 import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, Spin, message } from 'antd';
 import { useAppSelector, useAppDispatch } from "./model/hooks";
 import { fetchQueryGroupCustomTemplate, fetchQueryWorkOrder, fetchQueryCurrentCompanyUser, fetchQueryPaymentWorkOrderList, fetchDeleteWorkOrder } from "./model/workOrder";
@@ -54,6 +53,7 @@ import { transferWorkOrder } from "./model/servers/api";
 import get from 'lodash/get';
 import refreshImg from "./common/imgs/refresh.png";
 import emptyImg from "./common/imgs/empty.png";
+import moment from 'moment';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -125,7 +125,8 @@ var WorkOrder = function WorkOrder(props) {
 
   return /*#__PURE__*/_jsx(Spin, {
     spinning: loading,
-    children: /*#__PURE__*/_jsxs(Wrapper, {
+    children: /*#__PURE__*/_jsxs("div", {
+      className: "order_container",
       children: [/*#__PURE__*/_jsx("header", {
         className: "order_header",
         children: /*#__PURE__*/_jsxs("div", {
@@ -144,13 +145,18 @@ var WorkOrder = function WorkOrder(props) {
             children: "\u6253\u6B3E\u5DE5\u5355"
           })]
         })
-      }), OrderList(tabActive), PayOrderList(tabActive)]
+      }), /*#__PURE__*/_jsx(OrderList, {
+        tabActive: tabActive
+      }), /*#__PURE__*/_jsx(PayOrderList, {
+        tabActive: tabActive
+      })]
     })
   });
-}; //工单列表
-
+};
 
-var OrderList = function OrderList(tabActive) {
+//工单列表
+var OrderList = function OrderList(_ref) {
+  var tabActive = _ref.tabActive;
   var dispatch = useAppDispatch();
   var groupAllList = useAppSelector(function (state) {
     return state.workOrder.groupAllList;
@@ -172,7 +178,6 @@ var OrderList = function OrderList(tabActive) {
   });
   var buyerNick = platformInfo.buyerNick,
       buyerId = platformInfo.buyerId;
-  var isFirst = useRef(false);
   var recordLogRef = useRef();
   var transferRef = useRef();
   var customizeFormRef = useRef();
@@ -259,7 +264,7 @@ var OrderList = function OrderList(tabActive) {
   };
 
   var onDelete = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(item) {
       var _item$templateDetailD;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -306,7 +311,7 @@ var OrderList = function OrderList(tabActive) {
     }));
 
     return function onDelete(_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
@@ -316,7 +321,7 @@ var OrderList = function OrderList(tabActive) {
 
 
   var transCustomer = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, currentCustomer) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(record, currentCustomer) {
       var id, jsonMap, _record$templateDetai, componentDtoList, uniqueKey, params, workOrderStatusKey;
 
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -358,7 +363,7 @@ var OrderList = function OrderList(tabActive) {
     }));
 
     return function transCustomer(_x2, _x3) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
 
@@ -454,14 +459,14 @@ var OrderList = function OrderList(tabActive) {
     }), /*#__PURE__*/_jsx("main", {
       className: "custom_box_main",
       children: orderList.length ? orderList.map(function (item) {
-        return ListOrderItem({
+        return /*#__PURE__*/_jsx(ListOrderItem, {
           item: item,
           onEdit: onEdit,
           onLog: onLog,
           onRefresh: onSearch,
           onTransfer: onTransfer,
           onDelete: onDelete
-        });
+        }, item.id);
       }) : /*#__PURE__*/_jsx("div", {
         className: "custom_box_main_empty",
         children: /*#__PURE__*/_jsxs("div", {
@@ -473,7 +478,7 @@ var OrderList = function OrderList(tabActive) {
           })]
         })
       })
-    }), /*#__PURE__*/_jsx("div", {
+    }), total > 0 && /*#__PURE__*/_jsx("div", {
       className: "custom_box_page",
       children: /*#__PURE__*/_jsx(Pagination, {
         showSizeChanger: false,
@@ -494,8 +499,8 @@ var OrderList = function OrderList(tabActive) {
     }), /*#__PURE__*/_jsx(CustomizeFormModal, {
       ref: customizeFormRef,
       shopList: shopList,
-      onSuccess: function onSuccess(_ref3) {
-        var type = _ref3.type;
+      onSuccess: function onSuccess(_ref4) {
+        var type = _ref4.type;
         onSearch();
 
         if (type === 'ADD') {
@@ -511,10 +516,13 @@ var OrderList = function OrderList(tabActive) {
       }
     })]
   });
-}; //打款工单列表
+};
 
+//打款工单列表
+var PayOrderList = function PayOrderList(_ref5) {
+  var _paySearch$time;
 
-var PayOrderList = function PayOrderList(tabActive) {
+  var tabActive = _ref5.tabActive;
   var dispatch = useAppDispatch();
   var payOrderList = useAppSelector(function (state) {
     return state.workOrder.payOrderList;
@@ -684,10 +692,14 @@ var PayOrderList = function PayOrderList(tabActive) {
           children: "\u5F53\u524D\u4E70\u5BB6"
         }), /*#__PURE__*/_jsx(RangePicker, {
           allowClear: false,
-          value: paySearch.time,
+          value: (_paySearch$time = paySearch.time) === null || _paySearch$time === void 0 ? void 0 : _paySearch$time.map(function (item) {
+            return moment(item);
+          }),
           showTime: true,
           onChange: function onChange(dates) {
-            return upDateState('time', dates);
+            return upDateState('time', dates.map(function (item) {
+              return item.format('YYYY-MM-DD HH:mm:ss');
+            }));
           }
         })]
       }), /*#__PURE__*/_jsx("div", {
@@ -700,21 +712,19 @@ var PayOrderList = function PayOrderList(tabActive) {
           alt: ""
         })
       })]
-    }), /*#__PURE__*/_jsx("main", {
+    }), /*#__PURE__*/_jsx("div", {
       className: "payment_box_main",
       children: payOrderList.length ? payOrderList.map(function (item) {
-        return PayListOrderItem({
+        return /*#__PURE__*/_jsx(PayListOrderItem, {
           record: item,
-          onRefresh: function onRefresh() {
-            return onSearch();
-          },
+          onRefresh: onSearch,
           onEdit: function onEdit(record, type) {
             return handleOpenModify(_objectSpread(_objectSpread({}, record), {}, {
               shopList: shopList
             }), type);
           },
           onLog: handleOpenLog
-        });
+        }, item.id);
       }) : /*#__PURE__*/_jsx("div", {
         className: "custom_box_main_empty",
         children: /*#__PURE__*/_jsxs("div", {

package/dist/esm/WorkOrder/index.less

@@ -1,3 +1,6 @@
+.order_container {
+  padding-bottom: 40px;
+}
 .order_header {
   padding: 16px 16px 0 16px;
 
@@ -159,9 +162,14 @@
   }
 
   .custom_box_page {
+    position: fixed;
+    bottom: 0px;
     display: flex;
     justify-content: flex-end;
+    width: 100%;
+    height: 40px;
     padding: 0 16px;
+    background-color: #fff;
   }
 }
 

package/dist/esm/WorkOrder/model/workOrder.js

@@ -29,7 +29,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * @Author: litian
  * @Date: 2022-09-06 17:44:56
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-19 19:28:44
+ * @LastEditTime: 2022-10-21 13:45:42
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList, deleteWorkOrder } from "../model/servers/api";
@@ -64,7 +64,7 @@ var initialState = {
     //打款工单搜索条件
     pageNo: 1,
     pageSize: 20,
-    time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
+    time: [moment().subtract(31, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'), moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')],
     workPayStatus: '',
     timeType: 'submitTime',
     isBuyer: false
@@ -171,16 +171,14 @@ export var fetchQueryWorkOrder = createAsyncThunk('workOrder/queryWorkOrder', /*
 
 export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPaymentWorkOrderList', /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_, action) {
-    var _action$getState2, paySearch, global, timeType, _paySearch$time, startTime, endTime, workPayStatus, pageNo, pageSize, isBuyer, start, end, params, _yield$queryPaymentWo, data;
+    var _action$getState2, paySearch, global, timeType, _paySearch$time, start, end, workPayStatus, pageNo, pageSize, isBuyer, params, _yield$queryPaymentWo, data;
 
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             _action$getState2 = action.getState(), paySearch = _action$getState2.workOrder.paySearch, global = _action$getState2.global;
-            timeType = paySearch.timeType, _paySearch$time = _slicedToArray(paySearch.time, 2), startTime = _paySearch$time[0], endTime = _paySearch$time[1], workPayStatus = paySearch.workPayStatus, pageNo = paySearch.pageNo, pageSize = paySearch.pageSize, isBuyer = paySearch.isBuyer;
-            start = startTime ? moment(startTime).valueOf() : '';
-            end = endTime ? moment(endTime).valueOf() : '';
+            timeType = paySearch.timeType, _paySearch$time = _slicedToArray(paySearch.time, 2), start = _paySearch$time[0], end = _paySearch$time[1], workPayStatus = paySearch.workPayStatus, pageNo = paySearch.pageNo, pageSize = paySearch.pageSize, isBuyer = paySearch.isBuyer;
             params = {
               workPayStatus: workPayStatus,
               pageNo: pageNo,
@@ -204,15 +202,15 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
               params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
-            _context4.next = 9;
+            _context4.next = 7;
             return queryPaymentWorkOrderList(params);
 
-          case 9:
+          case 7:
             _yield$queryPaymentWo = _context4.sent;
             data = _yield$queryPaymentWo.data;
             return _context4.abrupt("return", data);
 
-          case 12:
+          case 10:
           case "end":
             return _context4.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -37,7 +37,7 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.6",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22",
     "@reduxjs/toolkit": "^1.8.5",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",