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

package/dist/esm/FormRender/index.js

@@ -683,23 +683,17 @@ var FormRender = function FormRender(props, ref) {
       }), /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread({
         form: form
       }, formProps), {}, {
-        children: [!templateId && /*#__PURE__*/_jsx("div", {
-          id: "templateCascader",
-          className: "templateCascader",
-          children: /*#__PURE__*/_jsx(Form.Item, {
-            label: "\u6A21\u677F\u540D\u79F0",
-            required: true,
-            children: /*#__PURE__*/_jsx(Cascader, {
-              options: templateList,
-              placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
-              showSearch: true,
-              value: templateIdState,
-              onChange: handleChangeTemplateId,
-              allowClear: false,
-              getPopupContainer: function getPopupContainer() {
-                return document.getElementById('templateCascader');
-              }
-            })
+        children: [!templateId && /*#__PURE__*/_jsx(Form.Item, {
+          label: "\u6A21\u677F\u540D\u79F0",
+          required: true,
+          children: /*#__PURE__*/_jsx(Cascader, {
+            popupClassName: "templateCascader",
+            options: templateList,
+            placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
+            showSearch: true,
+            value: templateIdState,
+            onChange: handleChangeTemplateId,
+            allowClear: false
           })
         }), isShowShopList && /*#__PURE__*/_jsx(ShopName, {
           shopList: shopList,

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.d.ts

@@ -2,7 +2,6 @@
 import './index.less';
 declare type OrderListProps = {
     tabActive: string;
-    shopId?: string | number;
 };
-declare const CustomizeWorkOrderList: ({ tabActive, shopId }: OrderListProps) => JSX.Element;
+declare const CustomizeWorkOrderList: ({ tabActive }: OrderListProps) => JSX.Element;
 export default CustomizeWorkOrderList;

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

@@ -78,7 +78,7 @@ var getTableData = function getTableData(_ref) {
       shopList = _ref.shopList,
       shopId = _ref.shopId;
   return function (_ref2, formData) {
-    var _shopList$find;
+    var _ref3, _ref3$find;
 
     var current = _ref2.current,
         pageSize = _ref2.pageSize;
@@ -89,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 = time[0] ? moment(time[0]).format('x') : undefined;
-      params.createdEndTime = time[1] ? moment(new Date(time[1]).getTime() + 24 * 60 * 60 * 1000 - 1000).format('x') : undefined;
+      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) {
@@ -103,9 +103,9 @@ var getTableData = function getTableData(_ref) {
 
     delete params.time; // time是moment类型的，监控上报的时侯，格式化报错了
 
-    var shopUniqueKey = (_shopList$find = shopList.find(function (item) {
+    var shopUniqueKey = (_ref3 = shopList || []) === null || _ref3 === void 0 ? void 0 : (_ref3$find = _ref3.find(function (item) {
       return item.shopId === shopId;
-    })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.uniqueKey;
+    })) === null || _ref3$find === void 0 ? void 0 : _ref3$find.uniqueKey;
 
     if (shopUniqueKey) {
       params.shopUniqueKeyList = [shopUniqueKey];
@@ -126,9 +126,8 @@ var getTableData = function getTableData(_ref) {
 }; //工单列表
 
 
-var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
-  var tabActive = _ref3.tabActive,
-      shopId = _ref3.shopId;
+var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
+  var tabActive = _ref4.tabActive;
   var dispatch = useAppDispatch();
 
   var _useState = useState(true),
@@ -167,7 +166,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(),
@@ -244,20 +244,14 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           })
         }), /*#__PURE__*/_jsx(Col, {
           span: 16,
-          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');
-                }
-              })
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "templateIdList",
+            children: /*#__PURE__*/_jsx(Cascader, {
+              popupClassName: "templateCascader",
+              options: groupAllList,
+              placeholder: "\u8BF7\u9009\u62E9\u6A21\u7248",
+              showSearch: true,
+              allowClear: false
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
@@ -404,7 +398,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,

package/dist/esm/WorkOrder/index.js

@@ -162,8 +162,7 @@ var WorkOrder = function WorkOrder(props) {
             })]
           })
         }), /*#__PURE__*/_jsx(OrderList, {
-          tabActive: tabActive,
-          shopId: shopId
+          tabActive: tabActive
         }), /*#__PURE__*/_jsx(PaymentWorkOrderList, {
           tabActive: tabActive
         })]

package/package.json

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