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

package/dist/esm/WorkOrder/index.js

@@ -28,13 +28,13 @@ 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-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.
  */
-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 { useAppSelector, useAppDispatch } from "./model/hooks";
@@ -78,35 +78,29 @@ var WorkOrder = function WorkOrder(props) {
       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 (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();
   };
@@ -155,6 +149,8 @@ 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,
@@ -188,12 +184,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());
@@ -459,6 +455,8 @@ 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 PAY_STATUS = [{
     value: '',
@@ -491,9 +489,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());

package/package.json

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