kmkf-work-order-service-component 0.1.2 → 0.1.4

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

@@ -21,12 +21,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-07 17:04:02
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-21 14:39:21
+ * @LastEditTime: 2022-10-25 11:26:29
  */
 import React from 'react';
 import { factory } from "../Widget";
 import { calcWorkOrderList } from "../../common/utils/tools";
-import { Modal, Divider, Popconfirm } from 'antd';
+import { Modal, Divider } from 'antd';
 import moment from 'moment';
 import { dealWorkOrder } from "../../model/servers/api";
 import { isEmpty } from 'lodash';
@@ -215,6 +215,24 @@ function ListOrderItem(props) {
           });
         }
       });
+    };
+
+    var deleteHandle = function deleteHandle(record) {
+      Modal.confirm({
+        title: '删除工单',
+        icon: null,
+        content: /*#__PURE__*/_jsxs("div", {
+          children: [/*#__PURE__*/_jsx("span", {
+            className: styles.red,
+            children: "\u5220\u9664\u540E\u7684\u5DE5\u5355\u65E0\u6CD5\u6062\u590D"
+          }), "\uFF0C \u786E\u8BA4\u8981\u5220\u9664\u8BE5\u6761\u6570\u636E\u5417\uFF1F"]
+        }),
+        okText: '确认',
+        cancelText: '取消',
+        onOk: function onOk() {
+          return onDelete(record);
+        }
+      });
     }; //转交
 
 
@@ -252,17 +270,12 @@ function ListOrderItem(props) {
           return onEdit(item);
         },
         children: "\u4FEE\u6539"
-      }), /*#__PURE__*/_jsx(Popconfirm, {
-        title: "\u5220\u9664\u5DE5\u5355\u540E\u5C06\u65E0\u6CD5\u6062\u590D\uFF0C\u786E\u8BA4\u8981\u5220\u9664\u8BE5\u6761\u6570\u636E\u5417\uFF1F",
-        onConfirm: function onConfirm() {
-          return onDelete(item);
+      }), /*#__PURE__*/_jsx("span", {
+        className: styles.orderItemOperate,
+        onClick: function onClick() {
+          return deleteHandle(item);
         },
-        okText: "\u786E\u5B9A",
-        cancelText: "\u53D6\u6D88",
-        children: /*#__PURE__*/_jsx("span", {
-          className: styles.orderItemOperate,
-          children: "\u5220\u9664"
-        })
+        children: "\u5220\u9664"
       }), /*#__PURE__*/_jsx("span", {
         className: styles.orderItemOperate,
         onClick: function onClick() {

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

@@ -1,7 +1,13 @@
 /// <reference types="react" />
 import './index.less';
+export declare enum PlatForm {
+    TB = "tb",
+    FXG = "fxg",
+    KS = "ks",
+    PDD = "pdd"
+}
 interface WorkOrderProps {
-    platform: string;
+    platform?: PlatForm;
     shopId?: string;
     buyerNick?: string;
     buyerId?: string;

package/dist/esm/WorkOrder/index.js

@@ -27,8 +27,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-21 14:47:07
+ * @LastEditors: litian
+ * @LastEditTime: 2022-10-25 13:33:56
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -59,6 +59,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Option = Select.Option;
 var RangePicker = DatePicker.RangePicker;
+export var PlatForm;
+
+(function (PlatForm) {
+  PlatForm["TB"] = "tb";
+  PlatForm["FXG"] = "fxg";
+  PlatForm["KS"] = "ks";
+  PlatForm["PDD"] = "pdd";
+})(PlatForm || (PlatForm = {}));
 
 var WorkOrder = function WorkOrder(props) {
   var platform = props.platform,
@@ -97,10 +105,7 @@ var WorkOrder = function WorkOrder(props) {
     }
   }, [buyerId]);
   useEffect(function () {
-    if (shopId != platformInfo.shopId) {
-      initHandle();
-    } //存储平台信息
-
+    initHandle(); //存储平台信息
 
     dispatch({
       type: 'global/setState',
@@ -114,7 +119,7 @@ var WorkOrder = function WorkOrder(props) {
         }
       }
     });
-  }, [platform, shopId, buyerNick, buyerId, orderNo]);
+  }, []);
 
   var initHandle = function initHandle() {
     dispatch(fetchQueryGroupCustomTemplate());
@@ -456,9 +461,9 @@ var OrderList = function OrderList(_ref) {
           alt: ""
         })
       })]
-    }), /*#__PURE__*/_jsx("main", {
+    }), /*#__PURE__*/_jsxs("main", {
       className: "custom_box_main",
-      children: orderList.length ? orderList.map(function (item) {
+      children: [orderList.length ? orderList.map(function (item) {
         return /*#__PURE__*/_jsx(ListOrderItem, {
           item: item,
           onEdit: onEdit,
@@ -477,20 +482,20 @@ var OrderList = function OrderList(_ref) {
             children: "\u6682\u65E0\u6570\u636E"
           })]
         })
-      })
-    }), total > 0 && /*#__PURE__*/_jsx("div", {
-      className: "custom_box_page",
-      children: /*#__PURE__*/_jsx(Pagination, {
-        showSizeChanger: false,
-        showQuickJumper: true,
-        showTotal: function showTotal(total) {
-          return "\u5171".concat(total, "\u6761");
-        },
-        current: customSearch.pageNo,
-        pageSize: customSearch.pageSize,
-        total: total,
-        onChange: onChangePage
-      })
+      }), total > 0 && /*#__PURE__*/_jsx("div", {
+        className: "custom_box_page",
+        children: /*#__PURE__*/_jsx(Pagination, {
+          showSizeChanger: false,
+          showQuickJumper: true,
+          showTotal: function showTotal(total) {
+            return "\u5171".concat(total, "\u6761");
+          },
+          current: customSearch.pageNo,
+          pageSize: customSearch.pageSize,
+          total: total,
+          onChange: onChangePage
+        })
+      })]
     }), /*#__PURE__*/_jsx(RecordLog, {
       ref: recordLogRef
     }), /*#__PURE__*/_jsx(TransferOrderModal, {
@@ -712,9 +717,9 @@ var PayOrderList = function PayOrderList(_ref5) {
           alt: ""
         })
       })]
-    }), /*#__PURE__*/_jsx("div", {
+    }), /*#__PURE__*/_jsxs("div", {
       className: "payment_box_main",
-      children: payOrderList.length ? payOrderList.map(function (item) {
+      children: [payOrderList.length ? payOrderList.map(function (item) {
         return /*#__PURE__*/_jsx(PayListOrderItem, {
           record: item,
           onRefresh: onSearch,
@@ -735,20 +740,20 @@ var PayOrderList = function PayOrderList(_ref5) {
             children: "\u6682\u65E0\u6570\u636E"
           })]
         })
-      })
-    }), /*#__PURE__*/_jsx("div", {
-      className: "custom_box_page",
-      children: /*#__PURE__*/_jsx(Pagination, {
-        showQuickJumper: true,
-        showSizeChanger: false,
-        showTotal: function showTotal(total) {
-          return "\u5171".concat(total, "\u6761");
-        },
-        current: paySearch.pageNo,
-        pageSize: paySearch.pageSize,
-        total: total,
-        onChange: onChangePage
-      })
+      }), /*#__PURE__*/_jsx("div", {
+        className: "custom_box_page",
+        children: /*#__PURE__*/_jsx(Pagination, {
+          showQuickJumper: true,
+          showSizeChanger: false,
+          showTotal: function showTotal(total) {
+            return "\u5171".concat(total, "\u6761");
+          },
+          current: paySearch.pageNo,
+          pageSize: paySearch.pageSize,
+          total: total,
+          onChange: onChangePage
+        })
+      })]
     }), /*#__PURE__*/_jsx(RecordModal, {
       ref: logRef
     }), /*#__PURE__*/_jsx(PayOrderModal, {

package/dist/esm/WorkOrder/index.less

@@ -1,6 +1,3 @@
-.order_container {
-  padding-bottom: 40px;
-}
 .order_header {
   padding: 16px 16px 0 16px;
 
@@ -62,6 +59,7 @@
     padding: 4px;
     overflow: auto;
     background-color: #fff;
+
     &:hover {
       height: 200px;
       box-shadow: 3px 3px 5px #eee;
@@ -140,7 +138,7 @@
   }
 
   .custom_box_main {
-    height: calc(100% - 273px);
+    height: calc(100vh - 273px);
     overflow: auto;
     background-color: #fafafa;
   }
@@ -162,8 +160,6 @@
   }
 
   .custom_box_page {
-    position: fixed;
-    bottom: 0px;
     display: flex;
     justify-content: flex-end;
     width: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -37,7 +37,7 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.6",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22",
     "@reduxjs/toolkit": "^1.8.5",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",