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

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

@@ -53,7 +53,8 @@ function CustomizeWorkOrderCard(props) {
     'OPERATOR_INPUT', // 提交人
     'CREATED_DATETIME', // 创建时间
     'SHOP_INPUT', // 店铺
-    'UPDATE_DATETIME'].includes(i.workOrderComponentType);
+    'UPDATE_DATETIME', 'COMPLETED_DATETIME' // 完成时间
+    ].includes(i.workOrderComponentType);
   });
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], filterComponentDtoList),
@@ -176,7 +177,7 @@ function CustomizeWorkOrderCard(props) {
   var ItemView = function ItemView(_ref) {
     var label = _ref.label,
         value = _ref.value;
-    return /*#__PURE__*/_jsxs("div", {
+    return value ? /*#__PURE__*/_jsxs("div", {
       className: "orderItemView",
       children: [/*#__PURE__*/_jsxs("div", {
         className: "itemViewLeft",
@@ -185,7 +186,7 @@ function CustomizeWorkOrderCard(props) {
         className: "itemViewRight",
         children: value
       })]
-    });
+    }) : null;
   };
 
   return /*#__PURE__*/_jsxs("div", {
@@ -234,7 +235,13 @@ function CustomizeWorkOrderCard(props) {
     }), /*#__PURE__*/_jsx(ItemView, {
       label: "\u4FEE\u6539\u65F6\u95F4",
       value: moment(transData.update).format('YYYY-MM-DD HH:mm:ss')
-    }, "update"), /*#__PURE__*/_jsx(Divider, {
+    }, "update"), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u5B8C\u6210\u65F6\u95F4",
+      value: moment(transData.completedTime).format('YYYY-MM-DD HH:mm:ss')
+    }, "completedTime"), /*#__PURE__*/_jsx(ItemView, {
+      label: "\u5B8C\u6210\u4EBA",
+      value: transData.completedUserName
+    }, "completedUserName"), /*#__PURE__*/_jsx(Divider, {
       dashed: true,
       style: {
         margin: '8px 0'

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

@@ -202,7 +202,7 @@ function PaymentWorkOrderCard(props) {
         label: '提交客服：',
         value: operateNick
       }, {
-        label: '工单编号',
+        label: '工单编号：',
         value: paymentOrderKey
       }])
     }), /*#__PURE__*/_jsx(Divider, {

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

@@ -58,7 +58,7 @@ var Express = /*#__PURE__*/function (_BasicComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
       return /*#__PURE__*/_jsx("span", {
-        children: express.getExpressNameByCode(value)
+        children: express.getExpressNameByCode(value) || value
       });
     });
 

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'] ? Number(detail['flag']) : detail['flag']
+                      flag: !!detail['flag'] ? Number(detail['flag']) : detail['flag']
                     };
                     break;
 

package/dist/esm/model/workOrder.js

@@ -171,7 +171,6 @@ 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,
               pageNo: pageNo,
               pageSize: pageSize,
               shopId: global.platformInfo.shopId

package/package.json

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