kmkf-work-order-service-component 0.4.10-alpha.3 → 0.4.10-alpha.4

package/dist/esm/SingleShopWorkOrder/components/Card/index.less

@@ -108,7 +108,7 @@
   margin: 6px 0;
 
   .itemViewLeft {
-    min-width: 48px;
+    max-width: 58px;
     margin-right: 8px;
     color: rgba(0, 0, 0, 0.4);
     font-weight: normal;

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.less

@@ -108,7 +108,7 @@
   margin: 6px 0;
 
   .itemViewLeft {
-    min-width: 48px;
+    max-width: 58px;
     margin-right: 8px;
     color: rgba(0, 0, 0, 0.4);
     font-weight: normal;

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RecordLog/index.js

@@ -195,7 +195,7 @@ var RecordLog = function RecordLog(props) {
                 }
               }, /*#__PURE__*/React.createElement("span", {
                 style: {
-                  minWidth: '70px',
+                  maxWidth: '66px',
                   flexShrink: 1
                 }
               }, child === null || child === void 0 ? void 0 : child.title, ":"), /*#__PURE__*/React.createElement("span", {
@@ -212,7 +212,7 @@ var RecordLog = function RecordLog(props) {
             }
           }, /*#__PURE__*/React.createElement("span", {
             style: {
-              minWidth: '70px',
+              maxWidth: '66px',
               flexShrink: 1
             }
           }, item === null || item === void 0 ? void 0 : item.name, ":"), /*#__PURE__*/React.createElement("span", {

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

@@ -62,20 +62,20 @@ var JstLogistics = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          var hasNotCompany = (value || []).some(function (item) {
+          var companyIndex = (value || []).findIndex(function (item) {
             return !item.logisticsCompany;
           });
 
-          if (hasNotCompany) {
-            return Promise.reject(new Error('请选择物流公司'));
+          if (companyIndex > -1) {
+            return Promise.reject(new Error("\u8BF7\u9009\u62E9\u5305\u88F9".concat(companyIndex + 1, "\u7269\u6D41\u516C\u53F8")));
           }
 
-          var hasNotCode = (value || []).some(function (item) {
+          var codeIndex = (value || []).findIndex(function (item) {
             return !item.logisticsCode;
           });
 
-          if (hasNotCode) {
-            return Promise.reject(new Error('请输入物流单号'));
+          if (codeIndex > -1) {
+            return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(codeIndex + 1, "\u7269\u6D41\u5355\u53F7")));
           }
 
           return Promise.resolve();

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

@@ -67,20 +67,20 @@ var JstSendGood = /*#__PURE__*/function (_BasicComponent) {
             return Promise.reject(new Error('请选择宝贝'));
           }
 
-          var hasNotName = (value || []).some(function (item) {
+          var nameIndex = (value || []).findIndex(function (item) {
             return !item.sendName;
           });
 
-          if (hasNotName && ['sendName', 'all'].includes(showField)) {
-            return Promise.reject(new Error('请输入发货仓名称'));
+          if (nameIndex > -1 && ['sendName', 'all'].includes(showField)) {
+            return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(nameIndex + 1, "\u53D1\u8D27\u4ED3\u540D\u79F0")));
           }
 
-          var hasNotId = (value || []).some(function (item) {
+          var idIndex = (value || []).findIndex(function (item) {
             return !item.sendId;
           });
 
-          if (hasNotId && ['sendId', 'all'].includes(showField)) {
-            return Promise.reject(new Error('请输入发货仓编码'));
+          if (idIndex > -1 && ['sendId', 'all'].includes(showField)) {
+            return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(idIndex + 1, "\u53D1\u8D27\u4ED3\u7F16\u7801")));
           }
 
           return Promise.resolve();

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

@@ -61,12 +61,12 @@ var JstSupply = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          var hasNotId = (value || []).some(function (item) {
+          var idIndex = (value || []).findIndex(function (item) {
             return !item.supplyId;
           });
 
-          if (hasNotId) {
-            return Promise.reject(new Error('请输入供销商编码'));
+          if (idIndex > -1) {
+            return Promise.reject(new Error("\u8BF7\u8F93\u5165\u5305\u88F9".concat(idIndex + 1, "\u4F9B\u9500\u5546\u7F16\u7801")));
           }
 
           return Promise.resolve();

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

@@ -80,4 +80,4 @@ export declare const getReplaceWarnValues: (templateDetail: {
 }) => any;
 export declare const taobaoGoodHandle: (arr: any[], type: string, config: any) => any;
 export declare const HasJstHandle: (templateDetail: any) => any;
-export declare const updateJSTItemListHandle: (list?: any[], type?: string) => any;
+export declare const updateJSTItemListHandle: (list: any[] | undefined, type: string | undefined, config: any) => any;

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

@@ -856,7 +856,8 @@ export var orderBack = /*#__PURE__*/function () {
             formValue = form.getFieldsValue();
             detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
               jstItemList: jstInfo
-            }); //抖音数据特殊处理
+            });
+            console.log(detail); //抖音数据特殊处理
 
             if (shopSourceStr === 'FXG') {
               detail = updateDYDetails(detail);
@@ -865,10 +866,11 @@ export var orderBack = /*#__PURE__*/function () {
 
             values = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
               var uniqueKey = next.uniqueKey;
+              var config = next.componentConfig;
 
               switch (next.workOrderComponentType) {
                 case 'TRADE_ID_INPUT':
-                  prv[uniqueKey] = detail['orderNo'];
+                  prv[uniqueKey] = order_no || detail['orderNo'];
                   break;
 
                 case 'BUYER_NICK_INPUT':
@@ -894,19 +896,19 @@ export var orderBack = /*#__PURE__*/function () {
                   break;
 
                 case 'TRADE_CREATE_DATETIME':
-                  prv[uniqueKey] = detail['orderCreateDateTime'];
+                  prv[uniqueKey] = detail['orderCreateDateTime'] ? moment(detail['orderCreateDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
                   break;
 
                 case 'TRADE_PAYMENT_DATETIME':
-                  prv[uniqueKey] = detail['orderPaymentDateTime'];
+                  prv[uniqueKey] = detail['orderPaymentDateTime'] ? moment(detail['orderPaymentDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
                   break;
 
                 case 'TRADE_DELIVERY_DATETIME':
-                  prv[uniqueKey] = detail['orderDeliveryDateTime'];
+                  prv[uniqueKey] = detail['orderDeliveryDateTime'] ? moment(detail['orderDeliveryDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
                   break;
 
                 case 'TRADE_CLOSING_DATETIME':
-                  prv[uniqueKey] = detail['orderClosingDateTime'];
+                  prv[uniqueKey] = detail['orderClosingDateTime'] ? moment(detail['orderClosingDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
                   break;
 
                 case 'ACTUAL_PAYMENT':
@@ -961,19 +963,19 @@ export var orderBack = /*#__PURE__*/function () {
                   break;
 
                 case 'JST_ITEM_SELECT_THIRD':
-                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'itemList');
+                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'itemList', config);
                   break;
 
                 case 'JST_SUPPLY':
-                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'supply');
+                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'supply', config);
                   break;
 
                 case 'JST_SEND_GOOD':
-                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'send');
+                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'send', config);
                   break;
 
                 case 'JST_LOGISTICS':
-                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'logistics');
+                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'logistics', config);
                   break;
               }
 
@@ -995,19 +997,19 @@ export var orderBack = /*#__PURE__*/function () {
             console.log(values);
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
             callback === null || callback === void 0 ? void 0 : callback(detail);
-            _context.next = 29;
+            _context.next = 30;
             break;
 
-          case 27:
-            _context.prev = 27;
+          case 28:
+            _context.prev = 28;
             _context.t0 = _context["catch"](5);
 
-          case 29:
+          case 30:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 27]]);
+    }, _callee, null, [[5, 28]]);
   }));
 
   return function orderBack(_x) {
@@ -1050,46 +1052,6 @@ var updateDYDetails = function updateDYDetails(value) {
     }
   });
   return details;
-}; //获取模版组件
-
-
-var getComponentsValue = function getComponentsValue() {
-  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  //订单详情映射字段
-  var mapList = {
-    TRADE_ID_INPUT: 'tradeId',
-    RECEIVER_NAME_INPUT: 'receiveName',
-    RECEIVER_MOBILE_INPUT: 'receiveMobile',
-    RECEIVER_ADDRESS_INPUT: 'province',
-    TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
-    TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
-    TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
-    TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
-    ACTUAL_PAYMENT: 'actualPayment',
-    EXPRESS_LOGISTICS_SELECT: 'expressLogisticsCompany',
-    RETURN_LOGISTICS_SELECT: 'returnLogisticsCompany',
-    ALI_PAY_INPUT: 'alipayName',
-    ITEM_SELECT: 'itemList',
-    REMARK_INPUT: 'remark',
-    ITEM_ID: 'goodId',
-    ITEM_ENCODE: 'goodSerial',
-    JST_ITEM_SELECT_THIRD: 'jstItemSelectThird',
-    JST_SUPPLY: 'jstSupply',
-    JST_SEND_GOOD: 'jstSendGood',
-    JST_LOGISTICS: 'jstLogistics',
-    BUYER_NICK_INPUT: 'buyer',
-    ENTERPRISE_PAYMENT: 'payBuyer'
-  };
-  return list.reduce(function (prv, next) {
-    if (mapList[next.workOrderComponentType]) {
-      prv[mapList[next.workOrderComponentType]] = {
-        uniqueKey: next.uniqueKey,
-        key: mapList[next.workOrderComponentType]
-      };
-    }
-
-    return prv;
-  }, {});
 }; //图片压缩
 
 
@@ -1190,10 +1152,14 @@ export var HasJstHandle = function HasJstHandle(templateDetail) {
 export var updateJSTItemListHandle = function updateJSTItemListHandle() {
   var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'logistics';
+  var config = arguments.length > 2 ? arguments[2] : undefined;
   var newList = JSON.parse(JSON.stringify(list));
+  var showField = config.showField,
+      enableItemId = config.enableItemId,
+      enableSupplierName = config.enableSupplierName;
 
   if (type !== 'itemList') {
-    return newList.map(function (item) {
+    var _list = newList.map(function (item) {
       var items = item.items.map(function (t) {
         return {
           title: t.skuName,
@@ -1212,22 +1178,62 @@ export var updateJSTItemListHandle = function updateJSTItemListHandle() {
       } else if (type === 'supply') {
         params.supplyId = item.drpCoIdTo;
       } else if (type === 'send') {
-        params.sendId = item.wmsCoId;
-        params.sendName = item.wmsCoName;
+        if (['sendId', 'all'].includes(showField)) {
+          params.sendId = item.wmsCoId;
+        }
+
+        if (['sendName', 'all'].includes(showField)) {
+          params.sendName = item.wmsCoName;
+        }
       }
 
+      console.log(params);
       return params;
     });
+
+    if (!_list.length) {
+      switch (type) {
+        case 'logistics':
+          _list = [{
+            logisticsCompany: null,
+            logisticsCode: ''
+          }];
+          break;
+
+        case 'supply':
+          _list = [{
+            supplyId: ''
+          }];
+          break;
+
+        case 'send':
+          _list = [{
+            sendId: '',
+            sendName: ''
+          }];
+          break;
+      }
+    }
+
+    return _list;
   } else {
     return newList.reduce(function (prv, next) {
       var items = next.items.map(function (t) {
-        return {
+        var params = {
           title: t.skuName,
           picUrl: t.pic,
-          platform: 'jst',
-          itemId: t.supplierId,
-          supplierName: t.supplierName
+          platform: 'jst'
         };
+
+        if (enableItemId) {
+          params.itemId = t.supplierId;
+        }
+
+        if (enableSupplierName) {
+          params.supplierName = t.supplierName;
+        }
+
+        return params;
       });
       prv.push.apply(prv, _toConsumableArray(items));
       return prv;

package/package.json

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