kmkf-work-order-service-component 0.5.0-alpha.8 → 0.5.0

package/dist/esm/FormRender/index.js

@@ -434,17 +434,18 @@ var FormRender = function FormRender(props, ref) {
 
 
   var orderBackReplace = function orderBackReplace(value, templateDetail) {
-    var tradeId = value.tradeId,
-        buyer = value.buyer,
+    var orderNo = value.orderNo,
+        buyerNick = value.buyerNick,
         receiveMobile = value.receiveMobile,
         alipayAccount = value.alipayAccount,
         expressLogisticsCode = value.expressLogisticsCode;
     queryReplaceCount({
-      tradeId: tradeId,
-      buyerNick: buyer === null || buyer === void 0 ? void 0 : buyer.buyerNick,
+      tradeId: orderNo,
+      buyerNick: buyerNick,
       receiveMobile: receiveMobile,
       alipayAccount: alipayAccount,
-      expressLogisticsCode: expressLogisticsCode
+      expressLogisticsCode: expressLogisticsCode,
+      enterprisePaymentTid: orderNo
     }, templateDetail);
   }; // 切换模板
 

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

@@ -48,17 +48,20 @@ var RepeatWorkOrder = function RepeatWorkOrder(_ref) {
       children: /*#__PURE__*/_jsx("ol", {
         className: "customize-repeat-workOrder",
         children: repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
-          return /*#__PURE__*/_jsxs("li", {
-            children: [/*#__PURE__*/_jsx("span", {
-              className: "workOrderId",
-              children: item
-            }), /*#__PURE__*/_jsx(Button, {
-              type: "link",
-              onClick: function onClick() {
-                return copyHandle(item);
-              },
-              children: "\u590D\u5236"
-            })]
+          return /*#__PURE__*/_jsx("li", {
+            children: /*#__PURE__*/_jsxs("div", {
+              className: "workOrderIdWrap",
+              children: [/*#__PURE__*/_jsx("span", {
+                className: "workOrderId",
+                children: item
+              }), /*#__PURE__*/_jsx(Button, {
+                type: "link",
+                onClick: function onClick() {
+                  return copyHandle(item);
+                },
+                children: "\u590D\u5236"
+              })]
+            })
           });
         })
       })
@@ -136,14 +139,20 @@ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
   };
 
   return /*#__PURE__*/_jsx(Modal, {
-    title: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7",
+    title: /*#__PURE__*/_jsx("span", {
+      style: {
+        fontWeight: 600
+      },
+      children: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7"
+    }),
     visible: visible,
     onCancel: handleCancel,
     footer: null,
     bodyStyle: {
-      maxHeight: '300px',
+      maxHeight: '400px',
       overflowY: 'auto'
     },
+    destroyOnClose: true,
     children: /*#__PURE__*/_jsx(Spin, {
       spinning: loading,
       children: /*#__PURE__*/_jsx("div", {
@@ -155,7 +164,7 @@ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
 
           if (item !== null && item !== void 0 && (_item$repeatField = item.repeatField) !== null && _item$repeatField !== void 0 && _item$repeatField.endsWith('_tradeId')) {
             return /*#__PURE__*/_jsx(RepeatWorkOrder, {
-              title: "\u8BA2\u5355\u91CD\u590D",
+              title: "\u8BA2\u5355\u53F7\u91CD\u590D",
               repeatWorkOrderList: item.workOrderIds
             });
           }

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/RepeatWorkOrderListModal/index.less

@@ -1,10 +1,10 @@
 .item-wrap {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
   margin-bottom: 4px;
   background: #fff;
   .item-main-item {
-    flex-basis: 100px;
+    // flex-basis: 100px;
     font-weight: 600;
     font-size: 14px;
     line-height: 32px;
@@ -15,16 +15,20 @@
   li {
     margin-bottom: 4px;
     list-style: decimal;
-    .workOrderId {
-      display: inline-flex;
-      width: 260px;
-      margin-right: 16px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-    .text-repeat {
-      cursor: pointer;
+    .workOrderIdWrap {
+      display: flex;
+      align-content: center;
+      .workOrderId {
+        display: inline-block;
+        width: 240px;
+        margin-right: 16px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+      .text-repeat {
+        cursor: pointer;
+      }
     }
   }
 }

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

@@ -246,6 +246,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
   };
 
   var searchForm = /*#__PURE__*/_jsxs("div", {
+    style: {
+      marginTop: '8px'
+    },
     children: [/*#__PURE__*/_jsx(Form, {
       form: form,
       className: "customizeSearch ".concat(open ? 'open' : 'close'),
@@ -394,7 +397,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       }), searchForm, /*#__PURE__*/_jsxs("div", {
         className: "custom_box_main_layout",
         children: [/*#__PURE__*/_jsx("main", {
-          className: "custom_box_main custom_box_main_".concat(platform),
+          className: "custom_box_main",
           children: dataSource.length > 0 ? dataSource.map(function (item) {
             return /*#__PURE__*/_jsx(CustomizeWorkOrderCard, {
               item: item,

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

@@ -135,9 +135,9 @@
 
   .custom_box_main {
     margin-top: 8px;
-    background-color: #fafafa;
-    overflow: auto;
     margin-bottom: 40px;
+    overflow: auto;
+    background-color: #fafafa;
   }
 
   .custom_box_main_empty {
@@ -151,15 +151,15 @@
   }
 
   .custom_box_page {
-    display: flex;
-    justify-content: flex-end;
-    width: 100%;
-    background-color: #fff;
     position: absolute;
     bottom: 0;
-    height: 40px;
+    display: flex;
     flex: 1;
     align-items: center;
+    justify-content: flex-end;
+    width: 100%;
+    height: 40px;
+    background-color: #fff;
   }
   .bottom-actions {
     display: flex;
@@ -175,7 +175,7 @@
     cursor: pointer;
   }
   .customizeSearch {
-    padding: 8px;
+    padding: 8px 8px 0px 8px;
     background-color: #fff;
     transition: all 0.3s linear;
     .ant-form-item {

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

@@ -318,13 +318,13 @@ function PaymentWorkOrderCard(props) {
     }), /*#__PURE__*/_jsx("div", {
       className: "workOrderInfo",
       children: renderFormItem([{
-        label: '提交时间：',
+        label: '提交时间:',
         value: moment(operateTime).format('YYYY-MM-DD HH:mm:ss')
       }, {
-        label: '提交客服：',
+        label: '提交客服:',
         value: operateNick
       }, {
-        label: '打款时间：',
+        label: '打款时间:',
         value: remitTime ? moment(remitTime).format('YYYY-MM-DD HH:mm:ss') : ''
       }])
     }), /*#__PURE__*/_jsx(Divider, {
@@ -335,22 +335,22 @@ function PaymentWorkOrderCard(props) {
     }), /*#__PURE__*/_jsxs("div", {
       className: "paymentInfo",
       children: [renderFormItem([{
-        label: '打款金额：',
+        label: '打款金额:',
         value: "\xA5 ".concat(workPayFee)
       }, {
-        label: '店铺名称：',
+        label: '店铺名称:',
         value: shopName
       }, {
-        label: '买家昵称：',
+        label: '买家昵称:',
         value: buyerNick
       }, {
-        label: '订单编号：',
+        label: '订单编号:',
         value: tid
       }, {
-        label: '支付宝名称：',
+        label: '支付宝名称:',
         value: accountNickMix
       }, {
-        label: '支付宝账号：',
+        label: '支付宝账号:',
         value: accountNoMix
       }]), /*#__PURE__*/_jsx(WorkOrderId, {
         label: "\u5DE5\u5355\u7F16\u53F7\uFF1A",

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

@@ -25,14 +25,20 @@ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
   };
 
   return /*#__PURE__*/_jsx(Modal, {
-    title: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7",
+    title: /*#__PURE__*/_jsx("span", {
+      style: {
+        fontWeight: 600
+      },
+      children: "\u91CD\u590D\u63D0\u4EA4\u5DE5\u5355\u7F16\u53F7"
+    }),
     visible: visible,
     onCancel: handleCancel,
     footer: null,
     bodyStyle: {
-      maxHeight: '500px',
+      maxHeight: '400px',
       overflowY: 'auto'
     },
+    destroyOnClose: true,
     children: /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx("span", {
         className: "repeat-trade-id",
@@ -40,17 +46,20 @@ var RepeatWorkOrderListModal = function RepeatWorkOrderListModal() {
       }), /*#__PURE__*/_jsx("ol", {
         className: "repeat-workOrder",
         children: repeatWorkOrderList === null || repeatWorkOrderList === void 0 ? void 0 : repeatWorkOrderList.map(function (item) {
-          return /*#__PURE__*/_jsxs("li", {
-            children: [/*#__PURE__*/_jsx("span", {
-              className: "workOrderId",
-              children: item
-            }), /*#__PURE__*/_jsx(Button, {
-              type: "link",
-              onClick: function onClick() {
-                return copyHandle(item);
-              },
-              children: "\u590D\u5236"
-            })]
+          return /*#__PURE__*/_jsx("li", {
+            children: /*#__PURE__*/_jsxs("div", {
+              className: "workOrderIdWrap",
+              children: [/*#__PURE__*/_jsx("span", {
+                className: "workOrderId",
+                children: item
+              }), /*#__PURE__*/_jsx(Button, {
+                type: "link",
+                onClick: function onClick() {
+                  return copyHandle(item);
+                },
+                children: "\u590D\u5236"
+              })]
+            })
           });
         })
       })]

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/RepeatWorkOrderListModal/index.less

@@ -6,14 +6,19 @@
   li {
     padding: 4px 0px;
     list-style: decimal;
-    .workOrderId {
-      display: inline-flex;
-      width: 300px;
-      margin-right: 16px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
+    .workOrderIdWrap {
+      display: flex;
+      align-items: center;
+      .workOrderId {
+        display: inline-block;
+        width: 240px;
+        margin-right: 16px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
     }
+
     .text-repeat {
       cursor: pointer;
     }

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

@@ -128,19 +128,19 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
         paySearch: {
           pageNo: 1,
           pageSize: 20,
-          time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
+          time: [moment().subtract(30, 'day').startOf('day'), moment().endOf('day')],
           workPayStatus: '',
           tid: '',
-          paymentOrderKey: '',
+          paymentMixUk: '',
           isBuyer: false
         }
       }
     });
     form.setFieldsValue({
-      time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
+      time: [moment().subtract(30, 'day').startOf('day'), moment().endOf('day')],
       workPayStatus: '',
       tid: '',
-      paymentOrderKey: ''
+      paymentMixUk: ''
     });
   };
 
@@ -259,7 +259,8 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
   return /*#__PURE__*/_jsxs("div", {
     className: "custom_box",
     style: {
-      display: tabActive === 'payment' ? 'block' : 'none'
+      display: tabActive === 'payment' ? 'flex' : 'none',
+      flexDirection: 'column'
     },
     children: [/*#__PURE__*/_jsxs("div", {
       className: "bottom-actions",
@@ -275,9 +276,9 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
         onClick: handleAddPaymentWorkOrder,
         children: "+\u65B0\u5EFA\u5DE5\u5355"
       })]
-    }), searchForm, /*#__PURE__*/_jsx("div", {
-      className: "payment_box_main payment_box_main_".concat(platform),
-      children: payOrderList.length ? payOrderList.map(function (item) {
+    }), searchForm, /*#__PURE__*/_jsxs("div", {
+      className: "payment_box_main",
+      children: [payOrderList.length ? payOrderList.map(function (item) {
         return /*#__PURE__*/_jsx(PaymentWorkOrderCard, {
           record: item
         }, item.id);
@@ -291,21 +292,21 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
             children: "\u6682\u65E0\u6570\u636E"
           })]
         })
-      })
-    }), /*#__PURE__*/_jsx("div", {
-      className: "payment_box_page",
-      children: /*#__PURE__*/_jsx(Pagination, {
-        size: "small",
-        showQuickJumper: true,
-        showSizeChanger: false,
-        showTotal: function showTotal(total) {
-          return "\u5171".concat(total, "\u6761");
-        },
-        current: paySearch.pageNo,
-        pageSize: paySearch.pageSize,
-        total: total,
-        onChange: onChangePage
-      })
+      }), /*#__PURE__*/_jsx("div", {
+        className: "payment_box_page",
+        children: /*#__PURE__*/_jsx(Pagination, {
+          size: "small",
+          showQuickJumper: true,
+          showSizeChanger: false,
+          showTotal: function showTotal(total) {
+            return "\u5171".concat(total, "\u6761");
+          },
+          current: paySearch.pageNo,
+          pageSize: paySearch.pageSize,
+          total: total,
+          onChange: onChangePage
+        })
+      })]
     }), /*#__PURE__*/_jsx(ExamineModal, {}), /*#__PURE__*/_jsx(UnExamineModal, {}), /*#__PURE__*/_jsx(DeletePaymentWorkOrderModal, {}), /*#__PURE__*/_jsx(FlagPayModal, {}), /*#__PURE__*/_jsx(RecordModal, {
       width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
     }), /*#__PURE__*/_jsx(PaymentFormModal, {

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/index.less

@@ -122,21 +122,22 @@
   }
 
   .payment_box_main {
-    height: calc(100vh - 236px);
+    display: flex;
+    flex: 1 1 auto;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-top: 8px;
+    margin-bottom: 40px;
+    overflow: auto;
     overflow: auto;
     background-color: #fafafa;
   }
 
-  .payment_box_main_fxg {
-    height: calc(100vh - 340px);
-  }
-
-  .payment_box_main_ks {
-    height: calc(100vh - 436px);
-  }
-
   .payment_box_page {
+    position: absolute;
+    bottom: 0;
     display: flex;
+    align-items: center;
     justify-content: flex-end;
     width: 100%;
     height: 40px;

package/dist/esm/WorkOrder/components/Widget/third/Payment/index.js

@@ -127,9 +127,7 @@ var Payment = /*#__PURE__*/function (_BasicComponent) {
         rules: _this.customRules(_this.componentConfig),
         required: (_this$componentConfig = _this.componentConfig) === null || _this$componentConfig === void 0 ? void 0 : _this$componentConfig.required,
         component: /*#__PURE__*/_jsx(ApaasPayment, _objectSpread(_objectSpread({}, _this.componentConfig), {}, {
-          onSearch: function onSearch(e) {
-            return _this.changeHandle(e.target.value);
-          },
+          // onSearch={(e) => this.changeHandle(e.target.value)}
           onBlur: onBlur
         }))
       }, value));

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

@@ -846,8 +846,7 @@ export var orderBack = /*#__PURE__*/function () {
             formValue = form.getFieldsValue();
             detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
               jstItemList: jstInfo
-            });
-            console.log(detail); //抖音数据特殊处理
+            }); //抖音数据特殊处理
 
             if (shopSourceStr === 'FXG') {
               detail = updateDYDetails(detail);
@@ -982,24 +981,24 @@ export var orderBack = /*#__PURE__*/function () {
                   enterprisePaymentTid: order_no
                 });
               }
-            }
+            } // console.log(values, detail);
+
 
-            console.log(values);
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
             callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-            _context.next = 30;
+            _context.next = 28;
             break;
 
-          case 28:
-            _context.prev = 28;
+          case 26:
+            _context.prev = 26;
             _context.t0 = _context["catch"](5);
 
-          case 30:
+          case 28:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 28]]);
+    }, _callee, null, [[5, 26]]);
   }));
 
   return function orderBack(_x) {
@@ -1062,14 +1061,16 @@ export var COMPONENT_MAP = {
   buyerNick: 'BUYER_NICK_INPUT',
   receiveMobile: 'RECEIVER_MOBILE_INPUT',
   alipayAccount: 'ALI_PAY_INPUT',
-  expressLogisticsCode: 'EXPRESS_LOGISTICS_SELECT'
+  expressLogisticsCode: 'EXPRESS_LOGISTICS_SELECT',
+  enterprisePaymentTid: 'ENTERPRISE_PAYMENT'
 };
 export var COMPONENT_MAP_NAME = {
   tradeId: '订单号',
   buyerNick: '买家昵称',
   receiveMobile: '收件人手机号',
   alipayAccount: '支付宝账号',
-  expressLogisticsCode: '快递物流单号'
+  expressLogisticsCode: '快递物流单号',
+  enterprisePaymentTid: '打款订单号'
 }; //数据唯一性校验提交数据组装
 
 export var getReplaceWarnValues = function getReplaceWarnValues(templateDetail, keyValues) {

package/dist/esm/model/workOrder.js

@@ -57,7 +57,7 @@ var initialState = {
     time: [moment().subtract(30, 'day').startOf('day'), moment().endOf('day')],
     workPayStatus: '',
     tid: '',
-    paymentOrderKey: '',
+    paymentMixUk: '',
     isBuyer: false
   },
   templateDetails: {} //打开的模版
@@ -180,7 +180,7 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
             workPayStatus && (params.workPayStatus = workPayStatus);
             paymentMixUk && (params.paymentMixUk = paymentMixUk);
 
-            if (time.length) {
+            if (time !== null && time !== void 0 && time.length) {
               params.operateStartTime = moment(time[0]).format('YYYY-MM-DD HH:mm:ss');
               params.operateEndTime = moment(time[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss');
             }

package/package.json

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