kmkf-work-order-service-component 0.5.0-alpha.11 → 0.5.0-alpha.2

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

@@ -4,11 +4,8 @@
   max-height: 78px;
   margin-bottom: 4px;
   overflow-y: auto;
-  background-color: #fff;
   &:hover {
-    position: absolute;
-    z-index: 1;
-    max-height: 160px;
+    max-height: 130px;
   }
   .template-button {
     margin-right: 8px;

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

@@ -139,7 +139,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
   var tabActive = _ref4.tabActive;
   var dispatch = useAppDispatch();
 
-  var _useState = useState(false),
+  var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       open = _useState2[0],
       setOpen = _useState2[1];
@@ -246,9 +246,6 @@ 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'),
@@ -377,8 +374,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     children: /*#__PURE__*/_jsxs("div", {
       className: "custom_box",
       style: {
-        display: tabActive === 'custom' ? 'flex' : 'none',
-        flexDirection: 'column'
+        display: tabActive === 'custom' ? 'block' : 'none'
       },
       children: [/*#__PURE__*/_jsxs("div", {
         className: "custom-top",
@@ -387,17 +383,14 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
           children: /*#__PURE__*/_jsx("span", {
             children: "\u9ED8\u8BA4\u8FD130\u5929\u7684\u5168\u90E8\u5DE5\u5355"
           })
-        }), /*#__PURE__*/_jsx("div", {
-          className: "template-list-flex-height",
-          children: /*#__PURE__*/_jsx(TemplateList, {
-            templateList: allTempLateList,
-            handleCreateWorkOrder: handleCreateWorkOrder
-          })
+        }), /*#__PURE__*/_jsx(TemplateList, {
+          templateList: allTempLateList,
+          handleCreateWorkOrder: handleCreateWorkOrder
         })]
       }), searchForm, /*#__PURE__*/_jsxs("div", {
         className: "custom_box_main_layout",
         children: [/*#__PURE__*/_jsx("main", {
-          className: "custom_box_main",
+          className: "custom_box_main custom_box_main_".concat(platform),
           children: dataSource.length > 0 ? dataSource.map(function (item) {
             return /*#__PURE__*/_jsx(CustomizeWorkOrderCard, {
               item: item,

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

@@ -1,5 +1,6 @@
 .custom_box {
-  overflow: hidden;
+  // height: calc(100vh - 58px);
+  overflow-x: hidden;
   :global(.ant-row) {
     margin: 0 !important;
   }
@@ -18,9 +19,6 @@
     justify-content: space-between;
     margin-bottom: 4px;
   }
-  .template-list-flex-height {
-    height: 78px;
-  }
   .custom_box_header {
     padding: 0 16px 16px 16px;
     border-bottom: 1px solid #f2f2f2;
@@ -127,19 +125,28 @@
 
   .custom_box_main_layout {
     display: flex;
-    flex: 1 1 auto;
     flex-direction: column;
     justify-content: space-between;
-    overflow: auto;
   }
 
   .custom_box_main {
+    height: calc(100vh - 338px);
     margin-top: 8px;
-    margin-bottom: 40px;
     overflow: auto;
     background-color: #fafafa;
   }
 
+  .custom_box_main_fxg {
+    height: calc(100vh - 412px);
+  }
+  .custom_box_main_xiaozhi {
+    height: calc(100vh - 228px);
+  }
+
+  .custom_box_main_ks {
+    height: calc(100vh - 538px); // TODO: ks顶部多144px
+  }
+
   .custom_box_main_empty {
     display: flex;
     align-items: center;
@@ -151,14 +158,11 @@
   }
 
   .custom_box_page {
-    position: absolute;
-    bottom: 0;
     display: flex;
-    flex: 1;
-    align-items: center;
+    flex-basis: 40px;
     justify-content: flex-end;
     width: 100%;
-    height: 40px;
+    padding: 0 16px;
     background-color: #fff;
   }
   .bottom-actions {
@@ -175,7 +179,7 @@
     cursor: pointer;
   }
   .customizeSearch {
-    padding: 8px 8px 0px 8px;
+    padding: 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/index.js

@@ -259,8 +259,7 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
   return /*#__PURE__*/_jsxs("div", {
     className: "custom_box",
     style: {
-      display: tabActive === 'payment' ? 'flex' : 'none',
-      flexDirection: 'column'
+      display: tabActive === 'payment' ? 'block' : 'none'
     },
     children: [/*#__PURE__*/_jsxs("div", {
       className: "bottom-actions",
@@ -276,9 +275,9 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
         onClick: handleAddPaymentWorkOrder,
         children: "+\u65B0\u5EFA\u5DE5\u5355"
       })]
-    }), searchForm, /*#__PURE__*/_jsxs("div", {
-      className: "payment_box_main",
-      children: [payOrderList.length ? payOrderList.map(function (item) {
+    }), searchForm, /*#__PURE__*/_jsx("div", {
+      className: "payment_box_main payment_box_main_".concat(platform),
+      children: payOrderList.length ? payOrderList.map(function (item) {
         return /*#__PURE__*/_jsx(PaymentWorkOrderCard, {
           record: item
         }, item.id);
@@ -292,21 +291,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: "custom_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

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

package/package.json

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