kmkf-work-order-service-component 0.1.6 → 0.1.8-alpha.1

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

@@ -98,7 +98,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       openModal: openModal,
       closeModal: closeModal
     };
-  }, [shopList]);
+  }, []);
 
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
@@ -292,13 +292,13 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
   var queryDetail = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-      var templateId, workOrderId, shopId, record, orderNo, buyerId, buyerNick, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _templateDetail$data3, jsonMap, _transData;
+      var templateId, workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, _workOrderDetail2, _workOrderDetail2$dat, _workOrderDetail2$dat2, _workOrderDetail, _templateDetail, _workOrderDetail3, _templateDetail$data, transData, _templateDetail$data2, _templateDetail$data3, jsonMap, _transData;
 
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId, buyerNick = _ref2.buyerNick;
+              templateId = _ref2.templateId, workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, shopList = _ref2.shopList, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId, buyerNick = _ref2.buyerNick;
               form.resetFields();
               _context2.prev = 2;
               setLoading(true);
@@ -407,6 +407,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
   var openModal = function openModal(_ref4) {
     var templateId = _ref4.templateId,
         shopId = _ref4.shopId,
+        shopList = _ref4.shopList,
         workOrderId = _ref4.workOrderId,
         _ref4$record = _ref4.record,
         record = _ref4$record === void 0 ? {} : _ref4$record,
@@ -421,6 +422,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       templateId: templateId,
       workOrderId: workOrderId,
       shopId: shopId,
+      shopList: shopList,
       record: record,
       orderNo: orderNo,
       buyerId: buyerId,

package/dist/esm/WorkOrder/index.js

@@ -27,8 +27,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-25 14:58:08
+ * @LastEditors: litian
+ * @LastEditTime: 2022-10-26 11:04:28
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -101,8 +101,7 @@ var WorkOrder = function WorkOrder(props) {
     }
   }, [buyerId]);
   useEffect(function () {
-    initHandle(); //存储平台信息
-
+    //存储平台信息
     dispatch({
       type: 'global/setState',
       payload: {
@@ -115,6 +114,9 @@ var WorkOrder = function WorkOrder(props) {
         }
       }
     });
+  }, [platform, shopId, buyerNick, buyerId, orderNo]);
+  useEffect(function () {
+    initHandle();
   }, []);
 
   var initHandle = function initHandle() {
@@ -240,9 +242,11 @@ var OrderList = function OrderList(_ref) {
 
 
   var openCustomForm = function openCustomForm(id) {
+    console.log('platformInfo', platformInfo, shopList);
     customizeFormRef.current.openModal({
       templateId: id,
       shopId: platformInfo.shopId + '',
+      shopList: shopList,
       orderNo: platformInfo.orderNo,
       buyerId: platformInfo.buyerId,
       buyerNick: platformInfo.buyerNick
@@ -255,6 +259,7 @@ var OrderList = function OrderList(_ref) {
       templateId: item.templateDetailDto.uniqueKey,
       record: item,
       shopId: item.shopId,
+      shopList: shopList,
       workOrderId: item.id,
       buyerNick: platformInfo.buyerNick
     });
@@ -458,9 +463,9 @@ var OrderList = function OrderList(_ref) {
           alt: ""
         })
       })]
-    }), /*#__PURE__*/_jsxs("main", {
+    }), /*#__PURE__*/_jsx("main", {
       className: "custom_box_main ".concat(platform === PlatForm.FXG ? 'custom_box_main_feige' : 'custom_box_main_other'),
-      children: [orderList.length ? orderList.map(function (item) {
+      children: orderList.length ? orderList.map(function (item) {
         return /*#__PURE__*/_jsx(ListOrderItem, {
           item: item,
           onEdit: onEdit,
@@ -479,20 +484,20 @@ var OrderList = function OrderList(_ref) {
             children: "\u6682\u65E0\u6570\u636E"
           })]
         })
-      }), total > 0 && /*#__PURE__*/_jsx("div", {
-        className: "custom_box_page ".concat(platform === PlatForm.FXG ? '' : 'custom_box_page_layout'),
-        children: /*#__PURE__*/_jsx(Pagination, {
-          showSizeChanger: false,
-          showQuickJumper: true,
-          showTotal: function showTotal(total) {
-            return "\u5171".concat(total, "\u6761");
-          },
-          current: customSearch.pageNo,
-          pageSize: customSearch.pageSize,
-          total: total,
-          onChange: onChangePage
-        })
-      })]
+      })
+    }), total > 0 && /*#__PURE__*/_jsx("div", {
+      className: "custom_box_page",
+      children: /*#__PURE__*/_jsx(Pagination, {
+        showSizeChanger: false,
+        showQuickJumper: true,
+        showTotal: function showTotal(total) {
+          return "\u5171".concat(total, "\u6761");
+        },
+        current: customSearch.pageNo,
+        pageSize: customSearch.pageSize,
+        total: total,
+        onChange: onChangePage
+      })
     }), /*#__PURE__*/_jsx(RecordLog, {
       ref: recordLogRef
     }), /*#__PURE__*/_jsx(TransferOrderModal, {
@@ -715,9 +720,9 @@ var PayOrderList = function PayOrderList(_ref5) {
           alt: ""
         })
       })]
-    }), /*#__PURE__*/_jsxs("div", {
+    }), /*#__PURE__*/_jsx("div", {
       className: "payment_box_main ".concat(platform === PlatForm.FXG ? 'payment_box_main_feige' : 'payment_box_main_other'),
-      children: [payOrderList.length ? payOrderList.map(function (item) {
+      children: payOrderList.length ? payOrderList.map(function (item) {
         return /*#__PURE__*/_jsx(PayListOrderItem, {
           record: item,
           onRefresh: onSearch,
@@ -738,20 +743,20 @@ var PayOrderList = function PayOrderList(_ref5) {
             children: "\u6682\u65E0\u6570\u636E"
           })]
         })
-      }), /*#__PURE__*/_jsx("div", {
-        className: "custom_box_page ".concat(platform === PlatForm.FXG ? '' : 'custom_box_page_layout'),
-        children: /*#__PURE__*/_jsx(Pagination, {
-          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, {
+        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(RecordModal, {
       ref: logRef
     }), /*#__PURE__*/_jsx(PayOrderModal, {

package/dist/esm/WorkOrder/index.less

@@ -1,6 +1,3 @@
-.order_container_padding_bottom {
-  padding-bottom: 40px;
-}
 .order_header {
   padding: 16px 16px 0 16px;
 
@@ -34,7 +31,7 @@
 }
 
 .custom_box {
-  height: calc(100% - 58px);
+  // height: calc(100% - 58px);
 
   .custom_box_header {
     padding: 0 16px 16px 16px;
@@ -144,11 +141,13 @@
     overflow: auto;
     background-color: #fafafa;
   }
+
   .custom_box_main_other {
     height: calc(100vh - 338px);
   }
+
   .custom_box_main_feige {
-    height: calc(100vh - 298px);
+    height: calc(100vh - 446px);
   }
 
   .custom_box_main_empty {
@@ -165,9 +164,11 @@
     overflow: auto;
     background-color: #fafafa;
   }
+
   .payment_box_main_feige {
-    height: calc(100vh - 196px);
+    height: calc(100vh - 340px);
   }
+
   .payment_box_main_other {
     height: calc(100vh - 236px);
   }
@@ -180,11 +181,6 @@
     padding: 0 16px;
     background-color: #fff;
   }
-  .custom_box_page_layout {
-    position: fixed;
-    right: 0px;
-    bottom: 0px;
-  }
 }
 
 .footer {

package/package.json

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