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

package/dist/esm/FormRender/index.js

@@ -253,7 +253,7 @@ var FormRender = function FormRender(props, ref) {
                 pdd: '拼多多',
                 jd: '京东',
                 xiaozhi: '小智',
-                pc: 'PC'
+                pc: '客服工作台'
               };
               _params = {
                 apiName: 'addWorkOrder',

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";
@@ -51,8 +52,8 @@ function CustomizeWorkOrderCard(props) {
     'HANDLER_INPUT', // 处理人
     'OPERATOR_INPUT', // 提交人
     'CREATED_DATETIME', // 创建时间
-    'SHOP_INPUT' // 店铺
-    ].includes(i.workOrderComponentType);
+    'SHOP_INPUT', // 店铺
+    'UPDATE_DATETIME'].includes(i.workOrderComponentType);
   });
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], filterComponentDtoList),
@@ -66,9 +67,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",
@@ -76,16 +81,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, '')
+      })]
     });
   };
 
@@ -221,6 +231,14 @@ function CustomizeWorkOrderCard(props) {
       style: {
         margin: '8px 0'
       }
+    }), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u4FEE\u6539\u65F6\u95F4",
+      value: moment(transData.update).format('YYYY-MM-DD HH:mm:ss')
+    }, "update"), /*#__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

@@ -253,7 +253,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
-          span: 16,
+          span: 12,
           children: /*#__PURE__*/_jsx(Form.Item, {
             name: "templateIdList",
             children: /*#__PURE__*/_jsx(Cascader, {
@@ -265,7 +265,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
-          span: 8,
+          span: 12,
           children: /*#__PURE__*/_jsx(Form.Item, {
             name: "workOrderId",
             children: /*#__PURE__*/_jsx(Input, {
@@ -337,6 +337,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
           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"

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

@@ -171,10 +171,10 @@
     }
   }
   .open {
-    max-height: 400px;
+    max-height: 200px;
   }
   .close {
-    max-height: 80px;
+    max-height: 40px;
   }
 }
 

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

@@ -17,7 +17,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 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 } from 'antd';
+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";
@@ -192,18 +192,26 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
           })
         }), /*#__PURE__*/_jsx(Col, {
           span: 8,
-          children: /*#__PURE__*/_jsx(Form.Item, {
-            name: "tid",
-            children: /*#__PURE__*/_jsx(Input, {
-              placeholder: "\u8BF7\u8F93\u5165\u8BA2\u5355\u7F16\u53F7"
+          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(Form.Item, {
-            name: "paymentOrderKey",
-            children: /*#__PURE__*/_jsx(Input, {
-              placeholder: "\u8BF7\u8F93\u5165\u5DE5\u5355\u7F16\u53F7"
+          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"
+              })
             })
           })
         })]
@@ -259,6 +267,7 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
       }), /*#__PURE__*/_jsx(Button, {
         type: "primary",
         size: "small",
+        ghost: true,
         style: {
           float: 'right'
         },

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

@@ -64,7 +64,7 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
             width: 32,
             src: imgResize(pic || ''),
             preview: {
-              src: pic
+              src: imgResize(pic || '', 0, 0)
             }
           })
         });

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/common/utils/tools.js

@@ -942,6 +942,11 @@ export var imgResize = function imgResize(url) {
   var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
   var h = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 60;
   var modifyUrl = url.startsWith('/') ? url : "/".concat(url);
+
+  if (w === 0 || h === 0) {
+    return "https://kefu.kuaimai.com".concat(modifyUrl);
+  }
+
   return "https://kefu.kuaimai.com".concat(modifyUrl, "?x-oss-process=image/resize,h_").concat(h, ",w_").concat(w);
 }; //重复校验数据映射字段
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.0-alpha.23",
+  "version": "0.4.0-alpha.25",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",