kmkf-work-order-service-component 0.2.2-alpha.2 → 0.2.2-alpha.4

package/dist/esm/Test/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const Test: ({ name }: any) => JSX.Element;
+export default Test;

package/dist/esm/Test/index.js

@@ -0,0 +1,42 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+/*
+ * @Author: wangzhenggui jianjia.wzg@raycloud.com
+ * @Date: 2022-12-06 21:04:43
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-12-07 23:27:47
+ * @FilePath: /kmkf-work-order-service-component/src/Test/index.tsx
+ * @Description: 
+ * 
+ * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved. 
+ */
+import React, { useState } from 'react';
+import { jsxs as _jsxs } from "react/jsx-runtime";
+
+var Test = function Test(_ref) {
+  var name = _ref.name;
+
+  var _useState = useState(0),
+      _useState2 = _slicedToArray(_useState, 2),
+      num = _useState2[0],
+      setNum = _useState2[1];
+
+  return /*#__PURE__*/_jsxs("div", {
+    onClick: function onClick() {
+      return setNum(num + 1);
+    },
+    children: ["Test ", name, " ", num]
+  });
+};
+
+export default Test;

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

@@ -109,7 +109,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
-      var data, res, params, submitData, _yield$updateWorkOrde, success, result, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
+      var data, res, params, submitData, _yield$updateWorkOrde, success, result, platformMap, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
@@ -175,10 +175,18 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 });
               }
 
-              _context.next = 35;
+              _context.next = 36;
               break;
 
             case 23:
+              platformMap = {
+                tb: '淘宝',
+                fxg: '抖音',
+                ks: '快手',
+                pdd: '拼多多',
+                jd: '京东',
+                xiaozhi: '小智'
+              };
               _params = {
                 apiName: 'addWorkOrder',
                 shopId: currentShopId,
@@ -187,7 +195,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 accessToken: get(find(shopList, function (s) {
                   return s.shopId === currentShopId;
                 }), 'accessToken', ''),
-                source: platformInfo.platform
+                source: platformMap[platformInfo.platform] || '工单通'
               };
               _params.workOrderComponentVos = submitDataTransOldFormat(data, templateDetail, !!workOrderId, workOrderDetail, _params);
               hasEnterPrisePayment = some(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, function (item) {
@@ -213,12 +221,11 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 };
               }
 
-              console.debug('增加数据参数', _params); // return;
-
-              _context.next = 31;
+              console.debug('增加数据参数', _params);
+              _context.next = 32;
               return addWorkOrder(_params);
 
-            case 31:
+            case 32:
               _yield$addWorkOrder = _context.sent;
               _success = _yield$addWorkOrder.success;
               _result = _yield$addWorkOrder.data;
@@ -233,13 +240,13 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 });
               }
 
-            case 35:
+            case 36:
               console.groupEnd();
-              _context.next = 41;
+              _context.next = 42;
               break;
 
-            case 38:
-              _context.prev = 38;
+            case 39:
+              _context.prev = 39;
               _context.t0 = _context["catch"](0);
 
               // 表单校验失败错误时，将错误第一项滚动到可视区域
@@ -255,12 +262,12 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 }, 0);
               }
 
-            case 41:
+            case 42:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 38]]);
+      }, _callee, null, [[0, 39]]);
     }));
 
     return function asyncDoSave(_x, _x2) {

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

@@ -101,9 +101,7 @@ function ModifyModal(props, ref) {
   var handleOk = function handleOk() {
     form.validateFields().then( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
-        var _shopList$find;
-
-        var id, shopSourceStr, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
+        var id, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
 
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
@@ -111,16 +109,18 @@ function ModifyModal(props, ref) {
               case 0:
                 //非淘宝账户支付宝姓名和支付宝账号必填
                 id = type === 'edit' ? record.shopId : shopInfo.shopId;
-                shopSourceStr = ((_shopList$find = shopList.find(function (item) {
-                  return item.shopId == id;
-                })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr) || '';
 
-                if (!(shopSourceStr !== 'TAOBAO' && (!values.accountNick || !values.accountNo))) {
+                if (!(values !== null && values !== void 0 && values.accountNick || values !== null && values !== void 0 && values.accountNo)) {
+                  _context.next = 5;
+                  break;
+                }
+
+                if (values !== null && values !== void 0 && values.accountNick && values !== null && values !== void 0 && values.accountNo) {
                   _context.next = 5;
                   break;
                 }
 
-                message.error('请输入支付宝姓名和支付宝账号');
+                message.error('支付宝姓名/账号都要填写');
                 return _context.abrupt("return");
 
               case 5:
@@ -131,7 +131,9 @@ function ModifyModal(props, ref) {
                   shopId = record.shopId, shopName = record.shopName, _shopList = record.shopList, other = _objectWithoutProperties(record, _excluded);
                   newValue = _objectSpread(_objectSpread({}, other), values);
                 } else {
-                  newValue = _objectSpread(_objectSpread({}, values), shopInfo);
+                  newValue = _objectSpread(_objectSpread(_objectSpread({}, values), shopInfo), {}, {
+                    buyerOpenUid: record.buyerOpenUid
+                  });
                 }
 
                 _context.next = 10;
@@ -224,12 +226,12 @@ function ModifyModal(props, ref) {
   }();
 
   var TidChangeHandle = function TidChangeHandle(e) {
-    var _shopList$find2;
+    var _shopList$find;
 
     var order_no = e.target.value;
-    var taobaoId = (_shopList$find2 = shopList.find(function (item) {
+    var taobaoId = (_shopList$find = shopList.find(function (item) {
       return item.shopSourceStr === 'TAOBAO' && item.shopId == platformInfo.shopId;
-    })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId; //淘宝订单买家id返填
+    })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.taobaoId; //淘宝订单买家id返填
 
     if (taobaoId) {
       clearTimeout(time.current);
@@ -330,7 +332,7 @@ function ModifyModal(props, ref) {
           label: "\u4E70\u5BB6\u6635\u79F0",
           name: "buyerNick",
           rules: [{
-            required: true,
+            required: false,
             message: '请输入买家昵称'
           }],
           children: /*#__PURE__*/_jsx(Input, {})

package/dist/esm/WorkOrder/components/Widget/third/Payment/index.js

@@ -99,6 +99,13 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
             return Promise.reject(new Error('请输入支付宝账号'));
           } else if (value.enterprisePaymentAlipayNo && !/^(?:1[3-9]\d{9}|[a-zA-Z\d._-]*\@[a-zA-Z\d.-]{1,10}\.[a-zA-Z\d]{1,20})$/.test(value.enterprisePaymentAlipayNo)) {
             return Promise.reject(new Error('请输入正确的支付宝账号格式'));
+          } //支付宝信息不能只填一个，否则不能打款
+
+
+          if (value !== null && value !== void 0 && value.enterprisePaymentAlipayNick || value !== null && value !== void 0 && value.enterprisePaymentAlipayNo) {
+            if (!(value !== null && value !== void 0 && value.enterprisePaymentAlipayNick && value !== null && value !== void 0 && value.enterprisePaymentAlipayNo)) {
+              return Promise.reject(new Error('支付宝姓名/账号都要填写'));
+            }
           }
 
           return Promise.resolve();

package/package.json

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