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

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

@@ -1,5 +1,13 @@
 .custom_box {
-  // height: calc(100% - 58px);
+  // height: calc(100vh - 58px);
+  overflow-x: hidden;
+  :global(.ant-row) {
+    margin: 0 !important;
+  }
+
+  :global(.ant-col) {
+    padding: 0 !important;
+  }
   .top-tip {
     display: flex;
     flex-direction: row;
@@ -119,7 +127,10 @@
   }
 
   .custom_box_main_fxg {
-    height: calc(100vh - 446px);
+    height: calc(100vh - 412px);
+  }
+  .custom_box_main_xiaozhi {
+    height: calc(100vh - 228px);
   }
 
   .custom_box_main_ks {
@@ -149,6 +160,7 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+    margin-bottom: 4px;
   }
   .action_collapse {
     padding-left: 8px;
@@ -156,17 +168,17 @@
     cursor: pointer;
   }
   .customizeSearch {
-    overflow: hidden;
     transition: all 0.3s linear;
     .ant-form-item {
       margin-bottom: 8px;
     }
   }
   .open {
-    max-height: 400px;
+    max-height: 200px;
   }
   .close {
-    max-height: 80px;
+    max-height: 40px;
+    overflow: hidden;
   }
 }
 

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

@@ -69,6 +69,7 @@ function PaymentWorkOrderCard(props) {
       workPayStatus = record.workPayStatus,
       operateTime = record.operateTime,
       operateNick = record.operateNick,
+      paymentOrderKey = record.paymentOrderKey,
       workPayFee = record.workPayFee,
       shopName = record.shopName,
       buyerNick = record.buyerNick,
@@ -200,6 +201,9 @@ function PaymentWorkOrderCard(props) {
       }, {
         label: '提交客服：',
         value: operateNick
+      }, {
+        label: '工单编号：',
+        value: paymentOrderKey
       }])
     }), /*#__PURE__*/_jsx(Divider, {
       dashed: true,

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

@@ -117,6 +117,7 @@
 
   .itemViewRight {
     flex-grow: 1;
+    min-width: 0;
     color: rgba(0, 0, 0, 0.85);
     word-break: break-all;
   }

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, Tooltip } 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,118 @@ 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__*/_jsxs("div", {
+            style: {
+              display: 'flex',
+              alignItems: 'center'
+            },
+            children: [/*#__PURE__*/_jsx("span", {
+              style: {
+                width: '64px'
+              },
+              children: "\u63D0\u4EA4\u65F6\u95F4"
+            }), /*#__PURE__*/_jsx(Form.Item, {
+              name: "time",
+              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(Tooltip, {
+            placement: "topLeft",
+            title: "\u8BF7\u8F93\u5165\u8BA2\u5355\u7F16\u53F7",
+            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(Tooltip, {
+            placement: "topLeft",
+            title: "\u8BF7\u8F93\u5165\u5DE5\u5355\u7F16\u53F7",
+            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);
+      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: [/*#__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);
-          },
-          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 +242,39 @@ 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",
+        ghost: true,
+        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/components/Widget/basic/Checkbox/index.js

@@ -42,7 +42,6 @@ import BasicComponent from "../../BasicComponent";
 import { ApaasCheckbox } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
 import { getFormItem } from "../../common/formItemWrap";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 
 var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
   _inherits(BasicCheckBox, _BasicComponent);
@@ -57,19 +56,27 @@ var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value) {
-      var _value$value;
+      var _value$value, _value$value2;
 
-      return /*#__PURE__*/_jsxs("span", {
-        children: [value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.join('/'), /*#__PURE__*/_jsx("br", {}), value === null || value === void 0 ? void 0 : value.other]
+      var findIndex = value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.findIndex(function (item) {
+        return item === '其他';
+      });
+
+      if (findIndex > -1 && value !== null && value !== void 0 && value.other) {
+        value.value[findIndex] = "\u5176\u4ED6(".concat(value === null || value === void 0 ? void 0 : value.other, ")");
+      }
+
+      return /*#__PURE__*/_jsx("span", {
+        children: value === null || value === void 0 ? void 0 : (_value$value2 = value.value) === null || _value$value2 === void 0 ? void 0 : _value$value2.join('/')
       });
     });
 
     _defineProperty(_assertThisInitialized(_this), "customRules", function () {
       return [{
         validator: function validator(_, value) {
-          var _value$value2;
+          var _value$value3;
 
-          if (!(value !== null && value !== void 0 && (_value$value2 = value.value) !== null && _value$value2 !== void 0 && _value$value2.length)) {
+          if (!(value !== null && value !== void 0 && (_value$value3 = value.value) !== null && _value$value3 !== void 0 && _value$value3.length)) {
             return Promise.reject(new Error('请选择'));
           }
 
@@ -92,9 +99,9 @@ var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "renderExport", function (value, record) {
-      var _value$value3;
+      var _value$value4;
 
-      return "".concat(value === null || value === void 0 ? void 0 : (_value$value3 = value.value) === null || _value$value3 === void 0 ? void 0 : _value$value3.join('/'), " ").concat((value === null || value === void 0 ? void 0 : value.other) || '');
+      return "".concat(value === null || value === void 0 ? void 0 : (_value$value4 = value.value) === null || _value$value4 === void 0 ? void 0 : _value$value4.join('/'), " ").concat((value === null || value === void 0 ? void 0 : value.other) || '');
     });
 
     _defineProperty(_assertThisInitialized(_this), "getColumns", function () {

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

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import BasicComponent from '../../BasicComponent';
+declare class CommonDataTime extends BasicComponent {
+    constructor(options: any);
+    render: (value: any, record: any) => JSX.Element;
+    editRender: () => null;
+    renderExport: (value: any, record: any) => string;
+    getColumns: () => any;
+}
+export default CommonDataTime;

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

@@ -0,0 +1,90 @@
+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); }
+
+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; }
+
+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; }
+
+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); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+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); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+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); }; }
+
+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); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+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; } }
+
+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); }
+
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+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 from 'react';
+import BasicComponent from "../../BasicComponent";
+import moment from 'moment';
+import { jsx as _jsx } from "react/jsx-runtime";
+
+var CommonDataTime = /*#__PURE__*/function (_BasicComponent) {
+  _inherits(CommonDataTime, _BasicComponent);
+
+  var _super = _createSuper(CommonDataTime);
+
+  function CommonDataTime(options) {
+    var _thisSuper, _this;
+
+    _classCallCheck(this, CommonDataTime);
+
+    _this = _super.call(this, options);
+
+    _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
+      if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
+        return /*#__PURE__*/_jsx("span", {
+          children: "--"
+        });
+      }
+
+      return /*#__PURE__*/_jsx("span", {
+        children: moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss')
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "editRender", function () {
+      return null;
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "renderExport", function (value, record) {
+      if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
+        return '--';
+      }
+
+      return moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss');
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
+      return _objectSpread(_objectSpread({}, _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(CommonDataTime.prototype)), "getColumns", _thisSuper).call(_thisSuper)), {}, {
+        renderExport: _this.renderExport
+      });
+    });
+
+    _this.canFilter = true;
+    _this.canGroup = true;
+    _this.canHidden = true;
+    _this.editable = true;
+    return _this;
+  }
+
+  return _createClass(CommonDataTime);
+}(BasicComponent);
+
+export default CommonDataTime;

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

@@ -54,7 +54,7 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value) {
-      return value === null || value === void 0 ? void 0 : value.map(function (pic) {
+      return value.length ? value === null || value === void 0 ? void 0 : value.map(function (pic) {
         return /*#__PURE__*/_jsx("div", {
           style: {
             marginRight: '5px',
@@ -64,11 +64,11 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
             width: 32,
             src: imgResize(pic || ''),
             preview: {
-              src: pic
+              src: imgResize(pic || '', 0, 0)
             }
           })
         });
-      });
+      }) : /*#__PURE__*/_jsx("div", {});
     });
 
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {

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

@@ -69,7 +69,7 @@ var BasicRadio = /*#__PURE__*/function (_BasicComponent) {
       var _value$value;
 
       return /*#__PURE__*/_jsxs("span", {
-        children: [value === null || value === void 0 ? void 0 : value.value, (value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.indexOf('其他')) > -1 && (value === null || value === void 0 ? void 0 : value.other)]
+        children: [value === null || value === void 0 ? void 0 : value.value, (value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.indexOf('其他')) > -1 && (value === null || value === void 0 ? void 0 : value.other) && "(".concat(value === null || value === void 0 ? void 0 : value.other, ")")]
       });
     });
 

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

@@ -75,7 +75,7 @@ export var showImage = function showImage(_ref2) {
     }), /*#__PURE__*/_jsxs("div", {
       className: styles.options,
       children: [type === 'itemId' && /*#__PURE__*/_jsx(TextTool, {
-        title: '宝贝id',
+        title: '商品id',
         text: item.numIid
       }), type === 'itemCode' && /*#__PURE__*/_jsx(TextTool, {
         title: '商品编码',
@@ -168,7 +168,7 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
               })
             }), /*#__PURE__*/_jsxs("div", {
               children: [type === 'itemId' && /*#__PURE__*/_jsx(TextTool, {
-                title: '宝贝id',
+                title: '商品id',
                 text: i.numIid
               }), type === 'itemCode' && /*#__PURE__*/_jsx(TextTool, {
                 title: '商品编码',

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

@@ -111,11 +111,11 @@ var ELogistics = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
-      name: '物流公司',
+      name: '快递物流公司',
       id: "".concat(options.id, "_expressLogisticsCompany")
     }));
     _this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, options), {}, {
-      name: '物流单号',
+      name: '快递物流单号',
       id: "".concat(options.id, "_expressLogisticsCode")
     }));
     _this.canHidden = true;

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

@@ -40,12 +40,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
 import { getFormItem } from "../../common/formItemWrap";
-import { Remark } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets'; // import Flag from './Flag';
+import { Remark } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
+import trade0 from "../../../../../assets/flag/trade-icon-flag-0.png";
+import trade1 from "../../../../../assets/flag/trade-icon-flag-1.png";
+import trade2 from "../../../../../assets/flag/trade-icon-flag-2.png";
+import trade3 from "../../../../../assets/flag/trade-icon-flag-3.png";
+import trade4 from "../../../../../assets/flag/trade-icon-flag-4.png";
+import trade5 from "../../../../../assets/flag/trade-icon-flag-5.png";
+import { get } from 'lodash'; // const flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
 
-import { get } from 'lodash';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
+var imgList = [trade0, trade1, trade2, trade3, trade4, trade5];
 
 var ERemark = /*#__PURE__*/function (_BasicComponent) {
   _inherits(ERemark, _BasicComponent);
@@ -64,8 +70,8 @@ var ERemark = /*#__PURE__*/function (_BasicComponent) {
         style: {
           display: 'inline-block'
         },
-        children: [get(value, 'flag') + '' ? /*#__PURE__*/_jsx("i", {
-          className: "dz-iconfont dz-beizhu_qizhi f-lt ft_12 mr_5 ".concat(flagColors[get(value, 'flag')])
+        children: [get(value, 'flag') ? /*#__PURE__*/_jsx("img", {
+          src: imgList[get(value, 'flag')]
         }) : null, /*#__PURE__*/_jsx("span", {
           children: get(value, 'remark')
         })]

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

@@ -58,7 +58,7 @@ var Express = /*#__PURE__*/function (_BasicComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
       return /*#__PURE__*/_jsx("span", {
-        children: express.getExpressNameByCode(value)
+        children: express.getExpressNameByCode(value) || value
       });
     });