kmkf-work-order-service-component 0.0.1-alpha.1 → 0.0.1-alpha.10

package/dist/esm/WorkOrder/index.js

@@ -27,27 +27,18 @@ 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-09-16 14:34:02
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-28 16:36:33
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
-
-/*
- * @Description:
- * @Author: litian
- * @Date: 2022-09-05 17:07:31
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 11:36:15
- */
 import React, { useState, useEffect, useRef } from 'react';
 import Wrapper from "./components/Wrapper";
-import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, Modal } from 'antd';
+import { Tabs, Select, Pagination, Cascader, DatePicker, Space, Checkbox, message } from 'antd';
 import { useAppSelector, useAppDispatch } from "./model/hooks";
 import { fetchQueryGroupCustomTemplate, fetchQueryWorkOrder, fetchQueryCurrentCompanyUser, fetchQueryPaymentWorkOrderList } from "./model/workOrder";
-import { fetchLogOut } from "./model/login";
 import openCustomizeWOrkOrder from "./components/CustomizeFormModal/wrap";
 import express from "./common/utils/express";
 import formatAddrData from "./common/utils/formatAddrData";
@@ -61,7 +52,8 @@ import store from "./model/store";
 import { Provider } from 'react-redux';
 import { transferWorkOrder } from "./model/servers/api";
 import get from 'lodash/get';
-import refresh from "./common/imgs/refresh.png";
+import refreshImg from "./common/imgs/refresh.png";
+import emptyImg from "./common/imgs/empty.png";
 import styles from "./index.module.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -87,7 +79,7 @@ var WorkOrder = function WorkOrder(props) {
       setTabActive = _useState2[1];
 
   useEffect(function () {
-    if (shopId !== platformInfo.shopId) {
+    if (shopId != platformInfo.shopId) {
       initHandle();
     } //存储平台信息
 
@@ -103,11 +95,8 @@ var WorkOrder = function WorkOrder(props) {
           orderNo: orderNo
         }
       }
-    }); // Reminder()
+    });
   }, [platform, shopId, buyerNick, buyerId, orderNo]);
-  useEffect(function () {
-    initHandle();
-  }, []);
 
   var initHandle = function initHandle() {
     dispatch(fetchQueryGroupCustomTemplate());
@@ -116,36 +105,6 @@ var WorkOrder = function WorkOrder(props) {
     formatAddrData.initData();
   };
 
-  var Footer = function Footer() {
-    var dispatch = useAppDispatch();
-
-    var open = function open(url) {
-      window.open(url);
-    };
-
-    var loginOut = function loginOut() {
-      Modal.confirm({
-        title: '退出',
-        content: '您确定要退出快麦工单吗？',
-        icon: null,
-        onOk: function onOk() {
-          dispatch(fetchLogOut());
-        }
-      });
-    };
-
-    return /*#__PURE__*/_jsx("footer", {
-      className: styles.footer,
-      children: /*#__PURE__*/_jsx("div", {
-        className: styles.footer_button,
-        onClick: function onClick() {
-          return loginOut();
-        },
-        children: "\u9000\u51FA"
-      })
-    });
-  };
-
   return /*#__PURE__*/_jsxs(Wrapper, {
     children: [/*#__PURE__*/_jsx("header", {
       className: styles.order_header,
@@ -165,7 +124,7 @@ var WorkOrder = function WorkOrder(props) {
           children: "\u6253\u6B3E\u5DE5\u5355"
         })]
       })
-    }), OrderList(tabActive), PayOrderList(tabActive), Footer()]
+    }), OrderList(tabActive), PayOrderList(tabActive)]
   });
 }; //工单列表
 
@@ -190,10 +149,25 @@ 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() {
-      return onSearch();
+    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();
@@ -212,8 +186,10 @@ var OrderList = function OrderList(tabActive) {
     value: 29
   }];
   useEffect(function () {
-    onSearch();
-  }, [customSearch]); //搜索
+    if (customSearch.tempSelect.length > 1) {
+      onSearch();
+    }
+  }, [customSearch, buyerNick, buyerId]); //搜索
 
   var onSearch = function onSearch() {
     dispatch(fetchQueryWorkOrder());
@@ -251,10 +227,16 @@ var OrderList = function OrderList(tabActive) {
 
 
   var openCustomForm = function openCustomForm(id) {
-    console.log(platformInfo);
+    if (!platformInfo.buyerId) {
+      message.error('请选择用户');
+      return;
+    }
+
     openCustomizeWOrkOrderModal({
       templateId: id,
-      shopId: platformInfo.shopId + ''
+      shopId: platformInfo.shopId + '',
+      orderNo: platformInfo.orderNo,
+      buyerId: platformInfo.buyerId
     });
   }; //编辑
 
@@ -274,20 +256,18 @@ var OrderList = function OrderList(tabActive) {
   };
 
   var onTransfer = function onTransfer(item) {
-    console.log(item);
     transferRef.current.openModal(item);
   }; //转交客服
 
 
   var transCustomer = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, currentCustomer) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, currentCustomer) {
       var id, jsonMap, _record$templateDetai, componentDtoList, uniqueKey, params, workOrderStatusKey;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              console.log(record);
               id = record.id, jsonMap = record.jsonMap, _record$templateDetai = record.templateDetailDto, componentDtoList = _record$templateDetai.componentDtoList, uniqueKey = _record$templateDetai.uniqueKey;
               params = {};
               params.uniqueKey = uniqueKey;
@@ -303,13 +283,18 @@ var OrderList = function OrderList(tabActive) {
                 }]
               }];
               transferWorkOrder(params).then(function (res) {
-                var _transferRef$current;
+                var success = res.success;
 
-                transferRef === null || transferRef === void 0 ? void 0 : (_transferRef$current = transferRef.current) === null || _transferRef$current === void 0 ? void 0 : _transferRef$current.closeModal();
-                onSearch();
+                if (success) {
+                  var _transferRef$current;
+
+                  transferRef === null || transferRef === void 0 ? void 0 : (_transferRef$current = transferRef.current) === null || _transferRef$current === void 0 ? void 0 : _transferRef$current.closeModal();
+                  onSearch();
+                  message.success('转交成功');
+                }
               });
 
-            case 7:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -318,7 +303,7 @@ var OrderList = function OrderList(tabActive) {
     }));
 
     return function transCustomer(_x, _x2) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
@@ -340,7 +325,7 @@ var OrderList = function OrderList(tabActive) {
         items: groupAllList.map(function (item) {
           return {
             label: item.label,
-            key: item.value,
+            key: item.value + '',
             children: /*#__PURE__*/_jsx("div", {
               className: styles.custom_temp_box,
               children: /*#__PURE__*/_jsx("div", {
@@ -355,53 +340,61 @@ var OrderList = function OrderList(tabActive) {
                         return openCustomForm(t.value);
                       },
                       children: t.label
-                    }, t.value);
+                    }, item.value + t.value + '');
                   })
                 })
               })
             }, item.value)
           };
-        })
+        }),
+        getPopupContainer: function getPopupContainer(triggerNode) {
+          return triggerNode.parentNode;
+        }
       })]
     }), /*#__PURE__*/_jsxs("div", {
       className: styles.custom_box_search,
-      children: [/*#__PURE__*/_jsx(Select, {
-        className: styles.custom_box_search_date,
-        value: customSearch.filterDay,
-        onChange: function onChange(val) {
-          return upDateState('filterDay', val);
-        },
-        children: dayList.map(function (item) {
-          return /*#__PURE__*/_jsx(Option, {
-            value: item.value,
-            children: item.name
-          }, item.name);
-        })
-      }), /*#__PURE__*/_jsx(Cascader, {
-        className: styles.custom_box_search_cascader,
-        options: groupAllList,
-        showSearch: true,
-        onChange: function onChange(val) {
-          return upDateState('tempSelect', val);
-        },
-        value: customSearch.tempSelect
-      }), /*#__PURE__*/_jsx(Checkbox, {
-        checked: customSearch.isBuyer,
-        onChange: function onChange(e) {
-          return upDateState('isBuyer', e.target.checked);
-        },
-        children: "\u5F53\u524D\u4E70\u5BB6"
+      children: [/*#__PURE__*/_jsxs("div", {
+        className: styles.custom_box_search_box,
+        children: [/*#__PURE__*/_jsx(Select, {
+          className: styles.custom_box_search_date,
+          value: customSearch.filterDay,
+          onChange: function onChange(val) {
+            return upDateState('filterDay', val);
+          },
+          children: dayList.map(function (item) {
+            return /*#__PURE__*/_jsx(Option, {
+              value: item.value,
+              children: item.name
+            }, item.name);
+          })
+        }), /*#__PURE__*/_jsx(Cascader, {
+          className: styles.custom_box_search_cascader,
+          options: groupAllList,
+          showSearch: true,
+          onChange: function onChange(val) {
+            return upDateState('tempSelect', val);
+          },
+          value: customSearch.tempSelect,
+          allowClear: false
+        }), /*#__PURE__*/_jsx(Checkbox, {
+          className: styles.custom_box_search_buyer,
+          checked: customSearch.isBuyer,
+          onChange: function onChange(e) {
+            return upDateState('isBuyer', e.target.checked);
+          },
+          children: "\u5F53\u524D\u4E70\u5BB6"
+        })]
       }), /*#__PURE__*/_jsx("div", {
         className: styles.custom_box_search_refresh,
         onClick: onSearch,
         children: /*#__PURE__*/_jsx("img", {
-          src: refresh,
+          src: refreshImg,
           alt: ""
         })
       })]
     }), /*#__PURE__*/_jsx("main", {
       className: styles.custom_box_main,
-      children: orderList.map(function (item) {
+      children: orderList.length ? orderList.map(function (item) {
         return ListOrderItem({
           item: item,
           onEdit: onEdit,
@@ -409,6 +402,16 @@ var OrderList = function OrderList(tabActive) {
           onRefresh: onSearch,
           onTransfer: onTransfer
         });
+      }) : /*#__PURE__*/_jsx("div", {
+        className: styles.custom_box_main_empty,
+        children: /*#__PURE__*/_jsxs("div", {
+          children: [/*#__PURE__*/_jsx("img", {
+            src: emptyImg,
+            alt: ""
+          }), /*#__PURE__*/_jsx("p", {
+            children: "\u6682\u65E0\u6570\u636E"
+          })]
+        })
       })
     }), /*#__PURE__*/_jsx("div", {
       className: styles.custom_box_page,
@@ -444,6 +447,16 @@ var PayOrderList = function PayOrderList(tabActive) {
   var paySearch = useAppSelector(function (state) {
     return state.workOrder.paySearch;
   });
+  var platformInfo = useAppSelector(function (state) {
+    var _state$global2;
+
+    return (_state$global2 = state.global) === null || _state$global2 === void 0 ? void 0 : _state$global2.platformInfo;
+  });
+  var shopList = useAppSelector(function (state) {
+    return state.workOrder.userInfo.shopList;
+  });
+  var buyerNick = platformInfo.buyerNick,
+      buyerId = platformInfo.buyerId;
   var logRef = useRef();
   var PAY_STATUS = [{
     value: '',
@@ -479,10 +492,9 @@ var PayOrderList = function PayOrderList(tabActive) {
   }];
   useEffect(function () {
     onSearch();
-  }, [paySearch]);
+  }, [paySearch, buyerNick, buyerId]);
 
   var onSearch = function onSearch() {
-    console.log('onSearch');
     dispatch(fetchQueryPaymentWorkOrderList());
   }; //分页搜索
 
@@ -510,6 +522,9 @@ var PayOrderList = function PayOrderList(tabActive) {
 
 
   var upDateState = function upDateState(type, value) {
+    // if(type === 'time'){
+    //   value = value.length ? [value[0].valueOf(), value[1].valueOf()]:[]
+    // }
     dispatch({
       type: 'workOrder/setState',
       payload: {
@@ -531,74 +546,102 @@ var PayOrderList = function PayOrderList(tabActive) {
         children: /*#__PURE__*/_jsx("span", {
           className: styles.custom_temp_list_button,
           onClick: function onClick() {
-            return handleOpenModify({}, 'add');
+            var _shopList$find;
+
+            return handleOpenModify({
+              buyerOpenUid: platformInfo.buyerId,
+              shopId: platformInfo.shopId,
+              shopName: (_shopList$find = shopList.find(function (item) {
+                return item.shopId == platformInfo.shopId;
+              })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopName,
+              shopList: shopList
+            }, 'add');
           },
           children: "\u6253\u6B3E\u5DE5\u5355"
         })
       })
     }), /*#__PURE__*/_jsxs("div", {
       className: "".concat(styles.custom_box_search, " ").concat(styles.pay_search),
-      children: [/*#__PURE__*/_jsxs(Select, {
-        className: styles.custom_box_search_date,
-        value: paySearch.timeType,
-        onChange: function onChange(val) {
-          return upDateState('timeType', val);
-        },
-        children: [/*#__PURE__*/_jsx(Select.Option, {
-          value: "submitTime",
-          children: "\u63D0\u4EA4\u65F6\u95F4"
-        }), /*#__PURE__*/_jsx(Select.Option, {
-          value: "auditTime",
-          children: "\u5BA1\u6838\u65F6\u95F4"
-        }), /*#__PURE__*/_jsx(Select.Option, {
-          value: "playWithTime",
-          children: "\u6253\u6B3E\u65F6\u95F4"
+      children: [/*#__PURE__*/_jsxs("div", {
+        className: "".concat(styles.custom_box_search_box, " ").concat(styles.pay_search_box),
+        children: [/*#__PURE__*/_jsxs(Select, {
+          className: styles.custom_box_search_date,
+          value: paySearch.timeType,
+          onChange: function onChange(val) {
+            return upDateState('timeType', val);
+          },
+          children: [/*#__PURE__*/_jsx(Select.Option, {
+            value: "submitTime",
+            children: "\u63D0\u4EA4\u65F6\u95F4"
+          }), /*#__PURE__*/_jsx(Select.Option, {
+            value: "auditTime",
+            children: "\u5BA1\u6838\u65F6\u95F4"
+          }), /*#__PURE__*/_jsx(Select.Option, {
+            value: "playWithTime",
+            children: "\u6253\u6B3E\u65F6\u95F4"
+          })]
+        }), /*#__PURE__*/_jsx(Select, {
+          className: styles.custom_box_search_cascader,
+          value: paySearch.workPayStatus,
+          onChange: function onChange(val) {
+            return upDateState('workPayStatus', val);
+          },
+          children: PAY_STATUS.map(function (item) {
+            return /*#__PURE__*/_jsx(Select.Option, {
+              value: item.value,
+              children: item.label
+            }, item.value);
+          })
+        }), /*#__PURE__*/_jsx(Checkbox, {
+          className: styles.custom_box_search_buyer,
+          checked: paySearch.isBuyer,
+          onChange: function onChange(e) {
+            return upDateState('isBuyer', e.target.checked);
+          },
+          children: "\u5F53\u524D\u4E70\u5BB6"
+        }), /*#__PURE__*/_jsx(RangePicker, {
+          allowClear: false,
+          value: paySearch.time,
+          showTime: true,
+          onChange: function onChange(dates) {
+            return upDateState('time', dates);
+          }
         })]
-      }), /*#__PURE__*/_jsx(Select, {
-        className: styles.custom_box_search_cascader,
-        value: paySearch.workPayStatus,
-        onChange: function onChange(val) {
-          return upDateState('workPayStatus', val);
-        },
-        children: PAY_STATUS.map(function (item) {
-          return /*#__PURE__*/_jsx(Select.Option, {
-            value: item.value,
-            children: item.label
-          }, item.value);
-        })
-      }), /*#__PURE__*/_jsx(Checkbox, {
-        checked: paySearch.isBuyer,
-        onChange: function onChange(e) {
-          return upDateState('isBuyer', e.target.checked);
-        },
-        children: "\u5F53\u524D\u4E70\u5BB6"
       }), /*#__PURE__*/_jsx("div", {
         className: styles.custom_box_search_refresh,
         onClick: function onClick() {
           return onSearch();
         },
         children: /*#__PURE__*/_jsx("img", {
-          src: refresh,
+          src: refreshImg,
           alt: ""
         })
-      }), /*#__PURE__*/_jsx(RangePicker, {
-        value: paySearch.time,
-        showTime: true,
-        onChange: function onChange(dates) {
-          return upDateState('time', dates);
-        }
       })]
     }), /*#__PURE__*/_jsx("main", {
       className: styles.payment_box_main,
-      children: payOrderList.map(function (item) {
+      children: payOrderList.length ? payOrderList.map(function (item) {
         return PayListOrderItem({
           record: item,
           onRefresh: function onRefresh() {
             return onSearch();
           },
-          onEdit: handleOpenModify,
+          onEdit: function onEdit(record, type) {
+            return handleOpenModify(_objectSpread(_objectSpread({}, record), {}, {
+              shopList: shopList
+            }), type);
+          },
           onLog: handleOpenLog
         });
+      }) : /*#__PURE__*/_jsx("div", {
+        className: styles.custom_box_main_empty,
+        children: /*#__PURE__*/_jsxs("div", {
+          children: [/*#__PURE__*/_jsx("img", {
+            src: emptyImg,
+            alt: ""
+          }), /*#__PURE__*/_jsx("p", {
+            children: "\u6682\u65E0\u6570\u636E"
+          })]
+        })
       })
     }), /*#__PURE__*/_jsx("div", {
       className: styles.custom_box_page,

package/dist/esm/WorkOrder/index.module.less

@@ -31,7 +31,7 @@
 }
 
 .custom_box {
-  height: calc(100% - 112px);
+  height: calc(100% - 58px);
 
   .custom_box_header {
     padding: 0 16px 16px 16px;
@@ -54,8 +54,15 @@
     top: 0;
     right: 0;
     left: 0;
+    z-index: 3;
     height: 70px;
     overflow: auto;
+    background-color: #fff;
+
+    &:hover {
+      height: 200px;
+      box-shadow: 3px 3px 5px #eee;
+    }
   }
 
   .custom_temp_list_button {
@@ -69,6 +76,7 @@
     background: rgba(0, 0, 0, 0.04);
     border: 1px solid #eeeff0;
     border-radius: 2px;
+    cursor: pointer;
   }
 
   .custom_box_search {
@@ -77,15 +85,25 @@
     justify-content: space-between;
     width: 100%;
     height: 49px;
-    padding: 0 16px;
-    background: #fffafa;
+    padding-left: 16px;
+    background: #fafafa;
 
     &.pay_search {
-      flex-wrap: wrap;
-      align-content: center;
+      align-items: inherit;
       height: 90px;
     }
 
+    .custom_box_search_box {
+      display: flex;
+      align-items: center;
+      width: 100%;
+    }
+
+    .pay_search_box {
+      flex-wrap: wrap;
+      align-items: center;
+    }
+
     .custom_box_search_date {
       width: 106px;
       margin-right: 8px;
@@ -93,14 +111,19 @@
 
     .custom_box_search_cascader {
       flex-grow: 1;
+      width: 130px;
       margin-right: 8px;
     }
 
+    .custom_box_search_buyer {
+      flex: none;
+    }
+
     .custom_box_search_refresh {
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 44px;
+      min-width: 44px;
       height: 48px;
       border-left: 1px solid #f2f2f2;
 
@@ -116,13 +139,23 @@
   .custom_box_main {
     height: calc(100% - 273px);
     overflow: auto;
-    background-color: #fffafa;
+    background-color: #fafafa;
+  }
+
+  .custom_box_main_empty {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+    color: rgba(0, 0, 0, 0.4);
+    text-align: center;
   }
 
   .payment_box_main {
     height: calc(100% - 173px);
     overflow: auto;
-    background-color: #fffafa;
+    background-color: #fafafa;
   }
 
   .custom_box_page {

package/dist/esm/WorkOrder/model/servers/api.d.ts

@@ -21,6 +21,7 @@ export declare const paymentOrder: (data: any) => Promise<any>;
 export declare const reportLogs: (data: any) => Promise<any>;
 export declare const editRemitOrder: (data: any) => Promise<any>;
 export declare const dealWorkOrder: (data: any) => Promise<any>;
+export declare const addPaymentOrder: (data: any) => Promise<any>;
 export declare const querySubUsers: (data: any) => Promise<any>;
 export declare const transferWorkOrder: (data: any) => Promise<any>;
 export declare type fetchGrayWhiteListParams = {

package/dist/esm/WorkOrder/model/servers/api.js

@@ -2,11 +2,11 @@
  * @Description:
  * @Author: litian
  * @Date: 2022-09-06 10:28:04
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 14:01:11
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-19 15:53:38
  */
 import request from "./request";
-//获取灰度白名单
+//获取灰度白名
 export var grayWhiteList = function grayWhiteList() {
   return request({
     url: '/qy/grayWhiteList/names',
@@ -166,6 +166,14 @@ export var dealWorkOrder = function dealWorkOrder(data) {
     method: 'post',
     data: data
   });
+}; //新建打款工单
+
+export var addPaymentOrder = function addPaymentOrder(data) {
+  return request({
+    url: '/qy/payment/paymentOrder/add',
+    method: 'post',
+    data: data
+  });
 }; //获取客服列表
 
 export var querySubUsers = function querySubUsers(data) {