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

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

@@ -622,7 +622,7 @@ export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _shopList$find;
 
-    var order_no, form, shopId, shopList, templateDetail, shopSourceStr, _yield$orderDetail, data, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, productId, productCode, transField, finalResponse, formValue, detail, componentsParams, detailsValue, enterprisePayment, newData;
+    var order_no, form, shopId, shopList, templateDetail, shopSourceStr, _yield$orderDetail, data, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, productId, productCode, transField, finalResponse, formValue, detail, componentsParams, detailsValue, newData;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -716,21 +716,23 @@ export var orderBack = /*#__PURE__*/function () {
               return prv;
             }, {}); //有打款组件返填订单编号
 
-            enterprisePayment = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.children) || []).find(function (item) {
-              return item.type === 'ENTERPRISE_PAYMENT';
-            });
-
-            if (enterprisePayment) {
-              detailsValue["".concat(enterprisePayment.uniqueKey, "_enterprisePaymentTid")] = detail['tradeId'];
-            }
+            ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).forEach(function (item) {
+              if (item.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
+                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentTid")] = detail['tradeId'];
+                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
+              }
 
+              if (item.workOrderComponentType === 'BUYER_NICK_INPUT') {
+                detailsValue["".concat(item.uniqueKey, "_buyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
+              }
+            });
             newData = calcWorkOrderList([{
               jsonMap: detailsValue
             }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init');
-            console.log('detailsValue=========', formValue, newData[0]);
-            form.setFieldsValue(_objectSpread(_objectSpread({}, newData[0]), formValue));
+            console.log('detailsValue++', formValue, newData[0]);
+            form.setFieldsValue(_objectSpread({}, newData[0]));
 
-          case 22:
+          case 21:
           case "end":
             return _context.stop();
         }

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

@@ -32,8 +32,8 @@
 
 .customizeFormModalClassName {
   :global(.goods-uploaded-state) {
-    margin: -5px 0 5px 0;
-    padding-left: 23px;
+    margin: 6px 0 5px 0;
+    padding-left: 7px;
     font-size: 12px;
   }
 
@@ -73,7 +73,7 @@
 
   :global(.ant-form-item-label) {
     position: relative;
-    max-width: 30%;
+    max-width: 72px;
     overflow: initial;
     color: rgba(0, 0, 0, 0.55);
     // font-weight: bold;

package/dist/esm/WorkOrder/components/ListOrderItem/index.js

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-07 17:04:02
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 16:01:53
+ * @LastEditTime: 2022-09-27 18:57:14
  */
 import React from 'react';
 import { factory } from "../Widget";
@@ -264,6 +264,10 @@ function ListOrderItem(props) {
       style: {
         margin: '8px 0'
       }
+    }), ItemView({
+      label: '店铺名称',
+      value: transData.shopName,
+      key: 'shopName'
     }), componentDtoList.map(function (t) {
       var instance = factory(t.workOrderComponentType, {
         id: t.uniqueKey,

package/dist/esm/WorkOrder/components/TransferOrderModal/index.js

@@ -22,8 +22,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Description:
  * @Author: litian
  * @Date: 2022-09-15 10:51:44
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-16 13:37:53
+ * @LastEditors: litian
+ * @LastEditTime: 2022-09-28 13:55:39
  */
 import React, { useState, useImperativeHandle, forwardRef } from 'react';
 import { Modal, Form, Select } from 'antd';
@@ -117,6 +117,7 @@ var TransCustomerModal = function TransCustomerModal(props, ref) {
     title: "\u8F6C\u4EA4\u5BA2\u670D",
     centered: true,
     visible: visible,
+    width: 400,
     onCancel: closeModal,
     onOk: handleTransCustomer,
     children: /*#__PURE__*/_jsx(Form.Item, {

package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js

@@ -31,7 +31,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-09-07 17:58:35
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 16:17:25
+ * @LastEditTime: 2022-09-28 14:37:28
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -80,7 +80,8 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
         rules: [],
         required: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.required,
         component: /*#__PURE__*/_jsx(ApaasUploadAsync, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
-          uniqueKey: _this.id
+          uniqueKey: _this.id,
+          hostUrl: "https://kefu.kuaimai.com"
         }))
       }, value));
     });

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-27 09:54:27
+ * @LastEditTime: 2022-09-28 15:07:36
  * @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 } from 'react';
+import React, { useState, useEffect, useRef, useCallback } 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,32 +78,35 @@ 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 () {
-    if (shopId !== platformInfo.shopId) {
-      initHandle();
-    } //存储平台信息
-
+    // console.log('shopid---====', shopId, platformInfo.shopId);
+    console.log('propsValue', propsValue()); //存储平台信息
 
     dispatch({
       type: 'global/setState',
       payload: {
-        platformInfo: {
-          platform: platform,
-          shopId: shopId,
-          buyerNick: buyerNick,
-          buyerId: buyerId,
-          orderNo: orderNo
-        }
+        platformInfo: _objectSpread({}, propsValue())
       }
     });
-  }, [platform, shopId, buyerNick, buyerId, orderNo]);
-  useEffect(function () {
     initHandle();
-  }, []);
+  }, [propsValue]); // useEffect(() => {
+  //   initHandle();
+  // }, []);
 
   var initHandle = function initHandle() {
     dispatch(fetchQueryGroupCustomTemplate());
     dispatch(fetchQueryCurrentCompanyUser());
+    dispatch(fetchQueryPaymentWorkOrderList());
+    dispatch(fetchQueryWorkOrder());
     express.initData();
     formatAddrData.initData();
   };
@@ -185,12 +188,12 @@ var OrderList = function OrderList(tabActive) {
   }, {
     name: '近30天',
     value: 29
-  }];
-  useEffect(function () {
-    if (customSearch.tempSelect.length > 1) {
-      onSearch();
-    }
-  }, [customSearch]); //搜索
+  }]; // useEffect(() => {
+  //   if (customSearch.tempSelect.length > 1) {
+  //     onSearch();
+  //   }
+  // }, [customSearch]);
+  //搜索
 
   var onSearch = function onSearch() {
     dispatch(fetchQueryWorkOrder());
@@ -284,10 +287,15 @@ var OrderList = function OrderList(tabActive) {
                 }]
               }];
               transferWorkOrder(params).then(function (res) {
-                var _transferRef$current;
+                var success = res.success;
+
+                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();
+                  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 6:
@@ -321,7 +329,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", {
@@ -336,13 +344,16 @@ 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,
@@ -480,10 +491,9 @@ var PayOrderList = function PayOrderList(tabActive) {
     value: 'ALI_PAY_CLOSE',
     label: '打款关闭',
     color: 'rgba(156,156,156)'
-  }];
-  useEffect(function () {
-    onSearch();
-  }, [paySearch]);
+  }]; // useEffect(() => {
+  //   onSearch();
+  // }, [paySearch]);
 
   var onSearch = function onSearch() {
     dispatch(fetchQueryPaymentWorkOrderList());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.0.1-alpha.7",
+  "version": "0.0.1-alpha.8",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -37,7 +37,7 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.21-alpha.1",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.21-alpha.2",
     "@reduxjs/toolkit": "^1.8.5",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",