完善仓库管理

2024-12-28 17:30:09 +08:00 · 2024-12-28 17:30:09 +08:00 · 5f7a8c8922
commit 5f7a8c8922
parent 0c91ace525
39 changed files with 8066 additions and 146 deletions
--- a/common/http/config.ts
+++ b/common/http/config.ts
@ -4,6 +4,7 @@ export default {
 	base_scm:'http://192.168.1.222:7002',
 	base_auth:'https://cloud.goodsilk.cn/auth',//登录
 	base_mes:'https://cloud.goodsilk.cn/mes',//面料
+	base_process:'http://120.26.196.222:8981',//工艺


 	//本地服务
--- a/common/http/interface.ts
+++ b/common/http/interface.ts
@ -24,6 +24,8 @@ function httpRequest(url : string, method : any, data = {}, headerCustom = {}) {
 			 base_url=myconfig.base_auth
 		}else if(url==='/fabric/info/all'){
 			 base_url=myconfig.base_mes
+		}else if(url.includes('fabric/craft')){
+			 base_url=myconfig.base_process
 		}else{
 			 base_url=myconfig.base_scm
 		}
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@ -65,6 +65,11 @@
      "resolved": "https://registry.npmmirror.com/@types/emscripten/-/emscripten-1.39.13.tgz",
      "integrity": "sha512-cFq+fO/isvhvmuP/+Sl4K4jtU6E23DoivtbO4r50e3odaxAiVdbfSYRDdJ4gCdxx+3aRjhphS5ZMwIH4hFy/Cw=="
    },
+    "node_modules/@types/sortablejs": {
+      "version": "1.15.8",
+      "resolved": "https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.8.tgz",
+      "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg=="
+    },
    "node_modules/@vant/area-data": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/@vant/area-data/-/area-data-2.0.0.tgz",
@ -324,6 +329,22 @@
        }
      }
    },
+    "node_modules/vue-draggable-plus": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmmirror.com/vue-draggable-plus/-/vue-draggable-plus-0.6.0.tgz",
+      "integrity": "sha512-G5TSfHrt9tX9EjdG49InoFJbt2NYk0h3kgjgKxkFWr3ulIUays0oFObr5KZ8qzD4+QnhtALiRwIqY6qul4egqw==",
+      "dependencies": {
+        "@types/sortablejs": "^1.15.8"
+      },
+      "peerDependencies": {
+        "@types/sortablejs": "^1.15.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/vue-qrcode-reader": {
      "version": "5.6.0",
      "resolved": "https://registry.npmmirror.com/vue-qrcode-reader/-/vue-qrcode-reader-5.6.0.tgz",
--- a/node_modules/@types/sortablejs/LICENSE
+++ b/node_modules/@types/sortablejs/LICENSE
@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
--- a/node_modules/@types/sortablejs/README.md
+++ b/node_modules/@types/sortablejs/README.md
@ -0,0 +1,15 @@
+# Installation
+> `npm install --save @types/sortablejs`
+
+# Summary
+This package contains type definitions for sortablejs (https://github.com/RubaXa/Sortable).
+
+# Details
+Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/sortablejs.
+
+### Additional Details
+ * Last updated: Sat, 17 Feb 2024 02:11:20 GMT
+ * Dependencies: none
+
+# Credits
+These definitions were written by [Maw-Fox](https://github.com/Maw-Fox), [Maarten Staa](https://github.com/maartenstaa), and [Wayne Van Son](https://github.com/waynevanson).
--- a/node_modules/@types/sortablejs/index.d.ts
+++ b/node_modules/@types/sortablejs/index.d.ts
@ -0,0 +1,528 @@
+import {
+    AutoScrollOptions,
+    AutoScrollPlugin,
+    MultiDragOptions,
+    MultiDragPlugin,
+    OnSpillOptions,
+    OnSpillPlugin,
+    SortablePlugin,
+    SwapOptions,
+    SwapPlugin,
+} from "./plugins";
+
+export = Sortable;
+
+declare class Sortable {
+    public options: Sortable.Options;
+    public el: HTMLElement;
+
+    /**
+     * Sortable's main constructor.
+     * @param element Any variety of HTMLElement.
+     * @param options Sortable options object.
+     */
+    constructor(element: HTMLElement, options: Sortable.Options);
+
+    static active: Sortable | null;
+    static utils: Sortable.Utils;
+
+    /**
+     * Mounts a plugin to Sortable
+     * @param sortablePlugin a sortable plugin.
+     *
+     * @example
+     *
+     * Sortable.mount(new MultiDrag(), new AutoScroll())
+     */
+    static mount(...sortablePlugins: SortablePlugin[]): void;
+
+    /**
+     * Creation of new instances.
+     * @param element Any variety of HTMLElement.
+     * @param options Sortable options object.
+     */
+    static create(element: HTMLElement, options?: Sortable.Options): Sortable;
+
+    /** The element being dragged. */
+    static dragged: HTMLElement | null;
+
+    /** The ghost element.*/
+    static ghost: HTMLElement | null;
+
+    /** The clone element. */
+    static clone: HTMLElement | null;
+
+    /** Get the Sortable instance on an element. */
+    static get(element: HTMLElement): Sortable | undefined;
+
+    /** Get the Sortable version */
+    static readonly version: string;
+
+    /**
+     * Options getter/setter
+     * @param name a Sortable.Options property.
+     * @param value a value.
+     */
+    option<K extends keyof Sortable.Options>(name: K, value: Sortable.Options[K]): void;
+    option<K extends keyof Sortable.Options>(name: K): Sortable.Options[K];
+
+    /**
+     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+     * @param element an HTMLElement or selector string.
+     * @param selector default: `options.draggable`
+     */
+    closest(element: HTMLElement, selector?: string): HTMLElement | null;
+
+    /**
+     * Sorts the elements according to the array.
+     * @param order an array of strings to sort.
+     * @param useAnimation default: false.
+     */
+    sort(order: readonly string[], useAnimation?: boolean): void;
+
+    /**
+     * Saving and restoring of the sort.
+     */
+    save(): void;
+
+    /**
+     * Removes the sortable functionality completely.
+     */
+    destroy(): void;
+
+    /**
+     * Serializes the sortable's item data-id's (dataIdAttr option) into an array of string.
+     */
+    toArray(): string[];
+}
+
+declare namespace Sortable {
+    export interface Options
+        extends SortableOptions, AutoScrollOptions, MultiDragOptions, OnSpillOptions, SwapOptions
+    {}
+
+    /**
+     * A class that all plugins inherit from for the sake of type inference.
+     */
+    export class Plugin extends SortablePlugin {}
+    export class MultiDrag extends MultiDragPlugin {}
+    export class AutoScroll extends AutoScrollPlugin {}
+    export class Swap extends SwapPlugin {}
+    export class OnSpill extends OnSpillPlugin {}
+
+    export interface SortableEvent extends Event {
+        clone: HTMLElement;
+        /**
+         * previous list
+         */
+        from: HTMLElement;
+        /**
+         * dragged element
+         */
+        item: HTMLElement;
+        /**
+         * dragged elements
+         */
+        items: HTMLElement[];
+        /**
+         * new index within parent
+         */
+        newIndex: number | undefined;
+        /**
+         * old index within parent
+         */
+        oldIndex: number | undefined;
+        target: HTMLElement;
+        /**
+         * list, in which moved element.
+         */
+        to: HTMLElement;
+        /**
+         * Old index within parent, only counting draggable elements
+         */
+        oldDraggableIndex: number | undefined;
+        /**
+         * New index within parent, only counting draggable elements
+         */
+        newDraggableIndex: number | undefined;
+        /**
+         * Pull mode if dragging into another sortable
+         */
+        pullMode: "clone" | boolean | undefined;
+        /**
+         * When MultiDrag is used to sort, this holds a HTMLElement and oldIndex for each item selected.
+         *
+         * `oldIndicies[number]` is directly related to `newIndicies[number]`
+         *
+         * If MultiDrag is not used to sort, this array will be empty.
+         */
+        oldIndicies: Array<{ multiDragElement: HTMLElement; index: number }>;
+        /**
+         * When MultiDrag is used to sort, this holds a HTMLElement and newIndex for each item.
+         *
+         * `oldIndicies[number]` is directly related to `newIndicies[number]`
+         *
+         * If MultiDrag is not used to sort, this array will be empty.
+         */
+        newIndicies: Array<{ multiDragElement: HTMLElement; index: number }>;
+        /** When Swap is used to sort, this will contain the dragging item that was dropped on.*/
+        swapItem: HTMLElement | null;
+    }
+
+    export interface MoveEvent extends Event {
+        dragged: HTMLElement;
+        draggedRect: DOMRect;
+        from: HTMLElement;
+        /**
+         * element on which have guided
+         */
+        related: HTMLElement;
+        relatedRect: DOMRect;
+        to: HTMLElement;
+        willInsertAfter?: boolean | undefined;
+    }
+
+    type PullResult = readonly string[] | boolean | "clone";
+    type PutResult = readonly string[] | boolean;
+    export interface GroupOptions {
+        /**
+         * group name
+         */
+        name: string;
+        /**
+         * ability to move from the list. clone — copy the item, rather than move.
+         */
+        pull?:
+            | PullResult
+            | ((to: Sortable, from: Sortable, dragEl: HTMLElement, event: SortableEvent) => PullResult)
+            | undefined;
+        /**
+         * whether elements can be added from other lists, or an array of group names from which elements can be taken.
+         */
+        put?:
+            | PutResult
+            | ((to: Sortable, from: Sortable, dragEl: HTMLElement, event: SortableEvent) => PutResult)
+            | undefined;
+        /**
+         * a canonical version of pull, created by Sortable
+         */
+        checkPull?:
+            | ((
+                sortable: Sortable,
+                activeSortable: Sortable,
+                dragEl: HTMLElement,
+                event: SortableEvent,
+            ) => boolean | string | string[])
+            | undefined;
+        /**
+         * a canonical version of put, created by Sortable
+         */
+        checkPut?:
+            | ((
+                sortable: Sortable,
+                activeSortable: Sortable,
+                dragEl: HTMLElement,
+                event: SortableEvent,
+            ) => boolean | string | "clone" | string[])
+            | undefined;
+        /**
+         * revert cloned element to initial position after moving to a another list.
+         */
+        revertClone?: boolean | undefined;
+    }
+    type Direction = "vertical" | "horizontal";
+    export interface SortableOptions {
+        /**
+         * ms, animation speed moving items when sorting, `0` — without animation
+         */
+        animation?: number | undefined;
+        /**
+         * Class name for the chosen item
+         */
+        chosenClass?: string | undefined;
+        dataIdAttr?: string | undefined;
+        /**
+         * time in milliseconds to define when the sorting should start
+         */
+        delay?: number | undefined;
+        /**
+         * Only delay if user is using touch
+         */
+        delayOnTouchOnly?: boolean | undefined;
+        /**
+         * Direction of Sortable
+         * (will be detected automatically if not given)
+         */
+        direction?:
+            | ((evt: SortableEvent, target: HTMLElement, dragEl: HTMLElement) => Direction)
+            | Direction
+            | undefined;
+        /**
+         * Disables the sortable if set to true.
+         */
+        disabled?: boolean | undefined;
+        /**
+         * Class name for the dragging item
+         */
+        dragClass?: string | undefined;
+        /**
+         * Specifies which items inside the element should be draggable
+         */
+        draggable?: string | undefined;
+        dragoverBubble?: boolean | undefined;
+        dropBubble?: boolean | undefined;
+        /**
+         * distance mouse must be from empty sortable
+         * to insert drag element into it
+         */
+        emptyInsertThreshold?: number | undefined;
+
+        /**
+         * Easing for animation. Defaults to null.
+         *
+         * See https://easings.net/ for examples.
+         *
+         * For other possible values, see
+         * https://www.w3schools.com/cssref/css3_pr_animation-timing-function.asp
+         *
+         * @example
+         *
+         * // CSS functions
+         * | 'steps(int, start | end)'
+         * | 'cubic-bezier(n, n, n, n)'
+         *
+         * // CSS values
+         * | 'linear'
+         * | 'ease'
+         * | 'ease-in'
+         * | 'ease-out'
+         * | 'ease-in-out'
+         * | 'step-start'
+         * | 'step-end'
+         * | 'initial'
+         * | 'inherit'
+         */
+        easing?: string | undefined;
+        /**
+         * Class name for the cloned DOM Element when using forceFallback
+         */
+        fallbackClass?: string | undefined;
+        /**
+         * Appends the cloned DOM Element into the Document's Body
+         */
+        fallbackOnBody?: boolean | undefined;
+        /**
+         * Specify in pixels how far the mouse should move before it's considered as a drag.
+         */
+        fallbackTolerance?: number | undefined;
+        fallbackOffset?: { x: number; y: number } | undefined;
+        /**
+         * Selectors that do not lead to dragging (String or Function)
+         */
+        filter?:
+            | string
+            | ((this: Sortable, event: Event | TouchEvent, target: HTMLElement, sortable: Sortable) => boolean)
+            | undefined;
+        /**
+         * ignore the HTML5 DnD behaviour and force the fallback to kick in
+         */
+        forceFallback?: boolean | undefined;
+        /**
+         * Class name for the drop placeholder
+         */
+        ghostClass?: string | undefined;
+        /**
+         * To drag elements from one list into another, both lists must have the same group value.
+         * You can also define whether lists can give away, give and keep a copy (clone), and receive elements.
+         */
+        group?: string | GroupOptions | undefined;
+        /**
+         * Drag handle selector within list items
+         */
+        handle?: string | undefined;
+        ignore?: string | undefined;
+        /**
+         * Will always use inverted swap zone if set to true
+         */
+        invertSwap?: boolean | undefined;
+        /**
+         * Threshold of the inverted swap zone
+         * (will be set to `swapThreshold` value by default)
+         */
+        invertedSwapThreshold?: number | undefined;
+        /**
+         * Call `event.preventDefault()` when triggered `filter`
+         */
+        preventOnFilter?: boolean | undefined;
+        /**
+         * Remove the clone element when it is not showing,
+         * rather than just hiding it
+         */
+        removeCloneOnHide?: boolean | undefined;
+        /**
+         * sorting inside list
+         */
+        sort?: boolean | undefined;
+        store?: {
+            get: (sortable: Sortable) => string[];
+            set: (sortable: Sortable) => void;
+        } | undefined;
+        /**
+         * Threshold of the swap zone.
+         * Defaults to `1`
+         */
+        swapThreshold?: number | undefined;
+        /**
+         * How many *pixels* the point should move before cancelling a delayed drag event
+         */
+        touchStartThreshold?: number | undefined;
+
+        setData?: ((dataTransfer: DataTransfer, draggedElement: HTMLElement) => void) | undefined;
+        /**
+         * Element dragging started
+         */
+        onStart?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Element dragging ended
+         */
+        onEnd?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Element is dropped into the list from another list
+         */
+        onAdd?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Created a clone of an element
+         */
+        onClone?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Element is chosen
+         */
+        onChoose?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Element is unchosen
+         */
+        onUnchoose?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Changed sorting within list
+         */
+        onUpdate?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Called by any change to the list (add / update / remove)
+         */
+        onSort?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Element is removed from the list into another list
+         */
+        onRemove?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Attempt to drag a filtered element
+         */
+        onFilter?: ((event: SortableEvent) => void) | undefined;
+        /**
+         * Event when you move an item in the list or between lists
+         */
+        // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+        onMove?: ((evt: MoveEvent, originalEvent: Event) => boolean | -1 | 1 | void) | undefined;
+        /**
+         * Called when dragging element changes position
+         */
+        onChange?: ((evt: SortableEvent) => void) | undefined;
+    }
+
+    interface Utils {
+        /**
+         * Attach an event handler function
+         * @param element an HTMLElement.
+         * @param event an Event context.
+         * @param fn
+         */
+        on(element: HTMLElement, event: string, fn: EventListenerOrEventListenerObject): void;
+
+        /**
+         * Remove an event handler function
+         * @param element an HTMLElement.
+         * @param event an Event context.
+         * @param fn a callback.
+         */
+        off(element: HTMLElement, event: string, fn: EventListenerOrEventListenerObject): void;
+
+        /**
+         * Get the values of all the CSS properties.
+         * @param element an HTMLElement.
+         */
+        css(element: HTMLElement): CSSStyleDeclaration;
+
+        /**
+         * Get the value of style properties.
+         * @param element an HTMLElement.
+         * @param prop a property key.
+         */
+        css<K extends keyof CSSStyleDeclaration>(element: HTMLElement, prop: K): CSSStyleDeclaration[K];
+
+        /**
+         * Set one CSS property.
+         * @param element an HTMLElement.
+         * @param prop a property key.
+         * @param value a property value.
+         */
+        css<K extends keyof CSSStyleDeclaration>(element: HTMLElement, prop: K, value: CSSStyleDeclaration[K]): void;
+
+        /**
+         * Get elements by tag name.
+         * @param context an HTMLElement.
+         * @param tagName A tag name.
+         * @param iterator An iterator.
+         */
+        find(
+            context: HTMLElement,
+            tagName: string,
+            iterator?: (value: HTMLElement, index: number) => void,
+        ): NodeListOf<HTMLElement>;
+
+        /**
+         * Check the current matched set of elements against a selector.
+         * @param element an HTMLElement.
+         * @param selector an element selector.
+         */
+        is(element: HTMLElement, selector: string): boolean;
+
+        /**
+         * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+         * @param element an HTMLElement.
+         * @param selector an element seletor.
+         * @param context a specific element's context.
+         */
+        closest(element: HTMLElement, selector: string, context?: HTMLElement): HTMLElement | null;
+
+        /**
+         * Add or remove one classes from each element
+         * @param element an HTMLElement.
+         * @param name a class name.
+         * @param state a class's state.
+         */
+        toggleClass(element: HTMLElement, name: string, state: boolean): void;
+
+        /**
+         * Selects the provided multi-drag item
+         * @param element The element to be selected
+         */
+        select(element: HTMLElement): void;
+
+        /**
+         * Deselects the provided multi-drag item
+         * @param element The element to be deselected
+         */
+        deselect(element: HTMLElement): void;
+    }
+
+    interface DOMRect {
+        bottom: number;
+        height: number;
+        left: number;
+        right: number;
+        top: number;
+        width: number;
+        x: number;
+        y: number;
+    }
+}
--- a/node_modules/@types/sortablejs/package.json
+++ b/node_modules/@types/sortablejs/package.json
@ -0,0 +1,35 @@
+{
+    "name": "@types/sortablejs",
+    "version": "1.15.8",
+    "description": "TypeScript definitions for sortablejs",
+    "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/sortablejs",
+    "license": "MIT",
+    "contributors": [
+        {
+            "name": "Maw-Fox",
+            "githubUsername": "Maw-Fox",
+            "url": "https://github.com/Maw-Fox"
+        },
+        {
+            "name": "Maarten Staa",
+            "githubUsername": "maartenstaa",
+            "url": "https://github.com/maartenstaa"
+        },
+        {
+            "name": "Wayne Van Son",
+            "githubUsername": "waynevanson",
+            "url": "https://github.com/waynevanson"
+        }
+    ],
+    "main": "",
+    "types": "index.d.ts",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/DefinitelyTyped/DefinitelyTyped.git",
+        "directory": "types/sortablejs"
+    },
+    "scripts": {},
+    "dependencies": {},
+    "typesPublisherContentHash": "9f337276197ef6915450f3a537e3c8444bd9f93ed0bcb6256725d73cbfa34bbb",
+    "typeScriptVersion": "4.6"
+}
--- a/node_modules/@types/sortablejs/plugins.d.ts
+++ b/node_modules/@types/sortablejs/plugins.d.ts
@ -0,0 +1,105 @@
+import * as Sortable from "./index";
+import { SortableEvent } from "./index";
+
+declare class SortablePlugin {}
+declare class AutoScrollPlugin {}
+declare class OnSpillPlugin {}
+declare class MultiDragPlugin {}
+declare class SwapPlugin {}
+
+export interface AutoScrollOptions {
+    /**
+     *  Enable the plugin. Can be `HTMLElement`.
+     */
+    scroll?: boolean | HTMLElement | undefined;
+    /**
+     * force the autoscroll fallback to kick in
+     */
+    forceAutoScrollFallback?: boolean | undefined;
+    /**
+     * if you have custom scrollbar scrollFn may be used for autoscrolling.
+     */
+    scrollFn?:
+        | ((
+            this: Sortable,
+            offsetX: number,
+            offsetY: number,
+            originalEvent: Event,
+            touchEvt: TouchEvent,
+            hoverTargetEl: HTMLElement,
+            // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+        ) => "continue" | void)
+        | undefined;
+    /**
+     * `px`, how near the mouse must be to an edge to start scrolling.
+     */
+    scrollSensitivity?: number | undefined;
+    /**
+     * `px`, speed of the scrolling.`
+     */
+    scrollSpeed?: number | undefined;
+    /**
+     * apply autoscroll to all parent elements, allowing for easier movement.
+     */
+    bubbleScroll?: boolean | undefined;
+}
+export interface OnSpillOptions {
+    /**
+     * This plugin, when enabled,
+     * will cause the dragged item to be reverted to it's original position if it is *spilled*
+     * (ie. it is dropped outside of a valid Sortable drop target)
+     */
+    revertOnSpill?: boolean | undefined;
+    /**
+     * This plugin, when enabled,
+     * will cause the dragged item to be removed from the DOM if it is *spilled*
+     * (ie. it is dropped outside of a valid Sortable drop target)
+     */
+    removeOnSpill?: boolean | undefined;
+    /**
+     * Called when either `revertOnSpill` or `RemoveOnSpill` plugins are enabled.
+     */
+    onSpill?: ((evt: SortableEvent) => void) | undefined;
+}
+export interface MultiDragOptions {
+    /**
+     * Enable the plugin
+     */
+    multiDrag?: boolean | undefined;
+    /**
+     * Class name for selected item
+     */
+    selectedClass?: string | undefined;
+    /**
+     * The key that must be down for multiple items to be selected.
+     * The default is null, meaning no key must be down.
+     * For special keys, such as the CTRL key,
+     * simply specify the option as 'CTRL' (casing does not matter).
+     */
+    multiDragKey?: null | undefined | string;
+
+    /**
+     * If you don't want to deselect items on outside click
+     */
+    avoidImplicitDeselect?: boolean | undefined;
+
+    /**
+     * Called when an item is selected
+     */
+    onSelect?: ((event: SortableEvent) => void) | undefined;
+
+    /**
+     * Called when an item is deselected
+     */
+    onDeselect?: ((event: SortableEvent) => void) | undefined;
+}
+export interface SwapOptions {
+    /**
+     * Enable swap mode
+     */
+    swap?: boolean | undefined;
+    /**
+     * Class name for swap item (if swap mode is enabled)
+     */
+    swapClass?: string | undefined;
+}
--- a/node_modules/vue-draggable-plus/LICENSE
+++ b/node_modules/vue-draggable-plus/LICENSE
@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 丶远方
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/node_modules/vue-draggable-plus/README.md
+++ b/node_modules/vue-draggable-plus/README.md
@ -0,0 +1,321 @@
+<p align="center"><img src="./docs/public/logo.svg" alt=""></p>
+
+<p align="center">
+<a href="https://www.npmjs.com/package/vue-draggable-plus" target="__blank"><img src="https://img.shields.io/npm/v/vue-draggable-plus?color=a1b858&label=" alt="NPM version"></a>
+<a href="https://www.npmjs.com/package/vue-draggable-plus" target="__blank"><img alt="NPM Downloads" src="https://img.shields.io/npm/dm/vue-draggable-plus?color=50a36f&label="></a>
+<a href="https://alfred-skyblue.github.io/vue-draggable-plus/en/" target="__blank"><img src="https://img.shields.io/static/v1?label=&message=docs%20%26%20demos&color=1e8a7a" alt="Docs & Demos"></a>
+<br>
+<a href="https://github.com/alfred-skyblue/vue-draggable-plus" target="__blank"><img alt="GitHub stars" src="https://img.shields.io/github/stars/alfred-skyblue/vue-draggable-plus?style=social"></a>
+</p>
+
+# vue-draggable-plus
+
+[中文文档](https://vue-draggable-plus.pages.dev/)
+
+
+Drag and drop sorting module, support Vue>=v3 or Vue>=2.7
+
+[Example of use](https://stackblitz.com/edit/github-b2xatc-qe8qxj?file=src%2FApp.vue)
+
+## Describe
+
+Since the `vue3` component of `Sortablejs` has not been updated, it has been seriously out of touch with `vue3`, so this project was born. This component is based on `Sortablejs`, so if you want to know more about `Sortablejs`, you can check it out [`Sortablejs` official website](https://github.com/SortableJS/Sortable)
+
+We have encapsulated a variety of usages for this, you can use components, function, or instructions, there is always one that suits you
+
+## Solve pain points
+
+In `Sortablejs` official `Vue` components in the past, the drag-and-drop list is implemented by using the component as a direct child element of the list. When we use some component libraries, if there is no slot for the root element of the list in the component library , it is difficult for us to implement a drag list, vue-draggable-plus perfectly solves this problem, it allows you to use a drag list on any element, we can use the selector of the specified element to get the root element of the list, and then Use the root element of the list as `container` of `Sortablejs`, for details, refer to [specify target container](/src/__docs__/target-container/).
+
+
+## Install
+
+```bash
+
+npm install vue-draggable-plus
+
+```
+
+## Usage
+
+### Component usage
+
+```vue
+<template>
+    <VueDraggable ref="el" v-model="list">
+      <div v-for="item in list" :key="item.id">
+        {{ item.name }}
+      </div>
+    </VueDraggable>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { VueDraggable } from 'vue-draggable-plus'
+
+const list = ref([
+  {
+    name: 'Joao',
+    id: 1
+  },
+  {
+    name: 'Jean',
+    id: 2
+  },
+  {
+    name: 'Johanna',
+    id: 3
+  },
+  {
+    name: 'Juan',
+    id: 4
+  }
+])
+</script>
+```
+
+### Function Usage
+
+```vue
+<template>
+  <div ref="el">
+    <div v-for="item in list" :key="item.id">
+      {{ item.name }}
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useDraggable } from 'vue-draggable-plus'
+
+const el = ref<HTMLElement | null>(null)
+const list = ref([
+  {
+    name: 'Joao',
+    id: 1
+  },
+  {
+    name: 'Jean',
+    id: 2
+  },
+  {
+    name: 'Johanna',
+    id: 3
+  },
+  {
+    name: 'Juan',
+    id: 4
+  }
+])
+// The return value is an object, which contains some methods, such as start, destroy, pause, etc.
+const draggable = useDraggable(el, list, {
+  animation: 150,
+  onStart() {
+    console.log('start')
+  },
+  onUpdate() {
+    console.log('update')
+  }
+})
+</script>
+```
+
+### Directive Usage
+
+```vue
+<template>
+  <div
+    v-draggable="[
+        list,
+        {
+          animation: 150,
+        }
+      ]"
+  >
+    <div v-for="item in list" :key="item.id">
+      {{ item.name }}
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { vDraggable } from 'vue-draggable-plus'
+const list = ref([
+  {
+    name: 'Joao',
+    id: 1
+  },
+  {
+    name: 'Jean',
+    id: 2
+  },
+  {
+    name: 'Johanna',
+    id: 3
+  },
+  {
+    name: 'Juan',
+    id: 4
+  }
+])
+
+function onStart() {
+  console.log('start')
+}
+
+function onUpdate() {
+  console.log('update')
+}
+</script>
+```
+
+
+
+## Explanation
+
+All event functions starting with `on` can be passed to components using `v-on`. For example:
+
+```vue
+
+<template>
+  <VueDraggable v-model="list" @start="onStart" @end="onEnd"></VueDraggable>
+</template>
+<script lang="ts" setup>
+import { ref } from "vue";
+import { VueDraggable } from 'vue-draggable-plus'
+import { SortableEvent } from "sortablejs";
+
+const list = ref([
+  {
+    name: 'Joao',
+    id: '1'
+  },
+  {
+    name: 'Jean',
+    id: '2'
+  },
+  {
+    name: 'Johanna',
+    id: '3'
+  },
+  {
+    name: 'Juan',
+    id: '4'
+  }
+])
+
+function onStart(event: SortableEvent) {
+  console.log('start drag')
+}
+
+function onEnd(event: SortableEvent) {
+  console.log('end drag')
+}
+</script>
+
+```
+
+> For information on using Hooks and directives, please refer to the documentation.
+
+## Options
+
+`Options` inherits all configuration items from `Sortablejs`. For details, please see the [`Sortablejs` official documentation](https://github.com/SortableJS/Sortable).
+
+### Types
+```ts
+type Easing =
+  | 'steps(int, start | end)'
+  | 'cubic-bezier(n, n, n, n)'
+  | 'linear'
+  | 'ease'
+  | 'ease-in'
+  | 'ease-out'
+  | 'ease-in-out'
+  | 'step-start'
+  | 'step-end'
+  | 'initial'
+  | 'inherit'
+
+type PullResult = ReadonlyArray<string> | boolean | 'clone';
+type PutResult = ReadonlyArray<string> | boolean;
+
+interface GroupOptions {
+  /**
+   * Group name.
+   */
+  name: string;
+  /**
+   * The ability to move from the list. Clone - copy the item instead of moving it.
+   */
+  pull?: PullResult | ((to: Sortable, from: Sortable, dragEl: HTMLElement, event: SortableEvent) => PullResult) | undefined;
+  /**
+   * Whether elements can be added from other lists, or an array of group names from which elements can be obtained.
+   */
+  put?: PutResult | ((to: Sortable, from: Sortable, dragEl: HTMLElement, event: SortableEvent) => PutResult) | undefined;
+  /**
+   * After moving to another list, the cloned element is restored to its initial position.
+   */
+  revertClone?: boolean | undefined;
+}
+
+type Group = string | GroupOptions | undefined;
+
+type ScrollFn = ((
+        this: Sortable,
+        offsetX: number,
+        offsetY: number,
+        originalEvent: Event,
+        touchEvt: TouchEvent,
+        hoverTargetEl: HTMLElement,
+    ) => 'continue' | void) | undefined;
+```
+
+## API
+
+| Parameter                | Description                                                                                 | Type                                                  | Default              |
+|-------------------------|---------------------------------------------------------------------------------------------|-------------------------------------------------------|----------------------|
+| animation               | Show animation while dragging                                                               | `Number`                                              | 0                     |
+| chosenClass             | CSS class name for chosen item                                                              | `String`                                              | 'sortable-chosen'     |
+| delay                   | Delay in milliseconds before drag starts                                                    | `Number`                                              | 0                     |
+| delayOnTouchOnly        | Delay on touch event                                                                        | `Number`                                              | 0                     |
+| direction               | Dragging direction, 'vertical' or 'horizontal' (default auto detect)                         | `String`                                              | -                     |
+| disabled                | Disable dragging                                                                            | `Boolean`                                             | false                 |
+| dragClass               | CSS class name for dragged item                                                              | `String`                                              | 'sortable-drag'       |
+| draggable               | Selector for draggable items within element                                                  | `String`                                              | -                     |
+| emptyInsertThreshold    | Distance (in pixels) from empty sortable items where dragging element should be inserted. Set to `0` to disable this feature.  | `Number`                                              | 5                     |
+| easing                  | Animation easing                                                                            | `Easing`                                              | -                     |
+| fallbackClass           | CSS class name for cloned DOM elements when using forceFallback                               | `String`                                              | `sortable-fallback`   |
+| fallbackOnBody          | Append cloned DOM element to body element                                                    | `Boolean`                                             | `false`               |
+| fallbackTolerance       | Pixels mouse must move before drag start when using forceFallback                             | `Number`                                              | 0                     |
+| filter                  | Selector for items that should not be draggable                                               | `String`                                              | -                     |
+| forceFallback           | Ignore HTML5 drag and drop behavior and force fallback                                        | `Boolean`                                             | `false`               |
+| ghostClass              | CSS class name for drop placeholder                                                          | `String`                                              | 'sortable-ghost'      |
+| group                   | Group items to drag between sortable lists. Both lists must have the same `group` value. Also define whether lists can be dragged out of, cloned, or receive elements from other lists. See TypeScript type definition above for details. | `Group`                                               | -                     |
+| handle                  | Selector for handle to initiate drag. If not set, the target element's children are used        | `String`                                              | -                     |
+| invertSwap              | Always use inverted swap zone if set to true                                                  | `Boolean`                                             | `false`               |
+| invertedSwapThreshold   | Inverted swap zone threshold, defaults to `swapThreshold` value                                | `Number`                                              | -                     |
+| preventOnFilter         | Call `event.preventDefault()` on filter event                                                | `Boolean`                                             | `true`                |
+| removeCloneOnHide       | Remove instead of hiding cloned element when not displayed                                     | `Boolean`                                             | `true`                |
+| sort                    | Allow list items to be sorted within container                                                 | `Boolean`                                             | `true`                |
+| swapThreshold           | Swap zone threshold                                                                         | `Number`                                              | 1                     |
+| touchStartThreshold     | Pixels before cancelling delay touch event                                                   | `Number`                                              | 1                     |
+| setData                 | Pass a function where the first argument is of type `DataTransfer` and the second argument is of type `HTMLElement` | `Function`                                            | -                     |
+| scroll                  | Enable scrolling                                                                            | `Boolean`                                             | `HTMLElement`         | `true`                |
+| scrollFn                | Custom scroll function                                                                      | `ScrollFn`                                            | -                     |
+| scrollSensitivity     | The distance in pixels the mouse must be to the edge to start scrolling                | `Number`                                             | -                    |
+| scrollSpeed           | The scrolling speed in ms/px                                                          | `number`                                             | -                    |
+| bubbleScroll          | Enables automatic scrolling for all parent elements to make it easier to move items   | `Boolean`                                            | `true`               |
+| onChoose              | Triggered when an item is selected                                                      | `((event: SortableEvent) => void)`                   | -                    |
+| onUnchoose            | Triggered when an item is deselected                                                    | `((event: SortableEvent) => void)`                   | -                    |
+| onStart               | Triggered when an item is picked up for drag and drop                                    | `((event: SortableEvent) => void)`                   | -                    |
+| onEnd                 | Triggered when an item is no longer being dragged                                       | `((event: SortableEvent) => void)`                   | -                    |
+| onAdd                 | Triggered when an item is moved from one list to another                                 | `((event: SortableEvent) => void)`                   | -                    |
+| onUpdate              | Triggered when the order of the items is updated                                        | `((event: SortableEvent) => void)`                   | -                    |
+| onSort                | Triggered whenever any changes are made to the list                                     | `((event: SortableEvent) => void)`                   | -                    |
+| onRemove              | Triggered when an item is removed from the list and moved to another                     | `((event: SortableEvent) => void)`                   | -                    |
+| onFilter              | Triggered when trying to drag a filtered item                                            | `((event: SortableEvent) => void)`                   | -                    |
+| onMove                | Triggered while an item is being dragged                                                | `((event: MoveEvent,originalEvent: Event) => void)`   | -                    |
+| onClone               | Triggered when an item is cloned                                                         | `((event: SortableEvent) => void)`                   | -                    |
+| onChange              | Triggered when an item is dragged and changes position                                   | `((event: SortableEvent) => void)`                   | -                    |
--- a/node_modules/vue-draggable-plus/dist/component.d.ts
+++ b/node_modules/vue-draggable-plus/dist/component.d.ts
@ -0,0 +1,8 @@
+import { UseDraggableOptions } from './useDraggable';
+interface IProps extends UseDraggableOptions<any> {
+    modelValue: any[];
+    tag?: string;
+    target?: string;
+}
+export declare const VueDraggable: import("vue").DefineComponent<IProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<IProps>, {}, {}>;
+export {};
--- a/node_modules/vue-draggable-plus/dist/directive.d.ts
+++ b/node_modules/vue-draggable-plus/dist/directive.d.ts
@ -0,0 +1,9 @@
+import type { ObjectDirective } from 'vue';
+import type { MaybeRef } from './types';
+import { UseDraggableOptions } from './useDraggable';
+type VDraggableBinding = [
+    list: MaybeRef<any[]>,
+    options?: MaybeRef<UseDraggableOptions<any>>
+];
+export declare const vDraggable: ObjectDirective<HTMLElement, VDraggableBinding | MaybeRef<any[]>>;
+export {};
--- a/node_modules/vue-draggable-plus/dist/index.d.ts
+++ b/node_modules/vue-draggable-plus/dist/index.d.ts
@ -0,0 +1,4 @@
+export * from './component';
+export * from './directive';
+export * from './useDraggable';
+export * from './types';
--- a/node_modules/vue-draggable-plus/dist/types/index.d.ts
+++ b/node_modules/vue-draggable-plus/dist/types/index.d.ts
@ -0,0 +1,13 @@
+import type { Ref, ShallowRef, WritableComputedRef } from 'vue';
+export { type Options, type SortableEvent } from 'sortablejs';
+/**
+ * @deprecated Use MaybeRef<T> instead
+ */
+export type RefOrValue<T> = T | Ref<T>;
+/**
+ * copied from vueuse: https://github.com/vueuse/vueuse/blob/main/packages/shared/tryOnUnmounted/index.ts
+ * Maybe it's a ref, or a plain value.
+ */
+export type MaybeRef<T = any> = T | Ref<T> | ShallowRef<T> | WritableComputedRef<T>;
+export type RefOrElement<T = HTMLElement> = T | Ref<T | undefined | null> | string;
+export type Fn = (...args: any[]) => any;
--- a/node_modules/vue-draggable-plus/dist/useDraggable.d.ts
+++ b/node_modules/vue-draggable-plus/dist/useDraggable.d.ts
@ -0,0 +1,38 @@
+import Sortable, { type Options, type SortableEvent } from 'sortablejs';
+import { type Ref } from 'vue';
+import type { RefOrElement, MaybeRef } from './types';
+declare const CLONE_ELEMENT_KEY: unique symbol;
+export interface DraggableEvent<T = any> extends SortableEvent {
+    item: HTMLElement & {
+        [CLONE_ELEMENT_KEY]: any;
+    };
+    data: T;
+    clonedData: T;
+}
+type SortableMethod = 'closest' | 'save' | 'toArray' | 'destroy' | 'option';
+export interface UseDraggableReturn extends Pick<Sortable, SortableMethod> {
+    /**
+     * Start the sortable.
+     * @param {HTMLElement} target - The target element to be sorted.
+     * @default By default the root element of the VueDraggablePlus instance is used
+     */
+    start: (target?: HTMLElement) => void;
+    pause: () => void;
+    resume: () => void;
+}
+export interface UseDraggableOptions<T> extends Options {
+    clone?: (element: T) => T;
+    immediate?: boolean;
+    customUpdate?: (event: SortableEvent) => void;
+}
+/**
+ * A custom compositionApi utils that allows you to drag and drop elements in lists.
+ * @param el
+ * @param {Array} list - The list to be dragged
+ * @param {Object} options - The options of the sortable
+ * @returns {Object} - The return of the sortable
+ */
+export declare function useDraggable<T>(el: RefOrElement, list?: Ref<T[] | undefined>, options?: MaybeRef<UseDraggableOptions<T>>): UseDraggableReturn;
+export declare function useDraggable<T>(el: null | undefined, list?: Ref<T[] | undefined>, options?: MaybeRef<UseDraggableOptions<T>>): UseDraggableReturn;
+export declare function useDraggable<T>(el: RefOrElement<HTMLElement | null | undefined>, options?: MaybeRef<UseDraggableOptions<T>>): UseDraggableReturn;
+export {};
--- a/node_modules/vue-draggable-plus/dist/utils/index.d.ts
+++ b/node_modules/vue-draggable-plus/dist/utils/index.d.ts
@ -0,0 +1,100 @@
+/**
+ * Moves an element in an array from one position to another.
+ * @param {T[]} array
+ * @param {number} from
+ * @param {number} to
+ * @returns {T[]}
+ */
+export declare function moveArrayElement<T>(array: T[], from: number, to: number): T[];
+/**
+ * Convert a hyphen-delimited string to camelCase.
+ * @param {string} str
+ * @returns {string}
+ */
+export declare function camelize(str: string): string;
+/**
+ * Convert an object's keys from hyphen-delimited to camelCase.
+ * @param {Record<string, any>} object
+ * @returns {Record<string, any>}
+ */
+export declare function objectMap(object: Record<any, any>): Record<string, any>;
+/**
+ * Removes an element from an array.
+ * @param {T[]} array
+ * @param {number} index
+ * @returns {T[]}
+ */
+export declare function removeElement<T>(array: T[], index: number): T[];
+/**
+ * Inserts an element into an array.
+ * @param {T[]} array
+ * @param {number} index
+ * @param element
+ * @returns {T[]}
+ */
+export declare function insertElement<T>(array: T[], index: number, element: any): T[];
+/**
+ * If the value is undefined, return true, otherwise return false.
+ * @param {any} value - any
+ * @returns {value is undefined}
+ */
+export declare function isUndefined(value: any): value is undefined;
+/**
+ * If the value is string, return true, otherwise return false.
+ * @param value
+ * @returns {value is string}
+ */
+export declare function isString(value: any): value is string;
+/**
+ * Inserts a element into the DOM at a given index.
+ * @param parentElement
+ * @param element
+ * @param {number} index
+ */
+export declare function insertNodeAt(parentElement: Element, element: Element, index: number): void;
+/**
+ * Removes a node from the DOM.
+ * @param {Node} node
+ */
+export declare function removeNode(node: Node): void;
+/**
+ * Get an element by selector.
+ * @param {string} selector
+ * @param parentElement
+ * @returns {Element}
+ */
+export declare function getElementBySelector(selector: string, parentElement?: Document | Element): HTMLElement;
+/**
+ * It takes a function and returns a function that executes the original function and then executes the second function.
+ * @param {Function} fn - The function to be executed
+ * @param {Function} afterFn - The function to be executed after the original function.
+ * @param {any} [ctx=null] - The context of the function.
+ * @returns {Function}
+ */
+export declare function mergeExecuted<T extends (...args: []) => any>(fn: T, afterFn: T, ctx?: any): (...args: any[]) => any;
+/**
+ * Merge the options and events.
+ * @param {Record<string, any>} options
+ * @param {Record<string, any>} events
+ * @returns {Record<string, any>}
+ */
+export declare function mergeOptionsEvents(options: Record<string, any>, events: Record<string, any>): {
+    [x: string]: any;
+};
+export declare function isHTMLElement(el: any): el is HTMLElement;
+/**
+ * @param obj
+ * @param fn
+ */
+export declare function forEachObject<T extends Record<string, any>>(obj: T, fn: (key: keyof T, value: T[keyof T]) => void): void;
+/**
+ *
+ * @param key
+ */
+export declare function isOn(key: any): boolean;
+export declare const extend: {
+    <T extends {}, U>(target: T, source: U): T & U;
+    <T_1 extends {}, U_1, V>(target: T_1, source1: U_1, source2: V): T_1 & U_1 & V;
+    <T_2 extends {}, U_2, V_1, W>(target: T_2, source1: U_2, source2: V_1, source3: W): T_2 & U_2 & V_1 & W;
+    (target: object, ...sources: any[]): any;
+};
--- a/node_modules/vue-draggable-plus/dist/utils/log.d.ts
+++ b/node_modules/vue-draggable-plus/dist/utils/log.d.ts
@ -0,0 +1,10 @@
+/**
+ * Logs a warning message.
+ * @param {string} msg
+ */
+export declare function warn(msg: string): void;
+/**
+ * Logs an error message.
+ * @param {string} msg
+ */
+export declare function error(msg: string): void;
--- a/node_modules/vue-draggable-plus/dist/vue-draggable-plus.cjs
+++ b/node_modules/vue-draggable-plus/dist/vue-draggable-plus.cjs
--- a/node_modules/vue-draggable-plus/dist/vue-draggable-plus.iife.js
+++ b/node_modules/vue-draggable-plus/dist/vue-draggable-plus.iife.js
--- a/node_modules/vue-draggable-plus/dist/vue-draggable-plus.js
+++ b/node_modules/vue-draggable-plus/dist/vue-draggable-plus.js
--- a/node_modules/vue-draggable-plus/dist/vue-draggable-plus.umd.cjs
+++ b/node_modules/vue-draggable-plus/dist/vue-draggable-plus.umd.cjs
--- a/node_modules/vue-draggable-plus/package.json
+++ b/node_modules/vue-draggable-plus/package.json
@ -0,0 +1,105 @@
+{
+  "name": "vue-draggable-plus",
+  "version": "0.6.0",
+  "author": {
+    "name": "yangpanteng",
+    "email": "yangpanteng@gmail.com"
+  },
+  "description": "Universal Drag-and-Drop Component Supporting both Vue 3 and Vue 2",
+  "homepage": "https://vue-draggable-plus.pages.dev/en/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Alfred-Skyblue/vue-draggable-plus"
+  },
+  "type": "module",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/vue-draggable-plus.umd.cjs",
+  "module": "./dist/vue-draggable-plus.js",
+  "unpkg": "./dist/vue-draggable-plus.iife.js",
+  "jsdelivr": "./dist/vue-draggable-plus.iife.js",
+  "sideEffects": false,
+  "license": "MIT",
+  "keywords": [
+    "vue",
+    "vue2.x",
+    "vue3.x",
+    "Sortable",
+    "sortablejs",
+    "drag",
+    "dragging",
+    "vue-draggable",
+    "vue-draggable-plus"
+  ],
+  "files": [
+    "dist",
+    "LICENSE",
+    "README.md"
+  ],
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/vue-draggable-plus.js"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/vue-draggable-plus.cjs"
+      },
+      "default": "./dist/vue-draggable-plus.umd.cjs"
+    }
+  },
+  "scripts": {
+    "dev": "initial-scan docs && vitepress dev .docs --host",
+    "build": "vite build",
+    "build:lib": "npm-run-all lint build",
+    "copy:docs": "node scripts/copy-docs.cjs",
+    "docs:build": "initial-scan docs && cross-env NODE_ENV=production && npm run copy:docs && vitepress build .docs",
+    "serve": "cross-env NODE_ENV=production vitepress serve .docs --host",
+    "lint": "eslint src/**/*.ts",
+    "lint-fix": "pnpm lint --fix",
+    "release": "np"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "devDependencies": {
+    "@algolia/client-search": "^4.23.3",
+    "@ruabick/md-demo-plugins": "latest",
+    "@ruabick/vite-plugin-gen-temp": "latest",
+    "@ruabick/vitepress-demo-block": "latest",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "@vitejs/plugin-vue": "^5.0.4",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.57.0",
+    "eslint-define-config": "^1.24.1",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-vue": "^9.26.0",
+    "fs-extra": "^11.2.0",
+    "np": "^7.7.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.8.8",
+    "sortablejs": "^1.15.2",
+    "typescript": "^5.4.5",
+    "unocss": "^0.60.3",
+    "vite": "^5.2.12",
+    "vite-plugin-dts": "^1.7.3",
+    "vitepress": "1.0.0-rc.44",
+    "vue": "^3.4.27",
+    "vue-demi": "^0.13.11",
+    "vue-eslint-parser": "^9.4.2"
+  },
+  "dependencies": {
+    "@types/sortablejs": "^1.15.8"
+  },
+  "peerDependencies": {
+    "@types/sortablejs": "^1.15.0"
+  },
+  "peerDependenciesMeta": {
+    "@vue/composition-api": {
+      "optional": true
+    }
+  }
+}
--- a/package-lock.json
+++ b/package-lock.json
@ -7,6 +7,7 @@
      "dependencies": {
        "@vant/area-data": "^2.0.0",
        "vant": "^4.9.15",
+        "vue-draggable-plus": "^0.6.0",
        "vue-qrcode-reader": "^5.6.0"
      }
    },
@ -72,6 +73,11 @@
      "resolved": "https://registry.npmmirror.com/@types/emscripten/-/emscripten-1.39.13.tgz",
      "integrity": "sha512-cFq+fO/isvhvmuP/+Sl4K4jtU6E23DoivtbO4r50e3odaxAiVdbfSYRDdJ4gCdxx+3aRjhphS5ZMwIH4hFy/Cw=="
    },
+    "node_modules/@types/sortablejs": {
+      "version": "1.15.8",
+      "resolved": "https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.8.tgz",
+      "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg=="
+    },
    "node_modules/@vant/area-data": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/@vant/area-data/-/area-data-2.0.0.tgz",
@ -331,6 +337,22 @@
        }
      }
    },
+    "node_modules/vue-draggable-plus": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmmirror.com/vue-draggable-plus/-/vue-draggable-plus-0.6.0.tgz",
+      "integrity": "sha512-G5TSfHrt9tX9EjdG49InoFJbt2NYk0h3kgjgKxkFWr3ulIUays0oFObr5KZ8qzD4+QnhtALiRwIqY6qul4egqw==",
+      "dependencies": {
+        "@types/sortablejs": "^1.15.8"
+      },
+      "peerDependencies": {
+        "@types/sortablejs": "^1.15.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/vue-qrcode-reader": {
      "version": "5.6.0",
      "resolved": "https://registry.npmmirror.com/vue-qrcode-reader/-/vue-qrcode-reader-5.6.0.tgz",
--- a/package.json
+++ b/package.json
@ -2,6 +2,7 @@
  "dependencies": {
    "@vant/area-data": "^2.0.0",
    "vant": "^4.9.15",
+    "vue-draggable-plus": "^0.6.0",
    "vue-qrcode-reader": "^5.6.0"
  }
 }
--- a/pages.json
+++ b/pages.json
@ -171,6 +171,80 @@
 					"bounce": "none"
 				}
 			}
+		},
+		{
+			"path" : "pages/maintenance/processOldzmd",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path" : "pages/spot/spot",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path" : "pages/spot/list",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path" : "pages/spot/audit",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path" : "pages/spot/pass",
+			"style" : 
+			{
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
+				"disableScroll": true,
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path" : "pages/tailorMade/tailorMade",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/tailorMade/list",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 	],
 	"globalStyle": {
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -10,21 +10,30 @@
 import { onMounted, ref } from 'vue'

 const ListData =ref([
+	{
+		path: '../maintenance/processOldzmd',
+		name: '工艺维护',
+		type:'',
+	},
 	{
 	  path: '../maintenance/m-process',
 	  name: '工序项维护',
+	  type:'process',
 	},
 	{
 	  path: '../maintenance/m-requirements',
 	  name: '工艺要求维护',
+	  type:'craftRequire',
 	},
 	{
 	  path: '../maintenance/m-factory',
 	  name: '工厂维护',
+	   type:'factory',
 	},
 	{
 	  path: '../maintenance/m-other',
 	  name: '其他要求项维护',
+	   type:'extraOption',
 	},
 	// {
 	//   path: '../lecher/l-quality',
@ -37,32 +46,43 @@ const ListData =ref([
 	{
 	  path: '../whiteEmbryo/w-warehousing',
 	  name: '白胚入库',
+	  type:'rawFabric',
 	},
 	{
 	  path: '../whiteEmbryo/w-level',
 	  name: '白胚等级维护',
+	  type:'rawFabricLevels',
 	},
 	{
 	  path: '../whiteEmbryo/w-suppliers',
 	  name: '供应商维护',
+	  type:'suppliers',
 	},
 	{
 	  path: '../whiteEmbryo/w-scanCode',
 	  name: '扫码放货架',
+	  type:'rawFabric',
 	},
 	{
 	  path: '../whiteEmbryo/w-warehouse',
 	  name: '仓库维护',
+	  type:'warehouse',
 	},
 	{
 	  path: '../whiteEmbryo/w-libraryLocation',
 	  name: '库位号维护',
+	  type:'shelves',
 	},
 	{
 	  path: '../whiteEmbryo/w-list',
 	  name: '白胚列表',
+	  type:'rawFabric',
+	},
+	{
+		path:'../spot/list',
+		name:'需求单列表',
+		type:'',
 	},
-	
 ] as any[])


--- a/pages/maintenance/m-other.vue
+++ b/pages/maintenance/m-other.vue
@ -1,13 +1,41 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
+import { getAction, putAction } from '../../common/http';
+import { showToast } from 'vant';

-const list = ref([{list:[{}]}] as any[])
+const list = ref([] as any[])

+onMounted(()=>{
+init()
+})
+function init(){
+	getAction('/extraOption').then((res:any)=>{
+		if(res.code===200){
+			list.value=JSON.parse(res.data.payload)
+		}
+	})
+}
 const onClickLeft = () =>{
  history.back()
 }
 const onClickRight=()=>{
-  list.value.push([])
+  list.value.push({options:[{}]})
+}
+//新增选项
+const addxx = (item:any) =>{
+	item.options.push({})
+}
+const onSubmit = () =>{
+	let param={
+		id:1,
+		payload:JSON.stringify(list.value)
+	}
+	putAction('/extraOption',param).then((res:any)=>{
+		if(res.code===200){
+			showToast('提交成功！')
+			init()
+		}
+	})	
 }
 </script>

@ -35,13 +63,13 @@ const onClickRight=()=>{
                label-width="6em"
                :rules="[{ required: true, message: '请填写' }]"
              />
-            <van-button type="primary">新增选项</van-button>
+            <van-button type="primary" @click="addxx(item)">新增选项</van-button>
          </view>
          <van-field name="是否必填" label="是否必填" colon label-width="7.5em">
            <template #input>
-              <van-radio-group v-model="item.type1" direction="horizontal">
-                <van-radio name="1">是</van-radio>
-                <van-radio name="2">否</van-radio>
+              <van-radio-group v-model="item.necessary" direction="horizontal">
+                <van-radio :name="true">是</van-radio>
+                <van-radio :name="false">否</van-radio>
              </van-radio-group>
            </template>
          </van-field>
@ -52,17 +80,18 @@ const onClickRight=()=>{
          <view class="grid-item">是否默认</view>
          <view class="grid-item">操作</view>
        </view>
-        <view class="grid-container" v-for="(itemSecond,indexSecond) in item.list" :key="indexSecond">
+        <view class="grid-container" v-for="(itemSecond,indexSecond) in item.options" :key="indexSecond">
          <view class="grid-item">选项</view>
-          <view class="grid-item">{{itemSecond.name}}</view>
+          <view class="grid-item"> <van-field v-model="itemSecond.name" /></view>
          <view class="grid-item" style="display: flex;align-items: center;justify-content: center">
-            <van-checkbox-group v-model="itemSecond.checked">
-              <van-checkbox name="1"></van-checkbox>
+            <van-checkbox-group v-model="itemSecond.default">
+              <van-checkbox :name="true"></van-checkbox>
            </van-checkbox-group></view>
-          <view class="grid-item" style="color: red">删除</view>
+          <view class="grid-item" style="color: red" @click="item.options.splice(indexSecond,1)">删除</view>
        </view>
      </view>
  </view>
+  <van-button type="primary" style="margin: 10rpx;" @click="onSubmit">提交</van-button>
 </view>
 </template>

--- a/pages/maintenance/m-requirements.vue
+++ b/pages/maintenance/m-requirements.vue
@ -1,135 +1,170 @@
 <script lang="ts" setup>
+	import { onMounted, ref } from 'vue'
+	import { getAction, postAction, putAction } from '../../common/http';
+	import { showToast } from 'vant';

-import { ref } from 'vue'
+	const showPop = ref(false)
+	const list = ref([] as any[])
+	const form = ref({} as any)

-const showPop = ref(false)
-const list= ref([{}] as any[])
-const form = ref({list:[{}]} as any)
+	onMounted(() => {
+		init()
+	})

-const onClickLeft = () =>{
-  history.back()
-}
-const onClickRight=()=>{
-  showPop.value=true
-}
-const addLittle = (item:any) =>{
-  console.log(item)
-  showPop.value=true
-}
-const submit =()=>{
+	function init() {
+		getAction('/craftRequire').then((res : any) => {
+			if (res.code === 200) {
+				list.value = res.data
+			}
+		})
+	}

-}
+	const onClickLeft = () => {
+		history.back()
+	}
+	const onClickRight = () => {
+		showPop.value = true
+		form.value = { requirements: [{}] }
+	}
+	const addLittle = (item : any) => {
+		form.value.id = item.id
+		form.value.craft = item.craft
+		form.value.requirements = item.requirements.map((l : any) => ({type:l}))
+		showPop.value = true
+	}
+	const submit = () => {
+		let requirements = form.value.requirements.map((l : any) => (l.type))
+		let param = {
+			craft: form.value.craft,
+			requirements: requirements
+		}
+		if (form.value.id) {
+			putAction('/craftRequire', { id: form.value.id, ...param }).then((res : any) => {
+				if (res.code === 200) {
+					init()
+					showPop.value = false
+					showToast('编辑成功！')
+				}
+			})
+		} else {
+			postAction('/craftRequire', param).then((res : any) => {
+				if (res.code === 200) {
+					init()
+					showPop.value = false
+					showToast('提交成功！')
+				}
+			})
+		}
+	}
 </script>

 <template>
-  <view class="flex">
-    <van-nav-bar
-      title="工艺要求维护"
-      left-text="返回"
-      left-arrow
-      right-text="新增"
-      @click-left="onClickLeft"
-      @click-right="onClickRight"
-    />
-    <view class="content">
-      <view class="card" v-for="(item,index) in list" :key="index">
-        <view
-          style="display: flex;align-items: center;justify-content: space-between;border-bottom: 1px solid #d7d7d7;padding: 5px">
-          <p>染色后做缩</p>
-          <p style="display: flex;align-items: center"> <van-icon name="add" color="red" size="25"
-                                                                  @click="addLittle(item)"/> 新增</p>
-        </view>
-        <view class="grid-container">
-          <view class="grid-item" v-for="(itemSecond,indexSecond) in item.list" :key="indexSecond">
-            缩率<2%
-            <van-icon name="clear" color="red" size="25" @click="list.splice(indexSecond,1)"/>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+	<view class="flex">
+		<van-nav-bar title="工艺要求维护" left-text="返回" left-arrow right-text="新增" @click-left="onClickLeft"
+			@click-right="onClickRight" />
+		<view class="content">
+			<view class="card" v-for="(item,index) in list" :key="index">
+				<view
+					style="display: flex;align-items: center;justify-content: space-between;border-bottom: 1px solid #d7d7d7;padding: 5px">
+					<p>{{item.craft}}</p>
+					<p style="display: flex;align-items: center"> <van-icon name="add" color="red" size="25"
+							@click="addLittle(item)" /> 编辑</p>
+				</view>
+				<view class="grid-container">
+					<view class="grid-item" v-for="(itemSecond,indexSecond) in item.requirements" :key="indexSecond">
+						<span>{{itemSecond}}</span>
+						<!-- <van-icon name="clear" color="red" size="25" @click="list.splice(indexSecond,1)" /> -->
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>

-  <van-popup v-model:show="showPop" style="width: 80%" round>
-    <view>
-      <h3 style="text-align: center">新增</h3>
-      <van-cell-group inset>
-        <van-field
-          v-model="form.name"
-          name="大类"
-          label="大类"
-          colon
-          label-width="4em"
-          :rules="[{ required: true, message: '请填写' }]"
-        />
-        <view v-for="(item,index) in form.list" :key="index" class="a-b">
-          <van-icon name="add" color="red" size="25" v-if="index===0" @click="form.list.push({})"/>
-          <van-icon name="clear" color="red" size="25" v-if="index!=0" @click="form.list.splice(index,1)"/>
-          <van-field
-            v-model="item.type"
-            name="小类"
-            label="小类"
-            colon
-            label-width="2.5em"
-            :rules="[{ required: true, message: '请填写' }]"
-          />
-        </view>
-      </van-cell-group>
-      <view class="a-c">
-        <van-button type="danger" @click="showPop=false">取消</van-button>
-        <van-button type="primary" @click="submit">确认</van-button>
-      </view>
-    </view>
-  </van-popup>
+	<van-popup v-model:show="showPop" style="width: 80%" round>
+		<view>
+			<h3 style="text-align: center">新增</h3>
+			<van-cell-group inset>
+				<van-field v-model="form.craft" name="大类" label="大类" colon label-width="4em"
+					:rules="[{ required: true, message: '请填写' }]" />
+				<view v-for="(item,index) in form.requirements" :key="index" class="a-b">
+					<van-icon name="add" color="red" size="25" v-if="index===0" @click="form.requirements.push({})" />
+					<van-icon name="clear" color="red" size="25" v-if="index!=0"
+						@click="form.requirements.splice(index,1)" />
+					<van-field v-model="item.type" name="小类" label="小类" colon label-width="2.5em"
+						:rules="[{ required: true, message: '请填写' }]" />
+				</view>
+			</van-cell-group>
+			<view class="a-c">
+				<van-button type="danger" @click="showPop=false">取消</van-button>
+				<van-button type="primary" @click="submit">确认</van-button>
+			</view>
+		</view>
+	</van-popup>
 </template>

 <style scoped lang="scss">
-.flex{
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  width: 100vw;
-  .van-nav-bar{
-    width: 100%;
-  }
-  .content{
-    flex: 1;
-    padding: 0 20rpx;
-    .grid-container {
-      display: grid;
-      grid-template-columns: 1fr 1fr 1fr;
-      .grid-item{
-        text-align: center;
-      }
-    }
-    .card{
-      margin: 20rpx 30rpx;
-      padding: 10rpx;
-      border: 1rpx solid #02a7f0;
-      border-radius: 20rpx;
-    }
-  }
-}
-.a-b{
-  display:flex;
-  align-items: center;
-}
-::v-deep .van-field{
-  font-size: 16px;
-}
-::v-deep .van-field__body {
-	border-bottom: 1rpx solid #d7d7d7!important;
-}
-::v-deep .van-field__label{
-  text-align: end!important;
-}
-.a-c{
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-  margin:30rpx;
-  ::v-deep .van-button--normal{
-      padding: 10rpx!important;
-      height: 60rpx!important;
-    }
-}
-</style>
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.content {
+			flex: 1;
+			padding: 0 20rpx;
+
+			.grid-container {
+				display: grid;
+				grid-template-columns: 1fr 1fr 1fr;
+
+				.grid-item {
+					text-align: center;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					padding: 10rpx 0;
+				}
+			}
+
+			.card {
+				margin: 20rpx 30rpx;
+				padding: 10rpx;
+				border: 1rpx solid #02a7f0;
+				border-radius: 20rpx;
+			}
+		}
+	}
+
+	.a-b {
+		display: flex;
+		align-items: center;
+	}
+
+	::v-deep .van-field {
+		font-size: 16px;
+	}
+
+	::v-deep .van-field__body {
+		border-bottom: 1rpx solid #d7d7d7 !important;
+	}
+
+	::v-deep .van-field__label {
+		text-align: end !important;
+	}
+
+	.a-c {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		margin: 30rpx;
+
+		::v-deep .van-button--normal {
+			padding: 10rpx !important;
+			height: 60rpx !important;
+		}
+	}
+</style>
--- a/pages/maintenance/processOldzmd.vue
+++ b/pages/maintenance/processOldzmd.vue
@ -0,0 +1,491 @@
+<template>
+	<view class="flex">
+		<van-nav-bar title="工艺维护" left-text="返回" left-arrow right-text="新增" @click-left="onClickLeft"
+			@click-right="onClickRight" />
+		<view class="grid-container">
+			<view class="grid-item">工艺名称</view>
+			<view class="grid-item">操作</view>
+		</view>
+		<view class="content">
+			<view class="grid-container" v-for="(item,index) in formList" :key=index>
+				<view class="grid-item">{{item.name}}</view>
+				<view class="grid-item" @click="edit(item)">编辑</view>
+			</view>
+		</view>
+	</view>
+	<van-popup v-model:show="show" style="width: 100%">
+		<view class="flex">
+			<van-nav-bar title="工艺维护" left-text="返回" left-arrow @click-left="poClickLeft" />
+			<view class="content">
+				<van-form ref="formRef" required="auto">
+					<van-cell-group>
+						<van-field label-width="7rem" label-align="right" v-model.number="form.name" type="text"
+							label="工艺名称：" placeholder="请输入"
+							:rules="[{ required: true, message: '请输入正确内容', validator}]" />
+						<van-field label-width="7rem" label-align="right" required readonly type="text"
+							label="大货价公式：" />
+						<view class="box">
+							<VueDraggable class="table-box1" v-model="listDHJ" group="people">
+								<view v-for="item in listDHJ" :key="item.name" class="table-item"
+									style="width: auto;padding:5px">
+									{{ item.name }}
+								</view>
+
+							</VueDraggable>
+							<van-button type="danger" size="mini" class="remove-btn" @click="listDHJ=[]">清空</van-button>
+						</view>
+						<van-field label-width="7rem" label-align="right" required readonly type="text"
+							label="成本价公式：" />
+						<view class="box">
+							<VueDraggable class="table-box1" v-model="listCBJ" group="people">
+								<view v-for="item in listCBJ" :key="item.name" class="table-item"
+									style="width: auto;padding:5px">
+									{{ item.name }}
+								</view>
+							</VueDraggable>
+							<van-button type="danger" size="mini" class="remove-btn" @click="listCBJ=[]">清空</van-button>
+						</view>
+					</van-cell-group>
+					<p>基础块：</p>
+					<VueDraggable class="table-box" v-model="BaseBlock"
+						:group="{ name: 'people', pull: 'clone', put: false }">
+						<view v-for="item in BaseBlock" :key="item.name" class="table-item">
+							{{ item.name }}
+						</view>
+					</VueDraggable>
+					<p>运算符号：</p>
+					<VueDraggable class="table-box" v-model="sign"
+						:group="{ name: 'people', pull: 'clone', put: false }">
+						<view v-for="item in sign" :key="item.name" class="table-item" style="background-color: #24d2d3;font-size:
+			                               16px">
+							{{ item.name }}
+						</view>
+					</VueDraggable>
+					<p>已有工艺：</p>
+					<VueDraggable class="table-boxa" v-model="ProcessPrice"
+						:group="{ name: 'people', pull: 'clone', put: false }">
+						<view v-for="item in ProcessPrice" :key="item.name" class="table-itema">
+							{{ item.name }}
+						</view>
+					</VueDraggable>
+					<p>常数：</p>
+					<VueDraggable class="table-boxa" v-model="numList"
+						:group="{ name: 'people', pull: 'clone', put: false }">
+						<view v-for="item in numList" :key="item.name" class="table-itemb"
+							style="background-color: #82d588">
+							{{ item.name}}
+						</view>
+					</VueDraggable>
+
+					<p>请选择对应工序</p>
+					<view v-for="(item,index) in form.processes" :key="index" class="a-b">
+						<van-icon name="add" color="red" size="25" v-if="index===0" @click="form.processes.push({})" />
+						<van-icon name="clear" color="red" size="25" v-if="index!=0"
+							@click="form.processes.splice(index,1)" />
+						<van-field v-model="item.name" name="工序" label="工序" label-align="right" readonly colon
+							label-width="2.5em" class="bor" @click="choosePic(index)">
+						</van-field>
+						<van-checkbox-group v-model="item.canSkip" style="margin-left: 20rpx;">
+							<van-checkbox :name="false">不可跳过</van-checkbox>
+						</van-checkbox-group>
+					</view>
+					<van-field name="出厂前是否需要填写缩率" label="出厂前是否需要填写缩率" label-align="right" readonly colon
+						label-width="12em">
+						<template #input>
+							<van-radio-group v-model="form.needShrinkage" direction="horizontal">
+								<van-radio :name="true">是</van-radio>
+								<van-radio :name="false">否</van-radio>
+							</van-radio-group>
+						</template>
+					</van-field>
+				</van-form>
+			</view>
+			<view style="display: flex;justify-content: space-between; padding: 0 30px;margin-top: 15px;">
+				<van-button type="primary" block @click="onSubmit">保存</van-button>
+			</view>
+		</view>
+	</van-popup>
+
+	<!--选择框-->
+	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
+		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
+			ref="pickerRef" />
+	</van-popup>
+</template>
+<script lang="ts" setup>
+	import { onMounted, ref } from 'vue';
+	import { VueDraggable } from "vue-draggable-plus";
+	import { getAction, postAction, putAction } from '../../common/http';
+	import { showToast } from 'vant';
+	const show = ref(false)
+	const formList = ref([])
+	const showPicker = ref(false)
+
+	const form = ref({ requirements: [{}] } as any)
+	const formRef = ref();
+	const listDHJ = ref([])
+	const listCBJ = ref([])
+	const BaseBlock = ref([
+		{ name: '基础大货价', value: '$基础大货价$' },
+		{ name: '基础成本价', value: '$基础成本价$' },
+		{ name: '缩率', value: '$缩率$' },
+		{ name: '姆米', value: '$姆米$' },
+		{ name: '门幅', value: '$门幅$' }
+	])
+	const sign = ref([
+		{ name: '+', value: '+' },
+		{ name: '-', value: '-' },
+		{ name: '*', value: '*' },
+		{ name: '/', value: '/' },
+		{ name: '(', value: '(' },
+		{ name: ')', value: ')' },
+		{ name: '=', value: '=' },
+		{ name: '>', value: '>' },
+		{ name: '<', value: '<' },
+		{ name: '?', value: '?' },
+		{ name: ':', value: ':' },
+	])
+	const ProcessPrice = ref([
+		{ name: '印花价', value: '#印花价#' },
+		{ name: '砂洗', value: '#砂洗#' },
+		{ name: '水洗', value: '#水洗#' },
+		{ name: '印花砂洗', value: '#印花砂洗#' },
+		{ name: '印花水洗', value: '#印花水洗#' },
+		{ name: '胚布', value: '#胚布#' },
+		{ name: '预缩（半）', value: '#预缩（半）#' },
+		{ name: '预缩（全）', value: '#预缩（全）#' },
+		{ name: '印花预缩（半）', value: '#印花预缩（半）#' },
+		{ name: '印花预缩（全）', value: '#印花预缩（全）#' },
+	])
+	const numList = ref([
+		{ name: '1', value: '1' },
+		{ name: '2', value: '2' },
+		{ name: '3', value: '3' },
+		{ name: '4', value: '4' },
+		{ name: '5', value: '5' },
+		{ name: '6', value: '6' },
+		{ name: '7', value: '7' },
+		{ name: '8', value: '8' },
+		{ name: '9', value: '9' },
+		{ name: '0', value: '0' },
+		{ name: '.', value: '.' },
+	])
+	const validator = (val : any) => {
+		return !/\s/g.test(val)
+	}
+	const broadHeadingExpression = ref('')
+	const costExpression = ref('')
+	const onSubmit = () => {
+		broadHeadingExpression.value = addTransformation(listDHJ.value)
+		costExpression.value = addTransformation(listCBJ.value)
+		let processes = form.value.processes.map((l : any) => ({
+			name: l.name,
+			canSkip: l.canSkip ? l.canSkip[0] : true
+		}))
+		if (form.value.id) {
+			let data = {
+				id: form.value.id,
+				name: form.value.name,
+				broadHeadingExpression: broadHeadingExpression.value,
+				costExpression: costExpression.value,
+				processes: processes,
+				needShrinkage: form.value.needShrinkage
+			}
+			putAction('/fabric/craft/update', data).then((res : any) => {
+				if (res.code === 200) {
+					initData()
+					show.value = false
+					showToast('修改成功！')
+				}
+			})
+		} else {
+			let data = {
+				name: form.value.name,
+				broadHeadingExpression: broadHeadingExpression.value,
+				costExpression: costExpression.value
+			}
+			postAction('/fabric/craft/add', data).then((res : any) => {
+				if (res.code === 200) {
+					initData()
+					show.value = false
+					showToast('提交成功！')
+				}
+			})
+		}
+	}
+
+	const poClickLeft = () => {
+		show.value = false
+	}
+	const onClickLeft = () => {
+		history.back()
+	}
+	const onClickRight = () => {
+		show.value = true
+		form.value.processes = [{}]
+	}
+
+	const initData = () => {
+		getAction('/fabric/craft/info').then((res : any) => {
+			if (res.code === 200) {
+				formList.value = res.data
+			}
+		})
+	}
+	const edit = (item : any) => {
+		handlEdit(item)
+		form.value = item
+		if (item.processes) {
+			form.value.processes = item.processes.map((l : any) => ({
+				name: l.name,
+				canSkip: l.canSkip ? [l.canSkip] : [l.canSkip]
+			}))
+		} else {
+			form.value.processes = [{}]
+		}
+		show.value = true
+	}
+
+	const indexType = ref()
+
+	//选择框事件
+	const choosePic = (index : any) => {
+		showPicker.value = true
+		indexType.value = index
+	}
+	//选择框确认
+	const pickerConfirm = (val : any) => {
+		form.value.processes[indexType.value].id = val.selectedOptions[0].value
+		form.value.processes[indexType.value].name = val.selectedOptions[0].text
+		showPickerCancel()
+	}
+	//取消
+	const showPickerCancel = () => {
+		showPicker.value = false
+	}
+	//弹窗开启事件
+	const handleOpen = () => {
+		popuList.value = processList.value
+	}
+	const popuList = ref([])
+	const processList = ref([])
+	onMounted(() => {
+		initData()
+		getAction('/process').then((res : any) => {
+			if (res.code === 200) {
+				processList.value = res.data.map((l : any) => ({ text: l.name, value: l.id }))
+			}
+		})
+	})
+	const handlEdit = (item : any) => {
+		// 定义一个正则表达式来匹配括号和变量名
+		const regex = /([()+-=><?:*/])|(\$[\w\u4e00-\u9fa5]+\$)|(#[\w\u4e00-\u9fa5]+#)|([\+\*])|(\d+)/g;
+
+		// 使用 match 方法来匹配所有的符号和变量名
+		const matches = item.broadHeadingExpression.match(regex);
+		const matches1 = item.costExpression.match(regex);
+		listDHJ.value = []
+		listCBJ.value = []
+		matches.forEach((l : any) => {
+			// 使用正则表达式匹配中文字符
+			const regex = /\$([\u4e00-\u9fa5]+)\$/;
+			const match = l.match(regex);
+			const regex1 = /#(.+)#/;
+			const match1 = l.match(regex1);
+			if (match) {
+				listDHJ.value.push({ name: match[1], value: l })
+			} else {
+				if (match1) {
+					listDHJ.value.push({ name: match1[1], value: l })
+				} else {
+					listDHJ.value.push({ name: l, value: l })
+				}
+			}
+		})
+		matches1.forEach((l : any) => {
+			// 使用正则表达式匹配中文字符
+			const regex = /\$([\u4e00-\u9fa5]+)\$/;
+			const match = l.match(regex);
+			const regex2 = /#(.+)#/;
+			const match2 = l.match(regex2);
+			if (match) {
+				listCBJ.value.push({ name: match[1], value: l })
+			} else {
+				if (match2) {
+					listCBJ.value.push({ name: match2[1], value: l })
+				} else {
+					listCBJ.value.push({ name: l, value: l })
+				}
+			}
+		})
+	}
+	const addTransformation = (list : any) => {
+		let str = ''
+		list.forEach((element : any) => {
+			str += element.value
+		});
+		return str
+	}
+</script>
+<style scoped lang="scss">
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.grid-container {
+			display: grid;
+			grid-template-columns: 2fr 1fr;
+
+			.grid-item {
+				border: 1rpx solid #f2f2f2;
+				text-align: center;
+				padding: 10rpx;
+
+				::v-deep .van-cell {
+					padding: 10rpx;
+				}
+			}
+
+			.content {
+				flex: 1;
+				padding: 0 20rpx;
+			}
+
+			.card {
+				margin: 16rpx 20rpx;
+				padding: 10rpx;
+				border: 1rpx solid #02a7f0;
+				border-radius: 20rpx;
+			}
+
+
+		}
+
+		::v-deep .van-field {
+			font-size: 16px;
+			padding: 5rpx 0;
+		}
+
+		::v-deep .van-cell-group--inset {
+			margin: 0;
+		}
+
+		.bor {
+			::v-deep .van-field__control {
+				text-align: center;
+				border: 1rpx solid #d7d7d7;
+			}
+		}
+
+	}
+
+	.a-b {
+		display: flex;
+		align-items: center;
+
+		::v-deep .van-button--normal {
+			padding: 8rpx;
+			height: 50rpx;
+			width: 7em;
+		}
+
+		::v-deep .van-field {
+			width: 65% !important;
+		}
+	}
+
+	::v-deep .van-popup--center {
+		max-width: 100vw !important;
+	}
+
+	.content-scroll {
+		flex: 1;
+		overflow-y: scroll;
+	}
+
+	.hide-scrollbar {
+		-ms-overflow-style: none;
+		/* IE and Edge */
+		scrollbar-width: none;
+		/* Firefox */
+		overflow-y: scroll;
+		/* 显示滚动条区域 */
+	}
+
+	.box {
+		width: 90vw;
+		min-height: 80px;
+		margin: 10px;
+		border: 1px solid #ccc;
+		position: relative;
+		padding: 5px;
+
+	}
+
+	.remove-btn {
+		position: absolute;
+		right: 5px;
+		bottom: 5px;
+	}
+
+	.table-box1 {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	.table-box {
+		width: 100vw;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		flex-wrap: wrap;
+	}
+
+	.table-item {
+		width: 15vw;
+		background-color: #73a0fa;
+		color: #fff;
+		font-size: 12px;
+		border-radius: 5px;
+		text-align: center;
+		padding: 5px 0;
+		margin: 5px 0;
+	}
+
+	.table-boxa {
+		width: 100vw;
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+	}
+
+	.table-itema {
+		background-color: #73a0fa;
+		color: #fff;
+		font-size: 12px;
+		border-radius: 5px;
+		text-align: center;
+		padding: 5px 10px;
+		margin: 5px 2px;
+	}
+
+	.table-itemb {
+		background-color: #73a0fa;
+		color: #fff;
+		font-size: 16px;
+		border-radius: 5px;
+		text-align: center;
+		padding: 10px 20px;
+		margin: 5px 2px;
+	}
+
+	p {
+		padding-left: 10px;
+	}
+</style>
--- a/pages/spot/audit.vue
+++ b/pages/spot/audit.vue
@ -0,0 +1,434 @@
+<script setup lang="ts">
+	import { onMounted, ref } from 'vue';
+	import { formatDate } from '../../utils/date';
+	import { getAction } from '../../common/http';
+	import { showToast } from 'vant';
+
+	const showDialog = ref(false)
+	const formList = ref([] as any[])
+	onMounted(() => {
+		getAction('/fabric/craft/info').then((res : any) => {
+			if (res.code === 200) {
+				formList.value = res.data
+			}
+		})
+		getAction('/fabric/info/all').then((res : any) => {
+			if (res.code === 200) {
+				res.data.forEach((l : any) => {
+					let itemMl = mlList.value.find(m => m.text === l.commodity)
+					if (itemMl) {
+						let itemMm = itemMl.children.find(m => m.value === l.momme)
+						if (itemMm) {
+							itemMm.children.push({ text: l.width + 'cm', value: l.width })
+						} else {
+							itemMl.children.push({
+								text: l.momme + 'mm',
+								value: l.momme,
+								children: [{ text: l.width + 'cm', value: l.width }]
+							})
+						}
+					} else {
+						mlList.value.push({
+							text: l.commodity,
+							value: l.commodity,
+							children: [{ text: l.momme + 'mm', value: l.momme, children: [{ text: l.width + 'cm', value: l.width }] }]
+						})
+					}
+				})
+			}
+		})
+	})
+
+	const onClickLeft = () => {
+		history.back()
+	}
+
+	//弹窗提交
+	const confirmSecond = () => {
+
+	}
+	const onSubmit = () => {
+
+	}
+
+	const form = ref({ processes: [{}] } as any)
+	const showPicker = ref(false)
+	const typeData = ref()
+	const popuList = ref([] as any[])
+	const show = ref(false)
+	const pickerList = ref([])//面料数据
+	const pickerContainerList = ref([])
+	const showPickerList = ref(false)
+	const searchValue = ref('')//查询的值
+	const searchIndex = ref(0)//查询到的数组
+	const mlList = ref([])
+	//选择框事件
+	const choosePic = (type : any) => {
+		showPicker.value = true
+		typeData.value = type
+	}
+	//选择框确认
+	const pickerConfirm = (val : any) => {
+		if (typeData.value === 'level') {
+		} else {
+			form.value[typeData.value] = val.selectedValues[0]
+		}
+		showPickerCancel()
+	}
+	//取消
+	const showPickerCancel = () => {
+		showPicker.value = false
+	}
+	//弹窗开启事件
+	const handleOpen = () => {
+		if (typeData.value === 'supplier') {
+			popuList.value = []
+		} else if (typeData.value === 'level') {
+			popuList.value = []
+		}
+	}
+	const chooseDate = () => {
+		show.value = true
+	}
+	//日期选择
+	const onConfirmDate = (val : any) => {
+		form.value.createTime = formatDate(val)
+		show.value = false
+	}
+
+	//选择面料
+	const selectChoose = () => {
+		showPickerList.value = true
+	}
+	//面料开启
+	const mlmcOpen = () => {
+		pickerList.value = mlList.value
+		pickerContainerList.value = pickerList.value
+		searchValue.value = ''
+	}
+	//面料关闭
+	const pickerCancel = () => {
+		showPickerList.value = false
+	}
+
+	//搜索
+	const selectedValue = ref()
+	const getSeachList = () => {
+		searchIndex.value = 0
+		let reg = new RegExp(searchValue.value)
+		let arr = []
+		pickerList.value.forEach(l => {
+			if (reg.test(l.text)) {
+				arr.push(l)
+			}
+		})
+		pickerContainerList.value = arr
+	}
+	//向上选择
+	const upSearch = () => {
+		if (searchIndex.value === 0 && pickerContainerList.value.length) {
+			searchIndex.value = pickerContainerList.value.length - 1
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else if (pickerContainerList.value.length) {
+			searchIndex.value--
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//向下选择
+	const downSearch = () => {
+		if (pickerContainerList.value.length) {
+			if (searchIndex.value === pickerContainerList.value.length) {
+				searchIndex.value = 0
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			} else {
+				searchIndex.value++
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			}
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//搜索框输入
+	const timer = ref()
+	const searchTo = () => {
+		if (timer.value) {
+			clearTimeout(timer.value)
+		}
+		timer.value = setTimeout(() => {
+			getSeachList()
+		}, 800)
+	}
+	const onConfirm = (val : any) => {
+		form.value.fabricName = val.selectedValues[2] + '/' + val.selectedValues[0] + val.selectedValues[1]
+		pickerCancel()
+	}
+</script>
+
+<template>
+	<view class="flex">
+		<van-nav-bar title="现货需求单" left-text="返回" left-arrow @click-left="onClickLeft" />
+		<view class="content">
+			<van-form @submit="onSubmit">
+				<van-cell-group inset>
+					<van-field v-model="form.createTime" name="做单日期" label="做单日期" colon class="bor" label-width="5em"
+						readonly :rules="[{ required: true, message: '请填写' }]" @click="chooseDate()" />
+					<van-field v-model="form.supplier" name="订单归属" label="订单归属" colon label-width="5em"
+						:rules="[{ required: true, message: '请填写' }]" />
+					<van-field v-model="form.fabricName" name="颜色色号" label="颜色色号" colon
+						:rules="[{ required: true, message: '请填写' }]" label-width="5em" />
+					<van-field v-model="form.fabricName" name="工艺" label="工艺" colon
+						:rules="[{ required: true, message: '请填写' }]" label-width="5em" readonly class="bor"
+						@click="choosePic('')" />
+					<view class="a-b">
+						<van-button type="primary" @click="showDialog=true">面料添加</van-button>
+					</view>
+					<view class="grid-container">
+						<view class="grid-item">面料名称</view>
+						<view class="grid-item">匹数</view>
+						<view class="grid-item">库存</view>
+						<view class="grid-item">谁定</view>
+						<view class="grid-item">操作</view>
+					</view>
+					<view class="grid-container" v-for="(item,index) in form.processes" :key=index>
+						<view class="grid-item">{{item.ml}}</view>
+						<view class="grid-item">匹数</view>
+						<view class="grid-item">库存</view>
+						<view class="grid-item">谁定</view>
+						<view class="grid-item">操作</view>
+					</view>
+					<van-field v-model="form.fabricName" name="备注" label="备注" colon label-width="5em" />
+				</van-cell-group>
+				<view style="margin: 16px;">
+					<van-button round block type="primary" native-type="submit">
+						提交
+					</van-button>
+				</view>
+			</van-form>
+		</view>
+	</view>
+
+	<van-dialog v-model:show="showDialog">
+		<view>
+			<van-cell-group inset>
+				<view v-for="(item,index) in form.processes" :key="index">
+					<view class="a-c">
+						<van-icon name="add" color="red" size="25" v-if="index===0" @click="form.processes.push({})" />
+						<van-icon name="clear" color="red" size="25" v-if="index!=0"
+							@click="form.processes.splice(index,1)" />
+						<van-field v-model="form.ml" name="面料名称" label="面料名称" colon readonly label-width="5em"
+							@click="selectChoose" class="bor"/>
+					</view>
+					<van-field v-model="item.ml" name="需求匹数" label="需求匹数" type="number" colon label-width="6.5em" />
+					<van-field v-model="item.ml" name="库存匹数" label="库存匹数" colon label-width="6.5em" readonly/>
+					<van-field v-model="form.ml" name="谁定" label="谁定" colon readonly label-width="6.5em" @click="choosePic" class="bor" />
+				</view>
+			</van-cell-group>
+		</view>
+		<template #footer>
+			<view class="footer-button">
+				<van-button plain size="small" native-type="button" style="width: 25vw;" @click="showDialog=false">
+					取消
+				</van-button>
+				<van-button size="small" type="success" native-type="submit" style="width: 25vw;"
+					@click="confirmSecond">
+					确认
+				</van-button>
+			</view>
+		</template>
+	</van-dialog>
+
+
+	<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2010, 0, 1)"
+		:max-date="new Date(2050, 0, 31)" />
+
+	<!--选择框-->
+	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
+		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
+			ref="pickerRef" />
+	</van-popup>
+
+	<!--    面料选择框-->
+	<van-popup v-model:show="showPickerList" position="bottom" @open="mlmcOpen">
+		<view class="select-model">
+			<van-picker :columns="pickerContainerList" @cancel="pickerCancel" v-model="selectedValue"
+				@confirm="onConfirm" />
+			<view>
+				<view class="top-select">
+					<view class="confirm-select">
+						<p>请选择品种</p>
+					</view>
+					<view class="search-box">
+						<view>
+							<van-search placeholder="请输入品种名字" v-model="searchValue" label="面料搜索：" background="#ffffff"
+								@input="searchTo()" :clearable="false" />
+						</view>
+						<view class="flex-btn">
+							<button class="search-btn" @click="upSearch()">↑</button>
+							<button class="search-btn" @click="downSearch()">↓</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</van-popup>
+</template>
+
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.content {
+			flex: 1;
+			padding: 0 10px;
+
+			.grid-container {
+				display: grid;
+				grid-template-columns: 2fr 1fr 1.5fr 1fr 1fr;
+
+				.grid-item {
+					border: 1px solid #f2f2f2;
+					text-align: center;
+
+					::v-deep .van-cell {
+						padding: 0 5px;
+					}
+				}
+			}
+		}
+	}
+
+	.footer-button {
+		margin: 20px;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	::v-deep .van-field {
+		font-size: 16px;
+	}
+
+	.a-b {
+		margin: 10rpx;
+
+		::v-deep .van-button--normal {
+			padding: 5px 8px;
+			height: 30px;
+		}
+	}
+
+	.a-c {
+		display: flex;
+		align-items: center;
+
+		::v-deep .van-button--normal {
+			padding: 8rpx;
+			height: 50rpx;
+			width: 7em;
+		}
+	}
+
+	.bor {
+		::v-deep .van-field__control {
+			border: 1px solid #d7d7d7;
+		}
+	}
+
+	::v-deep .van-field__control {
+		border-bottom: 1px solid #d7d7d7;
+		text-align: center;
+	}
+
+	::v-deep .van-field__label {
+		text-align: end;
+	}
+
+	/*面料选择搜索框*/
+	.select-model {
+		position: relative;
+	}
+
+	.confirm-select {
+		width: 100%;
+	}
+
+	.confirm-select>p {
+		text-align: center;
+	}
+
+	.confirm-select>button {
+		border: none;
+		background-color: #ffffff;
+		color: #388aed;
+		margin: 10px 30px 0 0;
+	}
+
+	.top-select {
+		position: absolute;
+		top: 30px;
+		left: 0;
+		right: 0;
+		margin: auto;
+		z-index: 999;
+	}
+
+	::v-deep .select-model .van-picker__toolbar {
+		height: 66px;
+		align-items: flex-start;
+		/*justify-content: flex-end;*/
+	}
+
+	::v-deep .select-model .van-picker__cancel,
+	.select-model .van-picker__confirm {
+		height: 30px;
+		padding: 10px 16px 0;
+	}
+
+	.search-btn {
+		padding: 1px 8px;
+		border: none;
+		background-color: #388aed;
+		color: #ffffff;
+		margin-left: 5px;
+		height: 30px;
+		line-height: 25px;
+	}
+
+	.search-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+		position: relative;
+		background-color: #fff;
+	}
+
+	.van-search {
+		background-color: #f7f7f8;
+	}
+
+	.ml-search-jump {
+		padding: 3px 10px;
+		background-color: #388aed;
+		color: #ffffff;
+		border: none;
+		margin-left: 10px;
+	}
+
+	.flex-btn {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
--- a/pages/spot/list.vue
+++ b/pages/spot/list.vue
@ -0,0 +1,405 @@
+<script setup lang="ts">
+	import { showToast } from 'vant';
+	import { onMounted, ref } from 'vue';
+	import { getAction } from '../../common/http';
+import { formatDate } from '../../utils/date';
+
+	const form = ref({} as any)
+	const list = ref([] as any[])
+	onMounted(() => {
+		getAction('/fabric/info/all').then((res : any) => {
+			if (res.code === 200) {
+				res.data.forEach((l : any) => {
+					let itemMl = mlList.value.find(m => m.text === l.commodity)
+					if (itemMl) {
+						let itemMm = itemMl.children.find(m => m.value === l.momme)
+						if (itemMm) {
+							itemMm.children.push({ text: l.width + 'cm', value: l.width })
+						} else {
+							itemMl.children.push({
+								text: l.momme + 'mm',
+								value: l.momme,
+								children: [{ text: l.width + 'cm', value: l.width }]
+							})
+						}
+					} else {
+						mlList.value.push({
+							text: l.commodity,
+							value: l.commodity,
+							children: [{ text: l.momme + 'mm', value: l.momme, children: [{ text: l.width + 'cm', value: l.width }] }]
+						})
+					}
+				})
+			}
+		})
+	})
+
+	const onClickLeft = () => {
+		history.back()
+	}
+	const onClickRight = () => {
+		uni.navigateTo({
+			url: '/pages/spot/spot'
+		})
+	}
+
+
+	const total = ref(0)
+	const currentPage = ref(1)
+	const finished = ref(false)
+	const loading = ref(false);
+
+	//动态获取数据
+	const onLoad = () => {
+		if (list.value.length < total.value) {
+			currentPage.value++
+			init()
+		} else {
+			finished.value = true
+		}
+	};
+
+	function init() {
+
+	}
+
+
+
+	const pickerList = ref([])//面料数据
+	const pickerContainerList = ref([])
+	const showPickerList = ref(false)
+	const searchValue = ref('')//查询的值
+	const searchIndex = ref(0)//查询到的数组
+	const mlList = ref([])
+	//选择面料
+	const selectChoose = () => {
+		showPickerList.value = true
+	}
+	//面料开启
+	const mlmcOpen = () => {
+		pickerList.value = mlList.value
+		pickerContainerList.value = pickerList.value
+		searchValue.value = ''
+	}
+	//面料关闭
+	const pickerCancel = () => {
+		showPickerList.value = false
+	}
+
+	//搜索
+	const selectedValue = ref()
+	const getSeachList = () => {
+		searchIndex.value = 0
+		let reg = new RegExp(searchValue.value)
+		let arr = []
+		pickerList.value.forEach(l => {
+			if (reg.test(l.text)) {
+				arr.push(l)
+			}
+		})
+		pickerContainerList.value = arr
+	}
+	//向上选择
+	const upSearch = () => {
+		if (searchIndex.value === 0 && pickerContainerList.value.length) {
+			searchIndex.value = pickerContainerList.value.length - 1
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else if (pickerContainerList.value.length) {
+			searchIndex.value--
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//向下选择
+	const downSearch = () => {
+		if (pickerContainerList.value.length) {
+			if (searchIndex.value === pickerContainerList.value.length) {
+				searchIndex.value = 0
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			} else {
+				searchIndex.value++
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			}
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//搜索框输入
+	const timer = ref()
+	const searchTo = () => {
+		if (timer.value) {
+			clearTimeout(timer.value)
+		}
+		timer.value = setTimeout(() => {
+			getSeachList()
+		}, 800)
+	}
+	const onConfirm = (val : any) => {
+		form.value.category = val.selectedValues[2] + '/' + val.selectedValues[0] + val.selectedValues[1]
+		pickerCancel()
+	}
+	
+	const showPicker = ref(false)
+	const typeData = ref()
+	const popuList = ref([] as any[])
+	//选择框事件
+	const choosePic = (type : any) => {
+		showPicker.value = true
+		typeData.value = type
+	}
+	//选择框确认
+	const pickerConfirm = (val : any) => {
+		if (typeData.value === 'level') {
+		} else {
+			form.value[typeData.value] = val.selectedValues[0]
+		}
+		showPickerCancel()
+	}
+	//取消
+	const showPickerCancel = () => {
+		showPicker.value = false
+	}
+	//弹窗开启事件
+	const handleOpen = () => {
+		if (typeData.value === 'supplier') {
+			popuList.value = []
+		} else if (typeData.value === 'level') {
+			popuList.value = []
+		}
+	}
+	//日期选择
+	const show = ref(false)
+	const dataType = ref('')
+	const chooseDate = (val : any) => {
+		show.value = true
+		dataType.value = val
+	}
+	const onConfirmDate = (val : any) => {
+		form.value[dataType.value] = formatDate(val)
+		show.value = false
+	}
+</script>
+
+<template>
+	<view class="flex">
+		<van-nav-bar title="需求单列表" left-text="返回" left-arrow right-text="新增需求单" @click-left="onClickLeft"
+			@click-right="onClickRight()" />
+		<van-cell-group inset style="display: flex;">
+			<van-field v-model="form.startDate" name="开始时间" label="开始时间" colon class="bor" label-width="5em" readonly
+				@click="chooseDate('startDate')" :rules="[{ required: true, message: '请填写' }]" />
+			<van-field v-model="form.endDate" name="截止时间" label="截止时间" colon class="bor" label-width="5em" readonly
+				@click="chooseDate('endDate')" />
+		</van-cell-group>
+		<van-cell-group inset style="display: flex;">
+			<van-field v-model="form.category" name="面料筛选" label="面料筛选" colon class="bor" label-width="5em" readonly
+				@click="selectChoose" />
+			<van-field v-model="form.barcode" name="订单状态" label="订单状态" colon class="bor" label-width="5em" readonly @click="choosePic"/>
+		</van-cell-group>
+		<van-cell-group inset style="display: flex;">
+			<van-field v-model="form.len" name="颜色筛选" label="颜色筛选" colon class="bor" label-width="5em" readonly @click="choosePic"/>
+			<van-field v-model="form.location" name="做单人员" label="做单人员" colon class="bor" label-width="5em" readonly @click="choosePic"/>
+		</van-cell-group>
+		<view class="grid-container">
+			<view class="grid-item">日期/颜色</view>
+			<view class="grid-item">面料名称/工艺/谁定</view>
+			<view class="grid-item">匹数</view>
+			<view class="grid-item">操作</view>
+		</view>
+		<view class="content">
+			<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+				<view class="grid-container" v-for="(item,index) in list" :key="index">
+					<view class="grid-item">{{item.category}}</view>
+					<view class="grid-item">{{item.barcode}}</view>
+					<view class="grid-item" @click="toDetile(item)">{{item.len}}</view>
+					<view class="grid-item">{{item.location}}</view>
+				</view>
+			</van-list>
+		</view>
+	</view>
+	
+	<!--选择框-->
+	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
+		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
+			ref="pickerRef" />
+	</van-popup>
+
+	<!--    面料选择框-->
+	<van-popup v-model:show="showPickerList" position="bottom" @open="mlmcOpen">
+		<view class="select-model">
+			<van-picker :columns="pickerContainerList" @cancel="pickerCancel" v-model="selectedValue"
+				@confirm="onConfirm" />
+			<view>
+				<view class="top-select">
+					<view class="confirm-select">
+						<p>请选择品种</p>
+					</view>
+					<view class="search-box">
+						<view>
+							<van-search placeholder="请输入品种名字" v-model="searchValue" label="面料搜索：" background="#ffffff"
+								@input="searchTo()" :clearable="false" />
+						</view>
+						<view class="flex-btn">
+							<button class="search-btn" @click="upSearch()">↑</button>
+							<button class="search-btn" @click="downSearch()">↓</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</van-popup>
+
+	<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2010, 0, 1)"
+		:max-date="new Date(2050, 0, 31)" />
+</template>
+
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.grid-container {
+			display: grid;
+			grid-template-columns: 2fr 3fr 1.3fr 1.5fr;
+			padding: 0 15rpx;
+
+			.grid-item {
+				border: 1px solid #f2f2f2;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 50rpx;
+			}
+		}
+
+		.content {
+			flex: 1;
+		}
+	}
+
+	::v-deep .van-cell {
+		padding: 5px !important;
+	}
+
+	::v-deep .van-field {
+		font-size: 16px;
+	}
+
+	.bor {
+		::v-deep .van-field__control {
+			border: 1px solid #d7d7d7;
+			text-align: center;
+		}
+
+		::v-deep .van-field__label {
+			margin: 0;
+		}
+	}
+
+	.bor-a {
+		::v-deep .van-field__control {
+			border-bottom: 1px solid #d7d7d7;
+			text-align: center;
+		}
+
+		::v-deep .van-field__label {
+			margin: 0;
+		}
+	}
+
+	::v-deep .van-button--normal {
+		padding: 5px 8px;
+		height: 30px;
+	}
+
+	::v-deep .van-field__control {
+		text-align: center;
+	}
+
+	/*面料选择搜索框*/
+	.select-model {
+		position: relative;
+	}
+
+	.confirm-select {
+		width: 100%;
+	}
+
+	.confirm-select>p {
+		text-align: center;
+	}
+
+	.confirm-select>button {
+		border: none;
+		background-color: #ffffff;
+		color: #388aed;
+		margin: 10px 30px 0 0;
+	}
+
+	.top-select {
+		position: absolute;
+		top: 30px;
+		left: 0;
+		right: 0;
+		margin: auto;
+		z-index: 999;
+	}
+
+	::v-deep .select-model .van-picker__toolbar {
+		height: 66px;
+		align-items: flex-start;
+		/*justify-content: flex-end;*/
+	}
+
+	::v-deep .select-model .van-picker__cancel,
+	.select-model .van-picker__confirm {
+		height: 30px;
+		padding: 10px 16px 0;
+	}
+
+	.search-btn {
+		padding: 1px 8px;
+		border: none;
+		background-color: #388aed;
+		color: #ffffff;
+		margin-left: 5px;
+		height: 30px;
+		line-height: 25px;
+	}
+
+	.search-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+		position: relative;
+		background-color: #fff;
+	}
+
+	.van-search {
+		background-color: #f7f7f8;
+	}
+
+	.ml-search-jump {
+		padding: 3px 10px;
+		background-color: #388aed;
+		color: #ffffff;
+		border: none;
+		margin-left: 10px;
+	}
+
+	.flex-btn {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
--- a/pages/spot/pass.vue
+++ b/pages/spot/pass.vue
@ -0,0 +1,447 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script setup lang="ts">
+	
+</script>
+
+<style lang="less">
+	       
+</style>
+<script setup lang="ts">
+	import { onMounted, ref } from 'vue';
+	import { formatDate } from '../../utils/date';
+	import { getAction } from '../../common/http';
+	import { showToast } from 'vant';
+
+	const showDialog = ref(false)
+	const formList = ref([] as any[])
+	onMounted(() => {
+		getAction('/fabric/craft/info').then((res : any) => {
+			if (res.code === 200) {
+				formList.value = res.data
+			}
+		})
+		getAction('/fabric/info/all').then((res : any) => {
+			if (res.code === 200) {
+				res.data.forEach((l : any) => {
+					let itemMl = mlList.value.find(m => m.text === l.commodity)
+					if (itemMl) {
+						let itemMm = itemMl.children.find(m => m.value === l.momme)
+						if (itemMm) {
+							itemMm.children.push({ text: l.width + 'cm', value: l.width })
+						} else {
+							itemMl.children.push({
+								text: l.momme + 'mm',
+								value: l.momme,
+								children: [{ text: l.width + 'cm', value: l.width }]
+							})
+						}
+					} else {
+						mlList.value.push({
+							text: l.commodity,
+							value: l.commodity,
+							children: [{ text: l.momme + 'mm', value: l.momme, children: [{ text: l.width + 'cm', value: l.width }] }]
+						})
+					}
+				})
+			}
+		})
+	})
+
+	const onClickLeft = () => {
+		history.back()
+	}
+
+	//弹窗提交
+	const confirmSecond = () => {
+
+	}
+	const onSubmit = () => {
+
+	}
+
+	const form = ref({ processes: [{}] } as any)
+	const showPicker = ref(false)
+	const typeData = ref()
+	const popuList = ref([] as any[])
+	const show = ref(false)
+	const pickerList = ref([])//面料数据
+	const pickerContainerList = ref([])
+	const showPickerList = ref(false)
+	const searchValue = ref('')//查询的值
+	const searchIndex = ref(0)//查询到的数组
+	const mlList = ref([])
+	//选择框事件
+	const choosePic = (type : any) => {
+		showPicker.value = true
+		typeData.value = type
+	}
+	//选择框确认
+	const pickerConfirm = (val : any) => {
+		if (typeData.value === 'level') {
+		} else {
+			form.value[typeData.value] = val.selectedValues[0]
+		}
+		showPickerCancel()
+	}
+	//取消
+	const showPickerCancel = () => {
+		showPicker.value = false
+	}
+	//弹窗开启事件
+	const handleOpen = () => {
+		if (typeData.value === 'supplier') {
+			popuList.value = []
+		} else if (typeData.value === 'level') {
+			popuList.value = []
+		}
+	}
+	const chooseDate = () => {
+		show.value = true
+	}
+	//日期选择
+	const onConfirmDate = (val : any) => {
+		form.value.createTime = formatDate(val)
+		show.value = false
+	}
+
+	//选择面料
+	const selectChoose = () => {
+		showPickerList.value = true
+	}
+	//面料开启
+	const mlmcOpen = () => {
+		pickerList.value = mlList.value
+		pickerContainerList.value = pickerList.value
+		searchValue.value = ''
+	}
+	//面料关闭
+	const pickerCancel = () => {
+		showPickerList.value = false
+	}
+
+	//搜索
+	const selectedValue = ref()
+	const getSeachList = () => {
+		searchIndex.value = 0
+		let reg = new RegExp(searchValue.value)
+		let arr = []
+		pickerList.value.forEach(l => {
+			if (reg.test(l.text)) {
+				arr.push(l)
+			}
+		})
+		pickerContainerList.value = arr
+	}
+	//向上选择
+	const upSearch = () => {
+		if (searchIndex.value === 0 && pickerContainerList.value.length) {
+			searchIndex.value = pickerContainerList.value.length - 1
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else if (pickerContainerList.value.length) {
+			searchIndex.value--
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//向下选择
+	const downSearch = () => {
+		if (pickerContainerList.value.length) {
+			if (searchIndex.value === pickerContainerList.value.length) {
+				searchIndex.value = 0
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			} else {
+				searchIndex.value++
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			}
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//搜索框输入
+	const timer = ref()
+	const searchTo = () => {
+		if (timer.value) {
+			clearTimeout(timer.value)
+		}
+		timer.value = setTimeout(() => {
+			getSeachList()
+		}, 800)
+	}
+	const onConfirm = (val : any) => {
+		form.value.fabricName = val.selectedValues[2] + '/' + val.selectedValues[0] + val.selectedValues[1]
+		pickerCancel()
+	}
+</script>
+
+<template>
+	<view class="flex">
+		<van-nav-bar title="现货需求单" left-text="返回" left-arrow @click-left="onClickLeft" />
+		<view class="content">
+			<van-form @submit="onSubmit">
+				<van-cell-group inset>
+					<van-field v-model="form.createTime" name="做单日期" label="做单日期" colon class="bor" label-width="5em"
+						readonly :rules="[{ required: true, message: '请填写' }]" @click="chooseDate()" />
+					<van-field v-model="form.supplier" name="订单归属" label="订单归属" colon label-width="5em"
+						:rules="[{ required: true, message: '请填写' }]" />
+					<van-field v-model="form.fabricName" name="颜色色号" label="颜色色号" colon
+						:rules="[{ required: true, message: '请填写' }]" label-width="5em" />
+					<van-field v-model="form.fabricName" name="工艺" label="工艺" colon
+						:rules="[{ required: true, message: '请填写' }]" label-width="5em" readonly class="bor"
+						@click="choosePic('')" />
+					<view class="a-b">
+						<van-button type="primary" @click="showDialog=true">面料添加</van-button>
+					</view>
+					<view class="grid-container">
+						<view class="grid-item">面料名称</view>
+						<view class="grid-item">匹数</view>
+						<view class="grid-item">库存</view>
+						<view class="grid-item">谁定</view>
+						<view class="grid-item">操作</view>
+					</view>
+					<view class="grid-container" v-for="(item,index) in form.processes" :key=index>
+						<view class="grid-item">{{item.ml}}</view>
+						<view class="grid-item">匹数</view>
+						<view class="grid-item">库存</view>
+						<view class="grid-item">谁定</view>
+						<view class="grid-item">操作</view>
+					</view>
+					<van-field v-model="form.fabricName" name="备注" label="备注" colon label-width="5em" />
+				</van-cell-group>
+				<view style="margin: 16px;">
+					<van-button round block type="primary" native-type="submit">
+						提交
+					</van-button>
+				</view>
+			</van-form>
+		</view>
+	</view>
+
+	<van-dialog v-model:show="showDialog">
+		<view>
+			<van-cell-group inset>
+				<view v-for="(item,index) in form.processes" :key="index">
+					<view class="a-c">
+						<van-icon name="add" color="red" size="25" v-if="index===0" @click="form.processes.push({})" />
+						<van-icon name="clear" color="red" size="25" v-if="index!=0"
+							@click="form.processes.splice(index,1)" />
+						<van-field v-model="form.ml" name="面料名称" label="面料名称" colon readonly label-width="5em"
+							@click="selectChoose" class="bor"/>
+					</view>
+					<van-field v-model="item.ml" name="需求匹数" label="需求匹数" type="number" colon label-width="6.5em" />
+					<van-field v-model="item.ml" name="库存匹数" label="库存匹数" colon label-width="6.5em" readonly/>
+					<van-field v-model="form.ml" name="谁定" label="谁定" colon readonly label-width="6.5em" @click="choosePic" class="bor" />
+				</view>
+			</van-cell-group>
+		</view>
+		<template #footer>
+			<view class="footer-button">
+				<van-button plain size="small" native-type="button" style="width: 25vw;" @click="showDialog=false">
+					取消
+				</van-button>
+				<van-button size="small" type="success" native-type="submit" style="width: 25vw;"
+					@click="confirmSecond">
+					确认
+				</van-button>
+			</view>
+		</template>
+	</van-dialog>
+
+
+	<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2010, 0, 1)"
+		:max-date="new Date(2050, 0, 31)" />
+
+	<!--选择框-->
+	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
+		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
+			ref="pickerRef" />
+	</van-popup>
+
+	<!--    面料选择框-->
+	<van-popup v-model:show="showPickerList" position="bottom" @open="mlmcOpen">
+		<view class="select-model">
+			<van-picker :columns="pickerContainerList" @cancel="pickerCancel" v-model="selectedValue"
+				@confirm="onConfirm" />
+			<view>
+				<view class="top-select">
+					<view class="confirm-select">
+						<p>请选择品种</p>
+					</view>
+					<view class="search-box">
+						<view>
+							<van-search placeholder="请输入品种名字" v-model="searchValue" label="面料搜索：" background="#ffffff"
+								@input="searchTo()" :clearable="false" />
+						</view>
+						<view class="flex-btn">
+							<button class="search-btn" @click="upSearch()">↑</button>
+							<button class="search-btn" @click="downSearch()">↓</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</van-popup>
+</template>
+
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.content {
+			flex: 1;
+			padding: 0 10px;
+
+			.grid-container {
+				display: grid;
+				grid-template-columns: 2fr 1fr 1.5fr 1fr 1fr;
+
+				.grid-item {
+					border: 1px solid #f2f2f2;
+					text-align: center;
+
+					::v-deep .van-cell {
+						padding: 0 5px;
+					}
+				}
+			}
+		}
+	}
+
+	.footer-button {
+		margin: 20px;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	::v-deep .van-field {
+		font-size: 16px;
+	}
+
+	.a-b {
+		margin: 10rpx;
+
+		::v-deep .van-button--normal {
+			padding: 5px 8px;
+			height: 30px;
+		}
+	}
+
+	.a-c {
+		display: flex;
+		align-items: center;
+
+		::v-deep .van-button--normal {
+			padding: 8rpx;
+			height: 50rpx;
+			width: 7em;
+		}
+	}
+
+	.bor {
+		::v-deep .van-field__control {
+			border: 1px solid #d7d7d7;
+		}
+	}
+
+	::v-deep .van-field__control {
+		border-bottom: 1px solid #d7d7d7;
+		text-align: center;
+	}
+
+	::v-deep .van-field__label {
+		text-align: end;
+	}
+
+	/*面料选择搜索框*/
+	.select-model {
+		position: relative;
+	}
+
+	.confirm-select {
+		width: 100%;
+	}
+
+	.confirm-select>p {
+		text-align: center;
+	}
+
+	.confirm-select>button {
+		border: none;
+		background-color: #ffffff;
+		color: #388aed;
+		margin: 10px 30px 0 0;
+	}
+
+	.top-select {
+		position: absolute;
+		top: 30px;
+		left: 0;
+		right: 0;
+		margin: auto;
+		z-index: 999;
+	}
+
+	::v-deep .select-model .van-picker__toolbar {
+		height: 66px;
+		align-items: flex-start;
+		/*justify-content: flex-end;*/
+	}
+
+	::v-deep .select-model .van-picker__cancel,
+	.select-model .van-picker__confirm {
+		height: 30px;
+		padding: 10px 16px 0;
+	}
+
+	.search-btn {
+		padding: 1px 8px;
+		border: none;
+		background-color: #388aed;
+		color: #ffffff;
+		margin-left: 5px;
+		height: 30px;
+		line-height: 25px;
+	}
+
+	.search-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+		position: relative;
+		background-color: #fff;
+	}
+
+	.van-search {
+		background-color: #f7f7f8;
+	}
+
+	.ml-search-jump {
+		padding: 3px 10px;
+		background-color: #388aed;
+		color: #ffffff;
+		border: none;
+		margin-left: 10px;
+	}
+
+	.flex-btn {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
--- a/pages/spot/spot.vue
+++ b/pages/spot/spot.vue
@ -0,0 +1,434 @@
+<script setup lang="ts">
+	import { onMounted, ref } from 'vue';
+	import { formatDate } from '../../utils/date';
+	import { getAction } from '../../common/http';
+	import { showToast } from 'vant';
+
+	const showDialog = ref(false)
+	const formList = ref([] as any[])
+	onMounted(() => {
+		getAction('/fabric/craft/info').then((res : any) => {
+			if (res.code === 200) {
+				formList.value = res.data
+			}
+		})
+		getAction('/fabric/info/all').then((res : any) => {
+			if (res.code === 200) {
+				res.data.forEach((l : any) => {
+					let itemMl = mlList.value.find(m => m.text === l.commodity)
+					if (itemMl) {
+						let itemMm = itemMl.children.find(m => m.value === l.momme)
+						if (itemMm) {
+							itemMm.children.push({ text: l.width + 'cm', value: l.width })
+						} else {
+							itemMl.children.push({
+								text: l.momme + 'mm',
+								value: l.momme,
+								children: [{ text: l.width + 'cm', value: l.width }]
+							})
+						}
+					} else {
+						mlList.value.push({
+							text: l.commodity,
+							value: l.commodity,
+							children: [{ text: l.momme + 'mm', value: l.momme, children: [{ text: l.width + 'cm', value: l.width }] }]
+						})
+					}
+				})
+			}
+		})
+	})
+
+	const onClickLeft = () => {
+		history.back()
+	}
+
+	//弹窗提交
+	const confirmSecond = () => {
+
+	}
+	const onSubmit = () => {
+
+	}
+
+	const form = ref({ processes: [{}] } as any)
+	const showPicker = ref(false)
+	const typeData = ref()
+	const popuList = ref([] as any[])
+	const show = ref(false)
+	const pickerList = ref([])//面料数据
+	const pickerContainerList = ref([])
+	const showPickerList = ref(false)
+	const searchValue = ref('')//查询的值
+	const searchIndex = ref(0)//查询到的数组
+	const mlList = ref([])
+	//选择框事件
+	const choosePic = (type : any) => {
+		showPicker.value = true
+		typeData.value = type
+	}
+	//选择框确认
+	const pickerConfirm = (val : any) => {
+		if (typeData.value === 'level') {
+		} else {
+			form.value[typeData.value] = val.selectedValues[0]
+		}
+		showPickerCancel()
+	}
+	//取消
+	const showPickerCancel = () => {
+		showPicker.value = false
+	}
+	//弹窗开启事件
+	const handleOpen = () => {
+		if (typeData.value === 'supplier') {
+			popuList.value = []
+		} else if (typeData.value === 'level') {
+			popuList.value = []
+		}
+	}
+	const chooseDate = () => {
+		show.value = true
+	}
+	//日期选择
+	const onConfirmDate = (val : any) => {
+		form.value.createTime = formatDate(val)
+		show.value = false
+	}
+
+	//选择面料
+	const selectChoose = () => {
+		showPickerList.value = true
+	}
+	//面料开启
+	const mlmcOpen = () => {
+		pickerList.value = mlList.value
+		pickerContainerList.value = pickerList.value
+		searchValue.value = ''
+	}
+	//面料关闭
+	const pickerCancel = () => {
+		showPickerList.value = false
+	}
+
+	//搜索
+	const selectedValue = ref()
+	const getSeachList = () => {
+		searchIndex.value = 0
+		let reg = new RegExp(searchValue.value)
+		let arr = []
+		pickerList.value.forEach(l => {
+			if (reg.test(l.text)) {
+				arr.push(l)
+			}
+		})
+		pickerContainerList.value = arr
+	}
+	//向上选择
+	const upSearch = () => {
+		if (searchIndex.value === 0 && pickerContainerList.value.length) {
+			searchIndex.value = pickerContainerList.value.length - 1
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else if (pickerContainerList.value.length) {
+			searchIndex.value--
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//向下选择
+	const downSearch = () => {
+		if (pickerContainerList.value.length) {
+			if (searchIndex.value === pickerContainerList.value.length) {
+				searchIndex.value = 0
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			} else {
+				searchIndex.value++
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			}
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//搜索框输入
+	const timer = ref()
+	const searchTo = () => {
+		if (timer.value) {
+			clearTimeout(timer.value)
+		}
+		timer.value = setTimeout(() => {
+			getSeachList()
+		}, 800)
+	}
+	const onConfirm = (val : any) => {
+		form.value.fabricName = val.selectedValues[2] + '/' + val.selectedValues[0] + val.selectedValues[1]
+		pickerCancel()
+	}
+</script>
+
+<template>
+	<view class="flex">
+		<van-nav-bar title="现货需求单" left-text="返回" left-arrow @click-left="onClickLeft" />
+		<view class="content">
+			<van-form @submit="onSubmit">
+				<van-cell-group inset>
+					<van-field v-model="form.createTime" name="做单日期" label="做单日期" colon class="bor" label-width="5em"
+						readonly :rules="[{ required: true, message: '请填写' }]" @click="chooseDate()" />
+					<van-field v-model="form.supplier" name="订单归属" label="订单归属" colon label-width="5em"
+						:rules="[{ required: true, message: '请填写' }]" />
+					<van-field v-model="form.fabricName" name="颜色色号" label="颜色色号" colon
+						:rules="[{ required: true, message: '请填写' }]" label-width="5em" />
+					<van-field v-model="form.fabricName" name="工艺" label="工艺" colon
+						:rules="[{ required: true, message: '请填写' }]" label-width="5em" readonly class="bor"
+						@click="choosePic('')" />
+					<view class="a-b">
+						<van-button type="primary" @click="showDialog=true">面料添加</van-button>
+					</view>
+					<view class="grid-container">
+						<view class="grid-item">面料名称</view>
+						<view class="grid-item">匹数</view>
+						<view class="grid-item">库存</view>
+						<view class="grid-item">谁定</view>
+						<view class="grid-item">操作</view>
+					</view>
+					<view class="grid-container" v-for="(item,index) in form.processes" :key=index>
+						<view class="grid-item">{{item.ml}}</view>
+						<view class="grid-item">匹数</view>
+						<view class="grid-item">库存</view>
+						<view class="grid-item">谁定</view>
+						<view class="grid-item">操作</view>
+					</view>
+					<van-field v-model="form.fabricName" name="备注" label="备注" colon label-width="5em" />
+				</van-cell-group>
+				<view style="margin: 16px;">
+					<van-button round block type="primary" native-type="submit">
+						提交
+					</van-button>
+				</view>
+			</van-form>
+		</view>
+	</view>
+
+	<van-dialog v-model:show="showDialog">
+		<view>
+			<van-cell-group inset>
+				<view v-for="(item,index) in form.processes" :key="index">
+					<view class="a-c">
+						<van-icon name="add" color="red" size="25" v-if="index===0" @click="form.processes.push({})" />
+						<van-icon name="clear" color="red" size="25" v-if="index!=0"
+							@click="form.processes.splice(index,1)" />
+						<van-field v-model="form.ml" name="面料名称" label="面料名称" colon readonly label-width="5em"
+							@click="selectChoose" class="bor"/>
+					</view>
+					<van-field v-model="item.ml" name="需求匹数" label="需求匹数" type="number" colon label-width="6.5em" />
+					<van-field v-model="item.ml" name="库存匹数" label="库存匹数" colon label-width="6.5em" readonly/>
+					<van-field v-model="form.ml" name="谁定" label="谁定" colon readonly label-width="6.5em" @click="choosePic" class="bor" />
+				</view>
+			</van-cell-group>
+		</view>
+		<template #footer>
+			<view class="footer-button">
+				<van-button plain size="small" native-type="button" style="width: 25vw;" @click="showDialog=false">
+					取消
+				</van-button>
+				<van-button size="small" type="success" native-type="submit" style="width: 25vw;"
+					@click="confirmSecond">
+					确认
+				</van-button>
+			</view>
+		</template>
+	</van-dialog>
+
+
+	<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2010, 0, 1)"
+		:max-date="new Date(2050, 0, 31)" />
+
+	<!--选择框-->
+	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
+		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
+			ref="pickerRef" />
+	</van-popup>
+
+	<!--    面料选择框-->
+	<van-popup v-model:show="showPickerList" position="bottom" @open="mlmcOpen">
+		<view class="select-model">
+			<van-picker :columns="pickerContainerList" @cancel="pickerCancel" v-model="selectedValue"
+				@confirm="onConfirm" />
+			<view>
+				<view class="top-select">
+					<view class="confirm-select">
+						<p>请选择品种</p>
+					</view>
+					<view class="search-box">
+						<view>
+							<van-search placeholder="请输入品种名字" v-model="searchValue" label="面料搜索：" background="#ffffff"
+								@input="searchTo()" :clearable="false" />
+						</view>
+						<view class="flex-btn">
+							<button class="search-btn" @click="upSearch()">↑</button>
+							<button class="search-btn" @click="downSearch()">↓</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</van-popup>
+</template>
+
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.content {
+			flex: 1;
+			padding: 0 10px;
+
+			.grid-container {
+				display: grid;
+				grid-template-columns: 2fr 1fr 1.5fr 1fr 1fr;
+
+				.grid-item {
+					border: 1px solid #f2f2f2;
+					text-align: center;
+
+					::v-deep .van-cell {
+						padding: 0 5px;
+					}
+				}
+			}
+		}
+	}
+
+	.footer-button {
+		margin: 20px;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	::v-deep .van-field {
+		font-size: 16px;
+	}
+
+	.a-b {
+		margin: 10rpx;
+
+		::v-deep .van-button--normal {
+			padding: 5px 8px;
+			height: 30px;
+		}
+	}
+
+	.a-c {
+		display: flex;
+		align-items: center;
+
+		::v-deep .van-button--normal {
+			padding: 8rpx;
+			height: 50rpx;
+			width: 7em;
+		}
+	}
+
+	.bor {
+		::v-deep .van-field__control {
+			border: 1px solid #d7d7d7;
+		}
+	}
+
+	::v-deep .van-field__control {
+		border-bottom: 1px solid #d7d7d7;
+		text-align: center;
+	}
+
+	::v-deep .van-field__label {
+		text-align: end;
+	}
+
+	/*面料选择搜索框*/
+	.select-model {
+		position: relative;
+	}
+
+	.confirm-select {
+		width: 100%;
+	}
+
+	.confirm-select>p {
+		text-align: center;
+	}
+
+	.confirm-select>button {
+		border: none;
+		background-color: #ffffff;
+		color: #388aed;
+		margin: 10px 30px 0 0;
+	}
+
+	.top-select {
+		position: absolute;
+		top: 30px;
+		left: 0;
+		right: 0;
+		margin: auto;
+		z-index: 999;
+	}
+
+	::v-deep .select-model .van-picker__toolbar {
+		height: 66px;
+		align-items: flex-start;
+		/*justify-content: flex-end;*/
+	}
+
+	::v-deep .select-model .van-picker__cancel,
+	.select-model .van-picker__confirm {
+		height: 30px;
+		padding: 10px 16px 0;
+	}
+
+	.search-btn {
+		padding: 1px 8px;
+		border: none;
+		background-color: #388aed;
+		color: #ffffff;
+		margin-left: 5px;
+		height: 30px;
+		line-height: 25px;
+	}
+
+	.search-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+		position: relative;
+		background-color: #fff;
+	}
+
+	.van-search {
+		background-color: #f7f7f8;
+	}
+
+	.ml-search-jump {
+		padding: 3px 10px;
+		background-color: #388aed;
+		color: #ffffff;
+		border: none;
+		margin-left: 10px;
+	}
+
+	.flex-btn {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
--- a/pages/tailorMade/list.vue
+++ b/pages/tailorMade/list.vue
@ -0,0 +1,405 @@
+<script setup lang="ts">
+	import { showToast } from 'vant';
+	import { onMounted, ref } from 'vue';
+	import { getAction } from '../../common/http';
+import { formatDate } from '../../utils/date';
+
+	const form = ref({} as any)
+	const list = ref([] as any[])
+	onMounted(() => {
+		getAction('/fabric/info/all').then((res : any) => {
+			if (res.code === 200) {
+				res.data.forEach((l : any) => {
+					let itemMl = mlList.value.find(m => m.text === l.commodity)
+					if (itemMl) {
+						let itemMm = itemMl.children.find(m => m.value === l.momme)
+						if (itemMm) {
+							itemMm.children.push({ text: l.width + 'cm', value: l.width })
+						} else {
+							itemMl.children.push({
+								text: l.momme + 'mm',
+								value: l.momme,
+								children: [{ text: l.width + 'cm', value: l.width }]
+							})
+						}
+					} else {
+						mlList.value.push({
+							text: l.commodity,
+							value: l.commodity,
+							children: [{ text: l.momme + 'mm', value: l.momme, children: [{ text: l.width + 'cm', value: l.width }] }]
+						})
+					}
+				})
+			}
+		})
+	})
+
+	const onClickLeft = () => {
+		history.back()
+	}
+	const onClickRight = () => {
+		uni.navigateTo({
+			url: '/pages/spot/spot'
+		})
+	}
+
+
+	const total = ref(0)
+	const currentPage = ref(1)
+	const finished = ref(false)
+	const loading = ref(false);
+
+	//动态获取数据
+	const onLoad = () => {
+		if (list.value.length < total.value) {
+			currentPage.value++
+			init()
+		} else {
+			finished.value = true
+		}
+	};
+
+	function init() {
+
+	}
+
+
+
+	const pickerList = ref([])//面料数据
+	const pickerContainerList = ref([])
+	const showPickerList = ref(false)
+	const searchValue = ref('')//查询的值
+	const searchIndex = ref(0)//查询到的数组
+	const mlList = ref([])
+	//选择面料
+	const selectChoose = () => {
+		showPickerList.value = true
+	}
+	//面料开启
+	const mlmcOpen = () => {
+		pickerList.value = mlList.value
+		pickerContainerList.value = pickerList.value
+		searchValue.value = ''
+	}
+	//面料关闭
+	const pickerCancel = () => {
+		showPickerList.value = false
+	}
+
+	//搜索
+	const selectedValue = ref()
+	const getSeachList = () => {
+		searchIndex.value = 0
+		let reg = new RegExp(searchValue.value)
+		let arr = []
+		pickerList.value.forEach(l => {
+			if (reg.test(l.text)) {
+				arr.push(l)
+			}
+		})
+		pickerContainerList.value = arr
+	}
+	//向上选择
+	const upSearch = () => {
+		if (searchIndex.value === 0 && pickerContainerList.value.length) {
+			searchIndex.value = pickerContainerList.value.length - 1
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else if (pickerContainerList.value.length) {
+			searchIndex.value--
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//向下选择
+	const downSearch = () => {
+		if (pickerContainerList.value.length) {
+			if (searchIndex.value === pickerContainerList.value.length) {
+				searchIndex.value = 0
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			} else {
+				searchIndex.value++
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			}
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//搜索框输入
+	const timer = ref()
+	const searchTo = () => {
+		if (timer.value) {
+			clearTimeout(timer.value)
+		}
+		timer.value = setTimeout(() => {
+			getSeachList()
+		}, 800)
+	}
+	const onConfirm = (val : any) => {
+		form.value.category = val.selectedValues[2] + '/' + val.selectedValues[0] + val.selectedValues[1]
+		pickerCancel()
+	}
+	
+	const showPicker = ref(false)
+	const typeData = ref()
+	const popuList = ref([] as any[])
+	//选择框事件
+	const choosePic = (type : any) => {
+		showPicker.value = true
+		typeData.value = type
+	}
+	//选择框确认
+	const pickerConfirm = (val : any) => {
+		if (typeData.value === 'level') {
+		} else {
+			form.value[typeData.value] = val.selectedValues[0]
+		}
+		showPickerCancel()
+	}
+	//取消
+	const showPickerCancel = () => {
+		showPicker.value = false
+	}
+	//弹窗开启事件
+	const handleOpen = () => {
+		if (typeData.value === 'supplier') {
+			popuList.value = []
+		} else if (typeData.value === 'level') {
+			popuList.value = []
+		}
+	}
+	//日期选择
+	const show = ref(false)
+	const dataType = ref('')
+	const chooseDate = (val : any) => {
+		show.value = true
+		dataType.value = val
+	}
+	const onConfirmDate = (val : any) => {
+		form.value[dataType.value] = formatDate(val)
+		show.value = false
+	}
+</script>
+
+<template>
+	<view class="flex">
+		<van-nav-bar title="需求单列表" left-text="返回" left-arrow right-text="新增需求单" @click-left="onClickLeft"
+			@click-right="onClickRight()" />
+		<van-cell-group inset style="display: flex;">
+			<van-field v-model="form.startDate" name="开始时间" label="开始时间" colon class="bor" label-width="5em" readonly
+				@click="chooseDate('startDate')" :rules="[{ required: true, message: '请填写' }]" />
+			<van-field v-model="form.endDate" name="截止时间" label="截止时间" colon class="bor" label-width="5em" readonly
+				@click="chooseDate('endDate')" />
+		</van-cell-group>
+		<van-cell-group inset style="display: flex;">
+			<van-field v-model="form.category" name="面料筛选" label="面料筛选" colon class="bor" label-width="5em" readonly
+				@click="selectChoose" />
+			<van-field v-model="form.barcode" name="订单状态" label="订单状态" colon class="bor" label-width="5em" readonly @click="choosePic"/>
+		</van-cell-group>
+		<van-cell-group inset style="display: flex;">
+			<van-field v-model="form.len" name="颜色筛选" label="颜色筛选" colon class="bor" label-width="5em" readonly @click="choosePic"/>
+			<van-field v-model="form.location" name="做单人员" label="做单人员" colon class="bor" label-width="5em" readonly @click="choosePic"/>
+		</van-cell-group>
+		<view class="grid-container">
+			<view class="grid-item">日期/颜色</view>
+			<view class="grid-item">面料名称/工艺/谁定</view>
+			<view class="grid-item">匹数</view>
+			<view class="grid-item">操作</view>
+		</view>
+		<view class="content">
+			<van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+				<view class="grid-container" v-for="(item,index) in list" :key="index">
+					<view class="grid-item">{{item.category}}</view>
+					<view class="grid-item">{{item.barcode}}</view>
+					<view class="grid-item" @click="toDetile(item)">{{item.len}}</view>
+					<view class="grid-item">{{item.location}}</view>
+				</view>
+			</van-list>
+		</view>
+	</view>
+	
+	<!--选择框-->
+	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
+		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
+			ref="pickerRef" />
+	</van-popup>
+
+	<!--    面料选择框-->
+	<van-popup v-model:show="showPickerList" position="bottom" @open="mlmcOpen">
+		<view class="select-model">
+			<van-picker :columns="pickerContainerList" @cancel="pickerCancel" v-model="selectedValue"
+				@confirm="onConfirm" />
+			<view>
+				<view class="top-select">
+					<view class="confirm-select">
+						<p>请选择品种</p>
+					</view>
+					<view class="search-box">
+						<view>
+							<van-search placeholder="请输入品种名字" v-model="searchValue" label="面料搜索：" background="#ffffff"
+								@input="searchTo()" :clearable="false" />
+						</view>
+						<view class="flex-btn">
+							<button class="search-btn" @click="upSearch()">↑</button>
+							<button class="search-btn" @click="downSearch()">↓</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</van-popup>
+
+	<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2010, 0, 1)"
+		:max-date="new Date(2050, 0, 31)" />
+</template>
+
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.grid-container {
+			display: grid;
+			grid-template-columns: 2fr 3fr 1.3fr 1.5fr;
+			padding: 0 15rpx;
+
+			.grid-item {
+				border: 1px solid #f2f2f2;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 50rpx;
+			}
+		}
+
+		.content {
+			flex: 1;
+		}
+	}
+
+	::v-deep .van-cell {
+		padding: 5px !important;
+	}
+
+	::v-deep .van-field {
+		font-size: 16px;
+	}
+
+	.bor {
+		::v-deep .van-field__control {
+			border: 1px solid #d7d7d7;
+			text-align: center;
+		}
+
+		::v-deep .van-field__label {
+			margin: 0;
+		}
+	}
+
+	.bor-a {
+		::v-deep .van-field__control {
+			border-bottom: 1px solid #d7d7d7;
+			text-align: center;
+		}
+
+		::v-deep .van-field__label {
+			margin: 0;
+		}
+	}
+
+	::v-deep .van-button--normal {
+		padding: 5px 8px;
+		height: 30px;
+	}
+
+	::v-deep .van-field__control {
+		text-align: center;
+	}
+
+	/*面料选择搜索框*/
+	.select-model {
+		position: relative;
+	}
+
+	.confirm-select {
+		width: 100%;
+	}
+
+	.confirm-select>p {
+		text-align: center;
+	}
+
+	.confirm-select>button {
+		border: none;
+		background-color: #ffffff;
+		color: #388aed;
+		margin: 10px 30px 0 0;
+	}
+
+	.top-select {
+		position: absolute;
+		top: 30px;
+		left: 0;
+		right: 0;
+		margin: auto;
+		z-index: 999;
+	}
+
+	::v-deep .select-model .van-picker__toolbar {
+		height: 66px;
+		align-items: flex-start;
+		/*justify-content: flex-end;*/
+	}
+
+	::v-deep .select-model .van-picker__cancel,
+	.select-model .van-picker__confirm {
+		height: 30px;
+		padding: 10px 16px 0;
+	}
+
+	.search-btn {
+		padding: 1px 8px;
+		border: none;
+		background-color: #388aed;
+		color: #ffffff;
+		margin-left: 5px;
+		height: 30px;
+		line-height: 25px;
+	}
+
+	.search-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+		position: relative;
+		background-color: #fff;
+	}
+
+	.van-search {
+		background-color: #f7f7f8;
+	}
+
+	.ml-search-jump {
+		padding: 3px 10px;
+		background-color: #388aed;
+		color: #ffffff;
+		border: none;
+		margin-left: 10px;
+	}
+
+	.flex-btn {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
--- a/pages/tailorMade/tailorMade.vue
+++ b/pages/tailorMade/tailorMade.vue
@ -0,0 +1,434 @@
+<script setup lang="ts">
+	import { onMounted, ref } from 'vue';
+	import { formatDate } from '../../utils/date';
+	import { getAction } from '../../common/http';
+	import { showToast } from 'vant';
+
+	const showDialog = ref(false)
+	const formList = ref([] as any[])
+	onMounted(() => {
+		getAction('/fabric/craft/info').then((res : any) => {
+			if (res.code === 200) {
+				formList.value = res.data
+			}
+		})
+		getAction('/fabric/info/all').then((res : any) => {
+			if (res.code === 200) {
+				res.data.forEach((l : any) => {
+					let itemMl = mlList.value.find(m => m.text === l.commodity)
+					if (itemMl) {
+						let itemMm = itemMl.children.find(m => m.value === l.momme)
+						if (itemMm) {
+							itemMm.children.push({ text: l.width + 'cm', value: l.width })
+						} else {
+							itemMl.children.push({
+								text: l.momme + 'mm',
+								value: l.momme,
+								children: [{ text: l.width + 'cm', value: l.width }]
+							})
+						}
+					} else {
+						mlList.value.push({
+							text: l.commodity,
+							value: l.commodity,
+							children: [{ text: l.momme + 'mm', value: l.momme, children: [{ text: l.width + 'cm', value: l.width }] }]
+						})
+					}
+				})
+			}
+		})
+	})
+
+	const onClickLeft = () => {
+		history.back()
+	}
+
+	//弹窗提交
+	const confirmSecond = () => {
+
+	}
+	const onSubmit = () => {
+
+	}
+
+	const form = ref({ processes: [{}] } as any)
+	const showPicker = ref(false)
+	const typeData = ref()
+	const popuList = ref([] as any[])
+	const show = ref(false)
+	const pickerList = ref([])//面料数据
+	const pickerContainerList = ref([])
+	const showPickerList = ref(false)
+	const searchValue = ref('')//查询的值
+	const searchIndex = ref(0)//查询到的数组
+	const mlList = ref([])
+	//选择框事件
+	const choosePic = (type : any) => {
+		showPicker.value = true
+		typeData.value = type
+	}
+	//选择框确认
+	const pickerConfirm = (val : any) => {
+		if (typeData.value === 'level') {
+		} else {
+			form.value[typeData.value] = val.selectedValues[0]
+		}
+		showPickerCancel()
+	}
+	//取消
+	const showPickerCancel = () => {
+		showPicker.value = false
+	}
+	//弹窗开启事件
+	const handleOpen = () => {
+		if (typeData.value === 'supplier') {
+			popuList.value = []
+		} else if (typeData.value === 'level') {
+			popuList.value = []
+		}
+	}
+	const chooseDate = () => {
+		show.value = true
+	}
+	//日期选择
+	const onConfirmDate = (val : any) => {
+		form.value.createTime = formatDate(val)
+		show.value = false
+	}
+
+	//选择面料
+	const selectChoose = () => {
+		showPickerList.value = true
+	}
+	//面料开启
+	const mlmcOpen = () => {
+		pickerList.value = mlList.value
+		pickerContainerList.value = pickerList.value
+		searchValue.value = ''
+	}
+	//面料关闭
+	const pickerCancel = () => {
+		showPickerList.value = false
+	}
+
+	//搜索
+	const selectedValue = ref()
+	const getSeachList = () => {
+		searchIndex.value = 0
+		let reg = new RegExp(searchValue.value)
+		let arr = []
+		pickerList.value.forEach(l => {
+			if (reg.test(l.text)) {
+				arr.push(l)
+			}
+		})
+		pickerContainerList.value = arr
+	}
+	//向上选择
+	const upSearch = () => {
+		if (searchIndex.value === 0 && pickerContainerList.value.length) {
+			searchIndex.value = pickerContainerList.value.length - 1
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else if (pickerContainerList.value.length) {
+			searchIndex.value--
+			selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//向下选择
+	const downSearch = () => {
+		if (pickerContainerList.value.length) {
+			if (searchIndex.value === pickerContainerList.value.length) {
+				searchIndex.value = 0
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			} else {
+				searchIndex.value++
+				selectedValue.value = [pickerContainerList.value[searchIndex.value].text]
+			}
+		} else {
+			showToast('没有了！')
+		}
+	}
+	//搜索框输入
+	const timer = ref()
+	const searchTo = () => {
+		if (timer.value) {
+			clearTimeout(timer.value)
+		}
+		timer.value = setTimeout(() => {
+			getSeachList()
+		}, 800)
+	}
+	const onConfirm = (val : any) => {
+		form.value.fabricName = val.selectedValues[2] + '/' + val.selectedValues[0] + val.selectedValues[1]
+		pickerCancel()
+	}
+</script>
+
+<template>
+	<view class="flex">
+		<van-nav-bar title="客户定做单" left-text="返回" left-arrow @click-left="onClickLeft" />
+		<view class="content">
+			<van-form @submit="onSubmit">
+				<van-cell-group inset>
+					<van-field v-model="form.createTime" name="做单日期" label="做单日期" colon class="bor" label-width="5em"
+						readonly :rules="[{ required: true, message: '请填写' }]" @click="chooseDate()" />
+					<van-field v-model="form.supplier" name="订单归属" label="订单归属" colon label-width="5em"
+						:rules="[{ required: true, message: '请填写' }]" />
+					<van-field v-model="form.fabricName" name="颜色色号" label="颜色色号" colon
+						:rules="[{ required: true, message: '请填写' }]" label-width="5em" />
+					<van-field v-model="form.fabricName" name="工艺" label="工艺" colon
+						:rules="[{ required: true, message: '请填写' }]" label-width="5em" readonly class="bor"
+						@click="choosePic('')" />
+					<view class="a-b">
+						<van-button type="primary" @click="showDialog=true">面料添加</van-button>
+					</view>
+					<view class="grid-container">
+						<view class="grid-item">面料名称</view>
+						<view class="grid-item">匹数</view>
+						<view class="grid-item">库存</view>
+						<view class="grid-item">谁定</view>
+						<view class="grid-item">操作</view>
+					</view>
+					<view class="grid-container" v-for="(item,index) in form.processes" :key=index>
+						<view class="grid-item">{{item.ml}}</view>
+						<view class="grid-item">匹数</view>
+						<view class="grid-item">库存</view>
+						<view class="grid-item">谁定</view>
+						<view class="grid-item">操作</view>
+					</view>
+					<van-field v-model="form.fabricName" name="备注" label="备注" colon label-width="5em" />
+				</van-cell-group>
+				<view style="margin: 16px;">
+					<van-button round block type="primary" native-type="submit">
+						提交
+					</van-button>
+				</view>
+			</van-form>
+		</view>
+	</view>
+
+	<van-dialog v-model:show="showDialog">
+		<view>
+			<van-cell-group inset>
+				<view v-for="(item,index) in form.processes" :key="index">
+					<view class="a-c">
+						<van-icon name="add" color="red" size="25" v-if="index===0" @click="form.processes.push({})" />
+						<van-icon name="clear" color="red" size="25" v-if="index!=0"
+							@click="form.processes.splice(index,1)" />
+						<van-field v-model="form.ml" name="面料名称" label="面料名称" colon readonly label-width="5em"
+							@click="selectChoose" class="bor"/>
+					</view>
+					<van-field v-model="item.ml" name="需求匹数" label="需求匹数" type="number" colon label-width="6.5em" />
+					<van-field v-model="item.ml" name="库存匹数" label="库存匹数" colon label-width="6.5em" readonly/>
+					<van-field v-model="form.ml" name="谁定" label="谁定" colon readonly label-width="6.5em" @click="choosePic" class="bor" />
+				</view>
+			</van-cell-group>
+		</view>
+		<template #footer>
+			<view class="footer-button">
+				<van-button plain size="small" native-type="button" style="width: 25vw;" @click="showDialog=false">
+					取消
+				</van-button>
+				<van-button size="small" type="success" native-type="submit" style="width: 25vw;"
+					@click="confirmSecond">
+					确认
+				</van-button>
+			</view>
+		</template>
+	</van-dialog>
+
+
+	<van-calendar v-model:show="show" @confirm="onConfirmDate" :min-date="new Date(2010, 0, 1)"
+		:max-date="new Date(2050, 0, 31)" />
+
+	<!--选择框-->
+	<van-popup v-model:show="showPicker" round position="bottom" @open="handleOpen">
+		<van-picker show-toolbar :columns="popuList" @confirm="pickerConfirm" @cancel="showPickerCancel"
+			ref="pickerRef" />
+	</van-popup>
+
+	<!--    面料选择框-->
+	<van-popup v-model:show="showPickerList" position="bottom" @open="mlmcOpen">
+		<view class="select-model">
+			<van-picker :columns="pickerContainerList" @cancel="pickerCancel" v-model="selectedValue"
+				@confirm="onConfirm" />
+			<view>
+				<view class="top-select">
+					<view class="confirm-select">
+						<p>请选择品种</p>
+					</view>
+					<view class="search-box">
+						<view>
+							<van-search placeholder="请输入品种名字" v-model="searchValue" label="面料搜索：" background="#ffffff"
+								@input="searchTo()" :clearable="false" />
+						</view>
+						<view class="flex-btn">
+							<button class="search-btn" @click="upSearch()">↑</button>
+							<button class="search-btn" @click="downSearch()">↓</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</van-popup>
+</template>
+
+<style lang="scss" scoped>
+	.flex {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+		width: 100vw;
+
+		.van-nav-bar {
+			width: 100%;
+		}
+
+		.content {
+			flex: 1;
+			padding: 0 10px;
+
+			.grid-container {
+				display: grid;
+				grid-template-columns: 2fr 1fr 1.5fr 1fr 1fr;
+
+				.grid-item {
+					border: 1px solid #f2f2f2;
+					text-align: center;
+
+					::v-deep .van-cell {
+						padding: 0 5px;
+					}
+				}
+			}
+		}
+	}
+
+	.footer-button {
+		margin: 20px;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	::v-deep .van-field {
+		font-size: 16px;
+	}
+
+	.a-b {
+		margin: 10rpx;
+
+		::v-deep .van-button--normal {
+			padding: 5px 8px;
+			height: 30px;
+		}
+	}
+
+	.a-c {
+		display: flex;
+		align-items: center;
+
+		::v-deep .van-button--normal {
+			padding: 8rpx;
+			height: 50rpx;
+			width: 7em;
+		}
+	}
+
+	.bor {
+		::v-deep .van-field__control {
+			border: 1px solid #d7d7d7;
+		}
+	}
+
+	::v-deep .van-field__control {
+		border-bottom: 1px solid #d7d7d7;
+		text-align: center;
+	}
+
+	::v-deep .van-field__label {
+		text-align: end;
+	}
+
+	/*面料选择搜索框*/
+	.select-model {
+		position: relative;
+	}
+
+	.confirm-select {
+		width: 100%;
+	}
+
+	.confirm-select>p {
+		text-align: center;
+	}
+
+	.confirm-select>button {
+		border: none;
+		background-color: #ffffff;
+		color: #388aed;
+		margin: 10px 30px 0 0;
+	}
+
+	.top-select {
+		position: absolute;
+		top: 30px;
+		left: 0;
+		right: 0;
+		margin: auto;
+		z-index: 999;
+	}
+
+	::v-deep .select-model .van-picker__toolbar {
+		height: 66px;
+		align-items: flex-start;
+		/*justify-content: flex-end;*/
+	}
+
+	::v-deep .select-model .van-picker__cancel,
+	.select-model .van-picker__confirm {
+		height: 30px;
+		padding: 10px 16px 0;
+	}
+
+	.search-btn {
+		padding: 1px 8px;
+		border: none;
+		background-color: #388aed;
+		color: #ffffff;
+		margin-left: 5px;
+		height: 30px;
+		line-height: 25px;
+	}
+
+	.search-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		padding-top: 15px;
+		padding-bottom: 5px;
+		position: relative;
+		background-color: #fff;
+	}
+
+	.van-search {
+		background-color: #f7f7f8;
+	}
+
+	.ml-search-jump {
+		padding: 3px 10px;
+		background-color: #388aed;
+		color: #ffffff;
+		border: none;
+		margin-left: 10px;
+	}
+
+	.flex-btn {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
+</style>
--- a/pages/whiteEmbryo/w-warehousing.vue
+++ b/pages/whiteEmbryo/w-warehousing.vue
@ -367,7 +367,7 @@ const totalMeter = computed(()=>{
 </view>

 <van-dialog v-model:show="showDialog" title="扫码成功，请输入米数">
-    <div>
+    <view>
    <van-cell-group inset>
      <van-field
        v-model="meter"
@ -380,9 +380,9 @@ const totalMeter = computed(()=>{
      />
 	  </van-cell-group>
 	  <van-checkbox v-model="checked" style="margin-left:5.5em;">暂存</van-checkbox>
-    </div>
+    </view>
    <template #footer>
-      <div class="footer-button">
+      <view class="footer-button">
        <van-button plain size="small" native-type="button" style="width: 25vw;"
                    @click="showDialog=false,meter='',checked=false">
          取消
@ -390,7 +390,7 @@ const totalMeter = computed(()=>{
        <van-button size="small" type="success" native-type="submit" style="width: 25vw;" @click="confirmSecond">
          确认
        </van-button>
-      </div>
+      </view>
    </template>
 </van-dialog>

--- a/unpackage/dist/cache/.vite/deps/_metadata.json
+++ b/unpackage/dist/cache/.vite/deps/_metadata.json
@ -1,25 +1,31 @@
 {
-  "hash": "c82f332f",
+  "hash": "a91feb9d",
  "configHash": "407aa7e3",
-  "lockfileHash": "4503c80a",
-  "browserHash": "645abd60",
+  "lockfileHash": "8d977c95",
+  "browserHash": "f4794a5f",
  "optimized": {
    "vant": {
      "src": "../../../../../node_modules/vant/es/index.mjs",
      "file": "vant.js",
-      "fileHash": "7cf83e71",
+      "fileHash": "3621a2f7",
      "needsInterop": false
    },
    "vue-qrcode-reader": {
      "src": "../../../../../node_modules/vue-qrcode-reader/dist/vue-qrcode-reader.js",
      "file": "vue-qrcode-reader.js",
-      "fileHash": "6dcfc47b",
+      "fileHash": "1e3483de",
      "needsInterop": false
    },
    "@vant/area-data": {
      "src": "../../../../../node_modules/@vant/area-data/dist/index.esm.mjs",
      "file": "@vant_area-data.js",
-      "fileHash": "dc22cc2a",
+      "fileHash": "c13ab492",
+      "needsInterop": false
+    },
+    "vue-draggable-plus": {
+      "src": "../../../../../node_modules/vue-draggable-plus/dist/vue-draggable-plus.js",
+      "file": "vue-draggable-plus.js",
+      "fileHash": "1010c612",
      "needsInterop": false
    }
  },
--- a/unpackage/dist/cache/.vite/deps/vue-draggable-plus.js
+++ b/unpackage/dist/cache/.vite/deps/vue-draggable-plus.js
--- a/unpackage/dist/cache/.vite/deps/vue-draggable-plus.js.map
+++ b/unpackage/dist/cache/.vite/deps/vue-draggable-plus.js.map