kmkf-work-order-service-component 0.4.0-alpha.2 → 0.4.0-alpha.21

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

@@ -74,8 +74,12 @@ var URL_MAPPING = {
 
 var getTableData = function getTableData(_ref) {
   var checkedBuyerId = _ref.checkedBuyerId,
-      buyerId = _ref.buyerId;
+      buyerId = _ref.buyerId,
+      shopList = _ref.shopList,
+      shopId = _ref.shopId;
   return function (_ref2, formData) {
+    var _shopList$find;
+
     var current = _ref2.current,
         pageSize = _ref2.pageSize;
     var time = formData.time,
@@ -85,8 +89,8 @@ var getTableData = function getTableData(_ref) {
     var params = _objectSpread({}, formData);
 
     if ((time === null || time === void 0 ? void 0 : time.length) > 1) {
-      params.createdStartTime = moment(time[0]).format('YYYY-MM-DD');
-      params.createdEndTime = moment(time[1]).format('YYYY-MM-DD');
+      params.createdStartTime = time[0] ? moment(time[0]).format('x') : undefined;
+      params.createdEndTime = time[1] ? moment(new Date(time[1]).getTime() + 24 * 60 * 60 * 1000 - 1000).format('x') : undefined;
     }
 
     if ((templateIdList === null || templateIdList === void 0 ? void 0 : templateIdList.length) > 0) {
@@ -97,6 +101,16 @@ var getTableData = function getTableData(_ref) {
       params.buyerOpenUid = buyerId;
     }
 
+    delete params.time; // time是moment类型的，监控上报的时侯，格式化报错了
+
+    var shopUniqueKey = (_shopList$find = shopList.find(function (item) {
+      return item.shopId === shopId;
+    })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.uniqueKey;
+
+    if (shopUniqueKey) {
+      params.shopUniqueKeyList = [shopUniqueKey];
+    }
+
     return queryAllWorkOrderList(URL_MAPPING[type], _objectSpread(_objectSpread({}, params), {}, {
       pageSize: pageSize,
       pageNo: current
@@ -113,7 +127,8 @@ var getTableData = function getTableData(_ref) {
 
 
 var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
-  var tabActive = _ref3.tabActive;
+  var tabActive = _ref3.tabActive,
+      shopId = _ref3.shopId;
   var dispatch = useAppDispatch();
 
   var _useState = useState(true),
@@ -135,6 +150,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
   var groupAllList = useAppSelector(function (state) {
     return state.workOrder.groupAllList;
   });
+  var enabledTemplateList = useAppSelector(function (state) {
+    return state.workOrder.enabledTemplateList;
+  });
   var shopList = useAppSelector(function (state) {
     return state.workOrder.userInfo.shopList;
   });
@@ -158,7 +176,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
 
   var callBackGetTableData = useCallback(getTableData({
     checkedBuyerId: currentBuyerChecked,
-    buyerId: buyerId
+    buyerId: buyerId,
+    shopList: shopList,
+    shopId: shopId
   }), [currentBuyerChecked, buyerId]);
 
   var _useAntdTable = useAntdTable(callBackGetTableData, {
@@ -176,8 +196,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
       pagination = tableProps.pagination,
       _onChange = tableProps.onChange;
   useEffect(function () {
-    // 当total有值以后将不在执行,以便从后面切换到第一页时闪动
-    if (pagination.current === 1 && total === 0) {
+    if (pagination.current === 1) {
       setTotal(pagination.total);
     }
   }, [pagination, total]);
@@ -224,7 +243,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
-          span: 24,
+          span: 16,
           children: /*#__PURE__*/_jsx("div", {
             id: "templateCascader",
             className: "templateCascader",
@@ -242,7 +261,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
             })
           })
         }), /*#__PURE__*/_jsx(Col, {
-          span: 12,
+          span: 8,
           children: /*#__PURE__*/_jsx(Form.Item, {
             name: "workOrderId",
             children: /*#__PURE__*/_jsx(Input, {
@@ -316,13 +335,14 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           type: "primary",
           size: "small",
           onClick: handleClick,
-          children: "\u65B0\u5EFA\u5DE5\u5355"
+          children: "+\u65B0\u5EFA\u5DE5\u5355"
         })]
       }), searchForm, /*#__PURE__*/_jsx("main", {
         className: "custom_box_main custom_box_main_".concat(platform),
         children: dataSource.length > 0 ? dataSource.map(function (item) {
           return /*#__PURE__*/_jsx(CustomizeWorkOrderCard, {
-            item: item
+            item: item,
+            enabledTemplateList: enabledTemplateList
           }, item.id);
         }) : /*#__PURE__*/_jsx("div", {
           className: "custom_box_main_empty",
@@ -357,7 +377,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
         width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
       }), /*#__PURE__*/_jsx(Drawer, {
         closeIcon: /*#__PURE__*/_jsx(LeftOutlined, {}),
-        title: title,
+        title: (record === null || record === void 0 ? void 0 : record.templateName) || title,
         width: platform === PlatForm.XIAOZHI ? '100%' : '90%',
         open: formRenderVisible,
         onClose: handleCloseFormModal,
@@ -393,6 +413,16 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           onTemplateChange: function onTemplateChange(title) {
             return setTitle(title);
           },
+          formProps: {
+            labelCol: {
+              span: 6
+            },
+            wrapperCol: {
+              span: 18
+            },
+            className: 'customizeFormModalClassName'
+          },
+          isShowShopList: false,
           onFormSubmitSuccess: function onFormSubmitSuccess(val) {
             submit();
             handleCloseFormModal();

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

@@ -1,5 +1,12 @@
 .custom_box {
   // height: calc(100% - 58px);
+  :global(.ant-row) {
+    margin: 0 !important;
+  }
+
+  :global(.ant-col) {
+    padding: 0 !important;
+  }
   .top-tip {
     display: flex;
     flex-direction: row;
@@ -149,6 +156,7 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+    margin-bottom: 4px;
   }
   .action_collapse {
     padding-left: 8px;
@@ -178,3 +186,86 @@
     text-overflow: ellipsis;
   }
 }
+
+.customizeFormModalClassName {
+  :global(.goods-uploaded-state) {
+    margin: 6px 0 5px 0;
+    padding-left: 7px;
+    font-size: 12px;
+  }
+
+  :global(.ant-picker) {
+    width: 100%;
+
+    box-shadow: none;
+    // background: #f2f3f5;
+    // border: none;
+
+    input {
+      &::placeholder {
+        color: #86909c;
+      }
+    }
+
+    &:hover {
+      border-color: #4583ff;
+    }
+  }
+
+  :global(.ant-radio-inner) {
+    background-color: #fff;
+  }
+
+  :global(.ant-select) {
+    width: 100% !important;
+
+    .ant-select-selector {
+      background: #f2f3f5 !important;
+    }
+  }
+
+  :global(.ant-form-item) {
+    margin-bottom: 8px;
+  }
+
+  :global(.ant-form-item .ant-form-item-label) {
+    padding: 0px;
+  }
+
+  :global(.ant-form-item-label) {
+    position: relative;
+    max-width: 100px;
+    overflow: initial;
+    color: rgba(0, 0, 0, 0.55);
+    font-size: 14px;
+    white-space: normal;
+    text-align: left;
+  }
+
+  :global(.form-item-label--index .ant-form-item-label label) {
+    text-align: left;
+  }
+
+  :global(.label-title--index) {
+    position: absolute;
+    color: #86909c;
+    font-family: 'PingFangSC-Semibold';
+  }
+
+  :global(.goods-title) {
+    color: #4e5969;
+    font-size: 12px;
+  }
+
+  :global(div.ant-form-item.invoice-title--basic label) {
+    padding-left: 0;
+    font-weight: normal;
+    font-family: 'PingFangSC-Regular';
+  }
+
+  :global(.payment-widgets--basic div.ant-form-item-label label) {
+    padding-left: 0;
+    font-weight: lighter;
+    font-family: 'PingFangSC-Regular';
+  }
+}

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

@@ -4,8 +4,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import React, { useEffect } from 'react';
-import { Select, Pagination, DatePicker, Space, Checkbox, message } from 'antd';
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useEffect, useState } from 'react';
+import { Select, Pagination, DatePicker, Checkbox, message, Input, Form, Row, Col, Button } from 'antd';
 import { useAppSelector, useAppDispatch } from "../../../model/hooks";
 import { fetchQueryPaymentWorkOrderList } from "../../../model/workOrder";
 import PaymentWorkOrderCard from "./components/PaymentWorkOrderCard";
@@ -15,7 +27,6 @@ import UnExamineModal from "./components/UnExamineModal";
 import DeletePaymentWorkOrderModal from "./components/DeletePaymentWorkOrderModal";
 import FlagPayModal from "./components/FlagPayModal";
 import PaymentFormModal from "./components/PaymentFormModal";
-import refreshImg from "../../../common/imgs/refresh.png";
 import emptyImg from "../../../common/imgs/empty.png";
 import { PAY_STATUS } from "../../../common/constant";
 import { setPaymentFormModalVisible, setCurrentPaymentRecord } from "../../../model/paymentWorkOrder";
@@ -28,8 +39,6 @@ var RangePicker = DatePicker.RangePicker;
 
 //打款工单列表
 var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
-  var _paySearch$time;
-
   var tabActive = _ref.tabActive;
   var dispatch = useAppDispatch();
   var payOrderList = useAppSelector(function (state) {
@@ -52,9 +61,19 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
   var buyerNick = platformInfo.buyerNick,
       buyerId = platformInfo.buyerId,
       platform = platformInfo.platform;
+
+  var _useState = useState(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      open = _useState2[0],
+      setOpen = _useState2[1];
+
+  var _Form$useForm = Form.useForm(),
+      _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+      form = _Form$useForm2[0];
+
   useEffect(function () {
     setTimeout(onSearch, 0); // TODO: 让请求在下一个任务中执行，前一个任务获取不到redux中的数据
-  }, [paySearch, buyerNick, buyerId]);
+  }, [buyerNick, buyerId]);
 
   var onSearch = function onSearch() {
     dispatch(fetchQueryPaymentWorkOrderList());
@@ -101,55 +120,100 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
     });
   };
 
-  return /*#__PURE__*/_jsxs("div", {
-    className: "custom_box",
-    style: {
-      display: tabActive === 'payment' ? 'block' : 'none'
-    },
-    children: [/*#__PURE__*/_jsx("div", {
-      className: "custom_box_header",
-      children: /*#__PURE__*/_jsx(Space, {
-        size: [8, 8],
-        wrap: true,
-        children: /*#__PURE__*/_jsx("span", {
-          className: "custom_temp_list_button",
-          onClick: handleAddPaymentWorkOrder,
-          children: "\u6253\u6B3E\u5DE5\u5355"
-        })
+  var resetHandle = function resetHandle() {
+    dispatch({
+      type: 'workOrder/setState',
+      payload: {
+        paySearch: {
+          pageNo: 1,
+          pageSize: 20,
+          time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
+          workPayStatus: '',
+          tid: '',
+          paymentOrderKey: '',
+          isBuyer: false
+        }
+      }
+    });
+    form.setFieldsValue({
+      time: [moment().subtract(31, 'day').startOf('day'), moment().endOf('day')],
+      workPayStatus: '',
+      tid: '',
+      paymentOrderKey: ''
+    });
+  };
+
+  var onFieldsChange = function onFieldsChange(changedFields, allFields) {
+    var _changedFields$ = changedFields[0],
+        name = _changedFields$.name,
+        value = _changedFields$.value;
+    upDateState(name[0], value);
+  };
+
+  var searchForm = /*#__PURE__*/_jsxs("div", {
+    children: [/*#__PURE__*/_jsx(Form, {
+      form: form,
+      className: "customizeSearch ".concat(open ? 'open' : 'close'),
+      initialValues: paySearch,
+      onFieldsChange: onFieldsChange,
+      children: /*#__PURE__*/_jsxs(Row, {
+        gutter: 24,
+        children: [/*#__PURE__*/_jsx(Col, {
+          span: 24,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "time",
+            label: "\u63D0\u4EA4\u65F6\u95F4",
+            children: /*#__PURE__*/_jsx(RangePicker, {
+              placeholder: ['开始提交时间', '结束提交时间']
+            })
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 8,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "workPayStatus",
+            children: /*#__PURE__*/_jsx(Select, {
+              children: PAY_STATUS.map(function (item) {
+                return /*#__PURE__*/_jsx(Select.Option, {
+                  value: item.value,
+                  children: item.label
+                }, item.value);
+              })
+            })
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 8,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "tid",
+            children: /*#__PURE__*/_jsx(Input, {
+              placeholder: "\u8BF7\u8F93\u5165\u8BA2\u5355\u7F16\u53F7"
+            })
+          })
+        }), /*#__PURE__*/_jsx(Col, {
+          span: 8,
+          children: /*#__PURE__*/_jsx(Form.Item, {
+            name: "paymentOrderKey",
+            children: /*#__PURE__*/_jsx(Input, {
+              placeholder: "\u8BF7\u8F93\u5165\u5DE5\u5355\u7F16\u53F7"
+            })
+          })
+        })]
       })
     }), /*#__PURE__*/_jsxs("div", {
-      className: "custom_box_search pay_search",
-      children: [/*#__PURE__*/_jsxs("div", {
-        className: "custom_box_search_box pay_search_box",
-        children: [/*#__PURE__*/_jsxs(Select, {
-          className: "custom_box_search_date",
-          value: paySearch.timeType,
-          onChange: function onChange(val) {
-            return upDateState('timeType', val);
-          },
-          children: [/*#__PURE__*/_jsx(Select.Option, {
-            value: "submitTime",
-            children: "\u63D0\u4EA4\u65F6\u95F4"
-          }), /*#__PURE__*/_jsx(Select.Option, {
-            value: "auditTime",
-            children: "\u5BA1\u6838\u65F6\u95F4"
-          }), /*#__PURE__*/_jsx(Select.Option, {
-            value: "playWithTime",
-            children: "\u6253\u6B3E\u65F6\u95F4"
-          })]
-        }), /*#__PURE__*/_jsx(Select, {
-          className: "custom_box_search_cascader",
-          value: paySearch.workPayStatus,
-          onChange: function onChange(val) {
-            return upDateState('workPayStatus', val);
+      className: "bottom-actions",
+      children: [/*#__PURE__*/_jsxs("span", {
+        children: [/*#__PURE__*/_jsx(Button, {
+          type: "primary",
+          onClick: onSearch,
+          children: "\u67E5\u8BE2"
+        }), /*#__PURE__*/_jsx(Button, {
+          onClick: resetHandle,
+          style: {
+            marginLeft: 16
           },
-          children: PAY_STATUS.map(function (item) {
-            return /*#__PURE__*/_jsx(Select.Option, {
-              value: item.value,
-              children: item.label
-            }, item.value);
-          })
-        }), /*#__PURE__*/_jsx(Checkbox, {
+          children: "\u91CD\u7F6E"
+        })]
+      }), /*#__PURE__*/_jsxs("span", {
+        children: [/*#__PURE__*/_jsx(Checkbox, {
           className: "custom_box_search_buyer",
           checked: paySearch.isBuyer,
           onChange: function onChange(e) {
@@ -160,29 +224,38 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
             upDateState('isBuyer', e.target.checked);
           },
           children: "\u5F53\u524D\u4E70\u5BB6"
-        }), /*#__PURE__*/_jsx(RangePicker, {
-          allowClear: false,
-          value: (_paySearch$time = paySearch.time) === null || _paySearch$time === void 0 ? void 0 : _paySearch$time.map(function (item) {
-            return moment(item);
-          }),
-          showTime: true,
-          onChange: function onChange(dates) {
-            return upDateState('time', dates.map(function (item) {
-              return item.format('YYYY-MM-DD HH:mm:ss');
-            }));
-          }
+        }), /*#__PURE__*/_jsx("span", {
+          className: "action_collapse",
+          onClick: function onClick() {
+            return setOpen(function (v) {
+              return !v;
+            });
+          },
+          children: open ? '收起' : '展开'
         })]
-      }), /*#__PURE__*/_jsx("div", {
-        className: "custom_box_search_refresh",
-        onClick: function onClick() {
-          return onSearch();
+      })]
+    })]
+  });
+
+  return /*#__PURE__*/_jsxs("div", {
+    className: "custom_box",
+    style: {
+      display: tabActive === 'payment' ? 'block' : 'none'
+    },
+    children: [/*#__PURE__*/_jsxs("div", {
+      className: "bottom-actions",
+      children: [/*#__PURE__*/_jsx("div", {
+        children: "\u9ED8\u8BA4\u6700\u8FD130\u5929\u7684\u5168\u90E8\u5DE5\u5355"
+      }), /*#__PURE__*/_jsx(Button, {
+        type: "primary",
+        size: "small",
+        style: {
+          float: 'right'
         },
-        children: /*#__PURE__*/_jsx("img", {
-          src: refreshImg,
-          alt: ""
-        })
+        onClick: handleAddPaymentWorkOrder,
+        children: "+\u65B0\u5EFA\u5DE5\u5355"
       })]
-    }), /*#__PURE__*/_jsx("div", {
+    }), searchForm, /*#__PURE__*/_jsx("div", {
       className: "payment_box_main payment_box_main_".concat(platform),
       children: payOrderList.length ? payOrderList.map(function (item) {
         return /*#__PURE__*/_jsx(PaymentWorkOrderCard, {

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

@@ -1,6 +1,4 @@
 .custom_box {
-  // height: calc(100% - 58px);
-
   .custom_box_header {
     padding: 0 16px 16px 16px;
     border-bottom: 1px solid #f2f2f2;

package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js

@@ -54,7 +54,7 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value) {
-      return value === null || value === void 0 ? void 0 : value.map(function (pic) {
+      return value.length ? value === null || value === void 0 ? void 0 : value.map(function (pic) {
         return /*#__PURE__*/_jsx("div", {
           style: {
             marginRight: '5px',
@@ -68,7 +68,7 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
             }
           })
         });
-      });
+      }) : /*#__PURE__*/_jsx("div", {});
     });
 
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {

package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.d.ts

@@ -5,9 +5,8 @@ declare type getFormItemProps = {
     rules?: any[];
     required: boolean;
     component: JSX.Element | string | null;
-    formItemIndex?: number;
 };
-export declare const getFormItem: ({ name, title, rules, required, component, formItemIndex, }: getFormItemProps) => JSX.Element;
+export declare const getFormItem: ({ name, title, rules, required, component }: getFormItemProps) => JSX.Element;
 export declare const showImage: ({ item, type }: {
     item: any;
     type: string;

package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js

@@ -23,8 +23,7 @@ export var getFormItem = function getFormItem(_ref) {
       _ref$rules = _ref.rules,
       rules = _ref$rules === void 0 ? [] : _ref$rules,
       required = _ref.required,
-      component = _ref.component,
-      formItemIndex = _ref.formItemIndex;
+      component = _ref.component;
   var newRules = rules;
 
   if (required) {
@@ -34,19 +33,6 @@ export var getFormItem = function getFormItem(_ref) {
     });
   }
 
-  var formIndexClassName = '';
-  var indexLabel = '';
-
-  if (formItemIndex != undefined) {
-    formIndexClassName = 'form-item-label--index';
-
-    if (formItemIndex >= 10) {
-      indexLabel = formItemIndex + '';
-    } else {
-      indexLabel = '0' + formItemIndex;
-    }
-  }
-
   return /*#__PURE__*/_jsx("div", {
     className: "form-item--wrap",
     style: {
@@ -56,7 +42,7 @@ export var getFormItem = function getFormItem(_ref) {
       name: name,
       label: title,
       rules: newRules,
-      className: formIndexClassName,
+      className: "form-item-label--index",
       children: component
     })
   });

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import 'moment/locale/zh-cn';
 import { PlatForm } from './types';
 import './index.less';
 interface WorkOrderProps {