kmkf-work-order-service-component 0.0.1-alpha.16 → 0.0.1-alpha.17

package/dist/esm/WorkOrder/index.js

@@ -28,7 +28,7 @@ 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-10 10:12:11
+ * @LastEditTime: 2022-10-10 11:27:26
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -39,7 +39,8 @@ import Wrapper from "./components/Wrapper";
 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,7 +48,6 @@ 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";
@@ -160,26 +160,9 @@ var OrderList = function OrderList(tabActive) {
   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
@@ -235,7 +218,7 @@ var OrderList = function OrderList(tabActive) {
 
 
   var openCustomForm = function openCustomForm(id) {
-    openCustomizeWOrkOrderModal({
+    customizeFormRef.current.openModal({
       templateId: id,
       shopId: platformInfo.shopId + '',
       orderNo: platformInfo.orderNo,
@@ -246,7 +229,7 @@ var OrderList = function OrderList(tabActive) {
 
 
   var onEdit = function onEdit(item) {
-    openCustomizeWOrkOrderModal({
+    customizeFormRef.current.openModal({
       templateId: item.templateDetailDto.uniqueKey,
       record: item,
       shopId: item.shopId,
@@ -266,7 +249,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) {
@@ -308,7 +291,7 @@ var OrderList = function OrderList(tabActive) {
     }));
 
     return function transCustomer(_x, _x2) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
@@ -436,6 +419,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: ''
+              })
+            }
+          });
+        }
+      }
     })]
   });
 }; //打款工单列表
@@ -463,6 +464,7 @@ var PayOrderList = function PayOrderList(tabActive) {
   var buyerNick = platformInfo.buyerNick,
       buyerId = platformInfo.buyerId;
   var logRef = useRef();
+  var payOrderRef = useRef();
   var PAY_STATUS = [{
     value: '',
     label: '全部'
@@ -517,7 +519,7 @@ var PayOrderList = function PayOrderList(tabActive) {
   };
 
   var handleOpenModify = function handleOpenModify(record, type) {
-    openPaymentWOrkOrder(record, type, onSearch);
+    payOrderRef.current.openModal(record, type);
   }; //记录
 
 
@@ -664,6 +666,9 @@ var PayOrderList = function PayOrderList(tabActive) {
       })
     }), /*#__PURE__*/_jsx(RecordModal, {
       ref: logRef
+    }), /*#__PURE__*/_jsx(PayOrderModal, {
+      ref: payOrderRef,
+      afterSuccessUpdateWorkOrder: onSearch
     })]
   });
 };

package/package.json

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