kmkf-work-order-service-component 0.4.0-alpha.20 → 0.4.0-alpha.22

package/dist/esm/FormRender/index.js

@@ -683,23 +683,17 @@ var FormRender = function FormRender(props, ref) {
       }), /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread({
         form: form
       }, formProps), {}, {
-        children: [!templateId && /*#__PURE__*/_jsx("div", {
-          id: "templateCascader",
-          className: "templateCascader",
-          children: /*#__PURE__*/_jsx(Form.Item, {
-            label: "\u6A21\u677F\u540D\u79F0",
-            required: true,
-            children: /*#__PURE__*/_jsx(Cascader, {
-              options: templateList,
-              placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
-              showSearch: true,
-              value: templateIdState,
-              onChange: handleChangeTemplateId,
-              allowClear: false,
-              getPopupContainer: function getPopupContainer() {
-                return document.getElementById('templateCascader');
-              }
-            })
+        children: [!templateId && /*#__PURE__*/_jsx(Form.Item, {
+          label: "\u6A21\u677F\u540D\u79F0",
+          required: true,
+          children: /*#__PURE__*/_jsx(Cascader, {
+            popupClassName: "templateCascader",
+            options: templateList,
+            placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
+            showSearch: true,
+            value: templateIdState,
+            onChange: handleChangeTemplateId,
+            allowClear: false
           })
         }), isShowShopList && /*#__PURE__*/_jsx(ShopName, {
           shopList: shopList,

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js

@@ -45,7 +45,7 @@ function CustomizeWorkOrderCard(props) {
   var dispatch = useAppDispatch();
   var componentDtoList = useAppSelector(selectorAllTemplateList);
   var filterComponentDtoList = componentDtoList.filter(function (i) {
-    return !['TEMPLATE_ID_INPUT', 'FLOW_STATUS_SELECT', 'HANDLER_INPUT', 'COMPLETED_USER_INPUT'].includes(i.workOrderComponentType);
+    return !['WORK_ORDER_ID_INPUT', 'TEMPLATE_ID_INPUT', 'FLOW_STATUS_SELECT', 'HANDLER_INPUT', 'COMPLETED_USER_INPUT'].includes(i.workOrderComponentType);
   });
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], filterComponentDtoList),
@@ -188,7 +188,10 @@ function CustomizeWorkOrderCard(props) {
       value: item === null || item === void 0 ? void 0 : (_item$handlerList = item.handlerList) === null || _item$handlerList === void 0 ? void 0 : (_item$handlerList$map = _item$handlerList.map(function (i) {
         return i.account;
       })) === null || _item$handlerList$map === void 0 ? void 0 : _item$handlerList$map.join('、')
-    }, "handleList"), /*#__PURE__*/_jsx(Divider, {
+    }, "handleList"), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u5DE5\u5355\u7F16\u53F7",
+      value: transData.id
+    }, "id"), /*#__PURE__*/_jsx(Divider, {
       dashed: true,
       style: {
         margin: '8px 0'

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

@@ -74,8 +74,12 @@ var URL_MAPPING = {
 
 var getTableData = function getTableData(_ref) {
   var checkedBuyerId = _ref.checkedBuyerId,
-      buyerId = _ref.buyerId;
+      buyerId = _ref.buyerId,
+      shopList = _ref.shopList,
+      shopId = _ref.shopId;
   return function (_ref2, formData) {
+    var _ref3, _ref3$find;
+
     var current = _ref2.current,
         pageSize = _ref2.pageSize;
     var time = formData.time,
@@ -85,8 +89,8 @@ var getTableData = function getTableData(_ref) {
     var params = _objectSpread({}, formData);
 
     if ((time === null || time === void 0 ? void 0 : time.length) > 1) {
-      params.createdStartTime = moment(time[0]).format('YYYY-MM-DD');
-      params.createdEndTime = moment(time[1]).format('YYYY-MM-DD');
+      params.createdStartTime = time[0] ? moment(time[0]).startOf('day').valueOf() : undefined;
+      params.createdEndTime = time[1] ? moment(time[1]).endOf('day').valueOf() : undefined;
     }
 
     if ((templateIdList === null || templateIdList === void 0 ? void 0 : templateIdList.length) > 0) {
@@ -99,6 +103,14 @@ var getTableData = function getTableData(_ref) {
 
     delete params.time; // time是moment类型的，监控上报的时侯，格式化报错了
 
+    var shopUniqueKey = (_ref3 = shopList || []) === null || _ref3 === void 0 ? void 0 : (_ref3$find = _ref3.find(function (item) {
+      return item.shopId === shopId;
+    })) === null || _ref3$find === void 0 ? void 0 : _ref3$find.uniqueKey;
+
+    if (shopUniqueKey) {
+      params.shopUniqueKeyList = [shopUniqueKey];
+    }
+
     return queryAllWorkOrderList(URL_MAPPING[type], _objectSpread(_objectSpread({}, params), {}, {
       pageSize: pageSize,
       pageNo: current
@@ -114,8 +126,8 @@ var getTableData = function getTableData(_ref) {
 }; //工单列表
 
 
-var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
-  var tabActive = _ref3.tabActive;
+var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
+  var tabActive = _ref4.tabActive;
   var dispatch = useAppDispatch();
 
   var _useState = useState(true),
@@ -154,7 +166,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
   var buyerNick = platformInfo.buyerNick,
       buyerId = platformInfo.buyerId,
       platform = platformInfo.platform,
-      orderNo = platformInfo.orderNo;
+      orderNo = platformInfo.orderNo,
+      shopId = platformInfo.shopId;
   var formRenderRef = useRef();
 
   var _Form$useForm = Form.useForm(),
@@ -163,7 +176,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
 
   var callBackGetTableData = useCallback(getTableData({
     checkedBuyerId: currentBuyerChecked,
-    buyerId: buyerId
+    buyerId: buyerId,
+    shopList: shopList,
+    shopId: shopId
   }), [currentBuyerChecked, buyerId]);
 
   var _useAntdTable = useAntdTable(callBackGetTableData, {
@@ -228,25 +243,19 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
-          span: 24,
-          children: /*#__PURE__*/_jsx("div", {
-            id: "templateCascader",
-            className: "templateCascader",
-            children: /*#__PURE__*/_jsx(Form.Item, {
-              name: "templateIdList",
-              children: /*#__PURE__*/_jsx(Cascader, {
-                options: groupAllList,
-                placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
-                showSearch: true,
-                allowClear: false,
-                getPopupContainer: function getPopupContainer() {
-                  return document.getElementById('templateCascader');
-                }
-              })
+          span: 16,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "templateIdList",
+            children: /*#__PURE__*/_jsx(Cascader, {
+              popupClassName: "templateCascader",
+              options: groupAllList,
+              placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
+              showSearch: true,
+              allowClear: false
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
-          span: 12,
+          span: 8,
           children: /*#__PURE__*/_jsx(Form.Item, {
             name: "workOrderId",
             children: /*#__PURE__*/_jsx(Input, {
@@ -320,7 +329,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           type: "primary",
           size: "small",
           onClick: handleClick,
-          children: "\u65B0\u5EFA\u5DE5\u5355"
+          children: "+\u65B0\u5EFA\u5DE5\u5355"
         })]
       }), searchForm, /*#__PURE__*/_jsx("main", {
         className: "custom_box_main custom_box_main_".concat(platform),
@@ -389,7 +398,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           record: record,
           shopList: shopList,
           templateId: templateId ? [templateId] : undefined,
-          shopId: currentShopId,
+          shopId: currentShopId || platformInfo.shopId,
           orderNo: orderNo,
           buyerId: buyerId,
           buyerNick: buyerNick,

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.less

@@ -1,5 +1,12 @@
 .custom_box {
   // height: calc(100% - 58px);
+  :global(.ant-row) {
+    margin: 0 !important;
+  }
+
+  :global(.ant-col) {
+    padding: 0 !important;
+  }
   .top-tip {
     display: flex;
     flex-direction: row;
@@ -149,6 +156,7 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+    margin-bottom: 4px;
   }
   .action_collapse {
     padding-left: 8px;

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

@@ -4,8 +4,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import React, { useEffect } from 'react';
-import { Select, Pagination, DatePicker, Space, Checkbox, message } from 'antd';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useEffect, useState } from 'react';
+import { Select, Pagination, DatePicker, Checkbox, message, Input, Form, Row, Col, Button } from 'antd';
 import { useAppSelector, useAppDispatch } from "../../../model/hooks";
 import { fetchQueryPaymentWorkOrderList } from "../../../model/workOrder";
 import PaymentWorkOrderCard from "./components/PaymentWorkOrderCard";
@@ -15,7 +27,6 @@ import UnExamineModal from "./components/UnExamineModal";
 import DeletePaymentWorkOrderModal from "./components/DeletePaymentWorkOrderModal";
 import FlagPayModal from "./components/FlagPayModal";
 import PaymentFormModal from "./components/PaymentFormModal";
-import refreshImg from "../../../common/imgs/refresh.png";
 import emptyImg from "../../../common/imgs/empty.png";
 import { PAY_STATUS } from "../../../common/constant";
 import { setPaymentFormModalVisible, setCurrentPaymentRecord } from "../../../model/paymentWorkOrder";
@@ -28,8 +39,6 @@ var RangePicker = DatePicker.RangePicker;
 
 //打款工单列表
 var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
-  var _paySearch$time;
-
   var tabActive = _ref.tabActive;
   var dispatch = useAppDispatch();
   var payOrderList = useAppSelector(function (state) {
@@ -52,9 +61,19 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
   var buyerNick = platformInfo.buyerNick,
       buyerId = platformInfo.buyerId,
       platform = platformInfo.platform;
+
+  var _useState = useState(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      open = _useState2[0],
+      setOpen = _useState2[1];
+
+  var _Form$useForm = Form.useForm(),
+      _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+      form = _Form$useForm2[0];
+
   useEffect(function () {
     setTimeout(onSearch, 0); // TODO: 让请求在下一个任务中执行，前一个任务获取不到redux中的数据
-  }, [paySearch, buyerNick, buyerId]);
+  }, [buyerNick, buyerId]);
 
   var onSearch = function onSearch() {
     dispatch(fetchQueryPaymentWorkOrderList());
@@ -101,55 +120,100 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
     });
   };
 
-  return /*#__PURE__*/_jsxs("div", {
-    className: "custom_box",
-    style: {
-      display: tabActive === 'payment' ? 'block' : 'none'
-    },
-    children: [/*#__PURE__*/_jsx("div", {
-      className: "custom_box_header",
-      children: /*#__PURE__*/_jsx(Space, {
-        size: [8, 8],
-        wrap: true,
-        children: /*#__PURE__*/_jsx("span", {
-          className: "custom_temp_list_button",
-          onClick: handleAddPaymentWorkOrder,
-          children: "\u6253\u6B3E\u5DE5\u5355"
-        })
+  var resetHandle = function resetHandle() {
+    dispatch({
+      type: 'workOrder/setState',
+      payload: {
+        paySearch: {
+          pageNo: 1,
+          pageSize: 20,
+          time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
+          workPayStatus: '',
+          tid: '',
+          paymentOrderKey: '',
+          isBuyer: false
+        }
+      }
+    });
+    form.setFieldsValue({
+      time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
+      workPayStatus: '',
+      tid: '',
+      paymentOrderKey: ''
+    });
+  };
+
+  var onFieldsChange = function onFieldsChange(changedFields, allFields) {
+    var _changedFields$ = changedFields[0],
+        name = _changedFields$.name,
+        value = _changedFields$.value;
+    upDateState(name[0], value);
+  };
+
+  var searchForm = /*#__PURE__*/_jsxs("div", {
+    children: [/*#__PURE__*/_jsx(Form, {
+      form: form,
+      className: "customizeSearch ".concat(open ? 'open' : 'close'),
+      initialValues: paySearch,
+      onFieldsChange: onFieldsChange,
+      children: /*#__PURE__*/_jsxs(Row, {
+        gutter: 24,
+        children: [/*#__PURE__*/_jsx(Col, {
+          span: 24,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "time",
+            label: "\u63D0\u4EA4\u65F6\u95F4",
+            children: /*#__PURE__*/_jsx(RangePicker, {
+              placeholder: ['开始提交时间', '结束提交时间']
+            })
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 8,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "workPayStatus",
+            children: /*#__PURE__*/_jsx(Select, {
+              children: PAY_STATUS.map(function (item) {
+                return /*#__PURE__*/_jsx(Select.Option, {
+                  value: item.value,
+                  children: item.label
+                }, item.value);
+              })
+            })
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 8,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "tid",
+            children: /*#__PURE__*/_jsx(Input, {
+              placeholder: "\u8BF7\u8F93\u5165\u8BA2\u5355\u7F16\u53F7"
+            })
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 8,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "paymentOrderKey",
+            children: /*#__PURE__*/_jsx(Input, {
+              placeholder: "\u8BF7\u8F93\u5165\u5DE5\u5355\u7F16\u53F7"
+            })
+          })
+        })]
       })
     }), /*#__PURE__*/_jsxs("div", {
-      className: "custom_box_search pay_search",
-      children: [/*#__PURE__*/_jsxs("div", {
-        className: "custom_box_search_box pay_search_box",
-        children: [/*#__PURE__*/_jsxs(Select, {
-          className: "custom_box_search_date",
-          value: paySearch.timeType,
-          onChange: function onChange(val) {
-            return upDateState('timeType', val);
-          },
-          children: [/*#__PURE__*/_jsx(Select.Option, {
-            value: "submitTime",
-            children: "\u63D0\u4EA4\u65F6\u95F4"
-          }), /*#__PURE__*/_jsx(Select.Option, {
-            value: "auditTime",
-            children: "\u5BA1\u6838\u65F6\u95F4"
-          }), /*#__PURE__*/_jsx(Select.Option, {
-            value: "playWithTime",
-            children: "\u6253\u6B3E\u65F6\u95F4"
-          })]
-        }), /*#__PURE__*/_jsx(Select, {
-          className: "custom_box_search_cascader",
-          value: paySearch.workPayStatus,
-          onChange: function onChange(val) {
-            return upDateState('workPayStatus', val);
+      className: "bottom-actions",
+      children: [/*#__PURE__*/_jsxs("span", {
+        children: [/*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          onClick: onSearch,
+          children: "\u67E5\u8BE2"
+        }), /*#__PURE__*/_jsx(Button, {
+          onClick: resetHandle,
+          style: {
+            marginLeft: 16
           },
-          children: PAY_STATUS.map(function (item) {
-            return /*#__PURE__*/_jsx(Select.Option, {
-              value: item.value,
-              children: item.label
-            }, item.value);
-          })
-        }), /*#__PURE__*/_jsx(Checkbox, {
+          children: "\u91CD\u7F6E"
+        })]
+      }), /*#__PURE__*/_jsxs("span", {
+        children: [/*#__PURE__*/_jsx(Checkbox, {
           className: "custom_box_search_buyer",
           checked: paySearch.isBuyer,
           onChange: function onChange(e) {
@@ -160,29 +224,38 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
             upDateState('isBuyer', e.target.checked);
           },
           children: "\u5F53\u524D\u4E70\u5BB6"
-        }), /*#__PURE__*/_jsx(RangePicker, {
-          allowClear: false,
-          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.map(function (item) {
-              return item.format('YYYY-MM-DD HH:mm:ss');
-            }));
-          }
+        }), /*#__PURE__*/_jsx("span", {
+          className: "action_collapse",
+          onClick: function onClick() {
+            return setOpen(function (v) {
+              return !v;
+            });
+          },
+          children: open ? '收起' : '展开'
         })]
-      }), /*#__PURE__*/_jsx("div", {
-        className: "custom_box_search_refresh",
-        onClick: function onClick() {
-          return onSearch();
+      })]
+    })]
+  });
+
+  return /*#__PURE__*/_jsxs("div", {
+    className: "custom_box",
+    style: {
+      display: tabActive === 'payment' ? 'block' : 'none'
+    },
+    children: [/*#__PURE__*/_jsxs("div", {
+      className: "bottom-actions",
+      children: [/*#__PURE__*/_jsx("div", {
+        children: "\u9ED8\u8BA4\u6700\u8FD130\u5929\u7684\u5168\u90E8\u5DE5\u5355"
+      }), /*#__PURE__*/_jsx(Button, {
+        type: "primary",
+        size: "small",
+        style: {
+          float: 'right'
         },
-        children: /*#__PURE__*/_jsx("img", {
-          src: refreshImg,
-          alt: ""
-        })
+        onClick: handleAddPaymentWorkOrder,
+        children: "+\u65B0\u5EFA\u5DE5\u5355"
       })]
-    }), /*#__PURE__*/_jsx("div", {
+    }), searchForm, /*#__PURE__*/_jsx("div", {
       className: "payment_box_main payment_box_main_".concat(platform),
       children: payOrderList.length ? payOrderList.map(function (item) {
         return /*#__PURE__*/_jsx(PaymentWorkOrderCard, {

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/index.less

@@ -1,6 +1,4 @@
 .custom_box {
-  // height: calc(100% - 58px);
-
   .custom_box_header {
     padding: 0 16px 16px 16px;
     border-bottom: 1px solid #f2f2f2;

package/dist/esm/WorkOrder/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import 'moment/locale/zh-cn';
 import { PlatForm } from './types';
 import './index.less';
 interface WorkOrderProps {

package/dist/esm/WorkOrder/index.js

@@ -27,7 +27,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
 import React, { useState, useEffect, useLayoutEffect, useMemo } from 'react';
-import { Spin } from 'antd';
+import { Spin, ConfigProvider } from 'antd';
 import { Provider } from 'react-redux';
 import { useAppSelector, useAppDispatch } from "../model/hooks";
 import { fetchQueryGroupCustomTemplate, fetchQueryCurrentCompanyUser } from "../model/workOrder";
@@ -38,6 +38,8 @@ import store from "../model/store";
 import OrderList from "./components/CustomizeWorkOrderList";
 import Reminder from "./components/Reminder";
 import PaymentWorkOrderList from "./components/PaymentWorkOrderList";
+import zhCN from 'antd/es/locale/zh_CN';
+import 'moment/locale/zh-cn';
 import { PlatForm } from "./types";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -61,7 +63,7 @@ var WorkOrder = function WorkOrder(props) {
     return state.workOrder.userInfo.shopList;
   });
 
-  var _useState = useState('custom'),
+  var _useState = useState('payment'),
       _useState2 = _slicedToArray(_useState, 2),
       tabActive = _useState2[0],
       setTabActive = _useState2[1];
@@ -146,17 +148,17 @@ var WorkOrder = function WorkOrder(props) {
           children: /*#__PURE__*/_jsxs("div", {
             className: "order_header_tabs",
             children: [/*#__PURE__*/_jsx("div", {
-              className: "order_header_tabs_button ".concat(tabActive === 'custom' ? 'active' : ''),
-              onClick: function onClick() {
-                return setTabActive('custom');
-              },
-              children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
-            }), /*#__PURE__*/_jsx("div", {
               className: "order_header_tabs_button border_left ".concat(tabActive === 'payment' ? 'active' : ''),
               onClick: function onClick() {
                 return setTabActive('payment');
               },
               children: "\u6253\u6B3E\u5DE5\u5355"
+            }), /*#__PURE__*/_jsx("div", {
+              className: "order_header_tabs_button ".concat(tabActive === 'custom' ? 'active' : ''),
+              onClick: function onClick() {
+                return setTabActive('custom');
+              },
+              children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
             })]
           })
         }), /*#__PURE__*/_jsx(OrderList, {
@@ -174,7 +176,10 @@ var WorkOrder = function WorkOrder(props) {
 var ProviderWrap = function ProviderWrap(props) {
   return /*#__PURE__*/_jsx(Provider, {
     store: store,
-    children: /*#__PURE__*/_jsx(WorkOrder, _objectSpread({}, props))
+    children: /*#__PURE__*/_jsx(ConfigProvider, {
+      locale: zhCN,
+      children: /*#__PURE__*/_jsx(WorkOrder, _objectSpread({}, props))
+    })
   });
 };
 

package/dist/esm/WorkOrder/index.less

@@ -1,6 +1,7 @@
+.order_container {
+  padding: 0 8px;
+}
 .order_header {
-  padding: 0 16px;
-
   .order_header_tabs {
     display: flex;
     align-items: center;
@@ -25,7 +26,8 @@
     }
 
     &.active {
-      color: #1966ff;
+      color: #fff;
+      background-color: #1966ff;
     }
   }
 }

package/dist/esm/common/utils/tools.d.ts

@@ -28,6 +28,7 @@ export declare const submitDataTransOldFormat: (nowData: {
     workOrderUpdateKeyVos: {
         type: string;
         isFlag: any;
+        tid: string;
     };
     buyerOpenUid: any;
 }) => any;

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

@@ -51,8 +51,7 @@ export var isNull = function isNull(value) {
   return isEmpty(value);
 };
 var workTypeKeys = {
-  TRADE_ID_INPUT: 'tradeId',
-  //订单号
+  // TRADE_ID_INPUT: 'tradeId', //订单号
   // BUYER_NICK_INPUT: 'buyerNick', //买家旺旺
   SHOP_NAME_INPUT: 'shopName',
   //店铺名称
@@ -159,6 +158,16 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         content: get(nowData, "".concat(item.uniqueKey), ''),
         name: item.name
       });
+    } else if (item.workOrderComponentType === 'TRADE_ID_INPUT') {
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_tradeId"),
+        content: get(nowData, "".concat(item.uniqueKey), ''),
+        name: item.name
+      });
+
+      if (updateFlag) {
+        params.workOrderUpdateKeyVos.tid = get(nowData, "".concat(item.uniqueKey), '');
+      }
     } else if (item.workOrderComponentType === 'RATE') {
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_rate"),

package/dist/esm/model/workOrder.js

@@ -6,18 +6,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -66,9 +54,10 @@ var initialState = {
     //打款工单搜索条件
     pageNo: 1,
     pageSize: 20,
-    time: [moment().subtract(31, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'), moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')],
+    time: [moment().subtract(30, 'day').startOf('day'), moment().endOf('day')],
     workPayStatus: '',
-    timeType: 'submitTime',
+    tid: '',
+    paymentOrderKey: '',
     isBuyer: false
   },
   templateDetails: {} //打开的模版
@@ -173,30 +162,26 @@ 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, start, end, workPayStatus, pageNo, pageSize, isBuyer, params, _yield$queryPaymentWo, data;
+    var _action$getState2, paySearch, global, _paySearch$tid, tid, _paySearch$paymentOrd, paymentOrderKey, time, 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), start = _paySearch$time[0], end = _paySearch$time[1], workPayStatus = paySearch.workPayStatus, pageNo = paySearch.pageNo, pageSize = paySearch.pageSize, isBuyer = paySearch.isBuyer;
+            _paySearch$tid = paySearch.tid, tid = _paySearch$tid === void 0 ? undefined : _paySearch$tid, _paySearch$paymentOrd = paySearch.paymentOrderKey, paymentOrderKey = _paySearch$paymentOrd === void 0 ? undefined : _paySearch$paymentOrd, time = paySearch.time, workPayStatus = paySearch.workPayStatus, pageNo = paySearch.pageNo, pageSize = paySearch.pageSize, isBuyer = paySearch.isBuyer;
             params = {
               workPayStatus: workPayStatus,
               pageNo: pageNo,
               pageSize: pageSize,
               shopId: global.platformInfo.shopId
             };
+            tid && (params.tid = tid);
+            paymentOrderKey && (params.paymentOrderKey = paymentOrderKey);
 
-            if (timeType === 'submitTime') {
-              params.operateStartTime = start;
-              params.operateEndTime = end;
-            } else if (timeType === 'auditTime') {
-              params.auditorStartTime = start;
-              params.auditorEndTime = end;
-            } else {
-              params.workPayStartTime = start;
-              params.workPayEndTime = end;
+            if (time.length) {
+              params.operateStartTime = moment(time[0]).format('YYYY-MM-DD HH:mm:ss');
+              params.operateEndTime = moment(new Date(time[1]).getTime() + 24 * 60 * 60 * 1000 - 1000).format('YYYY-MM-DD HH:mm:ss');
             }
 
             if (isBuyer) {
@@ -204,15 +189,15 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
               params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
-            _context4.next = 7;
+            _context4.next = 9;
             return queryPaymentWorkOrderList(params);
 
-          case 7:
+          case 9:
             _yield$queryPaymentWo = _context4.sent;
             data = _yield$queryPaymentWo.data;
             return _context4.abrupt("return", data);
 
-          case 10:
+          case 12:
           case "end":
             return _context4.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.0-alpha.20",
+  "version": "0.4.0-alpha.22",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",