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

package/dist/esm/WorkOrder/common/utils/tools.js

@@ -725,9 +725,11 @@ export var orderBack = /*#__PURE__*/function () {
               if (item.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
                 detailsValue["".concat(item.uniqueKey, "_enterprisePaymentTid")] = detail['tradeId'];
                 detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = formValue[item.uniqueKey]['enterprisePaymentBuyerOpenUid'];
+                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerNick")] = formValue[item.uniqueKey]['enterprisePaymentBuyerNick'];
               }
 
               if (item.workOrderComponentType === 'BUYER_NICK_INPUT') {
+                detailsValue["".concat(item.uniqueKey, "_buyerNick")] = formValue[item.uniqueKey]['buyerNick'];
                 detailsValue["".concat(item.uniqueKey, "_buyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
               }
 

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-09 16:32:48
+ * @LastEditTime: 2022-10-10 11:27:26
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -36,10 +36,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  */
 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,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";
@@ -72,6 +72,11 @@ 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),
@@ -105,26 +110,29 @@ var WorkOrder = function WorkOrder(props) {
     formatAddrData.initData();
   };
 
-  return /*#__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)]
+  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)]
+    })
   });
 }; //工单列表
 
@@ -152,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
@@ -227,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,
@@ -238,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,
@@ -258,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) {
@@ -300,7 +291,7 @@ var OrderList = function OrderList(tabActive) {
     }));
 
     return function transCustomer(_x, _x2) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
@@ -428,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: ''
+              })
+            }
+          });
+        }
+      }
     })]
   });
 }; //打款工单列表
@@ -455,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: '全部'
@@ -509,7 +519,7 @@ var PayOrderList = function PayOrderList(tabActive) {
   };
 
   var handleOpenModify = function handleOpenModify(record, type) {
-    openPaymentWOrkOrder(record, type, onSearch);
+    payOrderRef.current.openModal(record, type);
   }; //记录
 
 
@@ -656,6 +666,9 @@ var PayOrderList = function PayOrderList(tabActive) {
       })
     }), /*#__PURE__*/_jsx(RecordModal, {
       ref: logRef
+    }), /*#__PURE__*/_jsx(PayOrderModal, {
+      ref: payOrderRef,
+      afterSuccessUpdateWorkOrder: onSearch
     })]
   });
 };

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;

package/dist/esm/WorkOrder/model/workOrder.js

@@ -28,8 +28,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * @Description:
  * @Author: litian
  * @Date: 2022-09-06 17:44:56
- * @LastEditors: litian
- * @LastEditTime: 2022-09-23 14:35:55
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-10 10:14:26
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
@@ -51,6 +51,7 @@ var initialState = {
   //打款工单列表数量
   userInfo: {},
   //用户信息
+  loading: false,
   customSearch: {
     //自定义工单搜索条件
     pageNo: 1,
@@ -265,18 +266,28 @@ export var workOrderSlice = createSlice({
       });
       state.groupAllList = groupAllList;
       state.customSearch.tempSelect = (groupAllList === null || groupAllList === void 0 ? void 0 : groupAllList.length) && [(_groupAllList$ = groupAllList[0]) === null || _groupAllList$ === void 0 ? void 0 : _groupAllList$.value, (_groupAllList$2 = groupAllList[0]) === null || _groupAllList$2 === void 0 ? void 0 : (_groupAllList$2$child = _groupAllList$2.children[0]) === null || _groupAllList$2$child === void 0 ? void 0 : _groupAllList$2$child.value];
-    }), builder.addCase(fetchQueryWorkOrder.fulfilled, function (state, action) {
+    }), builder.addCase(fetchQueryWorkOrder.pending, function (state) {
+      state.loading = true;
+    }).addCase(fetchQueryWorkOrder.fulfilled, function (state, action) {
       var _action$payload = action.payload,
           list = _action$payload.list,
           total = _action$payload.total;
       state.orderList = list || [];
       state.orderListTotal = total;
-    }), builder.addCase(fetchQueryPaymentWorkOrderList.fulfilled, function (state, action) {
+      state.loading = false;
+    }).addCase(fetchQueryWorkOrder.rejected, function (state) {
+      state.loading = false;
+    }), builder.addCase(fetchQueryPaymentWorkOrderList.pending, function (state) {
+      state.loading = true;
+    }).addCase(fetchQueryPaymentWorkOrderList.fulfilled, function (state, action) {
       var _action$payload2 = action.payload,
           list = _action$payload2.list,
           total = _action$payload2.total;
       state.payOrderList = list || [];
       state.payOrderListTotal = total;
+      state.loading = false;
+    }).addCase(fetchQueryPaymentWorkOrderList.rejected, function (state) {
+      state.loading = false;
     }), builder.addCase(fetchQueryCurrentCompanyUser.fulfilled, function (state, action) {
       var newData = action.payload;
       newData.shopList.forEach(function (item) {

package/package.json

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