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

package/dist/esm/FormRender/index.js

@@ -433,14 +433,14 @@ var FormRender = function FormRender(props, ref) {
 
 
   var orderBackReplace = function orderBackReplace(value) {
-    var tradeId = value.tradeId,
-        buyer = value.buyer,
+    var orderNo = value.orderNo,
+        buyerNick = value.buyerNick,
         receiveMobile = value.receiveMobile,
         alipayAccount = value.alipayAccount,
         expressLogisticsCode = value.expressLogisticsCode;
     queryReplaceCount({
-      tradeId: tradeId,
-      buyerNick: buyer === null || buyer === void 0 ? void 0 : buyer.buyerNick,
+      tradeId: orderNo,
+      buyerNick: buyerNick,
       receiveMobile: receiveMobile,
       alipayAccount: alipayAccount,
       expressLogisticsCode: expressLogisticsCode
@@ -654,7 +654,41 @@ var FormRender = function FormRender(props, ref) {
 
       return cur;
     }, []);
-    form.resetFields(needClearFormFields); //切换店铺时，判断是否有订单号 有订单号自动订单返填
+    form.resetFields(needClearFormFields); //如果有聚水潭组件 设置成初始值
+
+    var hasJst = get(templateDetail, 'componentDtoList', []).some(function (item) {
+      return ['JST_LOGISTICS', 'JST_SUPPLY', 'JST_SEND_GOOD'].includes(item.workOrderComponentType);
+    });
+
+    if (hasJst) {
+      var jstValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
+        switch (next.workOrderComponentType) {
+          case 'JST_LOGISTICS':
+            prv[next.uniqueKey] = [{
+              logisticsCompany: null,
+              logisticsCode: null
+            }];
+            break;
+
+          case 'JST_SUPPLY':
+            prv[next.uniqueKey] = [{
+              supplyId: null
+            }];
+            break;
+
+          case 'JST_SEND_GOOD':
+            prv[next.uniqueKey] = [{
+              sendName: '',
+              sendId: ''
+            }];
+            break;
+        }
+
+        return prv;
+      }, {});
+      form.setFieldsValue(jstValue);
+    } //切换店铺时，判断是否有订单号 有订单号自动订单返填
+
 
     var allValue = form.getFieldsValue();
     var tradeIdUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo3 = templateDetail.componentDtoList.find(function (item) {

package/dist/esm/FormRender/index.less

@@ -134,7 +134,7 @@
 .tipBox {
   position: sticky;
   top: -24px;
-  z-index: 1;
+  z-index: 10;
   color: #e99d42;
   background-color: #fff;
 }

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/SingleShopWorkOrder/components/CustomizeFormModal/index.js

@@ -463,14 +463,14 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
 
 
   var orderBackReplace = function orderBackReplace(value) {
-    var tradeId = value.tradeId,
-        buyer = value.buyer,
+    var orderNo = value.orderNo,
+        buyerNick = value.buyerNick,
         receiveMobile = value.receiveMobile,
         alipayAccount = value.alipayAccount,
         expressLogisticsCode = value.expressLogisticsCode;
     queryReplaceCount({
-      tradeId: tradeId,
-      buyerNick: buyer === null || buyer === void 0 ? void 0 : buyer.buyerNick,
+      tradeId: orderNo,
+      buyerNick: buyerNick,
       receiveMobile: receiveMobile,
       alipayAccount: alipayAccount,
       expressLogisticsCode: expressLogisticsCode

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

@@ -128,7 +128,7 @@
 .tipBox {
   position: sticky;
   top: -24px;
-  z-index: 1;
+  z-index: 10;
   color: #e99d42;
   background-color: #fff;
 }

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/common/formItemWrap.js

@@ -220,11 +220,10 @@ var content = function content(item, index) {
 export var JstGoodImage = function JstGoodImage(_ref6) {
   var list = _ref6.list,
       type = _ref6.type;
-  console.log(list);
   return list.length ? (list || []).map(function (item, index) {
     var logisticsCompany = item.logisticsCompany;
     var company = express.getExpressNameByCode(logisticsCompany);
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, item !== null && item !== void 0 && item.items ? /*#__PURE__*/React.createElement(Popover, {
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Popover, {
       content: content(item, index)
     }, /*#__PURE__*/React.createElement("span", {
       key: index,
@@ -232,6 +231,6 @@ export var JstGoodImage = function JstGoodImage(_ref6) {
         color: '#1890ff',
         cursor: 'pointer'
       }
-    }, "\u5305\u88F9".concat(index + 1), ":")) : null, type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join('/') : company ? company : item.logisticsCode) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyId) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendName, item.sendId].join('/') : item.sendId ? item.sendId : item.sendName) : null));
+    }, "\u5305\u88F9".concat(index + 1), ":")), type === 1 ? /*#__PURE__*/React.createElement("span", null, company && item.logisticsCode ? [company, item.logisticsCode].join('/') : company ? company : item.logisticsCode) : null, type === 2 ? /*#__PURE__*/React.createElement("span", null, item.supplyId) : null, type === 3 ? /*#__PURE__*/React.createElement("span", null, item.sendName && item.sendId ? [item.sendName, item.sendId].join('/') : item.sendId ? item.sendId : item.sendName) : null));
   }) : null;
 };

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

@@ -78,5 +78,6 @@ export declare const getReplaceWarnValues: (templateDetail: {
 }, keyValues: {
     [x: string]: any;
 }) => 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

@@ -802,7 +802,7 @@ 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, JOIN_SHOP, shopSourceStr, _data$value, _jstOrder$value, _jstOrder$value$data, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, orderInfo, jstInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, buyerNick, buyerOpenUid, jstItemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, JOIN_SHOP, shopSourceStr, _data$value, _jstOrder$value, _jstOrder$value$data, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, orderInfo, jstInfo, formValue, detail, values, _templateDetail$compo, paymentUniqueKey;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -826,18 +826,15 @@ export var orderBack = /*#__PURE__*/function () {
               return item.shopId == shopId;
             })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
             _context.prev = 5;
-            // let taobaoId = shopList.find(
-            //   (item: any) => item.shopSourceStr === 'TAOBAO' && item.shopId == shopId,
-            // )?.taobaoId;
             promise = [orderDetail({
               shopId: shopId,
               //店铺id
               orderNo: order_no,
               //订单id
               templateId: templateDetail.uniqueKey
-            })];
+            })]; //判断是否有聚水潭组件 有就请求jst订单接口
+
             hasJst = HasJstHandle(templateDetail);
-            console.log(hasJst, templateDetail);
 
             if (hasJst) {
               promise.push(jstOrderDetail({
@@ -845,157 +842,145 @@ export var orderBack = /*#__PURE__*/function () {
               }));
             }
 
-            _context.next = 12;
+            _context.next = 11;
             return Promise.allSettled(promise);
 
-          case 12:
+          case 11:
             _yield$Promise$allSet = _context.sent;
             _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
             data = _yield$Promise$allSet2[0];
             jstOrder = _yield$Promise$allSet2[1];
-            orderInfo = data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data;
-            jstInfo = jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : (_jstOrder$value$data = _jstOrder$value.data) === null || _jstOrder$value$data === void 0 ? void 0 : _jstOrder$value$data.orders;
-            _ref3 = orderInfo || {}, orderNo = _ref3.orderNo, provinceCode = _ref3.provinceCode, cityCode = _ref3.cityCode, townCode = _ref3.townCode, orderCreateDateTime = _ref3.orderCreateDateTime, orderPaymentDateTime = _ref3.orderPaymentDateTime, orderDeliveryDateTime = _ref3.orderDeliveryDateTime, orderClosingDateTime = _ref3.orderClosingDateTime, itemList = _ref3.itemList, buyerNick = _ref3.buyerNick, buyerOpenUid = _ref3.buyerOpenUid, jstItemList = _ref3.jstItemList;
-            transField = orderInfo ? {
-              tradeId: orderNo,
-              province: provinceCode,
-              city: cityCode,
-              district: townCode,
-              tradeCreateDateTime: orderCreateDateTime,
-              tradePaymentDateTime: orderPaymentDateTime,
-              tradeDeliveryDateTime: orderDeliveryDateTime,
-              tradeClosingDateTime: orderClosingDateTime,
-              goodId: itemList,
-              goodSerial: itemList,
-              jstItemSelectThird: jstItemList,
-              jstLogistics: jstItemList,
-              jstSupply: jstItemList,
-              jstSendGood: jstItemList
-            } : {};
-
-            if (jstInfo) {
-              transField = _objectSpread(_objectSpread({}, transField), {}, {
-                jstItemSelectThird: jstInfo,
-                jstLogistics: jstInfo,
-                jstSupply: jstInfo,
-                jstSendGood: jstInfo
-              });
-            }
-
-            finalResponse = {};
-
-            if (orderInfo) {
-              finalResponse = _objectSpread(_objectSpread({}, orderInfo || {}), transField);
-            }
-
-            if (buyerNick || buyerOpenUid) {
-              finalResponse = _objectSpread(_objectSpread({}, finalResponse), {}, {
-                buyer: {
-                  buyerNick: buyerNick,
-                  buyerOpenUid: buyerOpenUid
-                } || {},
-                payBuyer: {
-                  buyerNick: buyerNick,
-                  buyerOpenUid: buyerOpenUid
-                } || {}
-              });
-            } //获取当前表单字段
-
+            orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
+            jstInfo = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : (_jstOrder$value$data = _jstOrder$value.data) === null || _jstOrder$value$data === void 0 ? void 0 : _jstOrder$value$data.orders) || []; //获取当前表单字段
 
             formValue = form.getFieldsValue();
-            detail = finalResponse || {}; //抖音数据
+            detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
+              jstItemList: jstInfo
+            });
+            console.log(detail); //抖音数据特殊处理
 
             if (shopSourceStr === 'FXG') {
-              detail = updateDYDetails(finalResponse);
-            }
-
-            componentsParams = getComponentsValue((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []); //获取详情映射表单字段
-
-            detailsValue = Object.keys(componentsParams).reduce(function (prv, next) {
-              var _detail$buyer, _detail$buyer2;
-
-              var key = componentsParams[next].key;
-              var uniqueKey = componentsParams[next].uniqueKey;
-
-              if (detail[next]) {
-                switch (next) {
-                  case 'province':
-                    prv[uniqueKey] = {
-                      address: [+detail['province'], +detail['city'], +detail['district']],
-                      detail: detail['address'] || ''
-                    };
-                    break;
-
-                  case 'expressLogisticsCompany':
-                    prv[uniqueKey] = {
-                      company: detail['expressLogisticsCompany'],
-                      order: detail['expressLogisticsCode']
-                    };
-                    break;
-
-                  case 'alipayName':
-                    prv[uniqueKey] = {
-                      name: detail['alipayName'],
-                      user: detail['alipayAccount']
-                    };
-                    break;
-
-                  case 'tradePaymentDateTime':
-                  case 'tradeCreateDateTime':
-                  case 'tradeClosingDateTime':
-                  case 'tradeDeliveryDateTime':
-                    prv[uniqueKey] = detail[key] ? moment(detail[key]).format('YYYY-MM-DD HH:mm:ss') : '';
-                    break;
-
-                  case 'remark':
-                    prv[uniqueKey] = {
-                      remark: detail['remark'] || '',
-                      flag: !!detail['flag'] ? Number(detail['flag']) : detail['flag']
-                    };
-                    break;
-
-                  case 'goodId':
-                  case 'goodSerial':
-                  case 'itemList':
-                    prv[uniqueKey] = detail['itemList'];
-                    break;
-
-                  case 'jstItemSelectThird':
-                    prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'itemList');
-                    break;
-
-                  case 'jstSupply':
-                    prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'supply');
-                    break;
-
-                  case 'jstSendGood':
-                    prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'send');
-                    break;
-
-                  case 'jstLogistics':
-                    prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'logistics');
-                    break;
-
-                  case 'payBuyer':
-                    if (type === 'edit') break;
-                    prv[uniqueKey] = {
-                      enterprisePaymentTid: '',
-                      enterprisePaymentRefundFee: '',
-                      enterprisePaymentBuyerNick: (_detail$buyer = detail['buyer']) === null || _detail$buyer === void 0 ? void 0 : _detail$buyer.buyerNick,
-                      enterprisePaymentBuyerOpenUid: (_detail$buyer2 = detail['buyer']) === null || _detail$buyer2 === void 0 ? void 0 : _detail$buyer2.buyerOpenUid,
-                      enterprisePaymentAlipayNick: '',
-                      enterprisePaymentAlipayNo: ''
-                    };
-                    break;
-
-                  default:
-                    prv["".concat(uniqueKey)] = detail[key];
-                    break;
-                }
+              detail = updateDYDetails(detail);
+            } //整合返回值
+
+
+            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] = order_no || detail['orderNo'];
+                  break;
+
+                case 'BUYER_NICK_INPUT':
+                  prv[uniqueKey] = {
+                    buyerNick: detail['buyerNick'],
+                    buyerOpenUid: detail['buyerOpenUid']
+                  };
+                  break;
+
+                case 'RECEIVER_NAME_INPUT':
+                  prv[uniqueKey] = detail['receiveName'];
+                  break;
+
+                case 'RECEIVER_MOBILE_INPUT':
+                  prv[uniqueKey] = detail['receiveMobile'];
+                  break;
+
+                case 'RECEIVER_ADDRESS_INPUT':
+                  prv[uniqueKey] = {
+                    address: [+detail['provinceCode'], +detail['cityCode'], +detail['townCode']],
+                    detail: detail['address'] || ''
+                  };
+                  break;
+
+                case 'TRADE_CREATE_DATETIME':
+                  prv[uniqueKey] = detail['orderCreateDateTime'] ? moment(detail['orderCreateDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
+                  break;
+
+                case 'TRADE_PAYMENT_DATETIME':
+                  prv[uniqueKey] = detail['orderPaymentDateTime'] ? moment(detail['orderPaymentDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
+                  break;
+
+                case 'TRADE_DELIVERY_DATETIME':
+                  prv[uniqueKey] = detail['orderDeliveryDateTime'] ? moment(detail['orderDeliveryDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
+                  break;
+
+                case 'TRADE_CLOSING_DATETIME':
+                  prv[uniqueKey] = detail['orderClosingDateTime'] ? moment(detail['orderClosingDateTime']).format('YYYY-MM-DD HH:mm:ss') : '';
+                  break;
+
+                case 'ACTUAL_PAYMENT':
+                  prv[uniqueKey] = detail['actualPayment'];
+                  break;
+
+                case 'EXPRESS_LOGISTICS_SELECT':
+                  prv[uniqueKey] = {
+                    company: detail['expressLogisticsCompany'],
+                    order: detail['expressLogisticsCode']
+                  };
+                  break;
+
+                case 'RETURN_LOGISTICS_SELECT':
+                  prv[uniqueKey] = {
+                    company: detail['returnLogisticsCompany'],
+                    order: detail['returnLogisticsCode']
+                  };
+                  break;
+
+                case 'ALI_PAY_INPUT':
+                  prv[uniqueKey] = {
+                    name: detail['alipayName'],
+                    user: detail['alipayAccount']
+                  };
+                  break;
+
+                case 'ITEM_SELECT':
+                case 'ITEM_ID':
+                case 'ITEM_ENCODE':
+                  prv[uniqueKey] = taobaoGoodHandle(detail['itemList'], next.workOrderComponentType, next.componentConfig);
+                  break;
+
+                case 'REMARK_INPUT':
+                  prv[uniqueKey] = {
+                    remark: detail['remark'] || '',
+                    flag: !!detail['flag'] ? Number(detail['flag']) : detail['flag']
+                  };
+                  break;
+
+                case 'ENTERPRISE_PAYMENT':
+                  //编辑的时候不能修改打款信息
+                  if (type === 'edit') break;
+                  prv[uniqueKey] = {
+                    enterprisePaymentTid: '',
+                    enterprisePaymentRefundFee: '',
+                    enterprisePaymentBuyerNick: detail['buyerNick'],
+                    enterprisePaymentBuyerOpenUid: detail['buyerOpenUid'],
+                    enterprisePaymentAlipayNick: '',
+                    enterprisePaymentAlipayNo: ''
+                  };
+                  break;
+
+                case 'JST_ITEM_SELECT_THIRD':
+                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'itemList', config);
+                  break;
+
+                case 'JST_SUPPLY':
+                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'supply', config);
+                  break;
+
+                case 'JST_SEND_GOOD':
+                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'send', config);
+                  break;
+
+                case 'JST_LOGISTICS':
+                  prv[uniqueKey] = updateJSTItemListHandle(detail['jstItemList'], 'logistics', config);
+                  break;
               }
 
               return prv;
-            }, {}); //打款组件
+            }, {}); //新建的情况下订单返填不能清空打款信息
 
             if (type !== 'edit') {
               paymentUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo = templateDetail.componentDtoList.find(function (item) {
@@ -1003,29 +988,28 @@ export var orderBack = /*#__PURE__*/function () {
               })) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.uniqueKey;
 
               if (paymentUniqueKey && orderInfo) {
-                detailsValue[paymentUniqueKey] = _objectSpread(_objectSpread(_objectSpread({}, formValue[paymentUniqueKey]), detailsValue[paymentUniqueKey]), {}, {
+                values[paymentUniqueKey] = _objectSpread(_objectSpread(_objectSpread({}, formValue[paymentUniqueKey]), values[paymentUniqueKey]), {}, {
                   enterprisePaymentTid: order_no
                 });
               }
             }
 
-            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 = 37;
+            console.log(values);
+            form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
+            callback === null || callback === void 0 ? void 0 : callback(detail);
+            _context.next = 30;
             break;
 
-          case 35:
-            _context.prev = 35;
+          case 28:
+            _context.prev = 28;
             _context.t0 = _context["catch"](5);
 
-          case 37:
+          case 30:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 35]]);
+    }, _callee, null, [[5, 28]]);
   }));
 
   return function orderBack(_x) {
@@ -1034,24 +1018,23 @@ export var orderBack = /*#__PURE__*/function () {
 }(); //抖音平台数据处理
 
 var updateDYDetails = function updateDYDetails(value) {
-  var details = _objectSpread({}, value);
+  var details = _objectSpread({}, value); //处理地址
 
-  var address = ['province', 'city', 'district']; //处理地址
 
-  if (details['province']) {
+  if (details['provinceCode']) {
     //直辖市区特殊处理
     var addList = ['110000', '120000', '310000', '500000'];
 
-    if (addList.includes(details.province)) {
-      var city = details['city'];
-      var newCity = city.split('');
+    if (addList.includes(details.provinceCode)) {
+      var cityCode = details['cityCode'];
+      var newCity = cityCode.split('');
       newCity[3] = '1';
-      details['city'] = newCity.join('');
+      details['cityCode'] = newCity.join('');
     }
   } //处理时间
 
 
-  var times = ['tradeClosingDateTime', 'tradeCreateDateTime', 'tradeDeliveryDateTime', 'tradePaymentDateTime'];
+  var times = ['orderClosingDateTime', 'orderCreateDateTime', 'orderDeliveryDateTime', 'orderPaymentDateTime'];
   times.forEach(function (item) {
     if (details[item]) {
       details[item] = moment(details[item]).format('YYYY-MM-DD HH:mm:ss');
@@ -1069,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;
-  }, {});
 }; //图片压缩
 
 
@@ -1157,6 +1100,47 @@ export var getReplaceWarnValues = function getReplaceWarnValues(templateDetail,
     });
     return prv;
   }, []);
+}; //淘宝商品组件信息处理
+
+export var taobaoGoodHandle = function taobaoGoodHandle(arr, type, config) {
+  var list = JSON.parse(JSON.stringify(arr));
+  var changeSku = config.changeSku;
+  return list.map(function (item) {
+    var numIid = item.numIid,
+        title = item.title,
+        picUrl = item.picUrl,
+        price = item.price,
+        outerId = item.outerId,
+        skuId = item.skuId,
+        platform = item.platform,
+        skuInfoDTO = item.skuInfoDTO;
+    var params = {
+      numIid: numIid,
+      title: title,
+      picUrl: picUrl,
+      price: price,
+      platform: platform
+    };
+
+    if (skuInfoDTO) {
+      params.picUrl = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.picUrl;
+      params.price = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.price;
+      params.skuId = skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.skuId;
+    }
+
+    if (changeSku) {
+      params.propertiesName = item.propertiesName;
+    }
+
+    if (type === 'ITEM_ENCODE') {
+      params.outerId = outerId;
+    } else if (type === 'ITEM_SELECT_THIRD') {
+      params.itemId = '';
+      params.supplierName = '';
+    }
+
+    return params;
+  });
 }; //聚水潭订单返填
 
 export var HasJstHandle = function HasJstHandle(templateDetail) {
@@ -1168,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,
@@ -1190,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.1",
+  "version": "0.4.10-alpha.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",