kmkf-work-order-service-component 0.4.0-alpha.8 → 0.4.0

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

@@ -19,6 +19,7 @@ declare type FormRenderProps = {
     platform?: string;
     templateList?: Option[];
     formProps?: FormProps;
+    isShowShopList: boolean;
     onTemplateChange?: (p: string) => any;
     onFormSubmitSuccess?: <T>(p: T) => void;
 };

package/dist/esm/FormRender/index.js

@@ -38,6 +38,8 @@ import zhCN from 'antd/es/locale/zh_CN';
 import { get, find, some, set, last } from 'lodash';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, submitDataTransOldFormat, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME } from "../common/utils/tools";
+import express from "../common/utils/express";
+import formatAddrData from "../common/utils/formatAddrData";
 import { queryTemplateDetail, addWorkOrder, queryWorkOrderDetail, updateWorkOrder, replaceCheck } from "../model/servers/api";
 import { getPlatList } from "../model/customizeWorkOrder/api";
 import { factory } from "../WorkOrder/components/Widget";
@@ -91,6 +93,7 @@ var FormRender = function FormRender(props, ref) {
       templateList = props.templateList,
       onFormSubmitSuccess = props.onFormSubmitSuccess,
       onTemplateChange = props.onTemplateChange,
+      isShowShopList = props.isShowShopList,
       _props$formProps = props.formProps,
       formProps = _props$formProps === void 0 ? {} : _props$formProps;
 
@@ -133,15 +136,18 @@ var FormRender = function FormRender(props, ref) {
       setPlatIcon = _useState14[1];
 
   useEffect(function () {
-    if (!currentShopId) {
+    express.initData();
+    formatAddrData.initData();
+  }, []);
+  useEffect(function () {
+    setShopId(currentShopId);
+
+    if (isShowShopList) {
       getPlatList().then(function (list) {
         return setPlatIcon(list);
       });
     }
-  }, [currentShopId]);
-  useEffect(function () {
-    setShopId(currentShopId);
-  }, [currentShopId]);
+  }, [currentShopId, isShowShopList]);
 
   var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -180,27 +186,35 @@ var FormRender = function FormRender(props, ref) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
-              debugger;
-              _context.next = 4;
+
+              if (templateIdState) {
+                _context.next = 3;
+                break;
+              }
+
+              return _context.abrupt("return", message.error('请先选择模板，再进行提交'));
+
+            case 3:
+              _context.next = 5;
               return form.validateFields();
 
-            case 4:
+            case 5:
               data = _context.sent;
               console.debug('表单内容', data);
               console.debug('templateDetail内容', templateDetail);
               res = verifyHandle(data, templateDetail);
 
               if (res.success) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
 
               message.error(res.message);
               return _context.abrupt("return");
 
-            case 11:
+            case 12:
               if (!workOrderId) {
-                _context.next = 23;
+                _context.next = 24;
                 break;
               }
 
@@ -220,10 +234,10 @@ var FormRender = function FormRender(props, ref) {
               params.workOrderUpdateKeyVos.workOrderUpdateKeySupVos = submitData.reduce(function (nex, cur) {
                 return nex.concat(cur === null || cur === void 0 ? void 0 : cur.contentVoList);
               }, []);
-              _context.next = 17;
+              _context.next = 18;
               return updateWorkOrder(params);
 
-            case 17:
+            case 18:
               _yield$updateWorkOrde = _context.sent;
               success = _yield$updateWorkOrde.success;
               result = _yield$updateWorkOrde.data;
@@ -237,10 +251,10 @@ var FormRender = function FormRender(props, ref) {
                 });
               }
 
-              _context.next = 36;
+              _context.next = 37;
               break;
 
-            case 23:
+            case 24:
               platformMap = {
                 tb: '淘宝',
                 fxg: '抖音',
@@ -248,7 +262,7 @@ var FormRender = function FormRender(props, ref) {
                 pdd: '拼多多',
                 jd: '京东',
                 xiaozhi: '小智',
-                pc: 'PC'
+                pc: '客服工作台'
               };
               _params = {
                 apiName: 'addWorkOrder',
@@ -285,10 +299,10 @@ var FormRender = function FormRender(props, ref) {
               }
 
               console.debug('增加数据参数', _params);
-              _context.next = 32;
+              _context.next = 33;
               return addWorkOrder(_params);
 
-            case 32:
+            case 33:
               _yield$addWorkOrder = _context.sent;
               _success = _yield$addWorkOrder.success;
               _result = _yield$addWorkOrder.data;
@@ -301,13 +315,13 @@ var FormRender = function FormRender(props, ref) {
                 });
               }
 
-            case 36:
+            case 37:
               console.groupEnd();
-              _context.next = 42;
+              _context.next = 43;
               break;
 
-            case 39:
-              _context.prev = 39;
+            case 40:
+              _context.prev = 40;
               _context.t0 = _context["catch"](0);
 
               // 表单校验失败错误时，将错误第一项滚动到可视区域
@@ -323,12 +337,12 @@ var FormRender = function FormRender(props, ref) {
                 }, 0);
               }
 
-            case 42:
+            case 43:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 39]]);
+      }, _callee, null, [[0, 40]]);
     }));
 
     return function asyncDoSave(_x, _x2) {
@@ -338,12 +352,12 @@ var FormRender = function FormRender(props, ref) {
 
   var handleSubmit = useCallback(function () {
     return asyncDoSave(workOrderDetail, templateDetail);
-  }, [workOrderDetail, templateDetail]);
+  }, [workOrderDetail, templateDetail, shopId, workOrderId, templateIdState]);
   useImperativeHandle(ref, function () {
     return {
       save: handleSubmit
     };
-  }, [workOrderDetail, templateDetail]); //带*参数提示清空
+  }, [handleSubmit]); //带*参数提示清空
 
   var filterStarValues = function filterStarValues() {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -628,6 +642,47 @@ var FormRender = function FormRender(props, ref) {
   }(); // 切换店铺
 
 
+  var handleChangeShopId = function handleChangeShopId(val) {
+    var _templateDetail$compo3, _templateDetail$compo4;
+
+    setShopId(val); // 清空表单字段
+
+    var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
+      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+        cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
+      }
+
+      return cur;
+    }, []);
+    form.resetFields(needClearFormFields); //切换店铺时，判断是否有订单号 有订单号自动订单返填
+
+    var allValue = form.getFieldsValue();
+    var tradeIdUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo3 = templateDetail.componentDtoList.find(function (item) {
+      return item.workOrderComponentType === 'TRADE_ID_INPUT';
+    })) === null || _templateDetail$compo3 === void 0 ? void 0 : _templateDetail$compo3.uniqueKey;
+    var paymentUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo4 = templateDetail.componentDtoList.find(function (item) {
+      return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
+    })) === null || _templateDetail$compo4 === void 0 ? void 0 : _templateDetail$compo4.uniqueKey;
+
+    if (tradeIdUniqueKey || paymentUniqueKey) {
+      var _allValue$paymentUniq;
+
+      var tradeValue = allValue[tradeIdUniqueKey];
+      var paymentValue = (_allValue$paymentUniq = allValue[paymentUniqueKey]) === null || _allValue$paymentUniq === void 0 ? void 0 : _allValue$paymentUniq.enterprisePaymentTid;
+
+      if (tradeValue || paymentValue) {
+        orderBack({
+          order_no: tradeValue || paymentValue,
+          form: form,
+          shopId: val,
+          shopList: shopList,
+          templateDetail: templateDetail,
+          callback: orderBackReplace
+        });
+      }
+    }
+  };
+
   var newRenderColumnItem = function newRenderColumnItem(effects) {
     return function (item) {
       if (look) {
@@ -682,6 +737,7 @@ var FormRender = function FormRender(props, ref) {
           label: "\u6A21\u677F\u540D\u79F0",
           required: true,
           children: /*#__PURE__*/_jsx(Cascader, {
+            popupClassName: "templateCascader",
             options: templateList,
             placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
             showSearch: true,
@@ -689,12 +745,12 @@ var FormRender = function FormRender(props, ref) {
             onChange: handleChangeTemplateId,
             allowClear: false
           })
-        }), !currentShopId && /*#__PURE__*/_jsx(ShopName, {
+        }), isShowShopList && /*#__PURE__*/_jsx(ShopName, {
           shopList: shopList,
           platIconList: platIcon,
           workOrderId: workOrderId,
           look: look,
-          handleChangeShopId: setShopId
+          handleChangeShopId: handleChangeShopId
         }), finalFormItems]
       }))]
     })

package/dist/esm/SingleShopWorkOrder/components/Card/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/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";
@@ -38,13 +39,26 @@ 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;
+  var item = props.item,
+      enabledTemplateList = props.enabledTemplateList,
+      singleTemplateDetails = props.singleTemplateDetails;
   var dispatch = useAppDispatch();
   var componentDtoList = useAppSelector(selectorAllTemplateList);
+  var filterComponentDtoList = singleTemplateDetails || componentDtoList.filter(function (i) {
+    return !['WORK_ORDER_ID_INPUT', // 工单ID
+    'TEMPLATE_ID_INPUT', // 模板Id
+    'FLOW_STATUS_SELECT', // 工单状态
+    'HANDLER_INPUT', // 处理人
+    'OPERATOR_INPUT', // 提交人
+    'CREATED_DATETIME', // 创建时间
+    'SHOP_INPUT', // 店铺
+    'UPDATE_DATETIME', 'COMPLETED_DATETIME' // 完成时间
+    ].includes(i.workOrderComponentType);
+  });
 
-  var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], componentDtoList),
+  var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], filterComponentDtoList),
       _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
       transData = _calcWorkOrderList2[0]; //列表头部
 
@@ -55,9 +69,13 @@ function CustomizeWorkOrderCard(props) {
     var templateName = item.templateName,
         flowStatus = item.flowStatus,
         jsonMap = item.jsonMap;
-    return /*#__PURE__*/_jsx("div", {
-      className: "orderItem",
-      children: /*#__PURE__*/_jsx("div", {
+    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__*/_jsxs("div", {
+      className: "customizeOrderItem",
+      children: [/*#__PURE__*/_jsx("div", {
         className: "orderItemLeft",
         children: /*#__PURE__*/_jsxs("div", {
           className: "orderItemType",
@@ -65,16 +83,21 @@ function CustomizeWorkOrderCard(props) {
             className: "orderItemLeftIcon"
           }), /*#__PURE__*/_jsxs("div", {
             className: "orderItemLeftName",
-            children: [templateName, flowStatus && /*#__PURE__*/_jsx("span", {
+            children: [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
-            })]
+            }), templateName]
           })]
         })
-      })
+      }), hasPaymentStatus && get(jsonMap, hasPaymentStatus, '') && /*#__PURE__*/_jsx("div", {
+        style: {
+          fontWeight: 600
+        },
+        children: get(jsonMap, hasPaymentStatus, '')
+      })]
     });
   };
 
@@ -154,9 +177,8 @@ function CustomizeWorkOrderCard(props) {
 
   var ItemView = function ItemView(_ref) {
     var label = _ref.label,
-        value = _ref.value,
-        key = _ref.key;
-    return /*#__PURE__*/_jsxs("div", {
+        value = _ref.value;
+    return value ? /*#__PURE__*/_jsxs("div", {
       className: "orderItemView",
       children: [/*#__PURE__*/_jsxs("div", {
         className: "itemViewLeft",
@@ -165,7 +187,7 @@ function CustomizeWorkOrderCard(props) {
         className: "itemViewRight",
         children: value
       })]
-    }, key);
+    }) : null;
   };
 
   return /*#__PURE__*/_jsxs("div", {
@@ -177,22 +199,19 @@ function CustomizeWorkOrderCard(props) {
       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(Divider, {
+    }, "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"), componentDtoList.map(function (t) {
+    }), filterComponentDtoList.map(function (t) {
       var instance = factory(t.workOrderComponentType, {
         id: t.uniqueKey,
         name: t.name,
@@ -214,7 +233,21 @@ function CustomizeWorkOrderCard(props) {
       style: {
         margin: '8px 0'
       }
-    }), /*#__PURE__*/_jsx(ItemActions, {})]
+    }), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u4FEE\u6539\u65F6\u95F4",
+      value: moment(transData.update).format('YYYY-MM-DD HH:mm:ss')
+    }, "update"), transData.completedTime && /*#__PURE__*/_jsx(ItemView, {
+      label: "\u5B8C\u6210\u65F6\u95F4",
+      value: moment(transData.completedTime).format('YYYY-MM-DD HH:mm:ss')
+    }, "completedTime"), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u5B8C\u6210\u4EBA",
+      value: transData.completedUserName
+    }, "completedUserName"), /*#__PURE__*/_jsx(Divider, {
+      dashed: true,
+      style: {
+        margin: '8px 0'
+      }
+    }), !enabledTemplateList.includes(item.templateId) && /*#__PURE__*/_jsx(ItemActions, {})]
   });
 }
 

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;
   }