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

package/dist/esm/WorkOrder/index.js

@@ -28,18 +28,19 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
  * @LastEditors: litian
- * @LastEditTime: 2022-09-28 15:07:36
+ * @LastEditTime: 2022-10-12 17:04:02
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import Wrapper from "./components/Wrapper";
-import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, message } from 'antd';
+import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, Spin, message } from 'antd';
 import { useAppSelector, useAppDispatch } from "./model/hooks";
 import { fetchQueryGroupCustomTemplate, fetchQueryWorkOrder, fetchQueryCurrentCompanyUser, fetchQueryPaymentWorkOrderList } from "./model/workOrder";
-import openCustomizeWOrkOrder from "./components/CustomizeFormModal/wrap";
+import CustomizeFormModal from "./components/CustomizeFormModal";
+import PayOrderModal from "./components/PayListOrderItem/ModifyModal";
 import express from "./common/utils/express";
 import formatAddrData from "./common/utils/formatAddrData";
 import ListOrderItem from "./components/ListOrderItem";
@@ -47,14 +48,13 @@ import PayListOrderItem from "./components/PayListOrderItem";
 import RecordModal from "./components/PayListOrderItem/RecordModal";
 import RecordLog from "./components/RecordLog";
 import TransferOrderModal from "./components/TransferOrderModal";
-import openPaymentWOrkOrder from "./components/PayListOrderItem/wrap";
 import store from "./model/store";
 import { Provider } from 'react-redux';
 import { transferWorkOrder } from "./model/servers/api";
 import get from 'lodash/get';
 import refreshImg from "./common/imgs/refresh.png";
 import emptyImg from "./common/imgs/empty.png";
-import styles from "./index.module.less";
+import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Option = Select.Option;
@@ -72,65 +72,80 @@ var WorkOrder = function WorkOrder(props) {
 
     return (_state$global = state.global) === null || _state$global === void 0 ? void 0 : _state$global.platformInfo;
   });
+  var loading = useAppSelector(function (state) {
+    var _state$workOrder;
+
+    return (_state$workOrder = state.workOrder) === null || _state$workOrder === void 0 ? void 0 : _state$workOrder.loading;
+  });
 
   var _useState = useState('custom'),
       _useState2 = _slicedToArray(_useState, 2),
       tabActive = _useState2[0],
       setTabActive = _useState2[1];
 
-  var propsValue = useCallback(function () {
-    return {
-      platform: platform,
-      shopId: shopId,
-      buyerNick: buyerNick,
-      buyerId: buyerId,
-      orderNo: orderNo
-    };
-  }, [platform, shopId, buyerNick, buyerId, orderNo]);
   useEffect(function () {
-    // console.log('shopid---====', shopId, platformInfo.shopId);
-    console.log('propsValue', propsValue()); //存储平台信息
+    if (buyerId) {
+      dispatch({
+        type: 'workOrder/setIsBuyer',
+        payload: true
+      });
+    } else {
+      dispatch({
+        type: 'workOrder/setIsBuyer',
+        payload: false
+      });
+    }
+  }, [buyerId]);
+  useEffect(function () {
+    if (shopId != platformInfo.shopId) {
+      initHandle();
+    } //存储平台信息
+
 
     dispatch({
       type: 'global/setState',
       payload: {
-        platformInfo: _objectSpread({}, propsValue())
+        platformInfo: {
+          platform: platform,
+          shopId: shopId,
+          buyerNick: buyerNick,
+          buyerId: buyerId,
+          orderNo: orderNo
+        }
       }
     });
-    initHandle();
-  }, [propsValue]); // useEffect(() => {
-  //   initHandle();
-  // }, []);
+  }, [platform, shopId, buyerNick, buyerId, orderNo]);
 
   var initHandle = function initHandle() {
     dispatch(fetchQueryGroupCustomTemplate());
     dispatch(fetchQueryCurrentCompanyUser());
-    dispatch(fetchQueryPaymentWorkOrderList());
-    dispatch(fetchQueryWorkOrder());
     express.initData();
     formatAddrData.initData();
   };
 
-  return /*#__PURE__*/_jsxs(Wrapper, {
-    children: [/*#__PURE__*/_jsx("header", {
-      className: styles.order_header,
-      children: /*#__PURE__*/_jsxs("div", {
-        className: styles.order_header_tabs,
-        children: [/*#__PURE__*/_jsx("div", {
-          className: "".concat(styles.order_header_tabs_button, " ").concat(tabActive === 'custom' ? styles.active : ''),
-          onClick: function onClick() {
-            return setTabActive('custom');
-          },
-          children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
-        }), /*#__PURE__*/_jsx("div", {
-          className: "".concat(styles.order_header_tabs_button, " ").concat(styles.border_left, " ").concat(tabActive === 'payment' ? styles.active : ''),
-          onClick: function onClick() {
-            return setTabActive('payment');
-          },
-          children: "\u6253\u6B3E\u5DE5\u5355"
-        })]
-      })
-    }), OrderList(tabActive), PayOrderList(tabActive)]
+  return /*#__PURE__*/_jsx(Spin, {
+    spinning: loading,
+    children: /*#__PURE__*/_jsxs(Wrapper, {
+      children: [/*#__PURE__*/_jsx("header", {
+        className: "order_header",
+        children: /*#__PURE__*/_jsxs("div", {
+          className: "order_header_tabs",
+          children: [/*#__PURE__*/_jsx("div", {
+            className: "order_header_tabs_button ".concat(tabActive === 'custom' ? 'active' : ''),
+            onClick: function onClick() {
+              return setTabActive('custom');
+            },
+            children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
+          }), /*#__PURE__*/_jsx("div", {
+            className: "order_header_tabs_button border_left ".concat(tabActive === 'payment' ? 'active' : ''),
+            onClick: function onClick() {
+              return setTabActive('payment');
+            },
+            children: "\u6253\u6B3E\u5DE5\u5355"
+          })]
+        })
+      }), OrderList(tabActive), PayOrderList(tabActive)]
+    })
   });
 }; //工单列表
 
@@ -155,27 +170,12 @@ var OrderList = function OrderList(tabActive) {
   var platformInfo = useAppSelector(function (state) {
     return state.global.platformInfo;
   });
+  var buyerNick = platformInfo.buyerNick,
+      buyerId = platformInfo.buyerId;
   var isFirst = useRef(false);
-  var openCustomizeWOrkOrderModal = openCustomizeWOrkOrder({
-    shopList: shopList,
-    onSuccess: function onSuccess(_ref) {
-      var type = _ref.type;
-      onSearch();
-
-      if (type === 'ADD') {
-        dispatch({
-          type: 'global/setState',
-          payload: {
-            platformInfo: _objectSpread(_objectSpread({}, platformInfo), {}, {
-              orderNo: ''
-            })
-          }
-        });
-      }
-    }
-  });
   var recordLogRef = useRef();
   var transferRef = useRef();
+  var customizeFormRef = useRef();
   var dayList = [{
     name: '今日',
     value: 0
@@ -188,12 +188,12 @@ var OrderList = function OrderList(tabActive) {
   }, {
     name: '近30天',
     value: 29
-  }]; // useEffect(() => {
-  //   if (customSearch.tempSelect.length > 1) {
-  //     onSearch();
-  //   }
-  // }, [customSearch]);
-  //搜索
+  }];
+  useEffect(function () {
+    if (customSearch.tempSelect.length > 1) {
+      onSearch();
+    }
+  }, [customSearch, buyerNick, buyerId]); //搜索
 
   var onSearch = function onSearch() {
     dispatch(fetchQueryWorkOrder());
@@ -201,10 +201,12 @@ var OrderList = function OrderList(tabActive) {
 
 
   var upDateState = function upDateState(type, val) {
+    var _objectSpread2;
+
     dispatch({
       type: 'workOrder/setState',
       payload: {
-        customSearch: _objectSpread(_objectSpread({}, customSearch), {}, _defineProperty({}, type, val))
+        customSearch: _objectSpread(_objectSpread({}, customSearch), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, type, val), _defineProperty(_objectSpread2, "pageNo", 1), _objectSpread2))
       }
     });
   }; //分页
@@ -231,26 +233,23 @@ var OrderList = function OrderList(tabActive) {
 
 
   var openCustomForm = function openCustomForm(id) {
-    if (!platformInfo.buyerId) {
-      message.error('请选择用户');
-      return;
-    }
-
-    openCustomizeWOrkOrderModal({
+    customizeFormRef.current.openModal({
       templateId: id,
       shopId: platformInfo.shopId + '',
       orderNo: platformInfo.orderNo,
-      buyerId: platformInfo.buyerId
+      buyerId: platformInfo.buyerId,
+      buyerNick: platformInfo.buyerNick
     });
   }; //编辑
 
 
   var onEdit = function onEdit(item) {
-    openCustomizeWOrkOrderModal({
+    customizeFormRef.current.openModal({
       templateId: item.templateDetailDto.uniqueKey,
       record: item,
       shopId: item.shopId,
-      workOrderId: item.id
+      workOrderId: item.id,
+      buyerNick: platformInfo.buyerNick
     });
   }; //记录
 
@@ -265,7 +264,7 @@ var OrderList = function OrderList(tabActive) {
 
 
   var transCustomer = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, currentCustomer) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, currentCustomer) {
       var id, jsonMap, _record$templateDetai, componentDtoList, uniqueKey, params, workOrderStatusKey;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -307,19 +306,19 @@ var OrderList = function OrderList(tabActive) {
     }));
 
     return function transCustomer(_x, _x2) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
   return /*#__PURE__*/_jsxs("div", {
-    className: styles.custom_box,
+    className: "custom_box",
     style: {
       display: tabActive === 'custom' ? 'block' : 'none'
     },
     children: [/*#__PURE__*/_jsxs("div", {
-      className: styles.custom_box_header,
+      className: "custom_box_header",
       children: [/*#__PURE__*/_jsx(Cascader, {
-        className: styles.custom_box_header_cascader,
+        className: "custom_box_header_cascader",
         options: groupAllList,
         placeholder: "\u8BF7\u8F93\u5165\u6A21\u7248\u540D\u79F0",
         showSearch: true,
@@ -331,15 +330,15 @@ var OrderList = function OrderList(tabActive) {
             label: item.label,
             key: item.value + '',
             children: /*#__PURE__*/_jsx("div", {
-              className: styles.custom_temp_box,
+              className: "custom_temp_box",
               children: /*#__PURE__*/_jsx("div", {
-                className: styles.custom_temp_list,
+                className: "custom_temp_list",
                 children: /*#__PURE__*/_jsx(Space, {
                   size: [8, 8],
                   wrap: true,
                   children: item.children.map(function (t) {
                     return /*#__PURE__*/_jsx("div", {
-                      className: styles.custom_temp_list_button,
+                      className: "custom_temp_list_button",
                       onClick: function onClick() {
                         return openCustomForm(t.value);
                       },
@@ -356,11 +355,11 @@ var OrderList = function OrderList(tabActive) {
         }
       })]
     }), /*#__PURE__*/_jsxs("div", {
-      className: styles.custom_box_search,
+      className: "custom_box_search",
       children: [/*#__PURE__*/_jsxs("div", {
-        className: styles.custom_box_search_box,
+        className: "custom_box_search_box",
         children: [/*#__PURE__*/_jsx(Select, {
-          className: styles.custom_box_search_date,
+          className: "custom_box_search_date",
           value: customSearch.filterDay,
           onChange: function onChange(val) {
             return upDateState('filterDay', val);
@@ -372,7 +371,7 @@ var OrderList = function OrderList(tabActive) {
             }, item.name);
           })
         }), /*#__PURE__*/_jsx(Cascader, {
-          className: styles.custom_box_search_cascader,
+          className: "custom_box_search_cascader",
           options: groupAllList,
           showSearch: true,
           onChange: function onChange(val) {
@@ -381,15 +380,19 @@ var OrderList = function OrderList(tabActive) {
           value: customSearch.tempSelect,
           allowClear: false
         }), /*#__PURE__*/_jsx(Checkbox, {
-          className: styles.custom_box_search_buyer,
+          className: "custom_box_search_buyer",
           checked: customSearch.isBuyer,
           onChange: function onChange(e) {
-            return upDateState('isBuyer', e.target.checked);
+            if (!platformInfo.buyerId) {
+              return message.warning('请先选择买家，再查询工单!');
+            }
+
+            upDateState('isBuyer', e.target.checked);
           },
           children: "\u5F53\u524D\u4E70\u5BB6"
         })]
       }), /*#__PURE__*/_jsx("div", {
-        className: styles.custom_box_search_refresh,
+        className: "custom_box_search_refresh",
         onClick: onSearch,
         children: /*#__PURE__*/_jsx("img", {
           src: refreshImg,
@@ -397,7 +400,7 @@ var OrderList = function OrderList(tabActive) {
         })
       })]
     }), /*#__PURE__*/_jsx("main", {
-      className: styles.custom_box_main,
+      className: "custom_box_main",
       children: orderList.length ? orderList.map(function (item) {
         return ListOrderItem({
           item: item,
@@ -407,7 +410,7 @@ var OrderList = function OrderList(tabActive) {
           onTransfer: onTransfer
         });
       }) : /*#__PURE__*/_jsx("div", {
-        className: styles.custom_box_main_empty,
+        className: "custom_box_main_empty",
         children: /*#__PURE__*/_jsxs("div", {
           children: [/*#__PURE__*/_jsx("img", {
             src: emptyImg,
@@ -418,7 +421,7 @@ var OrderList = function OrderList(tabActive) {
         })
       })
     }), /*#__PURE__*/_jsx("div", {
-      className: styles.custom_box_page,
+      className: "custom_box_page",
       children: /*#__PURE__*/_jsx(Pagination, {
         showSizeChanger: false,
         showQuickJumper: true,
@@ -435,6 +438,24 @@ var OrderList = function OrderList(tabActive) {
     }), /*#__PURE__*/_jsx(TransferOrderModal, {
       ref: transferRef,
       handleTransCustomer: transCustomer
+    }), /*#__PURE__*/_jsx(CustomizeFormModal, {
+      ref: customizeFormRef,
+      shopList: shopList,
+      onSuccess: function onSuccess(_ref2) {
+        var type = _ref2.type;
+        onSearch();
+
+        if (type === 'ADD') {
+          dispatch({
+            type: 'global/setState',
+            payload: {
+              platformInfo: _objectSpread(_objectSpread({}, platformInfo), {}, {
+                orderNo: ''
+              })
+            }
+          });
+        }
+      }
     })]
   });
 }; //打款工单列表
@@ -459,7 +480,10 @@ var PayOrderList = function PayOrderList(tabActive) {
   var shopList = useAppSelector(function (state) {
     return state.workOrder.userInfo.shopList;
   });
+  var buyerNick = platformInfo.buyerNick,
+      buyerId = platformInfo.buyerId;
   var logRef = useRef();
+  var payOrderRef = useRef();
   var PAY_STATUS = [{
     value: '',
     label: '全部'
@@ -491,9 +515,10 @@ var PayOrderList = function PayOrderList(tabActive) {
     value: 'ALI_PAY_CLOSE',
     label: '打款关闭',
     color: 'rgba(156,156,156)'
-  }]; // useEffect(() => {
-  //   onSearch();
-  // }, [paySearch]);
+  }];
+  useEffect(function () {
+    onSearch();
+  }, [paySearch, buyerNick, buyerId]);
 
   var onSearch = function onSearch() {
     dispatch(fetchQueryPaymentWorkOrderList());
@@ -513,7 +538,7 @@ var PayOrderList = function PayOrderList(tabActive) {
   };
 
   var handleOpenModify = function handleOpenModify(record, type) {
-    openPaymentWOrkOrder(record, type, onSearch);
+    payOrderRef.current.openModal(record, type);
   }; //记录
 
 
@@ -523,33 +548,33 @@ var PayOrderList = function PayOrderList(tabActive) {
 
 
   var upDateState = function upDateState(type, value) {
-    // if(type === 'time'){
-    //   value = value.length ? [value[0].valueOf(), value[1].valueOf()]:[]
-    // }
+    var _objectSpread3;
+
     dispatch({
       type: 'workOrder/setState',
       payload: {
-        paySearch: _objectSpread(_objectSpread({}, paySearch), {}, _defineProperty({}, type, value))
+        paySearch: _objectSpread(_objectSpread({}, paySearch), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, type, value), _defineProperty(_objectSpread3, "pageNo", 1), _objectSpread3))
       }
     });
   };
 
   return /*#__PURE__*/_jsxs("div", {
-    className: styles.custom_box,
+    className: "custom_box",
     style: {
       display: tabActive === 'payment' ? 'block' : 'none'
     },
     children: [/*#__PURE__*/_jsx("div", {
-      className: styles.custom_box_header,
+      className: "custom_box_header",
       children: /*#__PURE__*/_jsx(Space, {
         size: [8, 8],
         wrap: true,
         children: /*#__PURE__*/_jsx("span", {
-          className: styles.custom_temp_list_button,
+          className: "custom_temp_list_button",
           onClick: function onClick() {
             var _shopList$find;
 
             return handleOpenModify({
+              buyerNick: platformInfo.buyerNick,
               buyerOpenUid: platformInfo.buyerId,
               shopId: platformInfo.shopId,
               shopName: (_shopList$find = shopList.find(function (item) {
@@ -562,11 +587,11 @@ var PayOrderList = function PayOrderList(tabActive) {
         })
       })
     }), /*#__PURE__*/_jsxs("div", {
-      className: "".concat(styles.custom_box_search, " ").concat(styles.pay_search),
+      className: "custom_box_search pay_search",
       children: [/*#__PURE__*/_jsxs("div", {
-        className: "".concat(styles.custom_box_search_box, " ").concat(styles.pay_search_box),
+        className: "custom_box_search_box pay_search_box",
         children: [/*#__PURE__*/_jsxs(Select, {
-          className: styles.custom_box_search_date,
+          className: "custom_box_search_date",
           value: paySearch.timeType,
           onChange: function onChange(val) {
             return upDateState('timeType', val);
@@ -582,7 +607,7 @@ var PayOrderList = function PayOrderList(tabActive) {
             children: "\u6253\u6B3E\u65F6\u95F4"
           })]
         }), /*#__PURE__*/_jsx(Select, {
-          className: styles.custom_box_search_cascader,
+          className: "custom_box_search_cascader",
           value: paySearch.workPayStatus,
           onChange: function onChange(val) {
             return upDateState('workPayStatus', val);
@@ -594,10 +619,14 @@ var PayOrderList = function PayOrderList(tabActive) {
             }, item.value);
           })
         }), /*#__PURE__*/_jsx(Checkbox, {
-          className: styles.custom_box_search_buyer,
+          className: "custom_box_search_buyer",
           checked: paySearch.isBuyer,
           onChange: function onChange(e) {
-            return upDateState('isBuyer', e.target.checked);
+            if (!platformInfo.buyerId) {
+              return message.warning('请先选择买家，再查询工单!');
+            }
+
+            upDateState('isBuyer', e.target.checked);
           },
           children: "\u5F53\u524D\u4E70\u5BB6"
         }), /*#__PURE__*/_jsx(RangePicker, {
@@ -609,7 +638,7 @@ var PayOrderList = function PayOrderList(tabActive) {
           }
         })]
       }), /*#__PURE__*/_jsx("div", {
-        className: styles.custom_box_search_refresh,
+        className: "custom_box_search_refresh",
         onClick: function onClick() {
           return onSearch();
         },
@@ -619,7 +648,7 @@ var PayOrderList = function PayOrderList(tabActive) {
         })
       })]
     }), /*#__PURE__*/_jsx("main", {
-      className: styles.payment_box_main,
+      className: "payment_box_main",
       children: payOrderList.length ? payOrderList.map(function (item) {
         return PayListOrderItem({
           record: item,
@@ -634,7 +663,7 @@ var PayOrderList = function PayOrderList(tabActive) {
           onLog: handleOpenLog
         });
       }) : /*#__PURE__*/_jsx("div", {
-        className: styles.custom_box_main_empty,
+        className: "custom_box_main_empty",
         children: /*#__PURE__*/_jsxs("div", {
           children: [/*#__PURE__*/_jsx("img", {
             src: emptyImg,
@@ -645,7 +674,7 @@ var PayOrderList = function PayOrderList(tabActive) {
         })
       })
     }), /*#__PURE__*/_jsx("div", {
-      className: styles.custom_box_page,
+      className: "custom_box_page",
       children: /*#__PURE__*/_jsx(Pagination, {
         showQuickJumper: true,
         showSizeChanger: false,
@@ -659,6 +688,9 @@ var PayOrderList = function PayOrderList(tabActive) {
       })
     }), /*#__PURE__*/_jsx(RecordModal, {
       ref: logRef
+    }), /*#__PURE__*/_jsx(PayOrderModal, {
+      ref: payOrderRef,
+      afterSuccessUpdateWorkOrder: onSearch
     })]
   });
 };

package/dist/esm/WorkOrder/{index.module.less → index.less}

@@ -56,11 +56,12 @@
     left: 0;
     z-index: 3;
     height: 70px;
+    padding: 4px;
     overflow: auto;
     background-color: #fff;
-
     &:hover {
       height: 200px;
+      box-shadow: 3px 3px 5px #eee;
     }
   }
 

package/dist/esm/WorkOrder/model/workOrder.d.ts

@@ -10,6 +10,7 @@ export interface WorkOrderState {
     customSearch: any;
     paySearch: any;
     templateDetails: any;
+    loading: boolean;
 }
 export declare const fetchQueryCurrentCompanyUser: any;
 export declare const fetchQueryGroupCustomTemplate: any;
@@ -20,6 +21,10 @@ export declare const workOrderSlice: import("@reduxjs/toolkit").Slice<any, {
         payload: any;
         type: string;
     }) => any;
+    setIsBuyer: (state: import("immer/dist/internal").WritableDraft<WorkOrderState>, action: {
+        payload: any;
+        type: string;
+    }) => void;
 }, "workOrder">;
 export declare const setState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
 declare const _default: import("redux").Reducer<any, import("redux").AnyAction>;