@pisell/private-materials 6.11.28 → 6.11.30

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/es/components/booking/utils.d.ts

@@ -173,10 +173,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/ecocup/components/CupStatusModal/hooks.d.ts

@@ -8,7 +8,7 @@ export declare const useCupAction: () => {
  * @return {*}
  */
 export declare const useBatchCupAction: () => {
-    run: (this: unknown, eco_cup_ids: number[] | string[]) => Promise<boolean>;
+    run: (this: unknown, eco_cup_ids: string[] | number[]) => Promise<boolean>;
     loading: boolean;
 };
 /**

package/es/components/eftpos/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/device.d.ts

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"warn" | "success" | "loading" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -178,7 +178,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "warn" | "success" | "loading" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -301,8 +301,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | "huifu" | undefined;
-        action?: "deviceList" | "pay" | "amount" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -312,7 +312,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "warn" | "success" | "loading" | "init" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "init" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type CallToBookProps = {
     show: boolean;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const StripePayment: () => import("react").JSX.Element;
 export default StripePayment;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const PageLoading: () => import("react").JSX.Element;
 export default PageLoading;

package/es/components/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/es/hooks/usePaymentLogger.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/es/plus/pisellSalesGrid/PisellSalesGrid.js

@@ -39,7 +39,7 @@ function getDefaultSearchParams(currentPerspective) {
       filter: {
         values: {
           order_payment_status: defaultPaymentStatusKeys,
-          es_start_date: [dayjs(), dayjs()]
+          booking_time_start_between: [dayjs().startOf('day'), dayjs().endOf('day')]
         }
       }
     };
@@ -129,7 +129,7 @@ var PisellSalesGrid = function PisellSalesGrid(props) {
     setSelectedRows = _useState4[1];
   var _useState5 = useState({
       pageNumber: 1,
-      pageSize: 10
+      pageSize: 50
     }),
     _useState6 = _slicedToArray(_useState5, 2),
     pagination = _useState6[0],

package/es/plus/pisellSalesGrid/PisellSalesGrid.less

@@ -7,4 +7,10 @@
   display: flex;
   flex-direction: column;
   min-height: 0;
+
+  /* Quick filter 内日期选择器宽度加大 */
+
+  .record-board-toolbar-quick-filter-form .pisell-date-range-picker {
+    min-width: 240px !important;
+  }
 }

package/es/plus/pisellSalesGrid/serve.d.ts

@@ -6,7 +6,7 @@ export interface GetBookingListParams {
     with?: string[];
     item_type?: string;
     item_types?: string[];
-    es_start_date?: string;
+    booking_time_start_between?: string;
     keywords?: string;
     is_deposit?: number;
     child_booking?: number;

package/es/plus/pisellSalesGrid/serve.js

@@ -1,6 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["orderDate", "total_amount", "sort"],
-  _excluded2 = ["es_start_date", "created_at_between", "updated_at_between", "number_between", "total_amount_between", "sort"];
+  _excluded2 = ["booking_time_start_between", "created_at_between", "updated_at_between", "number_between", "total_amount_between", "sort"];
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -76,25 +76,25 @@ export var getOrderList = /*#__PURE__*/function () {
   };
 }();
 var formatBookingParams = function formatBookingParams(params) {
-  var es_start_date = params.es_start_date,
+  var booking_time_start_between = params.booking_time_start_between,
     created_at_between = params.created_at_between,
     updated_at_between = params.updated_at_between,
     number_between = params.number_between,
     total_amount_between = params.total_amount_between,
     sort = params.sort,
     rest = _objectWithoutProperties(params, _excluded2);
-  var bookingTimeRange = Array.isArray(es_start_date) ? es_start_date.map(function (value) {
-    return value ? dayjs(value).format('YYYY-MM-DD') : undefined;
+  var bookingTimeRange = Array.isArray(booking_time_start_between) ? booking_time_start_between.map(function (value) {
+    return value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : undefined;
   }).filter(function (value) {
     return value;
   }) : undefined;
   var createdRange = Array.isArray(created_at_between) ? created_at_between.map(function (value) {
-    return value ? dayjs(value).format('YYYY-MM-DD') : undefined;
+    return value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : undefined;
   }).filter(function (value) {
     return value;
   }) : undefined;
   var updatedRange = Array.isArray(updated_at_between) ? updated_at_between.map(function (value) {
-    return value ? dayjs(value).format('YYYY-MM-DD') : undefined;
+    return value ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : undefined;
   }).filter(function (value) {
     return value;
   }) : undefined;
@@ -106,7 +106,7 @@ var formatBookingParams = function formatBookingParams(params) {
     order_by: sort
   };
   return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, rest), ext), (bookingTimeRange === null || bookingTimeRange === void 0 ? void 0 : bookingTimeRange.length) && {
-    es_start_date: bookingTimeRange
+    booking_time_start_between: bookingTimeRange
   }), (createdRange === null || createdRange === void 0 ? void 0 : createdRange.length) && {
     created_at_between: createdRange
   }), (updatedRange === null || updatedRange === void 0 ? void 0 : updatedRange.length) && {

package/es/plus/pisellSalesGrid/types.d.ts

@@ -81,6 +81,8 @@ export interface RecordBoardGridPropsCompat {
     columns?: any[];
     /** 默认隐藏的列 key 列表（对应 columns 的 key 或 dataIndex），与列上 hidden: true 合并后由 RecordBoard 初始化列显隐 */
     defaultHiddenColumnKeys?: string[];
+    /** 当前页某列全同值/全空时隐藏该列并在表格上方展示总结区；默认 true，传 false 可关闭 */
+    collapseUniformColumns?: boolean;
     /** 表格滚动，与 RecordBoard grid.scroll 对齐（含 autoCalc、scrollToFirstRowOnChange） */
     scroll?: {
         x?: number | string;

package/es/plus/pisellSalesManagement/components/BookingFormsPreview.js

@@ -108,7 +108,8 @@ var BookingFormsPreview = function BookingFormsPreview(props) {
   var tooltipContent = /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'flex',
-      flexDirection: 'column'
+      flexDirection: 'column',
+      gap: 10
     }
   }, tableItems.map(function (item, idx) {
     var clickable = item.count > 0;
@@ -119,7 +120,7 @@ var BookingFormsPreview = function BookingFormsPreview(props) {
         color: clickable ? '#7f56d9' : '#98A2B3',
         textDecoration: clickable ? 'underline' : 'none',
         whiteSpace: 'nowrap',
-        lineHeight: '26px',
+        lineHeight: '18px',
         cursor: clickable ? 'pointer' : 'default'
       },
       onClick: function onClick(event) {

package/es/plus/pisellSalesManagement/config/booking.d.ts

@@ -22,6 +22,7 @@ export declare const getFilterButtonList: () => ({
         component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;
@@ -47,6 +48,7 @@ export declare const getFilterButtonList: () => ({
         component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;
@@ -73,6 +75,7 @@ export declare const getFilterButtonList: () => ({
         maxInputNumberProps?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
 } | {
     name: string;
@@ -90,6 +93,7 @@ export declare const getFilterButtonList: () => ({
         component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;
@@ -109,6 +113,7 @@ export declare const getFilterButtonList: () => ({
         component?: undefined;
         isSearchServer?: undefined;
         showSearch?: undefined;
+        showTime?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;
@@ -128,6 +133,27 @@ export declare const getFilterButtonList: () => ({
         minInputNumberProps?: undefined;
         maxInputNumberProps?: undefined;
         component?: undefined;
+        showTime?: undefined;
+    };
+    sort?: undefined;
+    localFilter?: undefined;
+} | {
+    name: string;
+    type: string;
+    key: string;
+    label: any;
+    other: {
+        placeholder: any;
+        showTime: boolean;
+        allowClear?: undefined;
+        mode?: undefined;
+        maxTagCount?: undefined;
+        options?: undefined;
+        minInputNumberProps?: undefined;
+        maxInputNumberProps?: undefined;
+        component?: undefined;
+        isSearchServer?: undefined;
+        showSearch?: undefined;
     };
     sort?: undefined;
     localFilter?: undefined;

package/es/plus/pisellSalesManagement/config/booking.js

@@ -56,7 +56,9 @@ export var getBookingHeaderLabels = function getBookingHeaderLabels() {
     orderNote: locales.getText('pisell2.salesManagement.booking.common.orderNote'),
     internalNote: locales.getText('pisell2.salesManagement.booking.common.internalNote'),
     more: locales.getText('pisell2.salesManagement.booking.common.more'),
-    createdBy: locales.getText('pisell2.salesManagement.booking.common.createdBy')
+    createdBy: locales.getText('pisell2.salesManagement.booking.common.createdBy'),
+    guest: locales.getText('pisell2.salesManagement.order.common.guest'),
+    walkIn: locales.getText('pisell2.salesManagement.order.common.walkIn')
   };
 };
 export var defaultPaymentStatusKeys = ['payment_pending', 'partially_paid', 'paid', 'partially_refunded', 'refunded'];
@@ -256,19 +258,21 @@ export var getFilterButtonList = function getFilterButtonList() {
     }
   }, {
     name: 'created_at_between',
-    type: 'rangePickerNew',
+    type: 'rangePicker',
     key: 'createdAtBetween',
     label: locales.getText('pisell2.salesManagement.booking.filter.orderDate.label'),
     other: {
-      placeholder: locales.getText('pisell2.salesManagement.booking.filter.orderDate.placeholder')
+      placeholder: locales.getText('pisell2.salesManagement.booking.filter.orderDate.placeholder'),
+      showTime: true
     }
   }, {
     name: 'updated_at_between',
-    type: 'rangePickerNew',
+    type: 'rangePicker',
     key: 'updatedAtBetween',
     label: locales.getText('pisell2.salesManagement.booking.filter.updatedDate.label'),
     other: {
-      placeholder: locales.getText('pisell2.salesManagement.booking.filter.updatedDate.placeholder')
+      placeholder: locales.getText('pisell2.salesManagement.booking.filter.updatedDate.placeholder'),
+      showTime: true
     }
   }];
 };

package/es/plus/pisellSalesManagement/hooks/useBookingPerspective.js

@@ -75,7 +75,6 @@ export var useBookingPerspective = function useBookingPerspective(params) {
       title: bookingLabels.bookingBrief,
       key: 'booking_brief',
       width: 225,
-      // fixed: 'left',
       render: function render(_, record) {
         var _record$order, _record$order2, _record$order3;
         var startAt = buildDateTime(record === null || record === void 0 ? void 0 : record.start_date, record === null || record === void 0 ? void 0 : record.start_time) || (record === null || record === void 0 ? void 0 : record.start_at);
@@ -156,15 +155,50 @@ export var useBookingPerspective = function useBookingPerspective(params) {
           startAt: startAt,
           endAt: endAt
         }));
+      },
+      uniformCompare: function uniformCompare(_, record) {
+        var _record$start_date = record.start_date,
+          start_date = _record$start_date === void 0 ? '' : _record$start_date,
+          _record$start_time = record.start_time,
+          start_time = _record$start_time === void 0 ? '' : _record$start_time,
+          _record$end_date = record.end_date,
+          end_date = _record$end_date === void 0 ? '' : _record$end_date,
+          _record$end_time = record.end_time,
+          end_time = _record$end_time === void 0 ? '' : _record$end_time;
+        return "".concat(start_date).concat(start_time).concat(end_date).concat(end_time);
       }
     }, {
       title: bookingLabels.customer,
-      dataIndex: 'order',
       key: 'customer',
       align: 'center',
       width: 150,
-      render: function render(value, record) {
+      uniformCompare: function uniformCompare(_, record) {
+        var value = record.order;
+        var customer = value === null || value === void 0 ? void 0 : value.customer;
+        if (!customer) return '-';
+        var guestCode = customer === null || customer === void 0 ? void 0 : customer.guest_code;
+        if (guestCode) return "".concat(guestCode);
+        if (customer.user_id === 1) return 'walk-in'; // 返回任意固定值即可
+        return customer;
+      },
+      render: function render(_, record) {
+        var value = record.order;
         var customer = value === null || value === void 0 ? void 0 : value.customer;
+        var guestCode = customer === null || customer === void 0 ? void 0 : customer.guest_code;
+        if (guestCode) {
+          return /*#__PURE__*/React.createElement("div", {
+            style: {
+              display: 'flex',
+              flexDirection: 'column',
+              alignItems: 'center',
+              textAlign: 'center'
+            }
+          }, /*#__PURE__*/React.createElement("div", {
+            style: {
+              fontWeight: 'bold'
+            }
+          }, bookingLabels.guest));
+        }
         var phone = formatPhone((customer === null || customer === void 0 ? void 0 : customer.phone) || (record === null || record === void 0 ? void 0 : record.phone), (customer === null || customer === void 0 ? void 0 : customer.country_calling_code) || (record === null || record === void 0 ? void 0 : record.country_calling_code));
         var email = customer === null || customer === void 0 ? void 0 : customer.email;
         var lines = getDisplayLines([phone, email]);
@@ -189,12 +223,19 @@ export var useBookingPerspective = function useBookingPerspective(params) {
       }
     }, {
       title: bookingLabels.contact,
-      dataIndex: 'order',
       key: 'contact',
       align: 'center',
       width: 150,
-      render: function render(value, record) {
-        var contactValue = (value === null || value === void 0 ? void 0 : value.contacts_info) || {};
+      uniformCompare: function uniformCompare(_, record) {
+        var value = record.order;
+        var contactValue = value === null || value === void 0 ? void 0 : value.contacts_info;
+        if (!contactValue) return '-';
+        return contactValue;
+      },
+      render: function render(_, record) {
+        var value = record.order;
+        var contactValue = value === null || value === void 0 ? void 0 : value.contacts_info;
+        if (!contactValue) return '-';
         var phone = formatPhone(contactValue === null || contactValue === void 0 ? void 0 : contactValue.phone);
         var lines = getDisplayLines([phone, contactValue === null || contactValue === void 0 ? void 0 : contactValue.email]);
         return /*#__PURE__*/React.createElement("div", {
@@ -222,6 +263,10 @@ export var useBookingPerspective = function useBookingPerspective(params) {
       key: 'holder_data',
       align: 'center',
       width: 110,
+      uniformCompare: function uniformCompare(value, record) {
+        if (!value) return '-';
+        return value;
+      },
       render: function render(value, record) {
         var _holderValue$data;
         if (!value) return '-';
@@ -288,16 +333,18 @@ export var useBookingPerspective = function useBookingPerspective(params) {
             style: textStyles.text
           }, line);
         }));
+      },
+      uniformCompare: function uniformCompare(_value, record) {
+        return (record === null || record === void 0 ? void 0 : record.order_detail) || '';
       }
     }, {
       title: bookingLabels.pax,
       dataIndex: 'number',
-      key: 'pax',
+      key: 'number',
       align: 'center',
       width: 110,
-      render: function render(value, record) {
-        var _ref2;
-        var count = (_ref2 = value !== null && value !== void 0 ? value : record === null || record === void 0 ? void 0 : record.pax) !== null && _ref2 !== void 0 ? _ref2 : record === null || record === void 0 ? void 0 : record.people_count;
+      render: function render(_, record) {
+        var count = record === null || record === void 0 ? void 0 : record.number;
         return /*#__PURE__*/React.createElement("span", {
           style: _objectSpread(_objectSpread({}, textStyles.text), {}, {
             textAlign: 'center'
@@ -310,29 +357,21 @@ export var useBookingPerspective = function useBookingPerspective(params) {
       key: 'relation_form_name',
       align: 'center',
       width: 100,
-      render: function render(value, record) {
+      render: function render(value) {
         if (!value) return '-';
         return /*#__PURE__*/React.createElement("div", {
-          style: {
-            display: 'flex',
-            flexDirection: 'column',
-            alignItems: 'center',
-            textAlign: 'center'
-          }
-        }, /*#__PURE__*/React.createElement("div", {
           style: textStyles.text
-        }, value));
+        }, value);
       }
     }, {
       title: bookingLabels.forms,
-      dataIndex: 'appointment_form',
       key: 'appointment_form',
       // width: 128,
       align: 'center',
-      render: function render(_value, record) {
+      render: function render(_, record) {
         var _record$order4;
         return /*#__PURE__*/React.createElement(BookingFormsPreview, {
-          value: _value,
+          value: record === null || record === void 0 ? void 0 : record.appointment_form,
           uniqueTables: uniqueTables,
           bookingLabels: bookingLabels,
           textStyles: textStyles,
@@ -517,6 +556,7 @@ export var useBookingPerspective = function useBookingPerspective(params) {
         return {
           grid: {
             bordered: true,
+            collapseUniformColumns: true,
             columns: buildColumns(ctx),
             defaultHiddenColumnKeys: ['order_origin', 'updated'],
             scroll: {
@@ -555,8 +595,8 @@ export var useBookingPerspective = function useBookingPerspective(params) {
                       }
                     },
                     callback: function callback(cbParams) {
-                      var _ref3 = cbParams || {},
-                        type = _ref3.type;
+                      var _ref2 = cbParams || {},
+                        type = _ref2.type;
                       // 打开弹窗前会先调用关闭，打开前调用的关闭不需要响应
                       if (Date.now() - time.getTime() < 500) {
                         return;
@@ -589,10 +629,11 @@ export var useBookingPerspective = function useBookingPerspective(params) {
             quickFilter: {
               filterList: [{
                 type: 'rangePicker',
-                name: 'es_start_date',
-                key: 'esStartDate',
+                name: 'booking_time_start_between',
+                key: 'bookingTimeStartBetween',
                 props: {
-                  placeholder: locales.getText('pisell2.orderList.quickFilter.orderDate.label')
+                  placeholder: locales.getText('pisell2.salesManagement.booking.filter.bookingDate.label'),
+                  showTime: true
                 }
               }]
             }