kmkf-work-order-service-component 0.2.2 → 0.2.4

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

@@ -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,18 +332,10 @@ function ModifyModal(props, ref) {
           label: "\u4E70\u5BB6\u6635\u79F0",
           name: "buyerNick",
           rules: [{
-            required: true,
+            required: false,
             message: '请输入买家昵称'
           }],
           children: /*#__PURE__*/_jsx(Input, {})
-        }), /*#__PURE__*/_jsx(Form.Item, {
-          label: "\u4E70\u5BB6\u6635\u79F0id",
-          name: "buyerOpenUid",
-          rules: [{
-            required: true,
-            message: '请输入买家昵称id'
-          }],
-          children: /*#__PURE__*/_jsx(Input, {})
         }), /*#__PURE__*/_jsx(Form.Item, {
           label: "\u8BA2\u5355\u7F16\u53F7",
           name: "tid",

package/dist/esm/WorkOrder/components/Widget/electricity/EBuyerNick/index.d.ts

@@ -1,10 +1,6 @@
 /// <reference types="react" />
 import BasicComponent from '../../BasicComponent';
-import EBuyerName from '../EBuyerName';
-import EBuyerOpenUid from '../EBuyerOpenUid';
 declare class EBuyerNick extends BasicComponent {
-    buyerNick: EBuyerName;
-    buyerOpenUid: EBuyerOpenUid;
     constructor(options: any);
     customRules: (config: any) => {
         validator: (_: any, value: {
@@ -12,8 +8,7 @@ declare class EBuyerNick extends BasicComponent {
             buyerOpenUid: any;
         }) => Promise<void>;
     }[];
-    render: () => null;
+    render: (value: any, record: any) => JSX.Element;
     editRender: (value: any) => JSX.Element;
-    getColumns: () => any;
 }
 export default EBuyerNick;

package/dist/esm/WorkOrder/components/Widget/electricity/EBuyerNick/index.js

@@ -31,13 +31,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-06-30 17:30:05
  * @LastEditors: litian
- * @LastEditTime: 2022-09-20 18:02:16
+ * @LastEditTime: 2022-11-30 14:34:16
  */
 import React from 'react';
 import { BuyerNick } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
 import BasicComponent from "../../BasicComponent";
-import EBuyerName from "../EBuyerName";
-import EBuyerOpenUid from "../EBuyerOpenUid";
 import { getFormItem } from "../../common/formItemWrap";
 import { jsx as _jsx } from "react/jsx-runtime";
 
@@ -55,10 +53,6 @@ var EBuyerNick = /*#__PURE__*/function (_BasicComponent) {
 
     _this = _super.call(this, options);
 
-    _defineProperty(_assertThisInitialized(_this), "buyerNick", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "buyerOpenUid", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "customRules", function (config) {
       return [{
         validator: function validator(_, value) {
@@ -66,53 +60,30 @@ var EBuyerNick = /*#__PURE__*/function (_BasicComponent) {
             return Promise.reject(new Error('请输入买家旺旺'));
           }
 
-          var _this$componentConfig = _this.componentConfig,
-              shopList = _this$componentConfig.shopList,
-              shopId = _this$componentConfig.shopId;
-          var isTaoBao = shopList.some(function (item) {
-            return item.shopId === shopId && item.shopSourceStr === 'TAOBAO';
-          });
-
-          if (isTaoBao && !(value !== null && value !== void 0 && value.buyerOpenUid)) {
-            return Promise.reject(new Error('请输入买家旺旺id'));
-          }
-
           return Promise.resolve();
         }
       }];
     });
 
-    _defineProperty(_assertThisInitialized(_this), "render", function () {
-      return null;
+    _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
+      return /*#__PURE__*/_jsx("span", {
+        children: value === null || value === void 0 ? void 0 : value.buyerNick
+      });
     });
 
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {
-      var _this$componentConfig2, _this$componentConfig3;
+      var _this$componentConfig, _this$componentConfig2;
 
       return getFormItem(_objectSpread({
         title: _this.name,
         name: _this.id,
-        rules: (_this$componentConfig2 = _this.componentConfig) !== null && _this$componentConfig2 !== void 0 && _this$componentConfig2.required ? _this.customRules(_this.componentConfig) : [],
-        required: (_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.required,
+        rules: (_this$componentConfig = _this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.required ? _this.customRules(_this.componentConfig) : [],
+        required: (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required,
         component: /*#__PURE__*/_jsx(BuyerNick, _objectSpread({}, _this.componentConfig))
       }, value));
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
-      return {
-        title: _this.name,
-        children: [_this.buyerNick.getColumns(), _this.buyerOpenUid.getColumns()],
-        canHidden: _this.canHidden,
-        dataIndex: _this.id
-      };
-    });
-
-    _this.buyerNick = new EBuyerName(_objectSpread(_objectSpread({}, options), {}, {
-      name: '买家旺旺'
-    }));
-    _this.buyerOpenUid = new EBuyerOpenUid(_objectSpread(_objectSpread({}, options), {}, {
-      name: '买家旺旺id'
-    }));
+    _this.canFilter = true;
     _this.canHidden = true;
     _this.effects = options.effects;
     _this.componentConfig = _objectSpread(_objectSpread({}, options.componentConfig), {}, {

package/dist/esm/WorkOrder/components/Widget/third/Payment/index.d.ts

@@ -4,7 +4,6 @@ import AlipayNick from './AlipayNick';
 import PaymentStatus from './PaymentStatus';
 import PaymentAmount from './PaymentAmount';
 import BuyerNick from './BuyerNick';
-import BuyerOpenUid from './BuyerOpenUid';
 import PaymentTid from './PaymentTid';
 import AlipayNo from './AlipayNo';
 import PayTime from './PayTime';
@@ -13,7 +12,6 @@ declare class Payment extends BasicComponent {
     paymentStatus: PaymentStatus;
     paymentAmount: PaymentAmount;
     buyerNick: BuyerNick;
-    buyerOpenUid: BuyerOpenUid;
     paymentTid: PaymentTid;
     alipayNo: AlipayNo;
     payTime: PayTime;

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

@@ -40,7 +40,6 @@ import AlipayNick from "./AlipayNick";
 import PaymentStatus from "./PaymentStatus";
 import PaymentAmount from "./PaymentAmount";
 import BuyerNick from "./BuyerNick";
-import BuyerOpenUid from "./BuyerOpenUid";
 import PaymentTid from "./PaymentTid";
 import AlipayNo from "./AlipayNo";
 import PayTime from "./PayTime";
@@ -69,8 +68,6 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "buyerNick", void 0);
 
-    _defineProperty(_assertThisInitialized(_this), "buyerOpenUid", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "paymentTid", void 0);
 
     _defineProperty(_assertThisInitialized(_this), "alipayNo", void 0);
@@ -88,21 +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('请输入买家昵称'));
-          }
-
-          var _this$componentConfig = _this.componentConfig,
-              shopList = _this$componentConfig.shopList,
-              shopId = _this$componentConfig.shopId;
-          var isTaoBao = shopList.some(function (item) {
-            return item.shopId === shopId && item.shopSourceStr === 'TAOBAO';
-          });
-
-          if (config.required && isTaoBao && !(value !== null && value !== void 0 && value.enterprisePaymentBuyerOpenUid)) {
-            return Promise.reject(new Error('请输入买家昵称id'));
-          }
-
           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)) {
@@ -117,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();
@@ -129,13 +118,13 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {
-      var _this$componentConfig2;
+      var _this$componentConfig;
 
       return getFormItem(_objectSpread({
         title: _this.name,
         name: _this.id,
         rules: _this.customRules(_this.componentConfig),
-        required: (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required,
+        required: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.required,
         component: /*#__PURE__*/_jsx(ApaasPayment, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
           onSearch: function onSearch(e) {
             return _this.changeHandle(e.target.value);
@@ -147,7 +136,8 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
     _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
       return {
         title: _this.name,
-        children: [_this.paymentTid.getColumns(), _this.paymentStatus.getColumns(), _this.paymentAmount.getColumns(), _this.buyerNick.getColumns(), _this.buyerOpenUid.getColumns(), _this.alipayNick.getColumns(), _this.alipayNo.getColumns(), _this.payTime.getColumns()],
+        children: [_this.paymentTid.getColumns(), _this.paymentStatus.getColumns(), _this.paymentAmount.getColumns(), _this.buyerNick.getColumns(), // this.buyerOpenUid.getColumns(),
+        _this.alipayNick.getColumns(), _this.alipayNo.getColumns(), _this.payTime.getColumns()],
         canHidden: _this.canHidden,
         dataIndex: _this.id
       };
@@ -162,9 +152,6 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
     _this.buyerNick = new BuyerNick(_objectSpread(_objectSpread({}, options), {}, {
       name: '买家昵称'
     }));
-    _this.buyerOpenUid = new BuyerOpenUid(_objectSpread(_objectSpread({}, options), {}, {
-      name: '买家昵称id'
-    }));
     _this.paymentTid = new PaymentTid(_objectSpread(_objectSpread({}, options), {}, {
       name: '订单编号'
     }));

package/dist/esm/WorkOrder/index.less

@@ -172,7 +172,7 @@
   }
 
   .payment_box_main_ks {
-    height: calc(100vh - 380px);
+    height: calc(100vh - 436px);
   }
 
   .custom_box_page {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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.27-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",