kmkf-work-order-service-component 0.4.0-alpha.14 → 0.4.0-alpha.16

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

@@ -43,8 +43,11 @@ function CustomizeWorkOrderCard(props) {
   var item = props.item;
   var dispatch = useAppDispatch();
   var componentDtoList = useAppSelector(selectorAllTemplateList);
+  var filterComponentDtoList = componentDtoList.filter(function (i) {
+    return !['TEMPLATE_ID_INPUT', 'FLOW_STATUS_SELECT'].includes(i.workOrderComponentType);
+  });
 
-  var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], componentDtoList),
+  var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], filterComponentDtoList),
       _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
       transData = _calcWorkOrderList2[0]; //列表头部
 
@@ -192,7 +195,7 @@ function CustomizeWorkOrderCard(props) {
     }), /*#__PURE__*/_jsx(ItemView, {
       label: "\u5E97\u94FA\u540D\u79F0",
       value: transData.shopName
-    }, "shopName"), componentDtoList.map(function (t) {
+    }, "shopName"), filterComponentDtoList.map(function (t) {
       var instance = factory(t.workOrderComponentType, {
         id: t.uniqueKey,
         name: t.name,

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

@@ -97,6 +97,8 @@ var getTableData = function getTableData(_ref) {
       params.buyerOpenUid = buyerId;
     }
 
+    delete time.time; // time是moment类型的，监控上报的时侯，格式化报错了
+
     return queryAllWorkOrderList(URL_MAPPING[type], _objectSpread(_objectSpread({}, params), {}, {
       pageSize: pageSize,
       pageNo: current

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

@@ -545,9 +545,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 +651,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 +693,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];
@@ -813,19 +825,19 @@ export var orderBack = /*#__PURE__*/function () {
 
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
             callback === null || callback === void 0 ? void 0 : callback(finalResponse);
-            _context.next = 31;
+            _context.next = 34;
             break;
 
-          case 29:
-            _context.prev = 29;
-            _context.t0 = _context["catch"](2);
+          case 32:
+            _context.prev = 32;
+            _context.t0 = _context["catch"](5);
 
-          case 31:
+          case 34:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 29]]);
+    }, _callee, null, [[5, 32]]);
   }));
 
   return function orderBack(_x) {
@@ -920,7 +932,8 @@ 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);
+  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/package.json

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