kmkf-work-order-service-component 0.1.12 → 0.1.14

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

@@ -786,23 +786,23 @@ export var orderBack = /*#__PURE__*/function () {
                   enterprisePaymentTid: order_no
                 });
               }
-            }
+            } // console.log('detailsValue++', formValue, detailsValue);
+
 
-            console.log('detailsValue++', formValue, detailsValue);
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
-            _context.next = 31;
+            _context.next = 30;
             break;
 
-          case 29:
-            _context.prev = 29;
+          case 28:
+            _context.prev = 28;
             _context.t0 = _context["catch"](2);
 
-          case 31:
+          case 30:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 29]]);
+    }, _callee, null, [[2, 28]]);
   }));
 
   return function orderBack(_x) {
@@ -877,7 +877,9 @@ var getComponentsValue = function getComponentsValue() {
     ITEM_SELECT: 'itemList',
     REMARK_INPUT: 'remark',
     ITEM_ID: 'goodId',
-    ITEM_ENCODE: 'goodSerial'
+    ITEM_ENCODE: 'goodSerial',
+    BUYER_NICK_INPUT: 'buyer',
+    ENTERPRISE_PAYMENT: 'payBuyer'
   };
   return list.reduce(function (prv, next) {
     if (mapList[next.workOrderComponentType]) {

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

@@ -104,7 +104,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
-      var data, params, submitData, _yield$updateWorkOrde, success, result, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
+      var data, res, params, submitData, _yield$updateWorkOrde, success, result, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
@@ -119,9 +119,19 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
               data = _context.sent;
               console.debug('表单内容', data);
               console.debug('templateDetail内容', templateDetail);
+              res = verifyHandle(data, templateDetail);
 
+              if (res.success) {
+                _context.next = 11;
+                break;
+              }
+
+              message.error(res.message);
+              return _context.abrupt("return");
+
+            case 11:
               if (!workOrderId) {
-                _context.next = 19;
+                _context.next = 23;
                 break;
               }
 
@@ -141,10 +151,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
               params.workOrderUpdateKeyVos.workOrderUpdateKeySupVos = submitData.reduce(function (nex, cur) {
                 return nex.concat(cur === null || cur === void 0 ? void 0 : cur.contentVoList);
               }, []);
-              _context.next = 13;
+              _context.next = 17;
               return updateWorkOrder(params);
 
-            case 13:
+            case 17:
               _yield$updateWorkOrde = _context.sent;
               success = _yield$updateWorkOrde.success;
               result = _yield$updateWorkOrde.data;
@@ -160,10 +170,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 });
               }
 
-              _context.next = 31;
+              _context.next = 35;
               break;
 
-            case 19:
+            case 23:
               _params = {
                 apiName: 'addWorkOrder',
                 shopId: currentShopId,
@@ -199,10 +209,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
               console.debug('增加数据参数', _params); // return;
 
-              _context.next = 27;
+              _context.next = 31;
               return addWorkOrder(_params);
 
-            case 27:
+            case 31:
               _yield$addWorkOrder = _context.sent;
               _success = _yield$addWorkOrder.success;
               _result = _yield$addWorkOrder.data;
@@ -217,13 +227,13 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 });
               }
 
-            case 31:
+            case 35:
               console.groupEnd();
-              _context.next = 37;
+              _context.next = 41;
               break;
 
-            case 34:
-              _context.prev = 34;
+            case 38:
+              _context.prev = 38;
               _context.t0 = _context["catch"](0);
 
               // 表单校验失败错误时，将错误第一项滚动到可视区域
@@ -239,18 +249,41 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 }, 0);
               }
 
-            case 37:
+            case 41:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 34]]);
+      }, _callee, null, [[0, 38]]);
     }));
 
     return function asyncDoSave(_x, _x2) {
       return _ref.apply(this, arguments);
     };
-  }();
+  }(); //表单额外校验
+
+
+  var verifyHandle = function verifyHandle(data, templateDetail) {
+    var _templateDetail$compo, _templateDetail$compo2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
+
+    var res = {
+      success: true,
+      message: ''
+    };
+    var tradeIdUniqueKey = (_templateDetail$compo = templateDetail.componentDtoList.find(function (item) {
+      return item.workOrderComponentType === 'TRADE_ID_INPUT';
+    })) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.uniqueKey;
+    var paymentUniqueKey = (_templateDetail$compo2 = templateDetail.componentDtoList.find(function (item) {
+      return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
+    })) === null || _templateDetail$compo2 === void 0 ? void 0 : _templateDetail$compo2.uniqueKey;
+
+    if (tradeIdUniqueKey && paymentUniqueKey && data[tradeIdUniqueKey] && (_data$paymentUniqueKe = data[paymentUniqueKey]) !== null && _data$paymentUniqueKe !== void 0 && _data$paymentUniqueKe.enterprisePaymentTid && data[tradeIdUniqueKey] != ((_data$paymentUniqueKe2 = data[paymentUniqueKey]) === null || _data$paymentUniqueKe2 === void 0 ? void 0 : _data$paymentUniqueKe2.enterprisePaymentTid)) {
+      res.success = false;
+      res.message = '订单组件和打款组件的订单号必须一致';
+    }
+
+    return res;
+  };
 
   var handleSubmit = useCallback(function () {
     return asyncDoSave(workOrderDetail, templateDetail);

package/dist/esm/WorkOrder/components/PayListOrderItem/ModifyModal.js

@@ -30,11 +30,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useState, useImperativeHandle, forwardRef } from 'react';
+import React, { useState, useImperativeHandle, forwardRef, useRef } from 'react';
 import { Drawer, Form, Spin, Input, Space, Button, message } from 'antd';
 import { LeftOutlined } from '@ant-design/icons';
 import { get } from 'lodash';
-import { decodeAlipayInfo, editRemitOrder, addPaymentOrder } from "../../model/servers/api";
+import { decodeAlipayInfo, editRemitOrder, addPaymentOrder, getThirdOpenUidByOrderNo } from "../../model/servers/api";
+import { useAppSelector } from "../../model/hooks";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 
@@ -57,6 +58,9 @@ function ModifyModal(props, ref) {
       }
     };
   });
+  var platformInfo = useAppSelector(function (state) {
+    return state.global.platformInfo;
+  });
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -92,6 +96,8 @@ function ModifyModal(props, ref) {
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
+  var time = useRef(null);
+
   var handleOk = function handleOk() {
     form.validateFields().then( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
@@ -218,8 +224,61 @@ function ModifyModal(props, ref) {
   }();
 
   var TidChangeHandle = function TidChangeHandle(e) {
-    console.log(e.target.value);
-  };
+    var _shopList$find2;
+
+    var order_no = e.target.value;
+    var taobaoId = (_shopList$find2 = shopList.find(function (item) {
+      return item.shopSourceStr === 'TAOBAO' && item.shopId == platformInfo.shopId;
+    })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId; //淘宝订单买家id返填
+
+    if (taobaoId) {
+      clearTimeout(time.current);
+      time.current = setTimeout(function () {
+        getThirdUid(order_no, taobaoId);
+      }, 1000);
+    }
+  }; //获取买家信息
+
+
+  var getThirdUid = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order_no, taobaoId) {
+      var buyer, buyerInfo;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+              _context3.next = 3;
+              return getThirdOpenUidByOrderNo({
+                orderNo: order_no,
+                toAppKey: '21819818',
+                platform: 'tb',
+                taobaoId: taobaoId
+              });
+
+            case 3:
+              buyer = _context3.sent;
+              buyerInfo = buyer === null || buyer === void 0 ? void 0 : buyer.data;
+              form.setFieldsValue(_objectSpread({}, buyerInfo || {}));
+              _context3.next = 10;
+              break;
+
+            case 8:
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](0);
+
+            case 10:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3, null, [[0, 8]]);
+    }));
+
+    return function getThirdUid(_x3, _x4) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
 
   return /*#__PURE__*/_jsx(Drawer, {
     closeIcon: /*#__PURE__*/_jsx(LeftOutlined, {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",