kmkf-work-order-service-component 0.4.0-alpha.21 → 0.4.0-alpha.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -683,23 +683,17 @@ var FormRender = function FormRender(props, ref) {
683
683
  }), /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread({
684
684
  form: form
685
685
  }, formProps), {}, {
686
- children: [!templateId && /*#__PURE__*/_jsx("div", {
687
- id: "templateCascader",
688
- className: "templateCascader",
689
- children: /*#__PURE__*/_jsx(Form.Item, {
690
- label: "\u6A21\u677F\u540D\u79F0",
691
- required: true,
692
- children: /*#__PURE__*/_jsx(Cascader, {
693
- options: templateList,
694
- placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
695
- showSearch: true,
696
- value: templateIdState,
697
- onChange: handleChangeTemplateId,
698
- allowClear: false,
699
- getPopupContainer: function getPopupContainer() {
700
- return document.getElementById('templateCascader');
701
- }
702
- })
686
+ children: [!templateId && /*#__PURE__*/_jsx(Form.Item, {
687
+ label: "\u6A21\u677F\u540D\u79F0",
688
+ required: true,
689
+ children: /*#__PURE__*/_jsx(Cascader, {
690
+ popupClassName: "templateCascader",
691
+ options: templateList,
692
+ placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
693
+ showSearch: true,
694
+ value: templateIdState,
695
+ onChange: handleChangeTemplateId,
696
+ allowClear: false
703
697
  })
704
698
  }), isShowShopList && /*#__PURE__*/_jsx(ShopName, {
705
699
  shopList: shopList,
@@ -38,14 +38,21 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
38
38
  import { Fragment as _Fragment } from "react/jsx-runtime";
39
39
 
40
40
  function CustomizeWorkOrderCard(props) {
41
- var _WORK_ORDER_STATUS$it, _item$jsonMap, _item$handlerList, _item$handlerList$map;
41
+ var _item$handlerList, _item$handlerList$map;
42
42
 
43
43
  var item = props.item,
44
44
  enabledTemplateList = props.enabledTemplateList;
45
45
  var dispatch = useAppDispatch();
46
46
  var componentDtoList = useAppSelector(selectorAllTemplateList);
47
47
  var filterComponentDtoList = componentDtoList.filter(function (i) {
48
- return !['WORK_ORDER_ID_INPUT', 'TEMPLATE_ID_INPUT', 'FLOW_STATUS_SELECT', 'HANDLER_INPUT', 'COMPLETED_USER_INPUT'].includes(i.workOrderComponentType);
48
+ return !['WORK_ORDER_ID_INPUT', // 工单ID
49
+ 'TEMPLATE_ID_INPUT', // 模板Id
50
+ 'FLOW_STATUS_SELECT', // 工单状态
51
+ 'HANDLER_INPUT', // 处理人
52
+ 'OPERATOR_INPUT', // 提交人
53
+ 'CREATED_DATETIME', // 创建时间
54
+ 'SHOP_INPUT' // 店铺
55
+ ].includes(i.workOrderComponentType);
49
56
  });
50
57
 
51
58
  var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], filterComponentDtoList),
@@ -158,8 +165,7 @@ function CustomizeWorkOrderCard(props) {
158
165
 
159
166
  var ItemView = function ItemView(_ref) {
160
167
  var label = _ref.label,
161
- value = _ref.value,
162
- key = _ref.key;
168
+ value = _ref.value;
163
169
  return /*#__PURE__*/_jsxs("div", {
164
170
  className: "orderItemView",
165
171
  children: [/*#__PURE__*/_jsxs("div", {
@@ -169,7 +175,7 @@ function CustomizeWorkOrderCard(props) {
169
175
  className: "itemViewRight",
170
176
  children: value
171
177
  })]
172
- }, key);
178
+ });
173
179
  };
174
180
 
175
181
  return /*#__PURE__*/_jsxs("div", {
@@ -181,9 +187,6 @@ function CustomizeWorkOrderCard(props) {
181
187
  label: "\u63D0\u4EA4\u5BA2\u670D",
182
188
  value: transData.submitter
183
189
  }, "submitter"), /*#__PURE__*/_jsx(ItemView, {
184
- label: "\u5DE5\u5355\u72B6\u6001",
185
- value: (_WORK_ORDER_STATUS$it = WORK_ORDER_STATUS[item === null || item === void 0 ? void 0 : (_item$jsonMap = item.jsonMap) === null || _item$jsonMap === void 0 ? void 0 : _item$jsonMap.flowStatus]) === null || _WORK_ORDER_STATUS$it === void 0 ? void 0 : _WORK_ORDER_STATUS$it.label
186
- }, "flowStatus"), /*#__PURE__*/_jsx(ItemView, {
187
190
  label: "\u5904\u7406\u5BA2\u670D",
188
191
  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) {
189
192
  return i.account;
@@ -196,10 +199,7 @@ function CustomizeWorkOrderCard(props) {
196
199
  style: {
197
200
  margin: '8px 0'
198
201
  }
199
- }), /*#__PURE__*/_jsx(ItemView, {
200
- label: "\u5E97\u94FA\u540D\u79F0",
201
- value: transData.shopName
202
- }, "shopName"), filterComponentDtoList.map(function (t) {
202
+ }), filterComponentDtoList.map(function (t) {
203
203
  var instance = factory(t.workOrderComponentType, {
204
204
  id: t.uniqueKey,
205
205
  name: t.name,
@@ -2,7 +2,6 @@
2
2
  import './index.less';
3
3
  declare type OrderListProps = {
4
4
  tabActive: string;
5
- shopId?: string | number;
6
5
  };
7
- declare const CustomizeWorkOrderList: ({ tabActive, shopId }: OrderListProps) => JSX.Element;
6
+ declare const CustomizeWorkOrderList: ({ tabActive }: OrderListProps) => JSX.Element;
8
7
  export default CustomizeWorkOrderList;
@@ -78,7 +78,7 @@ var getTableData = function getTableData(_ref) {
78
78
  shopList = _ref.shopList,
79
79
  shopId = _ref.shopId;
80
80
  return function (_ref2, formData) {
81
- var _shopList$find;
81
+ var _ref3, _ref3$find;
82
82
 
83
83
  var current = _ref2.current,
84
84
  pageSize = _ref2.pageSize;
@@ -89,8 +89,8 @@ var getTableData = function getTableData(_ref) {
89
89
  var params = _objectSpread({}, formData);
90
90
 
91
91
  if ((time === null || time === void 0 ? void 0 : time.length) > 1) {
92
- params.createdStartTime = time[0] ? moment(time[0]).format('x') : undefined;
93
- params.createdEndTime = time[1] ? moment(new Date(time[1]).getTime() + 24 * 60 * 60 * 1000 - 1000).format('x') : undefined;
92
+ params.createdStartTime = time[0] ? moment(time[0]).startOf('day').valueOf() : undefined;
93
+ params.createdEndTime = time[1] ? moment(time[1]).endOf('day').valueOf() : undefined;
94
94
  }
95
95
 
96
96
  if ((templateIdList === null || templateIdList === void 0 ? void 0 : templateIdList.length) > 0) {
@@ -103,9 +103,9 @@ var getTableData = function getTableData(_ref) {
103
103
 
104
104
  delete params.time; // time是moment类型的,监控上报的时侯,格式化报错了
105
105
 
106
- var shopUniqueKey = (_shopList$find = shopList.find(function (item) {
106
+ var shopUniqueKey = (_ref3 = shopList || []) === null || _ref3 === void 0 ? void 0 : (_ref3$find = _ref3.find(function (item) {
107
107
  return item.shopId === shopId;
108
- })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.uniqueKey;
108
+ })) === null || _ref3$find === void 0 ? void 0 : _ref3$find.uniqueKey;
109
109
 
110
110
  if (shopUniqueKey) {
111
111
  params.shopUniqueKeyList = [shopUniqueKey];
@@ -126,9 +126,8 @@ var getTableData = function getTableData(_ref) {
126
126
  }; //工单列表
127
127
 
128
128
 
129
- var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
130
- var tabActive = _ref3.tabActive,
131
- shopId = _ref3.shopId;
129
+ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
130
+ var tabActive = _ref4.tabActive;
132
131
  var dispatch = useAppDispatch();
133
132
 
134
133
  var _useState = useState(true),
@@ -167,7 +166,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
167
166
  var buyerNick = platformInfo.buyerNick,
168
167
  buyerId = platformInfo.buyerId,
169
168
  platform = platformInfo.platform,
170
- orderNo = platformInfo.orderNo;
169
+ orderNo = platformInfo.orderNo,
170
+ shopId = platformInfo.shopId;
171
171
  var formRenderRef = useRef();
172
172
 
173
173
  var _Form$useForm = Form.useForm(),
@@ -217,12 +217,22 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
217
217
  gutter: 24,
218
218
  children: [/*#__PURE__*/_jsx(Col, {
219
219
  span: 24,
220
- children: /*#__PURE__*/_jsx(Form.Item, {
221
- name: "time",
222
- label: "\u63D0\u4EA4\u65F6\u95F4",
223
- children: /*#__PURE__*/_jsx(RangePicker, {
224
- placeholder: ['开始提交时间', '结束提交时间']
225
- })
220
+ children: /*#__PURE__*/_jsxs("div", {
221
+ style: {
222
+ display: 'flex',
223
+ alignItems: 'center'
224
+ },
225
+ children: [/*#__PURE__*/_jsx("span", {
226
+ style: {
227
+ width: '64px'
228
+ },
229
+ children: "\u63D0\u4EA4\u65F6\u95F4"
230
+ }), /*#__PURE__*/_jsx(Form.Item, {
231
+ name: "time",
232
+ children: /*#__PURE__*/_jsx(RangePicker, {
233
+ placeholder: ['开始提交时间', '结束提交时间']
234
+ })
235
+ })]
226
236
  })
227
237
  }), /*#__PURE__*/_jsx(Col, {
228
238
  span: 12,
@@ -244,20 +254,14 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
244
254
  })
245
255
  }), /*#__PURE__*/_jsx(Col, {
246
256
  span: 16,
247
- children: /*#__PURE__*/_jsx("div", {
248
- id: "templateCascader",
249
- className: "templateCascader",
250
- children: /*#__PURE__*/_jsx(Form.Item, {
251
- name: "templateIdList",
252
- children: /*#__PURE__*/_jsx(Cascader, {
253
- options: groupAllList,
254
- placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
255
- showSearch: true,
256
- allowClear: false,
257
- getPopupContainer: function getPopupContainer() {
258
- return document.getElementById('templateCascader');
259
- }
260
- })
257
+ children: /*#__PURE__*/_jsx(Form.Item, {
258
+ name: "templateIdList",
259
+ children: /*#__PURE__*/_jsx(Cascader, {
260
+ popupClassName: "templateCascader",
261
+ options: groupAllList,
262
+ placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
263
+ showSearch: true,
264
+ allowClear: false
261
265
  })
262
266
  })
263
267
  }), /*#__PURE__*/_jsx(Col, {
@@ -404,7 +408,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
404
408
  record: record,
405
409
  shopList: shopList,
406
410
  templateId: templateId ? [templateId] : undefined,
407
- shopId: currentShopId,
411
+ shopId: currentShopId || platformInfo.shopId,
408
412
  orderNo: orderNo,
409
413
  buyerId: buyerId,
410
414
  buyerNick: buyerNick,
@@ -160,12 +160,22 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
160
160
  gutter: 24,
161
161
  children: [/*#__PURE__*/_jsx(Col, {
162
162
  span: 24,
163
- children: /*#__PURE__*/_jsx(Form.Item, {
164
- name: "time",
165
- label: "\u63D0\u4EA4\u65F6\u95F4",
166
- children: /*#__PURE__*/_jsx(RangePicker, {
167
- placeholder: ['开始提交时间', '结束提交时间']
168
- })
163
+ children: /*#__PURE__*/_jsxs("div", {
164
+ style: {
165
+ display: 'flex',
166
+ alignItems: 'center'
167
+ },
168
+ children: [/*#__PURE__*/_jsx("span", {
169
+ style: {
170
+ width: '64px'
171
+ },
172
+ children: "\u63D0\u4EA4\u65F6\u95F4"
173
+ }), /*#__PURE__*/_jsx(Form.Item, {
174
+ name: "time",
175
+ children: /*#__PURE__*/_jsx(RangePicker, {
176
+ placeholder: ['开始提交时间', '结束提交时间']
177
+ })
178
+ })]
169
179
  })
170
180
  }), /*#__PURE__*/_jsx(Col, {
171
181
  span: 8,
@@ -0,0 +1,10 @@
1
+ /// <reference types="react" />
2
+ import BasicComponent from '../../BasicComponent';
3
+ declare class CommonDataTime extends BasicComponent {
4
+ constructor(options: any);
5
+ render: (value: any, record: any) => JSX.Element;
6
+ editRender: () => null;
7
+ renderExport: (value: any, record: any) => string;
8
+ getColumns: () => any;
9
+ }
10
+ export default CommonDataTime;
@@ -0,0 +1,90 @@
1
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
+
3
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
4
+
5
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
6
+
7
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
8
+
9
+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
10
+
11
+ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
12
+
13
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
14
+
15
+ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
16
+
17
+ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
18
+
19
+ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
20
+
21
+ function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
22
+
23
+ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
24
+
25
+ function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
26
+
27
+ function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
28
+
29
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
30
+
31
+ 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; }
32
+
33
+ import React from 'react';
34
+ import BasicComponent from "../../BasicComponent";
35
+ import moment from 'moment';
36
+ import { jsx as _jsx } from "react/jsx-runtime";
37
+
38
+ var CommonDataTime = /*#__PURE__*/function (_BasicComponent) {
39
+ _inherits(CommonDataTime, _BasicComponent);
40
+
41
+ var _super = _createSuper(CommonDataTime);
42
+
43
+ function CommonDataTime(options) {
44
+ var _thisSuper, _this;
45
+
46
+ _classCallCheck(this, CommonDataTime);
47
+
48
+ _this = _super.call(this, options);
49
+
50
+ _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
51
+ if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
52
+ return /*#__PURE__*/_jsx("span", {
53
+ children: "--"
54
+ });
55
+ }
56
+
57
+ return /*#__PURE__*/_jsx("span", {
58
+ children: moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss')
59
+ });
60
+ });
61
+
62
+ _defineProperty(_assertThisInitialized(_this), "editRender", function () {
63
+ return null;
64
+ });
65
+
66
+ _defineProperty(_assertThisInitialized(_this), "renderExport", function (value, record) {
67
+ if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
68
+ return '--';
69
+ }
70
+
71
+ return moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss');
72
+ });
73
+
74
+ _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
75
+ return _objectSpread(_objectSpread({}, _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(CommonDataTime.prototype)), "getColumns", _thisSuper).call(_thisSuper)), {}, {
76
+ renderExport: _this.renderExport
77
+ });
78
+ });
79
+
80
+ _this.canFilter = true;
81
+ _this.canGroup = true;
82
+ _this.canHidden = true;
83
+ _this.editable = true;
84
+ return _this;
85
+ }
86
+
87
+ return _createClass(CommonDataTime);
88
+ }(BasicComponent);
89
+
90
+ export default CommonDataTime;
@@ -40,12 +40,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
40
40
  import React from 'react';
41
41
  import BasicComponent from "../../BasicComponent";
42
42
  import { getFormItem } from "../../common/formItemWrap";
43
- import { Remark } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets'; // import Flag from './Flag';
43
+ import { Remark } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
44
+ import trade0 from "../../../../../assets/flag/trade-icon-flag-0.png";
45
+ import trade1 from "../../../../../assets/flag/trade-icon-flag-1.png";
46
+ import trade2 from "../../../../../assets/flag/trade-icon-flag-2.png";
47
+ import trade3 from "../../../../../assets/flag/trade-icon-flag-3.png";
48
+ import trade4 from "../../../../../assets/flag/trade-icon-flag-4.png";
49
+ import trade5 from "../../../../../assets/flag/trade-icon-flag-5.png";
50
+ import { get } from 'lodash'; // const flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
44
51
 
45
- import { get } from 'lodash';
46
52
  import { jsx as _jsx } from "react/jsx-runtime";
47
53
  import { jsxs as _jsxs } from "react/jsx-runtime";
48
- var flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
54
+ var imgList = [trade0, trade1, trade2, trade3, trade4, trade5];
49
55
 
50
56
  var ERemark = /*#__PURE__*/function (_BasicComponent) {
51
57
  _inherits(ERemark, _BasicComponent);
@@ -64,8 +70,8 @@ var ERemark = /*#__PURE__*/function (_BasicComponent) {
64
70
  style: {
65
71
  display: 'inline-block'
66
72
  },
67
- children: [get(value, 'flag') + '' ? /*#__PURE__*/_jsx("i", {
68
- className: "dz-iconfont dz-beizhu_qizhi f-lt ft_12 mr_5 ".concat(flagColors[get(value, 'flag')])
73
+ children: [get(value, 'flag') ? /*#__PURE__*/_jsx("img", {
74
+ src: imgList[get(value, 'flag')]
69
75
  }) : null, /*#__PURE__*/_jsx("span", {
70
76
  children: get(value, 'remark')
71
77
  })]
@@ -10,6 +10,7 @@ import BasicCascader from '../Widget/basic/Cascader';
10
10
  import BasicAddress from '../Widget/basic/Address';
11
11
  import BasicGrade from '../Widget/basic/Grade';
12
12
  import BasicRate from '../Widget/basic/Rate';
13
+ import CommonDataTime from '../Widget/basic/CommonDataTime';
13
14
  import EBuyerNick from '../Widget/electricity/EBuyerNick';
14
15
  import EReceiverAddress from '../Widget/electricity/EReceiverAddress';
15
16
  import ELogistics from '../Widget/electricity/ELogistics';
@@ -23,4 +24,4 @@ import Status from '../Widget/third/Status';
23
24
  import Ordinary from '../Widget/third/Ordinary';
24
25
  import ItemSelectThird from '../Widget/third/ItemSelect';
25
26
  import Payment from '../Widget/third/Payment';
26
- 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;
27
+ 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;
@@ -10,6 +10,7 @@ import BasicCascader from "../Widget/basic/Cascader";
10
10
  import BasicAddress from "../Widget/basic/Address";
11
11
  import BasicGrade from "../Widget/basic/Grade";
12
12
  import BasicRate from "../Widget/basic/Rate";
13
+ import CommonDataTime from "../Widget/basic/CommonDataTime";
13
14
  import EShopName from "../Widget/electricity/ShopName";
14
15
  import ETradeId from "../Widget/electricity/ETradeId";
15
16
  import EBuyerNick from "../Widget/electricity/EBuyerNick";
@@ -131,6 +132,15 @@ export var factory = function factory(type, options) {
131
132
  case 'SYSTEM_ORDER_NO':
132
133
  return new SystemOrderNo(options);
133
134
 
135
+ case 'COMPLETED_DATETIME':
136
+ return new CommonDataTime(options);
137
+
138
+ case 'CREATED_DATETIME':
139
+ return new CommonDataTime(options);
140
+
141
+ case 'UPDATE_DATETIME':
142
+ return new CommonDataTime(options);
143
+
134
144
  default:
135
145
  return new BasicInput(options);
136
146
  }
@@ -162,8 +162,7 @@ var WorkOrder = function WorkOrder(props) {
162
162
  })]
163
163
  })
164
164
  }), /*#__PURE__*/_jsx(OrderList, {
165
- tabActive: tabActive,
166
- shopId: shopId
165
+ tabActive: tabActive
167
166
  }), /*#__PURE__*/_jsx(PaymentWorkOrderList, {
168
167
  tabActive: tabActive
169
168
  })]
@@ -3,7 +3,7 @@
3
3
  * @param {*} value
4
4
  * @returns
5
5
  */
6
- export declare const isNull: (value: number) => boolean;
6
+ export declare const isNull: (p: any) => boolean;
7
7
  export declare const findLabelBySelectValue: (vales: any[], options: {
8
8
  [x: string]: {
9
9
  [x: string]: any;
@@ -38,17 +38,17 @@ var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELEC
38
38
  */
39
39
 
40
40
  export var isNull = function isNull(value) {
41
- if (value === 0) {
42
- return false;
43
- }
44
-
45
41
  if (_typeof(value) === 'object' && value !== null) {
46
42
  return every(Object.values(value), function (v) {
47
- return isEmpty(v) && v !== 0;
43
+ return isNull(v);
48
44
  });
49
45
  }
50
46
 
51
- return isEmpty(value);
47
+ if (Array.isArray(value)) {
48
+ return value.length === 0;
49
+ }
50
+
51
+ return !value;
52
52
  };
53
53
  var workTypeKeys = {
54
54
  // TRADE_ID_INPUT: 'tradeId', //订单号
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kmkf-work-order-service-component",
3
- "version": "0.4.0-alpha.21",
3
+ "version": "0.4.0-alpha.23",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",