kmkf-work-order-service-component 0.4.0-alpha.25 → 0.4.0-alpha.27

package/dist/esm/FormRender/index.js

@@ -186,26 +186,35 @@ var FormRender = function FormRender(props, ref) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.prev = 0;
-              _context.next = 3;
-              return form.validateFields();
+
+              if (templateIdState) {
+                _context.next = 3;
+                break;
+              }
+
+              return _context.abrupt("return", message.error('请先选择模板，再进行提交'));
 
             case 3:
+              _context.next = 5;
+              return form.validateFields();
+
+            case 5:
               data = _context.sent;
               console.debug('表单内容', data);
               console.debug('templateDetail内容', templateDetail);
               res = verifyHandle(data, templateDetail);
 
               if (res.success) {
-                _context.next = 10;
+                _context.next = 12;
                 break;
               }
 
               message.error(res.message);
               return _context.abrupt("return");
 
-            case 10:
+            case 12:
               if (!workOrderId) {
-                _context.next = 22;
+                _context.next = 24;
                 break;
               }
 
@@ -225,10 +234,10 @@ var FormRender = function FormRender(props, ref) {
               params.workOrderUpdateKeyVos.workOrderUpdateKeySupVos = submitData.reduce(function (nex, cur) {
                 return nex.concat(cur === null || cur === void 0 ? void 0 : cur.contentVoList);
               }, []);
-              _context.next = 16;
+              _context.next = 18;
               return updateWorkOrder(params);
 
-            case 16:
+            case 18:
               _yield$updateWorkOrde = _context.sent;
               success = _yield$updateWorkOrde.success;
               result = _yield$updateWorkOrde.data;
@@ -242,10 +251,10 @@ var FormRender = function FormRender(props, ref) {
                 });
               }
 
-              _context.next = 35;
+              _context.next = 37;
               break;
 
-            case 22:
+            case 24:
               platformMap = {
                 tb: '淘宝',
                 fxg: '抖音',
@@ -290,10 +299,10 @@ var FormRender = function FormRender(props, ref) {
               }
 
               console.debug('增加数据参数', _params);
-              _context.next = 31;
+              _context.next = 33;
               return addWorkOrder(_params);
 
-            case 31:
+            case 33:
               _yield$addWorkOrder = _context.sent;
               _success = _yield$addWorkOrder.success;
               _result = _yield$addWorkOrder.data;
@@ -306,13 +315,13 @@ var FormRender = function FormRender(props, ref) {
                 });
               }
 
-            case 35:
+            case 37:
               console.groupEnd();
-              _context.next = 41;
+              _context.next = 43;
               break;
 
-            case 38:
-              _context.prev = 38;
+            case 40:
+              _context.prev = 40;
               _context.t0 = _context["catch"](0);
 
               // 表单校验失败错误时，将错误第一项滚动到可视区域
@@ -328,12 +337,12 @@ var FormRender = function FormRender(props, ref) {
                 }, 0);
               }
 
-            case 41:
+            case 43:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 38]]);
+      }, _callee, null, [[0, 40]]);
     }));
 
     return function asyncDoSave(_x, _x2) {
@@ -633,6 +642,47 @@ var FormRender = function FormRender(props, ref) {
   }(); // 切换店铺
 
 
+  var handleChangeShopId = function handleChangeShopId(val) {
+    var _templateDetail$compo3, _templateDetail$compo4;
+
+    setShopId(val); // 清空表单字段
+
+    var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
+      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+        cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
+      }
+
+      return cur;
+    }, []);
+    form.resetFields(needClearFormFields); //切换店铺时，判断是否有订单号 有订单号自动订单返填
+
+    var allValue = form.getFieldsValue();
+    var tradeIdUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo3 = templateDetail.componentDtoList.find(function (item) {
+      return item.workOrderComponentType === 'TRADE_ID_INPUT';
+    })) === null || _templateDetail$compo3 === void 0 ? void 0 : _templateDetail$compo3.uniqueKey;
+    var paymentUniqueKey = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo4 = templateDetail.componentDtoList.find(function (item) {
+      return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
+    })) === null || _templateDetail$compo4 === void 0 ? void 0 : _templateDetail$compo4.uniqueKey;
+
+    if (tradeIdUniqueKey || paymentUniqueKey) {
+      var _allValue$paymentUniq;
+
+      var tradeValue = allValue[tradeIdUniqueKey];
+      var paymentValue = (_allValue$paymentUniq = allValue[paymentUniqueKey]) === null || _allValue$paymentUniq === void 0 ? void 0 : _allValue$paymentUniq.enterprisePaymentTid;
+
+      if (tradeValue || paymentValue) {
+        orderBack({
+          order_no: tradeValue || paymentValue,
+          form: form,
+          shopId: val,
+          shopList: shopList,
+          templateDetail: templateDetail,
+          callback: orderBackReplace
+        });
+      }
+    }
+  };
+
   var newRenderColumnItem = function newRenderColumnItem(effects) {
     return function (item) {
       if (look) {
@@ -700,7 +750,7 @@ var FormRender = function FormRender(props, ref) {
           platIconList: platIcon,
           workOrderId: workOrderId,
           look: look,
-          handleChangeShopId: setShopId
+          handleChangeShopId: handleChangeShopId
         }), finalFormItems]
       }))]
     })

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentWorkOrderCard/index.js

@@ -69,6 +69,7 @@ function PaymentWorkOrderCard(props) {
       workPayStatus = record.workPayStatus,
       operateTime = record.operateTime,
       operateNick = record.operateNick,
+      paymentOrderKey = record.paymentOrderKey,
       workPayFee = record.workPayFee,
       shopName = record.shopName,
       buyerNick = record.buyerNick,
@@ -200,6 +201,9 @@ function PaymentWorkOrderCard(props) {
       }, {
         label: '提交客服：',
         value: operateNick
+      }, {
+        label: '工单编号',
+        value: paymentOrderKey
       }])
     }), /*#__PURE__*/_jsx(Divider, {
       dashed: true,

package/dist/esm/WorkOrder/components/Widget/electricity/ELogistics/index.js

@@ -111,11 +111,11 @@ var ELogistics = /*#__PURE__*/function (_BasicComponent) {
     });
 
     _this.express = new Express(_objectSpread(_objectSpread({}, options), {}, {
-      name: '物流公司',
+      name: '快递物流公司',
       id: "".concat(options.id, "_expressLogisticsCompany")
     }));
     _this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, options), {}, {
-      name: '物流单号',
+      name: '快递物流单号',
       id: "".concat(options.id, "_expressLogisticsCode")
     }));
     _this.canHidden = true;

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

@@ -788,7 +788,7 @@ export var orderBack = /*#__PURE__*/function () {
                   case 'remark':
                     prv[uniqueKey] = {
                       remark: detail['remark'] || '',
-                      flag: detail['flag']
+                      flag: !detail['flag'] ? Number(detail['flag']) : detail['flag']
                     };
                     break;
 
@@ -829,24 +829,25 @@ export var orderBack = /*#__PURE__*/function () {
                   enterprisePaymentTid: order_no
                 });
               }
-            } // console.log('detailsValue++', formValue, detailsValue);
+            }
 
+            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 = 34;
+            _context.next = 35;
             break;
 
-          case 32:
-            _context.prev = 32;
+          case 33:
+            _context.prev = 33;
             _context.t0 = _context["catch"](5);
 
-          case 34:
+          case 35:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 32]]);
+    }, _callee, null, [[5, 33]]);
   }));
 
   return function orderBack(_x) {

package/dist/esm/model/workOrder.js

@@ -171,17 +171,18 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
             _action$getState2 = action.getState(), paySearch = _action$getState2.workOrder.paySearch, global = _action$getState2.global;
             _paySearch$tid = paySearch.tid, tid = _paySearch$tid === void 0 ? undefined : _paySearch$tid, _paySearch$paymentOrd = paySearch.paymentOrderKey, paymentOrderKey = _paySearch$paymentOrd === void 0 ? undefined : _paySearch$paymentOrd, time = paySearch.time, workPayStatus = paySearch.workPayStatus, pageNo = paySearch.pageNo, pageSize = paySearch.pageSize, isBuyer = paySearch.isBuyer;
             params = {
-              workPayStatus: workPayStatus,
+              // workPayStatus,
               pageNo: pageNo,
               pageSize: pageSize,
               shopId: global.platformInfo.shopId
             };
             tid && (params.tid = tid);
+            workPayStatus && (params.workPayStatus = workPayStatus);
             paymentOrderKey && (params.paymentOrderKey = paymentOrderKey);
 
             if (time.length) {
               params.operateStartTime = moment(time[0]).format('YYYY-MM-DD HH:mm:ss');
-              params.operateEndTime = moment(new Date(time[1]).getTime() + 24 * 60 * 60 * 1000 - 1000).format('YYYY-MM-DD HH:mm:ss');
+              params.operateEndTime = moment(time[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss');
             }
 
             if (isBuyer) {
@@ -189,15 +190,15 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
               params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
-            _context4.next = 9;
+            _context4.next = 10;
             return queryPaymentWorkOrderList(params);
 
-          case 9:
+          case 10:
             _yield$queryPaymentWo = _context4.sent;
             data = _yield$queryPaymentWo.data;
             return _context4.abrupt("return", data);
 
-          case 12:
+          case 13:
           case "end":
             return _context4.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.0-alpha.25",
+  "version": "0.4.0-alpha.27",
   "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.3-alpha.2",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.1.3-alpha.3",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",