kmkf-work-order-service-component 0.0.1-alpha.10 → 0.0.1-alpha.12

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

@@ -720,23 +720,43 @@ export var orderBack = /*#__PURE__*/function () {
               return prv;
             }, {}); //有打款组件返填订单编号
 
+            console.log('formValue', formValue);
             ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).forEach(function (item) {
               if (item.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
                 detailsValue["".concat(item.uniqueKey, "_enterprisePaymentTid")] = detail['tradeId'];
-                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
+                detailsValue["".concat(item.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = formValue[item.uniqueKey]['enterprisePaymentBuyerOpenUid'];
               }
 
               if (item.workOrderComponentType === 'BUYER_NICK_INPUT') {
                 detailsValue["".concat(item.uniqueKey, "_buyerOpenUid")] = formValue[item.uniqueKey]['buyerOpenUid'];
               }
+
+              var GOOD_LIST = ['ITEM_ENCODE', 'ITEM_ID', 'ITEM_SELECT', 'ITEM_SELECT_THIRD'];
+
+              if (GOOD_LIST.includes(item.workOrderComponentType)) {
+                var itemList = detail['itemList'] || []; // let newList = itemList.map((t: any) => {
+                //   const { numIid, outerId, picUrl, platform, price, title } = t
+                //   let value = {
+                //     numIid,
+                //     outerId,
+                //     picUrl,
+                //     platform: platform.toLowerCase(),
+                //     price,
+                //     title
+                //   };
+                //   return value
+                // })
+
+                detailsValue["".concat(item.uniqueKey, "_itemList")] = JSON.stringify(itemList);
+              }
             });
             newData = calcWorkOrderList([{
               jsonMap: detailsValue
-            }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init'); // console.log('detailsValue++', formValue, newData[0]);
-
+            }], templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'init');
+            console.log('detailsValue++', detailsValue, newData[0]);
             form.setFieldsValue(_objectSpread({}, newData[0]));
 
-          case 20:
+          case 22:
           case "end":
             return _context.stop();
         }

package/dist/esm/WorkOrder/components/ListOrderItem/index.module.less

@@ -32,7 +32,7 @@
       }
 
       .orderItemLeftName {
-        width: 115px;
+        // width: 115px;
         line-height: 16px;
       }
     }

package/dist/esm/WorkOrder/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import './index.less';
 interface WorkOrderProps {
     platform: string;
     shopId?: string;

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: litian
- * @LastEditTime: 2022-09-28 16:36:33
+ * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
+ * @LastEditTime: 2022-10-08 13:35:45
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -53,8 +53,9 @@ import { Provider } from 'react-redux';
 import { transferWorkOrder } from "./model/servers/api";
 import get from 'lodash/get';
 import refreshImg from "./common/imgs/refresh.png";
-import emptyImg from "./common/imgs/empty.png";
-import styles from "./index.module.less";
+import emptyImg from "./common/imgs/empty.png"; // import styles from './index.module.less';
+
+import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Option = Select.Option;
@@ -107,17 +108,17 @@ var WorkOrder = function WorkOrder(props) {
 
   return /*#__PURE__*/_jsxs(Wrapper, {
     children: [/*#__PURE__*/_jsx("header", {
-      className: styles.order_header,
+      className: "order_header",
       children: /*#__PURE__*/_jsxs("div", {
-        className: styles.order_header_tabs,
+        className: "order_header_tabs",
         children: [/*#__PURE__*/_jsx("div", {
-          className: "".concat(styles.order_header_tabs_button, " ").concat(tabActive === 'custom' ? styles.active : ''),
+          className: "order_header_tabs_button ".concat(tabActive === 'custom' ? "active" : ''),
           onClick: function onClick() {
             return setTabActive('custom');
           },
           children: "\u81EA\u5B9A\u4E49\u5DE5\u5355"
         }), /*#__PURE__*/_jsx("div", {
-          className: "".concat(styles.order_header_tabs_button, " ").concat(styles.border_left, " ").concat(tabActive === 'payment' ? styles.active : ''),
+          className: "order_header_tabs_button border_left ".concat(tabActive === 'payment' ? 'active' : ''),
           onClick: function onClick() {
             return setTabActive('payment');
           },
@@ -227,11 +228,6 @@ var OrderList = function OrderList(tabActive) {
 
 
   var openCustomForm = function openCustomForm(id) {
-    if (!platformInfo.buyerId) {
-      message.error('请选择用户');
-      return;
-    }
-
     openCustomizeWOrkOrderModal({
       templateId: id,
       shopId: platformInfo.shopId + '',
@@ -308,14 +304,14 @@ var OrderList = function OrderList(tabActive) {
   }();
 
   return /*#__PURE__*/_jsxs("div", {
-    className: styles.custom_box,
+    className: "custom_box",
     style: {
       display: tabActive === 'custom' ? 'block' : 'none'
     },
     children: [/*#__PURE__*/_jsxs("div", {
-      className: styles.custom_box_header,
+      className: "custom_box_header",
       children: [/*#__PURE__*/_jsx(Cascader, {
-        className: styles.custom_box_header_cascader,
+        className: "custom_box_header_cascader",
         options: groupAllList,
         placeholder: "\u8BF7\u8F93\u5165\u6A21\u7248\u540D\u79F0",
         showSearch: true,
@@ -327,15 +323,15 @@ var OrderList = function OrderList(tabActive) {
             label: item.label,
             key: item.value + '',
             children: /*#__PURE__*/_jsx("div", {
-              className: styles.custom_temp_box,
+              className: "custom_temp_box",
               children: /*#__PURE__*/_jsx("div", {
-                className: styles.custom_temp_list,
+                className: "custom_temp_list",
                 children: /*#__PURE__*/_jsx(Space, {
                   size: [8, 8],
                   wrap: true,
                   children: item.children.map(function (t) {
                     return /*#__PURE__*/_jsx("div", {
-                      className: styles.custom_temp_list_button,
+                      className: "custom_temp_list_button",
                       onClick: function onClick() {
                         return openCustomForm(t.value);
                       },
@@ -352,11 +348,11 @@ var OrderList = function OrderList(tabActive) {
         }
       })]
     }), /*#__PURE__*/_jsxs("div", {
-      className: styles.custom_box_search,
+      className: "custom_box_search",
       children: [/*#__PURE__*/_jsxs("div", {
-        className: styles.custom_box_search_box,
+        className: "custom_box_search_box",
         children: [/*#__PURE__*/_jsx(Select, {
-          className: styles.custom_box_search_date,
+          className: "custom_box_search_date",
           value: customSearch.filterDay,
           onChange: function onChange(val) {
             return upDateState('filterDay', val);
@@ -368,7 +364,7 @@ var OrderList = function OrderList(tabActive) {
             }, item.name);
           })
         }), /*#__PURE__*/_jsx(Cascader, {
-          className: styles.custom_box_search_cascader,
+          className: "custom_box_search_cascader",
           options: groupAllList,
           showSearch: true,
           onChange: function onChange(val) {
@@ -377,7 +373,7 @@ var OrderList = function OrderList(tabActive) {
           value: customSearch.tempSelect,
           allowClear: false
         }), /*#__PURE__*/_jsx(Checkbox, {
-          className: styles.custom_box_search_buyer,
+          className: "custom_box_search_buyer",
           checked: customSearch.isBuyer,
           onChange: function onChange(e) {
             return upDateState('isBuyer', e.target.checked);
@@ -385,7 +381,7 @@ var OrderList = function OrderList(tabActive) {
           children: "\u5F53\u524D\u4E70\u5BB6"
         })]
       }), /*#__PURE__*/_jsx("div", {
-        className: styles.custom_box_search_refresh,
+        className: "custom_box_search_refresh",
         onClick: onSearch,
         children: /*#__PURE__*/_jsx("img", {
           src: refreshImg,
@@ -393,7 +389,7 @@ var OrderList = function OrderList(tabActive) {
         })
       })]
     }), /*#__PURE__*/_jsx("main", {
-      className: styles.custom_box_main,
+      className: "custom_box_main",
       children: orderList.length ? orderList.map(function (item) {
         return ListOrderItem({
           item: item,
@@ -403,7 +399,7 @@ var OrderList = function OrderList(tabActive) {
           onTransfer: onTransfer
         });
       }) : /*#__PURE__*/_jsx("div", {
-        className: styles.custom_box_main_empty,
+        className: "custom_box_main_empty",
         children: /*#__PURE__*/_jsxs("div", {
           children: [/*#__PURE__*/_jsx("img", {
             src: emptyImg,
@@ -414,7 +410,7 @@ var OrderList = function OrderList(tabActive) {
         })
       })
     }), /*#__PURE__*/_jsx("div", {
-      className: styles.custom_box_page,
+      className: "custom_box_page",
       children: /*#__PURE__*/_jsx(Pagination, {
         showSizeChanger: false,
         showQuickJumper: true,
@@ -534,17 +530,17 @@ var PayOrderList = function PayOrderList(tabActive) {
   };
 
   return /*#__PURE__*/_jsxs("div", {
-    className: styles.custom_box,
+    className: "custom_box",
     style: {
       display: tabActive === 'payment' ? 'block' : 'none'
     },
     children: [/*#__PURE__*/_jsx("div", {
-      className: styles.custom_box_header,
+      className: "custom_box_header",
       children: /*#__PURE__*/_jsx(Space, {
         size: [8, 8],
         wrap: true,
         children: /*#__PURE__*/_jsx("span", {
-          className: styles.custom_temp_list_button,
+          className: "custom_temp_list_button",
           onClick: function onClick() {
             var _shopList$find;
 
@@ -561,11 +557,11 @@ var PayOrderList = function PayOrderList(tabActive) {
         })
       })
     }), /*#__PURE__*/_jsxs("div", {
-      className: "".concat(styles.custom_box_search, " ").concat(styles.pay_search),
+      className: "custom_box_search pay_search",
       children: [/*#__PURE__*/_jsxs("div", {
-        className: "".concat(styles.custom_box_search_box, " ").concat(styles.pay_search_box),
+        className: "custom_box_search_box pay_search_box",
         children: [/*#__PURE__*/_jsxs(Select, {
-          className: styles.custom_box_search_date,
+          className: "custom_box_search_date",
           value: paySearch.timeType,
           onChange: function onChange(val) {
             return upDateState('timeType', val);
@@ -581,7 +577,7 @@ var PayOrderList = function PayOrderList(tabActive) {
             children: "\u6253\u6B3E\u65F6\u95F4"
           })]
         }), /*#__PURE__*/_jsx(Select, {
-          className: styles.custom_box_search_cascader,
+          className: "custom_box_search_cascader",
           value: paySearch.workPayStatus,
           onChange: function onChange(val) {
             return upDateState('workPayStatus', val);
@@ -593,7 +589,7 @@ var PayOrderList = function PayOrderList(tabActive) {
             }, item.value);
           })
         }), /*#__PURE__*/_jsx(Checkbox, {
-          className: styles.custom_box_search_buyer,
+          className: "custom_box_search_buyer",
           checked: paySearch.isBuyer,
           onChange: function onChange(e) {
             return upDateState('isBuyer', e.target.checked);
@@ -608,7 +604,7 @@ var PayOrderList = function PayOrderList(tabActive) {
           }
         })]
       }), /*#__PURE__*/_jsx("div", {
-        className: styles.custom_box_search_refresh,
+        className: "custom_box_search_refresh",
         onClick: function onClick() {
           return onSearch();
         },
@@ -618,7 +614,7 @@ var PayOrderList = function PayOrderList(tabActive) {
         })
       })]
     }), /*#__PURE__*/_jsx("main", {
-      className: styles.payment_box_main,
+      className: "payment_box_main",
       children: payOrderList.length ? payOrderList.map(function (item) {
         return PayListOrderItem({
           record: item,
@@ -633,7 +629,7 @@ var PayOrderList = function PayOrderList(tabActive) {
           onLog: handleOpenLog
         });
       }) : /*#__PURE__*/_jsx("div", {
-        className: styles.custom_box_main_empty,
+        className: "custom_box_main_empty",
         children: /*#__PURE__*/_jsxs("div", {
           children: [/*#__PURE__*/_jsx("img", {
             src: emptyImg,
@@ -644,7 +640,7 @@ var PayOrderList = function PayOrderList(tabActive) {
         })
       })
     }), /*#__PURE__*/_jsx("div", {
-      className: styles.custom_box_page,
+      className: "custom_box_page",
       children: /*#__PURE__*/_jsx(Pagination, {
         showQuickJumper: true,
         showSizeChanger: false,

package/dist/esm/WorkOrder/{index.module.less → index.less}

@@ -58,6 +58,7 @@
     height: 70px;
     overflow: auto;
     background-color: #fff;
+    padding: 4px;
 
     &:hover {
       height: 200px;

package/package.json

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