kmkf-work-order-service-component 0.1.7 → 0.1.8-alpha.2

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

@@ -51,7 +51,8 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
   var shopList = props.shopList,
       onSuccess = props.onSuccess,
       look = props.look,
-      title = props.title;
+      title = props.title,
+      width = props.width;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -98,7 +99,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 +293,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 +408,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 +423,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
       templateId: templateId,
       workOrderId: workOrderId,
       shopId: shopId,
+      shopList: shopList,
       record: record,
       orderNo: orderNo,
       buyerId: buyerId,
@@ -469,7 +472,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     title: (templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.name) || '工单录入',
-    width: '90%',
+    width: width,
     open: visible,
     onClose: closeModal,
     footer: renderFooter(),

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

@@ -7,9 +7,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-13 14:30:28
- * @LastEditors: litian
- * @LastEditTime: 2022-09-19 10:01:49
- * @FilePath: /dy-work-order/src/components/CustomizeFormModal/wrap.tsx
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-26 15:00:58
+ * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/components/CustomizeFormModal/wrap.tsx
  * @Description:
  *
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
@@ -31,6 +31,7 @@ var openCustomizeWOrkOrder = function openCustomizeWOrkOrder(prefixParams) {
     function render() {
       reactRender( /*#__PURE__*/_jsx(CustomizeFormModal, {
         ref: ref,
+        width: "100%",
         onSuccess: function onSuccess(val) {
           if (typeof (prefixParams === null || prefixParams === void 0 ? void 0 : prefixParams.onSuccess) === 'function') {
             return prefixParams === null || prefixParams === void 0 ? void 0 : prefixParams.onSuccess(val);

package/dist/esm/WorkOrder/components/PayListOrderItem/ModifyModal.js

@@ -38,7 +38,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 
 function ModifyModal(props, ref) {
-  var afterSuccessUpdateWorkOrder = props.afterSuccessUpdateWorkOrder;
+  var afterSuccessUpdateWorkOrder = props.afterSuccessUpdateWorkOrder,
+      width = props.width;
   useImperativeHandle(ref, function () {
     return {
       openModal: function openModal(val, type) {
@@ -217,7 +218,7 @@ function ModifyModal(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     open: visible,
-    width: '90%',
+    width: width,
     onClose: function onClose() {
       form.resetFields();
       setVisible(false);

package/dist/esm/WorkOrder/components/PayListOrderItem/RecordModal.js

@@ -23,7 +23,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-09 16:58:00
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-21 11:27:52
+ * @LastEditTime: 2022-10-26 15:06:21
  */
 import React, { useImperativeHandle, forwardRef, useState } from 'react';
 import { Drawer } from 'antd';
@@ -106,7 +106,7 @@ function RecordModal(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     title: "\u8BB0\u5F55",
-    width: '90%',
+    width: props === null || props === void 0 ? void 0 : props.width,
     open: visible,
     onClose: function onClose() {
       return setVisible(false);

package/dist/esm/WorkOrder/components/PayListOrderItem/wrap.js

@@ -2,8 +2,8 @@
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-13 14:30:28
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-09-13 15:52:39
- * @FilePath: /dy-work-order/src/components/PayListOrderItem/wrap.tsx
+ * @LastEditTime: 2022-10-26 15:03:56
+ * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/components/PayListOrderItem/wrap.tsx
  * @Description:
  *
  * Copyright (c) 2022 by wangzhenggui jianjia.wzg@raycloud.com, All Rights Reserved.
@@ -22,6 +22,7 @@ var openPaymentWOrkOrder = function openPaymentWOrkOrder(record, type, cb) {
   function render() {
     reactRender( /*#__PURE__*/_jsx(ModifyModal, {
       ref: ref,
+      width: "100%",
       afterSuccessUpdateWorkOrder: cb
     }), container);
     setTimeout(function () {

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

@@ -120,7 +120,7 @@ var RecordLog = function RecordLog(props, ref) {
 
   return /*#__PURE__*/_jsx(Drawer, {
     open: visible,
-    width: '90%',
+    width: props === null || props === void 0 ? void 0 : props.width,
     title: "\u64CD\u4F5C\u8BB0\u5F55",
     onClose: function onClose() {
       return setVisible(false);

package/dist/esm/WorkOrder/index.js

@@ -28,7 +28,7 @@ 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 15:27:24
+ * @LastEditTime: 2022-10-26 15:06:55
  * @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
     });
@@ -494,13 +499,15 @@ var OrderList = function OrderList(_ref) {
         onChange: onChangePage
       })
     }), /*#__PURE__*/_jsx(RecordLog, {
-      ref: recordLogRef
+      ref: recordLogRef,
+      width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
     }), /*#__PURE__*/_jsx(TransferOrderModal, {
       ref: transferRef,
       handleTransCustomer: transCustomer
     }), /*#__PURE__*/_jsx(CustomizeFormModal, {
       ref: customizeFormRef,
       shopList: shopList,
+      width: platform === PlatForm.XIAOZHI ? '100%' : '90%',
       onSuccess: function onSuccess(_ref4) {
         var type = _ref4.type;
         onSearch();
@@ -753,10 +760,12 @@ var PayOrderList = function PayOrderList(_ref5) {
         onChange: onChangePage
       })
     }), /*#__PURE__*/_jsx(RecordModal, {
-      ref: logRef
+      ref: logRef,
+      width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
     }), /*#__PURE__*/_jsx(PayOrderModal, {
       ref: payOrderRef,
-      afterSuccessUpdateWorkOrder: onSearch
+      afterSuccessUpdateWorkOrder: onSearch,
+      width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
     })]
   });
 };

package/package.json

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