kmkf-work-order-service-component 0.4.0-alpha.8 → 0.4.0

package/dist/esm/WorkOrder/components/Widget/basic/Checkbox/index.js

@@ -42,7 +42,6 @@ import BasicComponent from "../../BasicComponent";
 import { ApaasCheckbox } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
 import { getFormItem } from "../../common/formItemWrap";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 
 var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
   _inherits(BasicCheckBox, _BasicComponent);
@@ -57,19 +56,27 @@ var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value) {
-      var _value$value;
+      var _value$value, _value$value2;
 
-      return /*#__PURE__*/_jsxs("span", {
-        children: [value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.join('/'), /*#__PURE__*/_jsx("br", {}), value === null || value === void 0 ? void 0 : value.other]
+      var findIndex = value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.findIndex(function (item) {
+        return item === '其他';
+      });
+
+      if (findIndex > -1 && value !== null && value !== void 0 && value.other) {
+        value.value[findIndex] = "\u5176\u4ED6(".concat(value === null || value === void 0 ? void 0 : value.other, ")");
+      }
+
+      return /*#__PURE__*/_jsx("span", {
+        children: value === null || value === void 0 ? void 0 : (_value$value2 = value.value) === null || _value$value2 === void 0 ? void 0 : _value$value2.join('/')
       });
     });
 
     _defineProperty(_assertThisInitialized(_this), "customRules", function () {
       return [{
         validator: function validator(_, value) {
-          var _value$value2;
+          var _value$value3;
 
-          if (!(value !== null && value !== void 0 && (_value$value2 = value.value) !== null && _value$value2 !== void 0 && _value$value2.length)) {
+          if (!(value !== null && value !== void 0 && (_value$value3 = value.value) !== null && _value$value3 !== void 0 && _value$value3.length)) {
             return Promise.reject(new Error('请选择'));
           }
 
@@ -92,9 +99,9 @@ var BasicCheckBox = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "renderExport", function (value, record) {
-      var _value$value3;
+      var _value$value4;
 
-      return "".concat(value === null || value === void 0 ? void 0 : (_value$value3 = value.value) === null || _value$value3 === void 0 ? void 0 : _value$value3.join('/'), " ").concat((value === null || value === void 0 ? void 0 : value.other) || '');
+      return "".concat(value === null || value === void 0 ? void 0 : (_value$value4 = value.value) === null || _value$value4 === void 0 ? void 0 : _value$value4.join('/'), " ").concat((value === null || value === void 0 ? void 0 : value.other) || '');
     });
 
     _defineProperty(_assertThisInitialized(_this), "getColumns", function () {

package/dist/esm/WorkOrder/components/Widget/basic/CommonDataTime/index.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import BasicComponent from '../../BasicComponent';
+declare class CommonDataTime extends BasicComponent {
+    constructor(options: any);
+    render: (value: any, record: any) => JSX.Element;
+    editRender: () => null;
+    renderExport: (value: any, record: any) => string;
+    getColumns: () => any;
+}
+export default CommonDataTime;

package/dist/esm/WorkOrder/components/Widget/basic/CommonDataTime/index.js

@@ -0,0 +1,90 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import React from 'react';
+import BasicComponent from "../../BasicComponent";
+import moment from 'moment';
+import { jsx as _jsx } from "react/jsx-runtime";
+
+var CommonDataTime = /*#__PURE__*/function (_BasicComponent) {
+  _inherits(CommonDataTime, _BasicComponent);
+
+  var _super = _createSuper(CommonDataTime);
+
+  function CommonDataTime(options) {
+    var _thisSuper, _this;
+
+    _classCallCheck(this, CommonDataTime);
+
+    _this = _super.call(this, options);
+
+    _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
+      if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
+        return /*#__PURE__*/_jsx("span", {
+          children: "--"
+        });
+      }
+
+      return /*#__PURE__*/_jsx("span", {
+        children: moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss')
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "editRender", function () {
+      return null;
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "renderExport", function (value, record) {
+      if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
+        return '--';
+      }
+
+      return moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss');
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
+      return _objectSpread(_objectSpread({}, _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(CommonDataTime.prototype)), "getColumns", _thisSuper).call(_thisSuper)), {}, {
+        renderExport: _this.renderExport
+      });
+    });
+
+    _this.canFilter = true;
+    _this.canGroup = true;
+    _this.canHidden = true;
+    _this.editable = true;
+    return _this;
+  }
+
+  return _createClass(CommonDataTime);
+}(BasicComponent);
+
+export default CommonDataTime;

package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js

@@ -54,7 +54,7 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value) {
-      return value === null || value === void 0 ? void 0 : value.map(function (pic) {
+      return value.length ? value === null || value === void 0 ? void 0 : value.map(function (pic) {
         return /*#__PURE__*/_jsx("div", {
           style: {
             marginRight: '5px',
@@ -64,11 +64,11 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
             width: 32,
             src: imgResize(pic || ''),
             preview: {
-              src: pic
+              src: imgResize(pic || '', 0, 0)
             }
           })
         });
-      });
+      }) : /*#__PURE__*/_jsx("div", {});
     });
 
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {

package/dist/esm/WorkOrder/components/Widget/basic/Radio/index.js

@@ -69,7 +69,7 @@ var BasicRadio = /*#__PURE__*/function (_BasicComponent) {
       var _value$value;
 
       return /*#__PURE__*/_jsxs("span", {
-        children: [value === null || value === void 0 ? void 0 : value.value, (value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.indexOf('其他')) > -1 && (value === null || value === void 0 ? void 0 : value.other)]
+        children: [value === null || value === void 0 ? void 0 : value.value, (value === null || value === void 0 ? void 0 : (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.indexOf('其他')) > -1 && (value === null || value === void 0 ? void 0 : value.other) && "(".concat(value === null || value === void 0 ? void 0 : value.other, ")")]
       });
     });
 

package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js

@@ -75,7 +75,7 @@ export var showImage = function showImage(_ref2) {
     }), /*#__PURE__*/_jsxs("div", {
       className: styles.options,
       children: [type === 'itemId' && /*#__PURE__*/_jsx(TextTool, {
-        title: '宝贝id',
+        title: '商品id',
         text: item.numIid
       }), type === 'itemCode' && /*#__PURE__*/_jsx(TextTool, {
         title: '商品编码',
@@ -168,7 +168,7 @@ export var ShowTotalImage = function ShowTotalImage(_ref4) {
               })
             }), /*#__PURE__*/_jsxs("div", {
               children: [type === 'itemId' && /*#__PURE__*/_jsx(TextTool, {
-                title: '宝贝id',
+                title: '商品id',
                 text: i.numIid
               }), type === 'itemCode' && /*#__PURE__*/_jsx(TextTool, {
                 title: '商品编码',

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

@@ -111,11 +111,11 @@ var ELogistics = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
-      name: '物流公司',
+      name: '快递物流公司',
       id: "".concat(options.id, "_expressLogisticsCompany")
     }));
     _this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, options), {}, {
-      name: '物流单号',
+      name: '快递物流单号',
       id: "".concat(options.id, "_expressLogisticsCode")
     }));
     _this.canHidden = true;

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

@@ -40,12 +40,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
 import { getFormItem } from "../../common/formItemWrap";
-import { Remark } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets'; // import Flag from './Flag';
+import { Remark } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
+import trade0 from "../../../../../assets/flag/trade-icon-flag-0.png";
+import trade1 from "../../../../../assets/flag/trade-icon-flag-1.png";
+import trade2 from "../../../../../assets/flag/trade-icon-flag-2.png";
+import trade3 from "../../../../../assets/flag/trade-icon-flag-3.png";
+import trade4 from "../../../../../assets/flag/trade-icon-flag-4.png";
+import trade5 from "../../../../../assets/flag/trade-icon-flag-5.png";
+import { get } from 'lodash'; // const flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
 
-import { get } from 'lodash';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
+var imgList = [trade0, trade1, trade2, trade3, trade4, trade5];
 
 var ERemark = /*#__PURE__*/function (_BasicComponent) {
   _inherits(ERemark, _BasicComponent);
@@ -64,8 +70,8 @@ var ERemark = /*#__PURE__*/function (_BasicComponent) {
         style: {
           display: 'inline-block'
         },
-        children: [get(value, 'flag') + '' ? /*#__PURE__*/_jsx("i", {
-          className: "dz-iconfont dz-beizhu_qizhi f-lt ft_12 mr_5 ".concat(flagColors[get(value, 'flag')])
+        children: [get(value, 'flag') ? /*#__PURE__*/_jsx("img", {
+          src: imgList[get(value, 'flag')]
         }) : null, /*#__PURE__*/_jsx("span", {
           children: get(value, 'remark')
         })]

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

@@ -58,7 +58,7 @@ var Express = /*#__PURE__*/function (_BasicComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
       return /*#__PURE__*/_jsx("span", {
-        children: express.getExpressNameByCode(value)
+        children: express.getExpressNameByCode(value) || value
       });
     });
 

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

@@ -10,6 +10,7 @@ import BasicCascader from '../Widget/basic/Cascader';
 import BasicAddress from '../Widget/basic/Address';
 import BasicGrade from '../Widget/basic/Grade';
 import BasicRate from '../Widget/basic/Rate';
+import CommonDataTime from '../Widget/basic/CommonDataTime';
 import EBuyerNick from '../Widget/electricity/EBuyerNick';
 import EReceiverAddress from '../Widget/electricity/EReceiverAddress';
 import ELogistics from '../Widget/electricity/ELogistics';
@@ -23,4 +24,4 @@ import Status from '../Widget/third/Status';
 import Ordinary from '../Widget/third/Ordinary';
 import ItemSelectThird from '../Widget/third/ItemSelect';
 import Payment from '../Widget/third/Payment';
-export declare const factory: (type: string, options: any) => BasicInput | BasicRadio | BasicTextArea | BasicCheckBox | BasicDateTime | BasicSelect | BasicPicture | BasicMultSelect | BasicCascader | BasicAddress | BasicGrade | BasicRate | EBuyerNick | EReceiverAddress | ELogistics | EReturnLogistics | ERemark | EItemSelect | EItemId | EItemEncode | EAlipay | Status | Ordinary | ItemSelectThird | Payment;
+export declare const factory: (type: string, options: any) => BasicInput | BasicRadio | BasicTextArea | BasicCheckBox | BasicDateTime | BasicSelect | BasicPicture | BasicMultSelect | BasicCascader | BasicAddress | BasicGrade | BasicRate | CommonDataTime | EBuyerNick | EReceiverAddress | ELogistics | EReturnLogistics | ERemark | EItemSelect | EItemId | EItemEncode | EAlipay | Status | Ordinary | ItemSelectThird | Payment;

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

@@ -10,6 +10,7 @@ import BasicCascader from "../Widget/basic/Cascader";
 import BasicAddress from "../Widget/basic/Address";
 import BasicGrade from "../Widget/basic/Grade";
 import BasicRate from "../Widget/basic/Rate";
+import CommonDataTime from "../Widget/basic/CommonDataTime";
 import EShopName from "../Widget/electricity/ShopName";
 import ETradeId from "../Widget/electricity/ETradeId";
 import EBuyerNick from "../Widget/electricity/EBuyerNick";
@@ -131,6 +132,15 @@ export var factory = function factory(type, options) {
     case 'SYSTEM_ORDER_NO':
       return new SystemOrderNo(options);
 
+    case 'COMPLETED_DATETIME':
+      return new CommonDataTime(options);
+
+    case 'CREATED_DATETIME':
+      return new CommonDataTime(options);
+
+    case 'UPDATE_DATETIME':
+      return new CommonDataTime(options);
+
     default:
       return new BasicInput(options);
   }

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import 'moment/locale/zh-cn';
 import { PlatForm } from './types';
 import './index.less';
 interface WorkOrderProps {

package/dist/esm/WorkOrder/index.js

@@ -27,7 +27,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
  */
 import React, { useState, useEffect, useLayoutEffect, useMemo } from 'react';
-import { Spin } from 'antd';
+import { Spin, ConfigProvider } from 'antd';
 import { Provider } from 'react-redux';
 import { useAppSelector, useAppDispatch } from "../model/hooks";
 import { fetchQueryGroupCustomTemplate, fetchQueryCurrentCompanyUser } from "../model/workOrder";
@@ -38,6 +38,8 @@ import store from "../model/store";
 import OrderList from "./components/CustomizeWorkOrderList";
 import Reminder from "./components/Reminder";
 import PaymentWorkOrderList from "./components/PaymentWorkOrderList";
+import zhCN from 'antd/es/locale/zh_CN';
+import 'moment/locale/zh-cn';
 import { PlatForm } from "./types";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -61,7 +63,7 @@ var WorkOrder = function WorkOrder(props) {
     return state.workOrder.userInfo.shopList;
   });
 
-  var _useState = useState('custom'),
+  var _useState = useState('payment'),
       _useState2 = _slicedToArray(_useState, 2),
       tabActive = _useState2[0],
       setTabActive = _useState2[1];
@@ -72,13 +74,13 @@ var WorkOrder = function WorkOrder(props) {
         type: 'workOrder/setIsBuyer',
         payload: true
       });
-      setCurrentBuyerChecked(true);
+      dispatch(setCurrentBuyerChecked(true));
     } else {
       dispatch({
         type: 'workOrder/setIsBuyer',
         payload: false
       });
-      setCurrentBuyerChecked(false);
+      dispatch(setCurrentBuyerChecked(false));
     }
   }, [buyerId]);
   useEffect(function () {
@@ -146,17 +148,17 @@ var WorkOrder = function WorkOrder(props) {
           children: /*#__PURE__*/_jsxs("div", {
             className: "order_header_tabs",
             children: [/*#__PURE__*/_jsx("div", {
-              className: "order_header_tabs_button ".concat(tabActive === 'custom' ? 'active' : ''),
-              onClick: function onClick() {
-                return setTabActive('custom');
-              },
-              children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
-            }), /*#__PURE__*/_jsx("div", {
               className: "order_header_tabs_button border_left ".concat(tabActive === 'payment' ? 'active' : ''),
               onClick: function onClick() {
                 return setTabActive('payment');
               },
               children: "\u6253\u6B3E\u5DE5\u5355"
+            }), /*#__PURE__*/_jsx("div", {
+              className: "order_header_tabs_button ".concat(tabActive === 'custom' ? 'active' : ''),
+              onClick: function onClick() {
+                return setTabActive('custom');
+              },
+              children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
             })]
           })
         }), /*#__PURE__*/_jsx(OrderList, {
@@ -174,7 +176,10 @@ var WorkOrder = function WorkOrder(props) {
 var ProviderWrap = function ProviderWrap(props) {
   return /*#__PURE__*/_jsx(Provider, {
     store: store,
-    children: /*#__PURE__*/_jsx(WorkOrder, _objectSpread({}, props))
+    children: /*#__PURE__*/_jsx(ConfigProvider, {
+      locale: zhCN,
+      children: /*#__PURE__*/_jsx(WorkOrder, _objectSpread({}, props))
+    })
   });
 };
 

package/dist/esm/WorkOrder/index.less

@@ -1,6 +1,7 @@
+.order_container {
+  padding: 0 8px;
+}
 .order_header {
-  padding: 0 16px;
-
   .order_header_tabs {
     display: flex;
     align-items: center;
@@ -25,7 +26,8 @@
     }
 
     &.active {
-      color: #1966ff;
+      color: #fff;
+      background-color: #1966ff;
     }
   }
 }

package/dist/esm/common/utils/tools.d.ts

@@ -3,7 +3,7 @@
  * @param {*} value
  * @returns
  */
-export declare const isNull: (value: number) => boolean;
+export declare const isNull: (p: any) => boolean;
 export declare const findLabelBySelectValue: (vales: any[], options: {
     [x: string]: {
         [x: string]: any;
@@ -28,6 +28,7 @@ export declare const submitDataTransOldFormat: (nowData: {
     workOrderUpdateKeyVos: {
         type: string;
         isFlag: any;
+        tid: string;
     };
     buyerOpenUid: any;
 }) => any;

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

@@ -38,21 +38,24 @@ var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELEC
  */
 
 export var isNull = function isNull(value) {
-  if (value === 0) {
-    return false;
-  }
-
   if (_typeof(value) === 'object' && value !== null) {
     return every(Object.values(value), function (v) {
-      return isEmpty(v) && v !== 0;
+      return isNull(v);
     });
   }
 
-  return isEmpty(value);
+  if (Array.isArray(value)) {
+    return value.length === 0;
+  }
+
+  if (typeof value === 'number') {
+    return false;
+  }
+
+  return !value;
 };
 var workTypeKeys = {
-  TRADE_ID_INPUT: 'tradeId',
-  //订单号
+  // TRADE_ID_INPUT: 'tradeId', //订单号
   // BUYER_NICK_INPUT: 'buyerNick', //买家旺旺
   SHOP_NAME_INPUT: 'shopName',
   //店铺名称
@@ -159,6 +162,16 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         content: get(nowData, "".concat(item.uniqueKey), ''),
         name: item.name
       });
+    } else if (item.workOrderComponentType === 'TRADE_ID_INPUT') {
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_tradeId"),
+        content: get(nowData, "".concat(item.uniqueKey), ''),
+        name: item.name
+      });
+
+      if (updateFlag) {
+        params.workOrderUpdateKeyVos.tid = get(nowData, "".concat(item.uniqueKey), '');
+      }
     } else if (item.workOrderComponentType === 'RATE') {
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_rate"),
@@ -422,9 +435,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         name: item.name
       });
     } else {
+      var _nowData$item$uniqueK;
+
       contentVoList.push({
         uniqueKey: "".concat(item.uniqueKey, "_").concat(V.camelCase(item.workOrderComponentType)),
-        content: get(nowData, "".concat(item.uniqueKey), '') || '',
+        content: (_nowData$item$uniqueK = nowData === null || nowData === void 0 ? void 0 : nowData[item.uniqueKey]) !== null && _nowData$item$uniqueK !== void 0 ? _nowData$item$uniqueK : '',
         name: item.name
       });
     }
@@ -545,9 +560,8 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (nex.workOrderComponentType === 'DATETIME') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_dateTime")], item.jsonMap["".concat(nex.uniqueKey, "_dateTime")]) || config.dateTime));
       } else if (nex.workOrderComponentType === 'PICTURE') {
-        var host = cache.getHost();
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_picture")] ? formatPictures(item.jsonMap["".concat(nex.uniqueKey, "_picture")]).map(function (item) {
-          return "".concat(host, "/").concat(item);
+          return "".concat(item);
         }) : []));
       } else if (nex.workOrderComponentType === 'BASIC_MULT_SELECT') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_basicMultSelect")], '') || config.basicMultSelect || []));
@@ -652,17 +666,30 @@ export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _shopList$find;
 
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, shopSourceStr, _shopList$find2, _data$value, _buyer$value, taobaoId, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, orderInfo, buyerInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, JOIN_SHOP, shopSourceStr, _shopList$find2, _data$value, _buyer$value, taobaoId, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, orderInfo, buyerInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             order_no = _ref.order_no, form = _ref.form, shopId = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback;
+            //是否是对接平台，只有对接平台才能返填订单号
+            JOIN_SHOP = shopList.find(function (item) {
+              return !item.notJoin && item.shopId == shopId;
+            });
+
+            if (JOIN_SHOP) {
+              _context.next = 4;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 4:
             shopSourceStr = (_shopList$find = shopList.find(function (item) {
               return item.shopId == shopId;
             })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
-            _context.prev = 2;
+            _context.prev = 5;
             taobaoId = (_shopList$find2 = shopList.find(function (item) {
               return item.shopSourceStr === 'TAOBAO' && item.shopId == shopId;
             })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId;
@@ -681,10 +708,10 @@ export var orderBack = /*#__PURE__*/function () {
             })) : promise.push(new Promise(function (resolve) {
               resolve({});
             }));
-            _context.next = 8;
+            _context.next = 11;
             return Promise.allSettled(promise);
 
-          case 8:
+          case 11:
             _yield$Promise$allSet = _context.sent;
             _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
             data = _yield$Promise$allSet2[0];
@@ -767,7 +794,7 @@ export var orderBack = /*#__PURE__*/function () {
                   case 'remark':
                     prv[uniqueKey] = {
                       remark: detail['remark'] || '',
-                      flag: detail['flag']
+                      flag: !!detail['flag'] ? Number(detail['flag']) : detail['flag']
                     };
                     break;
 
@@ -808,24 +835,25 @@ export var orderBack = /*#__PURE__*/function () {
                   enterprisePaymentTid: order_no
                 });
               }
-            } // console.log('detailsValue++', formValue, detailsValue);
+            }
 
+            console.debug('detailsValue', detailsValue); // console.log('detailsValue++', formValue, detailsValue);
 
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
             callback === null || callback === void 0 ? void 0 : callback(finalResponse);
-            _context.next = 31;
+            _context.next = 35;
             break;
 
-          case 29:
-            _context.prev = 29;
-            _context.t0 = _context["catch"](2);
+          case 33:
+            _context.prev = 33;
+            _context.t0 = _context["catch"](5);
 
-          case 31:
+          case 35:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 29]]);
+    }, _callee, null, [[5, 33]]);
   }));
 
   return function orderBack(_x) {
@@ -920,7 +948,13 @@ var getComponentsValue = function getComponentsValue() {
 export var imgResize = function imgResize(url) {
   var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
   var h = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 60;
-  return "".concat(url, "?x-oss-process=image/resize,h_").concat(h, ",w_").concat(w);
+  var modifyUrl = url.startsWith('/') ? url : "/".concat(url);
+
+  if (w === 0 || h === 0) {
+    return "https://kefu.kuaimai.com".concat(modifyUrl);
+  }
+
+  return "https://kefu.kuaimai.com".concat(modifyUrl, "?x-oss-process=image/resize,h_").concat(h, ",w_").concat(w);
 }; //重复校验数据映射字段
 
 export var COMPONENT_MAP = {

package/dist/esm/model/customizeWorkOrder/index.js

@@ -110,7 +110,7 @@ export var fetchAllComponentList = /*#__PURE__*/function () {
             _context2.prev = 0;
             _context2.next = 3;
             return queryAllComponentList({
-              templateId: '74TM7ZQQ7Z2N3754WWBV7ALB' // 这个模板标识是全部工单
+              templateId: 'EHS2XLO7QXHYOR65I6OHQWNY' // 这个模板标识是全部工单
 
             });
 

package/dist/esm/model/workOrder.d.ts

@@ -1,6 +1,7 @@
 export interface WorkOrderState {
     groupAllList: [];
     groupTemplateList: any[];
+    enabledTemplateList: string[];
     allTempLateList: any[];
     orderList: any[];
     orderListTotal: number;