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

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/package.json

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