kmkf-work-order-service-component 0.4.10-alpha.5 → 0.4.10-alpha.7

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

@@ -83,7 +83,8 @@ function PaymentWorkOrderCard(props) {
       buyerNick = record.buyerNick,
       tid = record.tid,
       accountNickMix = record.accountNickMix,
-      accountNoMix = record.accountNoMix;
+      accountNoMix = record.accountNoMix,
+      remitTime = record.remitTime;
   var btnList = workPayStatusFuncMap[workPayStatus].map(function (id) {
     return /*#__PURE__*/React.createElement("div", {
       className: "orderItemOperate",
@@ -211,14 +212,18 @@ function PaymentWorkOrderCard(props) {
 
   var renderFormItem = function renderFormItem(items) {
     return items.map(function (item, index) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "orderItemView",
-        key: index
-      }, /*#__PURE__*/React.createElement("span", {
-        className: "itemViewLeft"
-      }, item.label), /*#__PURE__*/React.createElement("span", {
-        className: "itemViewRight"
-      }, item.value));
+      if (item.value) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "orderItemView",
+          key: index
+        }, /*#__PURE__*/React.createElement("span", {
+          className: "itemViewLeft"
+        }, item.label), /*#__PURE__*/React.createElement("span", {
+          className: "itemViewRight"
+        }, item.value));
+      }
+
+      return null;
     });
   };
 
@@ -249,8 +254,8 @@ function PaymentWorkOrderCard(props) {
     label: '提交客服：',
     value: operateNick
   }, {
-    label: '工单编号：',
-    value: paymentOrderKey
+    label: '打款时间：',
+    value: remitTime ? moment(remitTime).format('YYYY-MM-DD HH:mm:ss') : ''
   }])), /*#__PURE__*/React.createElement(Divider, {
     dashed: true,
     style: {
@@ -276,6 +281,9 @@ function PaymentWorkOrderCard(props) {
   }, {
     label: '支付宝账号：',
     value: accountNoMix
+  }, {
+    label: '工单编号：',
+    value: paymentOrderKey
   }])), /*#__PURE__*/React.createElement(Divider, {
     dashed: true,
     style: {

package/dist/esm/WorkOrder/components/Widget/jst/JstSendGood/index.js

@@ -112,7 +112,7 @@ var JstSendGood = /*#__PURE__*/function (_BasicComponent) {
       });
     });
 
-    _this.name = 'jst发货仓名称/编码';
+    _this.name = 'jst发货仓编码/名称';
     _this.width = 340;
     _this.canFilter = false;
     _this.canGroup = false;

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

@@ -1129,11 +1129,11 @@ export var taobaoGoodHandle = function taobaoGoodHandle(arr, type, config) {
     }
 
     if (changeSku) {
-      params.propertiesName = item.propertiesName;
+      params.propertiesName = (skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.propertiesName) || '';
     }
 
     if (type === 'ITEM_ENCODE') {
-      params.outerId = outerId;
+      params.outerId = (skuInfoDTO === null || skuInfoDTO === void 0 ? void 0 : skuInfoDTO.outerSkuId) || outerId;
     } else if (type === 'ITEM_SELECT_THIRD') {
       params.itemId = '';
       params.supplierName = '';

package/package.json

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