@kmkf-fe-packages/kmkf-work-order-service-component 2.0.40 → 2.0.42

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -688,7 +688,8 @@ var FormRender = function FormRender(props, ref) {
   //订单返填
   var changeHandle = function changeHandle(order_no) {
     if (!order_no) return;
-    console.log('[订单返填 changeHandle order_no ] >', order_no);
+    // console.log('[订单返填 changeHandle order_no ] >', order_no);
+
     sessionStorage.setItem('order_no_test', order_no);
     orderBack({
       order_no: order_no,
@@ -816,6 +817,7 @@ var FormRender = function FormRender(props, ref) {
   // 切换店铺
   var handleChangeShopId = function handleChangeShopId(val) {
     setShopId(val);
+    setIsOrderBackShopId(true);
     // 清空表单字段
     var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
       if (NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE.includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
@@ -909,7 +911,13 @@ var FormRender = function FormRender(props, ref) {
           templateDetail: templateDetail,
           callback: orderBackReplace,
           fromQNCreateWorkOrderByOrderNo: false,
-          plat: plat
+          plat: plat,
+          callbackShopId: function callbackShopId(id) {
+            setIsOrderBackShopId(true);
+            setTimeout(function () {
+              setShopId(id);
+            }, 0);
+          }
         });
       }
     }
@@ -930,7 +938,7 @@ var FormRender = function FormRender(props, ref) {
     });
   };
   var conditionItemResult = function conditionItemResult(item, getFieldValue) {
-    var _item$leftValue$split, _item$leftValue$split2, _dependenceDetail2, _item$compareSymbol, _item$compareSymbol2;
+    var _item$leftValue$split, _item$leftValue$split2, _item$compareSymbol;
     //现支持子组件控制显隐，格式为${uniqueKey}_${type}与普通组件做区分
     var isChildField = item.leftValue.includes('_');
     var prefixId = isChildField ? (_item$leftValue$split = item.leftValue.split('_')) === null || _item$leftValue$split === void 0 ? void 0 : _item$leftValue$split[0] : item.leftValue;
@@ -963,8 +971,14 @@ var FormRender = function FormRender(props, ref) {
     if (Reflect.has(currentComponentDisplayStatus.current, prefixId) && !currentComponentDisplayStatus.current[prefixId]) {
       return false;
     }
-    console.debug('显影计算', (_dependenceDetail2 = dependenceDetail) === null || _dependenceDetail2 === void 0 ? void 0 : _dependenceDetail2.type, leftValue, (_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), item.rightValue);
-    return getExpression((_item$compareSymbol2 = item.compareSymbol) === null || _item$compareSymbol2 === void 0 ? void 0 : _item$compareSymbol2.toUpperCase(), leftValue, item.rightValue);
+    // console.debug(
+    //   '显影计算',
+    //   dependenceDetail?.type,
+    //   leftValue,
+    //   item.compareSymbol?.toUpperCase(),
+    //   item.rightValue,
+    // );
+    return getExpression((_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), leftValue, item.rightValue);
   };
   var getDisplayAndDisabledConfig = function getDisplayAndDisabledConfig(config) {
     if (isNull(config)) {

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

@@ -132,7 +132,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, shopId, _res$data, _res$data2, _res$data4, res, _res$data3, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey;
+    var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _data$value, _data$value3, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -149,14 +149,21 @@ export var orderBack = /*#__PURE__*/function () {
           });
         case 6:
           res = _context.sent;
-          if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.shopId && !(res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.auditStatus)) {
-            message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
-          } else if (res !== null && res !== void 0 && (_res$data4 = res.data) !== null && _res$data4 !== void 0 && _res$data4.shopId) {
-            shopId = res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.shopId;
-            // form.setFieldsValue({
-            //   shopId,
-            // });
-            callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
+          if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.shopId) {
+            shopInfo = shopList.find(function (item) {
+              var _res$data2;
+              return item.shopId === (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shopId);
+            });
+            if (!shopInfo) {
+              message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u662F\u5426\u6709".concat(res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopName, "\u5E97\u94FA\u6743\u9650"));
+            } else {
+              if (!shopInfo.auditStatus) {
+                message.error("\u5339\u914D\u5E97\u94FA\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5".concat(res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shopName, "\u6388\u6743\u662F\u5426\u6B63\u5E38"));
+              } else {
+                shopId = res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : _res$data5.shopId;
+                callbackShopId === null || callbackShopId === void 0 ? void 0 : callbackShopId(shopId);
+              }
+            }
           }
           _context.next = 13;
           break;
@@ -180,15 +187,21 @@ export var orderBack = /*#__PURE__*/function () {
           }).every(function (item) {
             return item === false;
           }))) {
-            _context.next = 17;
+            _context.next = 18;
             break;
           }
+          //处理店铺映射存在店铺信息却没有返填的问题
+          if (shopId) {
+            form.setFieldsValue({
+              shopId: shopId
+            });
+          }
           return _context.abrupt("return");
-        case 17:
+        case 18:
           _ref3 = shopList.find(function (item) {
             return item.shopId == shopId;
           }) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick, thirdShopMainType = _ref3.thirdShopMainType;
-          _context.prev = 18;
+          _context.prev = 19;
           promise = [];
           if (!JOIN_SHOP || thirdShopMainType === '1' && shopSourceStr === 'JD') {
             promise.push(Promise.resolve([]));
@@ -223,9 +236,9 @@ export var orderBack = /*#__PURE__*/function () {
           });
 
           //需按照orderBackMap中的顺序结构
-          _context.next = 25;
+          _context.next = 26;
           return Promise.allSettled(promise);
-        case 25:
+        case 26:
           _yield$Promise$allSet = _context.sent;
           _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 9);
           data = _yield$Promise$allSet2[0];
@@ -413,7 +426,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 89;
+            _context.next = 90;
             break;
           }
           list = detail['itemList'];
@@ -431,10 +444,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 79;
-          _context.next = 82;
+          _context.prev = 80;
+          _context.next = 83;
           return Promise.all(promises);
-        case 82:
+        case 83:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -444,13 +457,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 89;
+          _context.next = 90;
           break;
-        case 86:
-          _context.prev = 86;
-          _context.t1 = _context["catch"](79);
+        case 87:
+          _context.prev = 87;
+          _context.t1 = _context["catch"](80);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 89:
+        case 90:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -461,11 +474,8 @@ export var orderBack = /*#__PURE__*/function () {
             fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo
           });
           pushGyLog('values', values);
-          console.log('formValue', formValue);
-          console.log('values', values, {
-            type: type,
-            plat: plat
-          });
+          // console.log('formValue', formValue);
+          // console.log('values', values, { type, plat });
           //新建的情况下订单返填不能清空打款信息
           if (type !== 'edit') {
             paymentUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'ENTERPRISE_PAYMENT');
@@ -498,17 +508,17 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 102;
+          _context.next = 101;
           break;
-        case 99:
-          _context.prev = 99;
-          _context.t2 = _context["catch"](18);
+        case 98:
+          _context.prev = 98;
+          _context.t2 = _context["catch"](19);
           console.error(_context.t2);
-        case 102:
+        case 101:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[3, 10], [18, 99], [79, 86]]);
+    }, _callee, null, [[3, 10], [19, 98], [80, 87]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -942,7 +952,6 @@ export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref7)
   var values = bsE3OrderBackFormValues(orderInfo, {
     componentDtoList: bsE3GoodsComponent
   });
-  console.log('values', values);
   form.setFieldsValue(values);
 };
 
@@ -1052,7 +1061,6 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
   var values = gyOrderBackFormValues(orderInfo, {
     componentDtoList: gyGoodsComponent
   }, 2);
-  console.log('values', values);
   form.setFieldsValue(values);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.40",
+  "version": "2.0.42",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.0.39",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.39",
-    "@kmkf-fe-packages/services-components": "2.0.40",
+    "@kmkf-fe-packages/basic-components": "2.0.42",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.42",
+    "@kmkf-fe-packages/services-components": "2.0.42",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ab72ad58ac742ad06f1f265eb631fd20634a9f28",
+  "gitHead": "fa256bbf3b073a798c5d523e27d7205c1bd197e6",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }