kmkf-work-order-service-component 0.2.2-alpha.1 → 0.2.2-alpha.3

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

@@ -42,6 +42,7 @@ import 'moment/locale/zh-cn';
 import { calcWorkOrderList, submitDataTransOldFormat, orderBack } from "../../../common/utils/tools";
 import { factory } from "../Widget";
 import { queryTemplateDetail, addWorkOrder, queryWorkOrderDetail, updateWorkOrder } from "../../../model/servers/api";
+import { useAppSelector } from "../../../model/hooks";
 import styles from "./index.module.less";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -91,6 +92,10 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       setCurrentShopId = _useState14[1]; // 有些组件对于shopId有依赖
 
 
+  var platformInfo = useAppSelector(function (state) {
+    return state.global.platformInfo;
+  });
+
   var _Form$useForm = Form.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
@@ -104,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) {
@@ -170,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,
@@ -181,7 +194,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
                 workOrderComponentVos: [],
                 accessToken: get(find(shopList, function (s) {
                   return s.shopId === currentShopId;
-                }), 'accessToken', '')
+                }), 'accessToken', ''),
+                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) {
@@ -207,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;
@@ -227,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);
 
               // 表单校验失败错误时，将错误第一项滚动到可视区域
@@ -249,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/CustomizeFormModal/wrap.d.ts

@@ -1,5 +1,5 @@
-declare const openCustomizeWOrkOrder: (prefixParams: {
+declare const openCustomizeWorkOrder: (prefixParams: {
     shopList?: [] | undefined;
     onSuccess?: ((val?: any) => void) | undefined;
 }) => (params: any) => void;
-export default openCustomizeWOrkOrder;
+export default openCustomizeWorkOrder;

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

@@ -7,8 +7,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-13 14:30:28
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-26 15:00:58
+ * @LastEditors: litian
+ * @LastEditTime: 2022-12-01 16:30:15
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/components/CustomizeFormModal/wrap.tsx
  * @Description:
  *
@@ -19,7 +19,7 @@ import { render as reactRender, unmount as reactUnmount } from 'rc-util/lib/Reac
 import CustomizeFormModal from "./index";
 import { jsx as _jsx } from "react/jsx-runtime";
 
-var openCustomizeWOrkOrder = function openCustomizeWOrkOrder(prefixParams) {
+var openCustomizeWorkOrder = function openCustomizeWorkOrder(prefixParams) {
   return function (params) {
     var container = document.createDocumentFragment();
     var ref = /*#__PURE__*/createRef();
@@ -50,4 +50,4 @@ var openCustomizeWOrkOrder = function openCustomizeWOrkOrder(prefixParams) {
   };
 };
 
-export default openCustomizeWOrkOrder;
+export default openCustomizeWorkOrder;

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

@@ -330,7 +330,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

@@ -85,10 +85,6 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
             return Promise.reject(new Error('打款金额最多2位小数'));
           }
 
-          if (config.required && !(value !== null && value !== void 0 && value.enterprisePaymentBuyerNick)) {
-            return Promise.reject(new Error('请输入买家昵称'));
-          }
-
           if (config.required && !(value !== null && value !== void 0 && value.enterprisePaymentTid)) {
             return Promise.reject(new Error('请输入订单编号'));
           } else if (value.enterprisePaymentTid && !/^[0-9a-zA-Z_-]{1,}$/.test(value.enterprisePaymentTid)) {
@@ -103,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.1",
+  "version": "0.2.2-alpha.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.28-alpha.1",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.28-alpha.3",
     "@reduxjs/toolkit": "^1.8.5",
     "js-md5": "^0.7.3",
     "react-redux": "^7.2.8",