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

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

@@ -1,3 +1,11 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -26,7 +34,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 
 import { get, isEmpty, find, keys, every } from 'lodash';
 import V from 'voca';
-import { orderDetail, getThirdOpenUidByOrderNo } from "../../model/servers/api";
+import { orderDetail, jstOrderDetail } from "../../model/servers/api";
 import moment from 'moment';
 import express from "./express";
 import cache from "../cache";
@@ -434,6 +442,110 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         }).join(),
         name: item.name
       });
+    } else if (item.workOrderComponentType === 'JST_LOGISTICS') {
+      var logisticsList = get(nowData, "".concat(item.uniqueKey), []); //判断单个组件是否有输入值 没有就传空
+      // if (
+      //   logisticsList.length === 1 &&
+      //   !logisticsList[0]?.items?.length &&
+      //   logisticsList.some((t) => {
+      //     return !t.logisticsCompany && !t.logisticsCode;
+      //   })
+      // ) {
+      //   logisticsList = [];
+      // }
+
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
+        content: JSON.stringify(logisticsList),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_logisticsCompany"),
+        content: logisticsList.map(function (item) {
+          return item.logisticsCompany;
+        }).join(),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_logisticsCode"),
+        content: logisticsList.map(function (item) {
+          return item.logisticsCode;
+        }).join(),
+        name: item.name
+      });
+    } else if (item.workOrderComponentType === 'JST_SUPPLY') {
+      var supplyList = get(nowData, "".concat(item.uniqueKey), []); // if (
+      //   supplyList.length === 1 &&
+      //   !supplyList[0]?.items?.length &&
+      //   supplyList.some((t) => {
+      //     return !t.supplyId;
+      //   })
+      // ) {
+      //   supplyList = [];
+      // }
+
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
+        content: JSON.stringify(supplyList),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_supplyId"),
+        content: supplyList.map(function (item) {
+          return item.supplyId;
+        }).join(),
+        name: item.name
+      });
+    } else if (item.workOrderComponentType === 'JST_SEND_GOOD') {
+      var sendList = get(nowData, "".concat(item.uniqueKey), []); // if (
+      //   sendList.length === 1 &&
+      //   !sendList[0]?.items?.length &&
+      //   sendList.some((t) => {
+      //     return !t.sendId && !t.sendName;
+      //   })
+      // ) {
+      //   sendList = [];
+      // }
+
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
+        content: JSON.stringify(sendList),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_sendId"),
+        content: sendList.map(function (item) {
+          return item.sendId;
+        }).join(),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_sendName"),
+        content: sendList.map(function (item) {
+          return item.sendName;
+        }).join(),
+        name: item.name
+      });
+    } else if (item.workOrderComponentType === 'JST_ITEM_SELECT_THIRD') {
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_jstItemList"),
+        content: JSON.stringify(get(nowData, "".concat(item.uniqueKey), [])),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_itemId"),
+        content: get(nowData, "".concat(item.uniqueKey), []).map(function (item) {
+          return item.itemId;
+        }).join(),
+        name: item.name
+      });
+      contentVoList.push({
+        uniqueKey: "".concat(item.uniqueKey, "_supplierName"),
+        content: get(nowData, "".concat(item.uniqueKey), []).map(function (item) {
+          return item.supplierName;
+        }).join(),
+        name: item.name
+      });
     } else {
       var _nowData$item$uniqueK;
 
@@ -642,6 +754,30 @@ var transDataSource = function transDataSource(templateColumns) {
         }));
       } else if (nex.workOrderComponentType === 'SYSTEM_ORDER_NO') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_systemOrderNo")]));
+      } else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
+        var _itemList2 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
+          logisticsCompany: null,
+          logisticsCode: null
+        }]);
+
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList2));
+      } else if (nex.workOrderComponentType === 'JST_ITEM_SELECT_THIRD') {
+        var _itemList3 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], []);
+
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList3));
+      } else if (nex.workOrderComponentType === 'JST_SUPPLY') {
+        var _itemList4 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
+          supplyId: null
+        }]);
+
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList4));
+      } else if (nex.workOrderComponentType === 'JST_SEND_GOOD') {
+        var _itemList5 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
+          sendName: '',
+          sendId: ''
+        }]);
+
+        return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList5));
       }
 
       return cur;
@@ -666,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, _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, _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;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
@@ -690,9 +826,9 @@ export var orderBack = /*#__PURE__*/function () {
               return item.shopId == shopId;
             })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
             _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;
+            // let taobaoId = shopList.find(
+            //   (item: any) => item.shopSourceStr === 'TAOBAO' && item.shopId == shopId,
+            // )?.taobaoId;
             promise = [orderDetail({
               shopId: shopId,
               //店铺id
@@ -700,26 +836,26 @@ export var orderBack = /*#__PURE__*/function () {
               //订单id
               templateId: templateDetail.uniqueKey
             })];
-            taobaoId ? promise.push(getThirdOpenUidByOrderNo({
-              orderNo: order_no,
-              toAppKey: '21819818',
-              platform: 'tb',
-              taobaoId: taobaoId
-            })) : promise.push(new Promise(function (resolve) {
-              resolve({});
-            }));
-            _context.next = 11;
+            hasJst = HasJstHandle(templateDetail);
+            console.log(hasJst, templateDetail);
+
+            if (hasJst) {
+              promise.push(jstOrderDetail({
+                soId: order_no
+              }));
+            }
+
+            _context.next = 12;
             return Promise.allSettled(promise);
 
-          case 11:
+          case 12:
             _yield$Promise$allSet = _context.sent;
             _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
             data = _yield$Promise$allSet2[0];
-            buyer = _yield$Promise$allSet2[1];
-            // console.log(data, buyer);
+            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;
-            buyerInfo = buyer === null || buyer === void 0 ? void 0 : (_buyer$value = buyer.value) === null || _buyer$value === void 0 ? void 0 : _buyer$value.data;
-            _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;
+            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,
@@ -730,18 +866,38 @@ export var orderBack = /*#__PURE__*/function () {
               tradeDeliveryDateTime: orderDeliveryDateTime,
               tradeClosingDateTime: orderClosingDateTime,
               goodId: itemList,
-              goodSerial: 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 (buyerInfo) {
+            if (buyerNick || buyerOpenUid) {
               finalResponse = _objectSpread(_objectSpread({}, finalResponse), {}, {
-                buyer: buyerInfo || {},
-                payBuyer: buyerInfo || {}
+                buyer: {
+                  buyerNick: buyerNick,
+                  buyerOpenUid: buyerOpenUid
+                } || {},
+                payBuyer: {
+                  buyerNick: buyerNick,
+                  buyerOpenUid: buyerOpenUid
+                } || {}
               });
             } //获取当前表单字段
 
@@ -804,6 +960,22 @@ export var orderBack = /*#__PURE__*/function () {
                     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] = {
@@ -841,19 +1013,19 @@ export var orderBack = /*#__PURE__*/function () {
 
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
             callback === null || callback === void 0 ? void 0 : callback(finalResponse);
-            _context.next = 35;
+            _context.next = 37;
             break;
 
-          case 33:
-            _context.prev = 33;
+          case 35:
+            _context.prev = 35;
             _context.t0 = _context["catch"](5);
 
-          case 35:
+          case 37:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 33]]);
+    }, _callee, null, [[5, 35]]);
   }));
 
   return function orderBack(_x) {
@@ -867,8 +1039,6 @@ var updateDYDetails = function updateDYDetails(value) {
   var address = ['province', 'city', 'district']; //处理地址
 
   if (details['province']) {
-    // let cityData: string[] = [],
-    // areaData: string[] = [];
     //直辖市区特殊处理
     var addList = ['110000', '120000', '310000', '500000'];
 
@@ -877,14 +1047,7 @@ var updateDYDetails = function updateDYDetails(value) {
       var newCity = city.split('');
       newCity[3] = '1';
       details['city'] = newCity.join('');
-    } // address.forEach(item => {
-    //   if (item === 'city') {
-    //     cityData = details['province'] ? formatAddrData.getCityByProCode(details['province']) : []
-    //   } else if (item === 'district') {
-    //     areaData = details['city'] ? formatAddrData.getAreaByCityCode(details['city']) : []
-    //   }
-    // })
-
+    }
   } //处理时间
 
 
@@ -929,6 +1092,10 @@ var getComponentsValue = function getComponentsValue() {
     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'
   };
@@ -990,4 +1157,58 @@ export var getReplaceWarnValues = function getReplaceWarnValues(templateDetail,
     });
     return prv;
   }, []);
+}; //聚水潭订单返填
+
+export var HasJstHandle = function HasJstHandle(templateDetail) {
+  return templateDetail.componentDtoList.some(function (item) {
+    return ['JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'].includes(item.workOrderComponentType);
+  });
+}; //重组聚水潭商品数据
+
+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 newList = JSON.parse(JSON.stringify(list));
+
+  if (type !== 'itemList') {
+    return newList.map(function (item) {
+      var items = item.items.map(function (t) {
+        return {
+          title: t.skuName,
+          picUrl: t.pic,
+          platform: 'jst',
+          skuId: t.skuId
+        };
+      });
+      var params = {
+        items: items
+      };
+
+      if (type === 'logistics') {
+        params.logisticsCompany = express.getExpressNameByName(item.logisticsCompany);
+        params.logisticsCode = item.lId;
+      } else if (type === 'supply') {
+        params.supplyId = item.drpCoIdTo;
+      } else if (type === 'send') {
+        params.sendId = item.wmsCoId;
+        params.sendName = item.wmsCoName;
+      }
+
+      return params;
+    });
+  } else {
+    return newList.reduce(function (prv, next) {
+      var items = next.items.map(function (t) {
+        return {
+          title: t.skuName,
+          picUrl: t.pic,
+          platform: 'jst',
+          itemId: t.supplierId,
+          supplierName: t.supplierName
+        };
+      });
+      prv.push.apply(prv, _toConsumableArray(items));
+      return prv;
+    }, []);
+  }
 };

package/dist/esm/model/customizeWorkOrder/index.d.ts

@@ -10,6 +10,6 @@ export declare const fetchCompanyUserList: (dispatch: any) => Promise<void>;
  * 查询所有工单下面的组件信息
  */
 export declare const fetchAllComponentList: (dispatch: any) => Promise<void>;
-export declare const setDeleteCustomizeWorkOrderModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setDealerModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setCompanyUserList: import("@reduxjs/toolkit").ActionCreatorWithPayload<CompanyUserListI[], string>, setSelectedUserList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], string>, setStatusSelectModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setLogModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setFormModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setTemplateId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setCustomizeFormShopId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setCurrentCustomizeRecord: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setCurrentBuyerChecked: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setAllTemplateList: import("@reduxjs/toolkit").ActionCreatorWithPayload<ComponentColumnsT[], string>;
+export declare const setDeleteCustomizeWorkOrderModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "customizeWorkOrder/setDeleteCustomizeWorkOrderModalVisible">, setDealerModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "customizeWorkOrder/setDealerModalVisible">, setCompanyUserList: import("@reduxjs/toolkit").ActionCreatorWithPayload<CompanyUserListI[], "customizeWorkOrder/setCompanyUserList">, setSelectedUserList: import("@reduxjs/toolkit").ActionCreatorWithPayload<string[], "customizeWorkOrder/setSelectedUserList">, setStatusSelectModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "customizeWorkOrder/setStatusSelectModalVisible">, setLogModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "customizeWorkOrder/setLogModalVisible">, setFormModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "customizeWorkOrder/setFormModalVisible">, setTemplateId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "customizeWorkOrder/setTemplateId">, setCustomizeFormShopId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "customizeWorkOrder/setCustomizeFormShopId">, setCurrentCustomizeRecord: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "customizeWorkOrder/setCurrentCustomizeRecord">, setCurrentBuyerChecked: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "customizeWorkOrder/setCurrentBuyerChecked">, setAllTemplateList: import("@reduxjs/toolkit").ActionCreatorWithPayload<ComponentColumnsT[], "customizeWorkOrder/setAllTemplateList">;
 declare const _default: import("redux").Reducer<CustomizeWorkOrderState, import("redux").AnyAction>;
 export default _default;

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

@@ -13,7 +13,7 @@ export declare const globalSlice: import("@reduxjs/toolkit").Slice<GlobalState,
         type: string;
     }) => void;
 }, "global">;
-export declare const setState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
+export declare const setState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "global/setState">;
 export declare const selectTop: (state: RootState) => number;
 declare const _default: import("redux").Reducer<GlobalState, import("redux").AnyAction>;
 export default _default;

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

@@ -7,10 +7,46 @@ export interface GlobalState {
     shopList: Shop[];
     platform: number;
 }
-export declare const fetchGrayWhiteListThunk: import("@reduxjs/toolkit").AsyncThunk<any, fetchGrayWhiteListParams, {}>;
-export declare const fetchLogin: import("@reduxjs/toolkit").AsyncThunk<any, LoginParams, {}>;
-export declare const fetchShopList: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
-export declare const fetchLogOut: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
+export declare const fetchGrayWhiteListThunk: import("@reduxjs/toolkit").AsyncThunk<any, fetchGrayWhiteListParams, {
+    state?: unknown;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
+export declare const fetchLogin: import("@reduxjs/toolkit").AsyncThunk<any, LoginParams, {
+    state?: unknown;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
+export declare const fetchShopList: import("@reduxjs/toolkit").AsyncThunk<any, void, {
+    state?: unknown;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
+export declare const fetchLogOut: import("@reduxjs/toolkit").AsyncThunk<any, void, {
+    state?: unknown;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    extra?: unknown;
+    rejectValue?: unknown;
+    serializedErrorType?: unknown;
+    pendingMeta?: unknown;
+    fulfilledMeta?: unknown;
+    rejectedMeta?: unknown;
+}>;
 export declare const globalSlice: import("@reduxjs/toolkit").Slice<GlobalState, {
     openLoading: (state: import("immer/dist/internal").WritableDraft<GlobalState>) => void;
     closeLoading: (state: import("immer/dist/internal").WritableDraft<GlobalState>) => void;
@@ -28,6 +64,6 @@ export declare const globalSlice: import("@reduxjs/toolkit").Slice<GlobalState,
     }) => void;
 }, "login">;
 export declare const selectCount: (state: RootState) => GlobalState;
-export declare const openLoading: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, closeLoading: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, setUserInfo: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setShopList: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setPlatform: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
+export declare const openLoading: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"login/openLoading">, closeLoading: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"login/closeLoading">, setUserInfo: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "login/setUserInfo">, setShopList: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "login/setShopList">, setPlatform: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "login/setPlatform">;
 declare const _default: import("redux").Reducer<GlobalState, import("redux").AnyAction>;
 export default _default;

package/dist/esm/model/paymentWorkOrder/index.d.ts

@@ -1,5 +1,5 @@
 import { PaymentWorkOrderState } from './types';
 export declare const initialState: PaymentWorkOrderState;
-export declare const setPaymentWorkOrderExamineModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setCurrentPaymentRecord: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setPaymentWorkOrderUnExamineModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setDeletePaymentWorkOrderVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setFlagPayModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setLogModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setPaymentFormModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>;
+export declare const setPaymentWorkOrderExamineModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "paymentWorkOrder/setPaymentWorkOrderExamineModalVisible">, setCurrentPaymentRecord: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "paymentWorkOrder/setCurrentPaymentRecord">, setPaymentWorkOrderUnExamineModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "paymentWorkOrder/setPaymentWorkOrderUnExamineModalVisible">, setDeletePaymentWorkOrderVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "paymentWorkOrder/setDeletePaymentWorkOrderVisible">, setFlagPayModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "paymentWorkOrder/setFlagPayModalVisible">, setLogModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "paymentWorkOrder/setLogModalVisible">, setPaymentFormModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "paymentWorkOrder/setPaymentFormModalVisible">;
 declare const _default: import("redux").Reducer<PaymentWorkOrderState, import("redux").AnyAction>;
 export default _default;

package/dist/esm/model/servers/api.d.ts

@@ -53,3 +53,4 @@ export declare const updateSingleShopWorkOrder: (data: any) => Promise<any>;
 export declare const addSingleShopWorkOrder: (data: any) => Promise<any>;
 export declare const queryAllWorkOrderList: (s: string, data: any) => Promise<any>;
 export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
+export declare const jstOrderDetail: (data: any) => Promise<any>;

package/dist/esm/model/servers/api.js

@@ -318,4 +318,12 @@ export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
     method: 'post',
     data: data
   });
+}; // jst订单详情
+
+export var jstOrderDetail = function jstOrderDetail(data) {
+  return request({
+    url: '/qy/gdfw/order/jstOrderDetail',
+    method: 'post',
+    data: data
+  });
 };

package/dist/esm/model/singleShopWorkOrder/index.d.ts

@@ -7,6 +7,6 @@ export declare const initialState: SingleWorkOrderState;
  */
 export declare const fetchTemplateList: (dispatch: any) => Promise<void>;
 export declare const fetchDeleteWorkOrder: any;
-export declare const setTemplateList: import("@reduxjs/toolkit").ActionCreatorWithPayload<SelectI[], string>, setCurrentCustomizeRecord: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, setTemplateId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, string>, setFormModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>;
+export declare const setTemplateList: import("@reduxjs/toolkit").ActionCreatorWithPayload<SelectI[], "singleShopWorkOrder/setTemplateList">, setCurrentCustomizeRecord: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "singleShopWorkOrder/setCurrentCustomizeRecord">, setTemplateId: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "singleShopWorkOrder/setTemplateId">, setFormModalVisible: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, "singleShopWorkOrder/setFormModalVisible">;
 declare const _default: import("redux").Reducer<SingleWorkOrderState, import("redux").AnyAction>;
 export default _default;

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

@@ -1,5 +1,5 @@
 import { SingleWorkOrderState } from './singleShopWorkOrder/types';
-declare const store: import("@reduxjs/toolkit").EnhancedStore<{
+declare const store: import("@reduxjs/toolkit/dist/configureStore").ToolkitStore<{
     login: import("./login").GlobalState;
     global: import("./global").GlobalState;
     workOrder: any;

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

@@ -28,6 +28,6 @@ export declare const workOrderSlice: import("@reduxjs/toolkit").Slice<any, {
         type: string;
     }) => void;
 }, "workOrder">;
-export declare const setState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>;
+export declare const setState: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "workOrder/setState">;
 declare const _default: import("redux").Reducer<any, import("redux").AnyAction>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.8",
+  "version": "0.4.10-alpha.1",
   "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.1.5",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.2.0-alpha.4",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",