kmkf-work-order-service-component 0.4.0-alpha.9 → 0.4.1

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

@@ -10,6 +10,7 @@ import BasicCascader from '../Widget/basic/Cascader';
 import BasicAddress from '../Widget/basic/Address';
 import BasicGrade from '../Widget/basic/Grade';
 import BasicRate from '../Widget/basic/Rate';
+import CommonDataTime from '../Widget/basic/CommonDataTime';
 import EBuyerNick from '../Widget/electricity/EBuyerNick';
 import EReceiverAddress from '../Widget/electricity/EReceiverAddress';
 import ELogistics from '../Widget/electricity/ELogistics';
@@ -23,4 +24,4 @@ import Status from '../Widget/third/Status';
 import Ordinary from '../Widget/third/Ordinary';
 import ItemSelectThird from '../Widget/third/ItemSelect';
 import Payment from '../Widget/third/Payment';
-export declare const factory: (type: string, options: any) => BasicInput | BasicRadio | BasicTextArea | BasicCheckBox | BasicDateTime | BasicSelect | BasicPicture | BasicMultSelect | BasicCascader | BasicAddress | BasicGrade | BasicRate | EBuyerNick | EReceiverAddress | ELogistics | EReturnLogistics | ERemark | EItemSelect | EItemId | EItemEncode | EAlipay | Status | Ordinary | ItemSelectThird | Payment;
+export declare const factory: (type: string, options: any) => BasicInput | BasicRadio | BasicTextArea | BasicCheckBox | BasicDateTime | BasicSelect | BasicPicture | BasicMultSelect | BasicCascader | BasicAddress | BasicGrade | BasicRate | CommonDataTime | EBuyerNick | EReceiverAddress | ELogistics | EReturnLogistics | ERemark | EItemSelect | EItemId | EItemEncode | EAlipay | Status | Ordinary | ItemSelectThird | Payment;

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

@@ -10,6 +10,7 @@ import BasicCascader from "../Widget/basic/Cascader";
 import BasicAddress from "../Widget/basic/Address";
 import BasicGrade from "../Widget/basic/Grade";
 import BasicRate from "../Widget/basic/Rate";
+import CommonDataTime from "../Widget/basic/CommonDataTime";
 import EShopName from "../Widget/electricity/ShopName";
 import ETradeId from "../Widget/electricity/ETradeId";
 import EBuyerNick from "../Widget/electricity/EBuyerNick";
@@ -131,6 +132,15 @@ export var factory = function factory(type, options) {
     case 'SYSTEM_ORDER_NO':
       return new SystemOrderNo(options);
 
+    case 'COMPLETED_DATETIME':
+      return new CommonDataTime(options);
+
+    case 'CREATED_DATETIME':
+      return new CommonDataTime(options);
+
+    case 'UPDATE_DATETIME':
+      return new CommonDataTime(options);
+
     default:
       return new BasicInput(options);
   }

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];
@@ -72,13 +74,13 @@ var WorkOrder = function WorkOrder(props) {
         type: 'workOrder/setIsBuyer',
         payload: true
       });
-      setCurrentBuyerChecked(true);
+      dispatch(setCurrentBuyerChecked(true));
     } else {
       dispatch({
         type: 'workOrder/setIsBuyer',
         payload: false
       });
-      setCurrentBuyerChecked(false);
+      dispatch(setCurrentBuyerChecked(false));
     }
   }, [buyerId]);
   useEffect(function () {
@@ -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

@@ -3,7 +3,7 @@
  * @param {*} value
  * @returns
  */
-export declare const isNull: (value: number) => boolean;
+export declare const isNull: (p: any) => boolean;
 export declare const findLabelBySelectValue: (vales: any[], options: {
     [x: string]: {
         [x: string]: any;
@@ -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

@@ -38,21 +38,24 @@ var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELEC
  */
 
 export var isNull = function isNull(value) {
-  if (value === 0) {
-    return false;
-  }
-
   if (_typeof(value) === 'object' && value !== null) {
     return every(Object.values(value), function (v) {
-      return isEmpty(v) && v !== 0;
+      return isNull(v);
     });
   }
 
-  return isEmpty(value);
+  if (Array.isArray(value)) {
+    return value.length === 0;
+  }
+
+  if (typeof value === 'number') {
+    return false;
+  }
+
+  return !value;
 };
 var workTypeKeys = {
-  TRADE_ID_INPUT: 'tradeId',
-  //订单号
+  // TRADE_ID_INPUT: 'tradeId', //订单号
   // BUYER_NICK_INPUT: 'buyerNick', //买家旺旺
   SHOP_NAME_INPUT: 'shopName',
   //店铺名称
@@ -159,6 +162,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"),
@@ -422,9 +435,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         name: item.name
       });
     } else {
+      var _nowData$item$uniqueK;
+
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_").concat(V.camelCase(item.workOrderComponentType)),
-        content: get(nowData, "".concat(item.uniqueKey), '') || '',
+        content: (_nowData$item$uniqueK = nowData === null || nowData === void 0 ? void 0 : nowData[item.uniqueKey]) !== null && _nowData$item$uniqueK !== void 0 ? _nowData$item$uniqueK : '',
         name: item.name
       });
     }
@@ -545,9 +560,8 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (nex.workOrderComponentType === 'DATETIME') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_dateTime")], item.jsonMap["".concat(nex.uniqueKey, "_dateTime")]) || config.dateTime));
       } else if (nex.workOrderComponentType === 'PICTURE') {
-        var host = cache.getHost();
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_picture")] ? formatPictures(item.jsonMap["".concat(nex.uniqueKey, "_picture")]).map(function (item) {
-          return "".concat(host, "/").concat(item);
+          return "".concat(item);
         }) : []));
       } else if (nex.workOrderComponentType === 'BASIC_MULT_SELECT') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_basicMultSelect")], '') || config.basicMultSelect || []));
@@ -652,17 +666,30 @@ export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _shopList$find;
 
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, shopSourceStr, _shopList$find2, _data$value, _buyer$value, taobaoId, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, orderInfo, buyerInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, JOIN_SHOP, shopSourceStr, _shopList$find2, _data$value, _buyer$value, taobaoId, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, orderInfo, buyerInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             order_no = _ref.order_no, form = _ref.form, shopId = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback;
+            //是否是对接平台，只有对接平台才能返填订单号
+            JOIN_SHOP = shopList.find(function (item) {
+              return !item.notJoin && item.shopId == shopId;
+            });
+
+            if (JOIN_SHOP) {
+              _context.next = 4;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 4:
             shopSourceStr = (_shopList$find = shopList.find(function (item) {
               return item.shopId == shopId;
             })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
-            _context.prev = 2;
+            _context.prev = 5;
             taobaoId = (_shopList$find2 = shopList.find(function (item) {
               return item.shopSourceStr === 'TAOBAO' && item.shopId == shopId;
             })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId;
@@ -681,10 +708,10 @@ export var orderBack = /*#__PURE__*/function () {
             })) : promise.push(new Promise(function (resolve) {
               resolve({});
             }));
-            _context.next = 8;
+            _context.next = 11;
             return Promise.allSettled(promise);
 
-          case 8:
+          case 11:
             _yield$Promise$allSet = _context.sent;
             _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
             data = _yield$Promise$allSet2[0];
@@ -767,7 +794,7 @@ export var orderBack = /*#__PURE__*/function () {
                   case 'remark':
                     prv[uniqueKey] = {
                       remark: detail['remark'] || '',
-                      flag: detail['flag']
+                      flag: !!detail['flag'] ? Number(detail['flag']) : detail['flag']
                     };
                     break;
 
@@ -808,24 +835,25 @@ export var orderBack = /*#__PURE__*/function () {
                   enterprisePaymentTid: order_no
                 });
               }
-            } // console.log('detailsValue++', formValue, detailsValue);
+            }
 
+            console.debug('detailsValue', detailsValue); // console.log('detailsValue++', formValue, detailsValue);
 
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
             callback === null || callback === void 0 ? void 0 : callback(finalResponse);
-            _context.next = 31;
+            _context.next = 35;
             break;
 
-          case 29:
-            _context.prev = 29;
-            _context.t0 = _context["catch"](2);
+          case 33:
+            _context.prev = 33;
+            _context.t0 = _context["catch"](5);
 
-          case 31:
+          case 35:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 29]]);
+    }, _callee, null, [[5, 33]]);
   }));
 
   return function orderBack(_x) {
@@ -920,7 +948,13 @@ var getComponentsValue = function getComponentsValue() {
 export var imgResize = function imgResize(url) {
   var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
   var h = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 60;
-  return "".concat(url, "?x-oss-process=image/resize,h_").concat(h, ",w_").concat(w);
+  var modifyUrl = url.startsWith('/') ? url : "/".concat(url);
+
+  if (w === 0 || h === 0) {
+    return "https://kefu.kuaimai.com".concat(modifyUrl);
+  }
+
+  return "https://kefu.kuaimai.com".concat(modifyUrl, "?x-oss-process=image/resize,h_").concat(h, ",w_").concat(w);
 }; //重复校验数据映射字段
 
 export var COMPONENT_MAP = {

package/dist/esm/model/customizeWorkOrder/index.js

@@ -110,7 +110,7 @@ export var fetchAllComponentList = /*#__PURE__*/function () {
             _context2.prev = 0;
             _context2.next = 3;
             return queryAllComponentList({
-              templateId: '74TM7ZQQ7Z2N3754WWBV7ALB' // 这个模板标识是全部工单
+              templateId: 'EHS2XLO7QXHYOR65I6OHQWNY' // 这个模板标识是全部工单
 
             });
 

package/dist/esm/model/workOrder.d.ts

@@ -1,6 +1,7 @@
 export interface WorkOrderState {
     groupAllList: [];
     groupTemplateList: any[];
+    enabledTemplateList: string[];
     allTempLateList: any[];
     orderList: any[];
     orderListTotal: number;

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); } }
@@ -39,6 +27,8 @@ var initialState = {
   //模版组列表包含模版
   groupTemplateList: [],
   //模版组列表 不包含模版
+  enabledTemplateList: [],
+  //禁用组件模版列表
   allTempLateList: [],
   //组列表下的模版
   orderList: [],
@@ -64,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: {} //打开的模版
@@ -171,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);
+            workPayStatus && (params.workPayStatus = workPayStatus);
+            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(time[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss');
             }
 
             if (isBuyer) {
@@ -202,15 +189,15 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
               params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
-            _context4.next = 7;
+            _context4.next = 10;
             return queryPaymentWorkOrderList(params);
 
-          case 7:
+          case 10:
             _yield$queryPaymentWo = _context4.sent;
             data = _yield$queryPaymentWo.data;
             return _context4.abrupt("return", data);
 
-          case 10:
+          case 13:
           case "end":
             return _context4.stop();
         }
@@ -266,6 +253,7 @@ export var workOrderSlice = createSlice({
       var list = action.payload;
       var groupList = [];
       var tempList = [];
+      var enabledTemplateList = [];
       var groupAllList = list.reduce(function (prv, item) {
         if (item.workOrderTemplates.length) {
           var groupId = item.groupId,
@@ -282,6 +270,8 @@ export var workOrderSlice = createSlice({
 
             if (t.enabled) {
               tempList.push(t);
+            } else {
+              enabledTemplateList.push(t.uniqueKey);
             }
 
             return t.enabled;
@@ -296,6 +286,7 @@ export var workOrderSlice = createSlice({
         return prv;
       }, []);
       state.groupAllList = groupAllList;
+      state.enabledTemplateList = enabledTemplateList;
       state.customSearch.tempSelect = (groupAllList === null || groupAllList === void 0 ? void 0 : groupAllList.length) && [(_groupAllList$ = groupAllList[0]) === null || _groupAllList$ === void 0 ? void 0 : _groupAllList$.value, (_groupAllList$2 = groupAllList[0]) === null || _groupAllList$2 === void 0 ? void 0 : (_groupAllList$2$child = _groupAllList$2.children[0]) === null || _groupAllList$2$child === void 0 ? void 0 : _groupAllList$2$child.value];
     }), builder.addCase(fetchQueryWorkOrder.pending, function (state) {
       state.loading = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.0-alpha.9",
+  "version": "0.4.1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.1.2",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.1.3",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",