kmkf-work-order-service-component 0.4.0-alpha.3 → 0.4.0-alpha.30

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"), /*#__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;
   }

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

@@ -33,7 +33,7 @@ import StatusSelectModal from "./components/StatusSelectModal";
 import RecordLog from "./components/RecordLog";
 import emptyImg from "../../../common/imgs/empty.png";
 import { PlatForm } from "../../types";
-import { queryAllWorkOrderList } from "../../../model/servers/api";
+import { queryAllWorkOrderList, queryTemplateDetail } from "../../../model/servers/api";
 import FormRender from "../../../FormRender";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -74,8 +74,12 @@ var URL_MAPPING = {
 
 var getTableData = function getTableData(_ref) {
   var checkedBuyerId = _ref.checkedBuyerId,
-      buyerId = _ref.buyerId;
+      buyerId = _ref.buyerId,
+      shopList = _ref.shopList,
+      shopId = _ref.shopId;
   return function (_ref2, formData) {
+    var _ref3, _ref3$find;
+
     var current = _ref2.current,
         pageSize = _ref2.pageSize;
     var time = formData.time,
@@ -85,8 +89,8 @@ var getTableData = function getTableData(_ref) {
     var params = _objectSpread({}, formData);
 
     if ((time === null || time === void 0 ? void 0 : time.length) > 1) {
-      params.createdStartTime = moment(time[0]).format('YYYY-MM-DD');
-      params.createdEndTime = moment(time[1]).format('YYYY-MM-DD');
+      params.createdStartTime = time[0] ? moment(time[0]).startOf('day').valueOf() : undefined;
+      params.createdEndTime = time[1] ? moment(time[1]).endOf('day').valueOf() : undefined;
     }
 
     if ((templateIdList === null || templateIdList === void 0 ? void 0 : templateIdList.length) > 0) {
@@ -97,6 +101,16 @@ var getTableData = function getTableData(_ref) {
       params.buyerOpenUid = buyerId;
     }
 
+    delete params.time; // time是moment类型的，监控上报的时侯，格式化报错了
+
+    var shopUniqueKey = (_ref3 = shopList || []) === null || _ref3 === void 0 ? void 0 : (_ref3$find = _ref3.find(function (item) {
+      return item.shopId === shopId;
+    })) === null || _ref3$find === void 0 ? void 0 : _ref3$find.uniqueKey;
+
+    if (shopUniqueKey) {
+      params.shopUniqueKeyList = [shopUniqueKey];
+    }
+
     return queryAllWorkOrderList(URL_MAPPING[type], _objectSpread(_objectSpread({}, params), {}, {
       pageSize: pageSize,
       pageNo: current
@@ -112,8 +126,8 @@ var getTableData = function getTableData(_ref) {
 }; //工单列表
 
 
-var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
-  var tabActive = _ref3.tabActive;
+var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
+  var tabActive = _ref4.tabActive;
   var dispatch = useAppDispatch();
 
   var _useState = useState(true),
@@ -132,9 +146,17 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
       title = _useState6[0],
       setTitle = _useState6[1];
 
+  var _useState7 = useState(null),
+      _useState8 = _slicedToArray(_useState7, 2),
+      searchTemplateDetails = _useState8[0],
+      setSearchTemplateDetails = _useState8[1];
+
   var groupAllList = useAppSelector(function (state) {
     return state.workOrder.groupAllList;
   });
+  var enabledTemplateList = useAppSelector(function (state) {
+    return state.workOrder.enabledTemplateList;
+  });
   var shopList = useAppSelector(function (state) {
     return state.workOrder.userInfo.shopList;
   });
@@ -149,7 +171,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
   var buyerNick = platformInfo.buyerNick,
       buyerId = platformInfo.buyerId,
       platform = platformInfo.platform,
-      orderNo = platformInfo.orderNo;
+      orderNo = platformInfo.orderNo,
+      shopId = platformInfo.shopId;
   var formRenderRef = useRef();
 
   var _Form$useForm = Form.useForm(),
@@ -158,7 +181,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
 
   var callBackGetTableData = useCallback(getTableData({
     checkedBuyerId: currentBuyerChecked,
-    buyerId: buyerId
+    buyerId: buyerId,
+    shopList: shopList,
+    shopId: shopId
   }), [currentBuyerChecked, buyerId]);
 
   var _useAntdTable = useAntdTable(callBackGetTableData, {
@@ -185,6 +210,26 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
     dispatch(fetchAllComponentList);
   }, []);
 
+  var searchHandle = function searchHandle() {
+    var templateList = form.getFieldValue('templateIdList');
+
+    if (templateList && templateList.length) {
+      var tempId = templateList[templateList.length - 1];
+
+      if ((searchTemplateDetails === null || searchTemplateDetails === void 0 ? void 0 : searchTemplateDetails.uniqueKey) !== tempId) {
+        queryTemplateDetail({
+          uniqueKey: tempId
+        }).then(function (res) {
+          setSearchTemplateDetails(res === null || res === void 0 ? void 0 : res.data);
+          submit();
+        });
+      }
+    } else {
+      setSearchTemplateDetails(null);
+      submit();
+    }
+  };
+
   var searchForm = /*#__PURE__*/_jsxs("div", {
     children: [/*#__PURE__*/_jsx(Form, {
       form: form,
@@ -197,12 +242,22 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
         gutter: 24,
         children: [/*#__PURE__*/_jsx(Col, {
           span: 24,
-          children: /*#__PURE__*/_jsx(Form.Item, {
-            name: "time",
-            label: "\u63D0\u4EA4\u65F6\u95F4",
-            children: /*#__PURE__*/_jsx(RangePicker, {
-              placeholder: ['开始提交时间', '结束提交时间']
-            })
+          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: 12,
@@ -223,21 +278,15 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
-          span: 24,
-          children: /*#__PURE__*/_jsx("div", {
-            id: "templateCascader",
-            className: "templateCascader",
-            children: /*#__PURE__*/_jsx(Form.Item, {
-              name: "templateIdList",
-              children: /*#__PURE__*/_jsx(Cascader, {
-                options: groupAllList,
-                placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
-                showSearch: true,
-                allowClear: false,
-                getPopupContainer: function getPopupContainer() {
-                  return document.getElementById('templateCascader');
-                }
-              })
+          span: 12,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "templateIdList",
+            children: /*#__PURE__*/_jsx(Cascader, {
+              popupClassName: "templateCascader",
+              options: groupAllList,
+              placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
+              showSearch: true,
+              allowClear: true
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
@@ -255,7 +304,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
       children: [/*#__PURE__*/_jsxs("span", {
         children: [/*#__PURE__*/_jsx(Button, {
           type: "primary",
-          onClick: submit,
+          onClick: searchHandle,
           children: "\u67E5\u8BE2"
         }), /*#__PURE__*/_jsx(Button, {
           onClick: reset,
@@ -313,15 +362,18 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           children: "\u9ED8\u8BA4\u8FD130\u5929\u7684\u5168\u90E8\u5DE5\u5355"
         }), /*#__PURE__*/_jsx(Button, {
           type: "primary",
+          ghost: true,
           size: "small",
           onClick: handleClick,
-          children: "\u65B0\u5EFA\u5DE5\u5355"
+          children: "+\u65B0\u5EFA\u5DE5\u5355"
         })]
       }), searchForm, /*#__PURE__*/_jsx("main", {
         className: "custom_box_main custom_box_main_".concat(platform),
         children: dataSource.length > 0 ? dataSource.map(function (item) {
           return /*#__PURE__*/_jsx(CustomizeWorkOrderCard, {
-            item: item
+            item: item,
+            enabledTemplateList: enabledTemplateList,
+            singleTemplateDetails: searchTemplateDetails === null || searchTemplateDetails === void 0 ? void 0 : searchTemplateDetails.componentDtoList
           }, item.id);
         }) : /*#__PURE__*/_jsx("div", {
           className: "custom_box_main_empty",
@@ -383,7 +435,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           record: record,
           shopList: shopList,
           templateId: templateId ? [templateId] : undefined,
-          shopId: currentShopId,
+          shopId: currentShopId || platformInfo.shopId,
           orderNo: orderNo,
           buyerId: buyerId,
           buyerNick: buyerNick,
@@ -392,6 +444,16 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           onTemplateChange: function onTemplateChange(title) {
             return setTitle(title);
           },
+          formProps: {
+            labelCol: {
+              span: 6
+            },
+            wrapperCol: {
+              span: 18
+            },
+            className: 'customizeFormModalClassName'
+          },
+          isShowShopList: false,
           onFormSubmitSuccess: function onFormSubmitSuccess(val) {
             submit();
             handleCloseFormModal();

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

@@ -1,5 +1,12 @@
 .custom_box {
   // height: calc(100% - 58px);
+  :global(.ant-row) {
+    margin: 0 !important;
+  }
+
+  :global(.ant-col) {
+    padding: 0 !important;
+  }
   .top-tip {
     display: flex;
     flex-direction: row;
@@ -149,6 +156,7 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+    margin-bottom: 4px;
   }
   .action_collapse {
     padding-left: 8px;
@@ -163,10 +171,10 @@
     }
   }
   .open {
-    max-height: 400px;
+    max-height: 200px;
   }
   .close {
-    max-height: 80px;
+    max-height: 40px;
   }
 }
 
@@ -178,3 +186,86 @@
     text-overflow: ellipsis;
   }
 }
+
+.customizeFormModalClassName {
+  :global(.goods-uploaded-state) {
+    margin: 6px 0 5px 0;
+    padding-left: 7px;
+    font-size: 12px;
+  }
+
+  :global(.ant-picker) {
+    width: 100%;
+
+    box-shadow: none;
+    // background: #f2f3f5;
+    // border: none;
+
+    input {
+      &::placeholder {
+        color: #86909c;
+      }
+    }
+
+    &:hover {
+      border-color: #4583ff;
+    }
+  }
+
+  :global(.ant-radio-inner) {
+    background-color: #fff;
+  }
+
+  :global(.ant-select) {
+    width: 100% !important;
+
+    .ant-select-selector {
+      background: #f2f3f5 !important;
+    }
+  }
+
+  :global(.ant-form-item) {
+    margin-bottom: 8px;
+  }
+
+  :global(.ant-form-item .ant-form-item-label) {
+    padding: 0px;
+  }
+
+  :global(.ant-form-item-label) {
+    position: relative;
+    max-width: 100px;
+    overflow: initial;
+    color: rgba(0, 0, 0, 0.55);
+    font-size: 14px;
+    white-space: normal;
+    text-align: left;
+  }
+
+  :global(.form-item-label--index .ant-form-item-label label) {
+    text-align: left;
+  }
+
+  :global(.label-title--index) {
+    position: absolute;
+    color: #86909c;
+    font-family: 'PingFangSC-Semibold';
+  }
+
+  :global(.goods-title) {
+    color: #4e5969;
+    font-size: 12px;
+  }
+
+  :global(div.ant-form-item.invoice-title--basic label) {
+    padding-left: 0;
+    font-weight: normal;
+    font-family: 'PingFangSC-Regular';
+  }
+
+  :global(.payment-widgets--basic div.ant-form-item-label label) {
+    padding-left: 0;
+    font-weight: lighter;
+    font-family: 'PingFangSC-Regular';
+  }
+}

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