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

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

@@ -26,6 +26,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { Divider } from 'antd';
 import moment from 'moment';
+import { get } from 'lodash';
 import { useAppDispatch, useAppSelector } from "../../../../../model/hooks";
 import { factory } from "../../../Widget";
 import { calcWorkOrderList, isNull } from "../../../../../common/utils/tools";
@@ -33,19 +34,23 @@ import { WORK_ORDER_STATUS, WAITING, HANDLING, STOPPING } from "../../../../../c
 import { setStatusSelectModalVisible, setLogModalVisible, setFormModalVisible, setTemplateId, setCustomizeFormShopId, setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
 import { selectorAllTemplateList } from "../../../../../model/customizeWorkOrder/selector";
 import "./index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 
 function CustomizeWorkOrderCard(props) {
-  var _WORK_ORDER_STATUS$it, _item$jsonMap, _item$handlerList, _item$handlerList$map;
+  var _item$handlerList, _item$handlerList$map;
 
   var item = props.item,
       enabledTemplateList = props.enabledTemplateList;
   var dispatch = useAppDispatch();
   var componentDtoList = useAppSelector(selectorAllTemplateList);
   var filterComponentDtoList = componentDtoList.filter(function (i) {
-    return !['WORK_ORDER_ID_INPUT', 'TEMPLATE_ID_INPUT', 'FLOW_STATUS_SELECT', 'HANDLER_INPUT', 'COMPLETED_USER_INPUT'].includes(i.workOrderComponentType);
+    return !['WORK_ORDER_ID_INPUT', // 工单ID
+    'TEMPLATE_ID_INPUT', // 模板Id
+    'FLOW_STATUS_SELECT', // 工单状态
+    'HANDLER_INPUT', // 处理人
+    'OPERATOR_INPUT', // 提交人
+    'CREATED_DATETIME', // 创建时间
+    'SHOP_INPUT', // 店铺
+    'UPDATE_DATETIME'].includes(i.workOrderComponentType);
   });
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], filterComponentDtoList),
@@ -59,27 +64,30 @@ function CustomizeWorkOrderCard(props) {
     var templateName = item.templateName,
         flowStatus = item.flowStatus,
         jsonMap = item.jsonMap;
-    return /*#__PURE__*/_jsx("div", {
-      className: "orderItem",
-      children: /*#__PURE__*/_jsx("div", {
-        className: "orderItemLeft",
-        children: /*#__PURE__*/_jsxs("div", {
-          className: "orderItemType",
-          children: [/*#__PURE__*/_jsx("div", {
-            className: "orderItemLeftIcon"
-          }), /*#__PURE__*/_jsxs("div", {
-            className: "orderItemLeftName",
-            children: [templateName, flowStatus && /*#__PURE__*/_jsx("span", {
-              className: "status",
-              style: {
-                background: (_WORK_ORDER_STATUS = WORK_ORDER_STATUS[flowStatus]) === null || _WORK_ORDER_STATUS === void 0 ? void 0 : _WORK_ORDER_STATUS.bgColor
-              },
-              children: (_WORK_ORDER_STATUS2 = WORK_ORDER_STATUS[flowStatus]) === null || _WORK_ORDER_STATUS2 === void 0 ? void 0 : _WORK_ORDER_STATUS2.label
-            })]
-          })]
-        })
-      })
-    });
+    var hasPaymentStatus = Object.keys(jsonMap).find(function (key) {
+      return key === null || key === void 0 ? void 0 : key.includes('enterprisePaymentStatus');
+    }); // const paymentStatus = get(jsonMap, hasPaymentStatus, '')
+
+    return /*#__PURE__*/React.createElement("div", {
+      className: "customizeOrderItem"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "orderItemLeft"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "orderItemType"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "orderItemLeftIcon"
+    }), /*#__PURE__*/React.createElement("div", {
+      className: "orderItemLeftName"
+    }, flowStatus && /*#__PURE__*/React.createElement("span", {
+      className: "status",
+      style: {
+        background: (_WORK_ORDER_STATUS = WORK_ORDER_STATUS[flowStatus]) === null || _WORK_ORDER_STATUS === void 0 ? void 0 : _WORK_ORDER_STATUS.bgColor
+      }
+    }, (_WORK_ORDER_STATUS2 = WORK_ORDER_STATUS[flowStatus]) === null || _WORK_ORDER_STATUS2 === void 0 ? void 0 : _WORK_ORDER_STATUS2.label), templateName))), hasPaymentStatus && get(jsonMap, hasPaymentStatus, '') && /*#__PURE__*/React.createElement("div", {
+      style: {
+        fontWeight: 600
+      }
+    }, get(jsonMap, hasPaymentStatus, '')));
   };
 
   var ItemActions = function ItemActions() {
@@ -118,111 +126,107 @@ function CustomizeWorkOrderCard(props) {
 
     var jsonMap = item.jsonMap;
     var unCompletedStatus = [WAITING, HANDLING, STOPPING, undefined].includes(jsonMap === null || jsonMap === void 0 ? void 0 : jsonMap.flowStatus);
-    return /*#__PURE__*/_jsxs("div", {
-      className: "orderItemRight",
-      children: [unCompletedStatus && /*#__PURE__*/_jsxs(_Fragment, {
-        children: [/*#__PURE__*/_jsx("span", {
-          className: "orderItemOperate",
-          onClick: function onClick() {
-            return handleChangeStatus(item);
-          },
-          children: "\u5904\u7406"
-        }), /*#__PURE__*/_jsx("span", {
-          className: "orderItemOperate",
-          onClick: function onClick() {
-            return transferOrder(item);
-          },
-          children: "\u8F6C\u4EA4"
-        })]
-      }), /*#__PURE__*/_jsx("span", {
-        className: "orderItemOperate",
-        onClick: function onClick() {
-          return handleEdit(item);
-        },
-        children: "\u4FEE\u6539"
-      }), /*#__PURE__*/_jsx("span", {
-        className: "orderItemOperate",
-        onClick: function onClick() {
-          return deleteHandle(item);
-        },
-        children: "\u5220\u9664"
-      }), /*#__PURE__*/_jsx("span", {
-        className: "orderItemOperate",
-        onClick: function onClick() {
-          return handleLog(item);
-        },
-        children: "\u8BB0\u5F55"
-      })]
-    });
+    return /*#__PURE__*/React.createElement("div", {
+      className: "orderItemRight"
+    }, unCompletedStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+      className: "orderItemOperate",
+      onClick: function onClick() {
+        return handleChangeStatus(item);
+      }
+    }, "\u5904\u7406"), /*#__PURE__*/React.createElement("span", {
+      className: "orderItemOperate",
+      onClick: function onClick() {
+        return transferOrder(item);
+      }
+    }, "\u8F6C\u4EA4")), /*#__PURE__*/React.createElement("span", {
+      className: "orderItemOperate",
+      onClick: function onClick() {
+        return handleEdit(item);
+      }
+    }, "\u4FEE\u6539"), /*#__PURE__*/React.createElement("span", {
+      className: "orderItemOperate",
+      onClick: function onClick() {
+        return deleteHandle(item);
+      }
+    }, "\u5220\u9664"), /*#__PURE__*/React.createElement("span", {
+      className: "orderItemOperate",
+      onClick: function onClick() {
+        return handleLog(item);
+      }
+    }, "\u8BB0\u5F55"));
   };
 
   var ItemView = function ItemView(_ref) {
     var label = _ref.label,
-        value = _ref.value,
-        key = _ref.key;
-    return /*#__PURE__*/_jsxs("div", {
-      className: "orderItemView",
-      children: [/*#__PURE__*/_jsxs("div", {
-        className: "itemViewLeft",
-        children: [label, ":"]
-      }), /*#__PURE__*/_jsx("span", {
-        className: "itemViewRight",
-        children: value
-      })]
-    }, key);
+        value = _ref.value;
+    return /*#__PURE__*/React.createElement("div", {
+      className: "orderItemView"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "itemViewLeft"
+    }, label, ":"), /*#__PURE__*/React.createElement("span", {
+      className: "itemViewRight"
+    }, value));
   };
 
-  return /*#__PURE__*/_jsxs("div", {
-    className: "listOrderItemBox",
-    children: [/*#__PURE__*/_jsx(ItemHeader, {}), /*#__PURE__*/_jsx(ItemView, {
-      label: "\u63D0\u4EA4\u65F6\u95F4",
-      value: moment(transData.created).format('YYYY-MM-DD HH:mm:ss')
-    }, "created"), /*#__PURE__*/_jsx(ItemView, {
-      label: "\u63D0\u4EA4\u5BA2\u670D",
-      value: transData.submitter
-    }, "submitter"), /*#__PURE__*/_jsx(ItemView, {
-      label: "\u5DE5\u5355\u72B6\u6001",
-      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
-    }, "flowStatus"), /*#__PURE__*/_jsx(ItemView, {
-      label: "\u5904\u7406\u5BA2\u670D",
-      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(ItemView, {
-      label: "\u5DE5\u5355\u7F16\u53F7",
-      value: transData.id
-    }, "id"), /*#__PURE__*/_jsx(Divider, {
-      dashed: true,
-      style: {
-        margin: '8px 0'
-      }
-    }), /*#__PURE__*/_jsx(ItemView, {
-      label: "\u5E97\u94FA\u540D\u79F0",
-      value: transData.shopName
-    }, "shopName"), filterComponentDtoList.map(function (t) {
-      var instance = factory(t.workOrderComponentType, {
-        id: t.uniqueKey,
-        name: t.name,
-        componentConfig: t.componentConfig
-      });
-      var subColumns = instance.getColumns(); // 复合组件存在多个字段展示
-
-      return subColumns !== null && subColumns !== void 0 && subColumns.children ? subColumns.children.map(function (item) {
-        return !isNull(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || '']) ? /*#__PURE__*/_jsx(ItemView, {
-          label: item.title,
-          value: item.render(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || ''], transData)
-        }, item.dataIndex) : null;
-      }) : !isNull(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || '']) ? /*#__PURE__*/_jsx(ItemView, {
-        label: t.name,
-        value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData)
-      }, t.uniqueKey) : null;
-    }), /*#__PURE__*/_jsx(Divider, {
-      dashed: true,
-      style: {
-        margin: '8px 0'
-      }
-    }), !enabledTemplateList.includes(item.templateId) && /*#__PURE__*/_jsx(ItemActions, {})]
-  });
+  return /*#__PURE__*/React.createElement("div", {
+    className: "listOrderItemBox"
+  }, /*#__PURE__*/React.createElement(ItemHeader, null), /*#__PURE__*/React.createElement(ItemView, {
+    label: "\u63D0\u4EA4\u65F6\u95F4",
+    value: moment(transData.created).format('YYYY-MM-DD HH:mm:ss'),
+    key: "created"
+  }), /*#__PURE__*/React.createElement(ItemView, {
+    label: "\u63D0\u4EA4\u5BA2\u670D",
+    value: transData.submitter,
+    key: "submitter"
+  }), /*#__PURE__*/React.createElement(ItemView, {
+    label: "\u5904\u7406\u5BA2\u670D",
+    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('、'),
+    key: "handleList"
+  }), /*#__PURE__*/React.createElement(ItemView, {
+    label: "\u5DE5\u5355\u7F16\u53F7",
+    value: transData.id,
+    key: "id"
+  }), /*#__PURE__*/React.createElement(Divider, {
+    dashed: true,
+    style: {
+      margin: '8px 0'
+    }
+  }), filterComponentDtoList.map(function (t) {
+    var instance = factory(t.workOrderComponentType, {
+      id: t.uniqueKey,
+      name: t.name,
+      componentConfig: t.componentConfig
+    });
+    var subColumns = instance.getColumns(); // 复合组件存在多个字段展示
+
+    return subColumns !== null && subColumns !== void 0 && subColumns.children ? subColumns.children.map(function (item) {
+      return !isNull(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || '']) ? /*#__PURE__*/React.createElement(ItemView, {
+        label: item.title,
+        value: item.render(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || ''], transData),
+        key: item.dataIndex
+      }) : null;
+    }) : !isNull(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || '']) ? /*#__PURE__*/React.createElement(ItemView, {
+      label: t.name,
+      value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData),
+      key: t.uniqueKey
+    }) : null;
+  }), /*#__PURE__*/React.createElement(Divider, {
+    dashed: true,
+    style: {
+      margin: '8px 0'
+    }
+  }), /*#__PURE__*/React.createElement(ItemView, {
+    label: "\u4FEE\u6539\u65F6\u95F4",
+    value: moment(transData.update).format('YYYY-MM-DD HH:mm:ss'),
+    key: "update"
+  }), /*#__PURE__*/React.createElement(Divider, {
+    dashed: true,
+    style: {
+      margin: '8px 0'
+    }
+  }), !enabledTemplateList.includes(item.templateId) && /*#__PURE__*/React.createElement(ItemActions, null));
 }
 
 export default CustomizeWorkOrderCard;

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

@@ -5,7 +5,7 @@
   border: 1px solid #f2f2f2;
 }
 
-.orderItem {
+.customizeOrderItem {
   position: relative;
   display: flex;
   align-items: center;
@@ -38,7 +38,7 @@
       }
 
       .status {
-        margin-left: 8px;
+        margin-right: 8px;
         padding: 2px 4px;
         font-size: 12px;
         line-height: 16px;
@@ -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/CustomizeWorkOrderList/components/DealerSelectModal/index.js

@@ -13,7 +13,6 @@ import { debounce } from 'lodash';
 import { setSelectedUserList, setDealerModalVisible, setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
 import { selectorDealerModalVisible, selectorCompanyUserList, selectorSelectedCompanyUserList, selectorCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder/selector";
 import { appointTo } from "../../../../../model/servers/api";
-import { jsx as _jsx } from "react/jsx-runtime";
 
 var DealerSelectModal = function DealerSelectModal(_ref) {
   var onSuccess = _ref.onSuccess;
@@ -92,25 +91,24 @@ var DealerSelectModal = function DealerSelectModal(_ref) {
     };
   }();
 
-  return /*#__PURE__*/_jsx(Modal, {
+  return /*#__PURE__*/React.createElement(Modal, {
     title: "\u5DE5\u5355\u6307\u6D3E",
     visible: visible,
     okText: "\u786E\u5B9A",
     cancelText: "\u53D6\u6D88",
     onCancel: handleCancel,
-    onOk: debounce(handleAppointTo, 300),
-    children: /*#__PURE__*/_jsx(Select, {
-      mode: "multiple",
-      allowClear: true,
-      style: {
-        width: '100%'
-      },
-      placeholder: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA",
-      onChange: handleChange,
-      value: selectedCompanyUserList,
-      options: companyUserList
-    })
-  });
+    onOk: debounce(handleAppointTo, 300)
+  }, /*#__PURE__*/React.createElement(Select, {
+    mode: "multiple",
+    allowClear: true,
+    style: {
+      width: '100%'
+    },
+    placeholder: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA",
+    onChange: handleChange,
+    value: selectedCompanyUserList,
+    options: companyUserList
+  }));
 };
 
 export default DealerSelectModal;

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

@@ -24,8 +24,6 @@ import { useAppDispatch } from "../../../../../model/hooks";
 import { fetchDeleteWorkOrder } from "../../../../../model/workOrder";
 import { setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
 import { selectDeleteCustomizeWorkOrderModalVisible, selectorCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder/selector";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 
 var DeleteCustomizeOrderModal = function DeleteCustomizeOrderModal(_ref) {
   var submit = _ref.submit;
@@ -71,20 +69,16 @@ var DeleteCustomizeOrderModal = function DeleteCustomizeOrderModal(_ref) {
       }
     }, _callee, null, [[0, 7]]);
   })), [record]);
-  return /*#__PURE__*/_jsx(Modal, {
+  return /*#__PURE__*/React.createElement(Modal, {
     title: "\u5220\u9664\u5DE5\u5355",
     open: deleteCustomizeWorkOrderModalVisible,
     okText: "\u786E\u5B9A",
     cancelText: "\u53D6\u6D88",
     onOk: debounce(onDelete, 300),
-    onCancel: handleCancel,
-    children: /*#__PURE__*/_jsxs("div", {
-      children: [/*#__PURE__*/_jsx("span", {
-        className: "red",
-        children: "\u5220\u9664\u540E\u7684\u5DE5\u5355\u65E0\u6CD5\u6062\u590D"
-      }), "\uFF0C \u786E\u8BA4\u8981\u5220\u9664\u8BE5\u6761\u6570\u636E\u5417\uFF1F"]
-    })
-  });
+    onCancel: handleCancel
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", {
+    className: "red"
+  }, "\u5220\u9664\u540E\u7684\u5DE5\u5355\u65E0\u6CD5\u6062\u590D"), "\uFF0C \u786E\u8BA4\u8981\u5220\u9664\u8BE5\u6761\u6570\u636E\u5417\uFF1F"));
 };
 
 export default DeleteCustomizeOrderModal;