From c9a32ba780b8bc69bae54a3ef60edc4145298ba5 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 30 May 2026 16:51:13 +0800 Subject: [PATCH] =?UTF-8?q?```text=20refactor:=20=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20constants=20=E5=88=B0=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 MES/WMS 共享业务常量导出 - 将 Mall 客服、IoT 缺失常量合并到 @vben/constants - 替换各模块本地 constants 引用 - 删除模块内重复 constants 文件 ``` --- .../src/views/mall/promotion/kefu/index.vue | 2 +- .../kefu/modules/conversation-list.vue | 2 +- .../promotion/kefu/modules/message-list.vue | 3 +- .../promotion/kefu/modules/tools/constants.ts | 17 - .../components/calendar-date-cell.vue | 4 +- .../cal/calendar/components/use-calendar.ts | 3 +- .../src/views/mes/cal/holiday/data.ts | 3 +- .../src/views/mes/cal/holiday/index.vue | 2 +- .../views/mes/cal/holiday/modules/form.vue | 2 +- apps/web-antd/src/views/mes/cal/plan/data.ts | 8 +- .../web-antd/src/views/mes/cal/plan/index.vue | 2 +- .../src/views/mes/cal/plan/modules/form.vue | 2 +- apps/web-antd/src/views/mes/cal/team/data.ts | 3 +- .../src/views/mes/dv/checkplan/data.ts | 7 +- .../src/views/mes/dv/checkplan/index.vue | 2 +- .../views/mes/dv/checkplan/modules/form.vue | 2 +- .../src/views/mes/dv/checkrecord/data.ts | 7 +- .../src/views/mes/dv/checkrecord/index.vue | 2 +- .../views/mes/dv/checkrecord/modules/form.vue | 2 +- .../mes/dv/checkrecord/modules/line-list.vue | 3 +- .../src/views/mes/dv/machinery/data.ts | 3 +- .../views/mes/dv/machinery/modules/form.vue | 2 +- .../src/views/mes/dv/machinery/type/data.ts | 5 +- .../src/views/mes/dv/maintenrecord/data.ts | 7 +- .../src/views/mes/dv/maintenrecord/index.vue | 2 +- .../mes/dv/maintenrecord/modules/form.vue | 2 +- .../dv/maintenrecord/modules/line-list.vue | 3 +- apps/web-antd/src/views/mes/dv/repair/data.ts | 3 +- .../src/views/mes/dv/repair/index.vue | 2 +- .../src/views/mes/dv/repair/modules/form.vue | 2 +- .../web-antd/src/views/mes/dv/subject/data.ts | 5 +- apps/web-antd/src/views/mes/home/data.ts | 2 +- .../src/views/mes/md/autocode/data.ts | 3 +- .../mes/md/autocode/modules/part-form.vue | 2 +- apps/web-antd/src/views/mes/md/client/data.ts | 5 +- apps/web-antd/src/views/mes/md/item/data.ts | 5 +- .../src/views/mes/md/item/modules/form.vue | 2 +- .../item/modules/item-batch-config-form.vue | 3 +- .../src/views/mes/md/item/type/data.ts | 8 +- apps/web-antd/src/views/mes/md/vendor/data.ts | 5 +- .../src/views/mes/md/workstation/data.ts | 5 +- .../src/views/mes/md/workstation/index.vue | 2 +- .../views/mes/md/workstation/modules/form.vue | 2 +- .../views/mes/md/workstation/workshop/data.ts | 5 +- .../md/workstation/workshop/modules/form.vue | 2 +- .../src/views/mes/pro/andon/record/data.ts | 3 +- .../src/views/mes/pro/andon/record/index.vue | 2 +- .../mes/pro/andon/record/modules/form.vue | 2 +- apps/web-antd/src/views/mes/pro/card/data.ts | 6 +- .../web-antd/src/views/mes/pro/card/index.vue | 2 +- .../src/views/mes/pro/card/modules/form.vue | 8 +- .../src/views/mes/pro/feedback/data.ts | 7 +- .../src/views/mes/pro/feedback/index.vue | 2 +- .../views/mes/pro/feedback/modules/form.vue | 8 +- .../src/views/mes/pro/process/data.ts | 5 +- apps/web-antd/src/views/mes/pro/route/data.ts | 5 +- .../mes/pro/task/components/gantt-chart.vue | 4 +- .../web-antd/src/views/mes/pro/task/index.vue | 8 +- .../src/views/mes/pro/workorder/data.ts | 7 +- .../src/views/mes/pro/workorder/index.vue | 10 +- .../mes/pro/workorder/modules/bom-list.vue | 8 +- .../views/mes/pro/workorder/modules/form.vue | 8 +- .../components/work-record-status-bar.vue | 2 +- apps/web-antd/src/views/mes/qc/defect/data.ts | 3 +- .../src/views/mes/qc/indicator/data.ts | 6 +- .../mes/qc/indicatorresult/components/data.ts | 3 +- .../components/qc-indicator-result-form.vue | 2 +- apps/web-antd/src/views/mes/qc/ipqc/data.ts | 7 +- apps/web-antd/src/views/mes/qc/ipqc/index.vue | 2 +- .../src/views/mes/qc/ipqc/modules/form.vue | 2 +- .../views/mes/qc/ipqc/modules/line-list.vue | 2 +- apps/web-antd/src/views/mes/qc/iqc/data.ts | 3 +- apps/web-antd/src/views/mes/qc/iqc/index.vue | 2 +- .../src/views/mes/qc/iqc/modules/form.vue | 2 +- .../views/mes/qc/iqc/modules/line-list.vue | 2 +- apps/web-antd/src/views/mes/qc/oqc/data.ts | 3 +- apps/web-antd/src/views/mes/qc/oqc/index.vue | 2 +- .../src/views/mes/qc/oqc/modules/form.vue | 2 +- .../views/mes/qc/oqc/modules/line-list.vue | 2 +- .../src/views/mes/qc/pendinginspect/index.vue | 2 +- apps/web-antd/src/views/mes/qc/rqc/data.ts | 6 +- apps/web-antd/src/views/mes/qc/rqc/index.vue | 2 +- .../src/views/mes/qc/rqc/modules/form.vue | 2 +- .../views/mes/qc/rqc/modules/line-list.vue | 2 +- .../src/views/mes/qc/template/data.ts | 5 +- apps/web-antd/src/views/mes/tm/tool/data.ts | 7 +- .../src/views/mes/tm/tool/modules/form.vue | 2 +- .../src/views/mes/tm/tool/type/data.ts | 3 +- .../src/views/mes/wm/arrivalnotice/data.ts | 3 +- .../src/views/mes/wm/arrivalnotice/index.vue | 2 +- .../mes/wm/arrivalnotice/modules/form.vue | 2 +- .../web-antd/src/views/mes/wm/barcode/data.ts | 5 +- .../src/views/mes/wm/barcode/modules/form.vue | 3 +- .../src/views/mes/wm/itemreceipt/data.ts | 6 +- .../src/views/mes/wm/itemreceipt/index.vue | 2 +- .../views/mes/wm/itemreceipt/modules/form.vue | 2 +- .../src/views/mes/wm/miscissue/data.ts | 3 +- .../src/views/mes/wm/miscissue/index.vue | 2 +- .../views/mes/wm/miscissue/modules/form.vue | 2 +- .../src/views/mes/wm/miscreceipt/data.ts | 3 +- .../src/views/mes/wm/miscreceipt/index.vue | 2 +- .../views/mes/wm/miscreceipt/modules/form.vue | 2 +- .../src/views/mes/wm/outsourceissue/data.ts | 7 +- .../src/views/mes/wm/outsourceissue/index.vue | 2 +- .../mes/wm/outsourceissue/modules/form.vue | 2 +- .../src/views/mes/wm/outsourcereceipt/data.ts | 7 +- .../views/mes/wm/outsourcereceipt/index.vue | 2 +- .../mes/wm/outsourcereceipt/modules/form.vue | 2 +- .../components/wm-package-select-dialog.vue | 3 +- .../src/views/mes/wm/packages/data.ts | 6 +- .../src/views/mes/wm/packages/index.vue | 2 +- .../views/mes/wm/packages/modules/form.vue | 2 +- .../src/views/mes/wm/productissue/data.ts | 6 +- .../src/views/mes/wm/productissue/index.vue | 2 +- .../mes/wm/productissue/modules/form.vue | 2 +- .../src/views/mes/wm/productreceipt/data.ts | 6 +- .../src/views/mes/wm/productreceipt/index.vue | 2 +- .../mes/wm/productreceipt/modules/form.vue | 2 +- .../wm/productreceipt/modules/line-list.vue | 2 +- .../src/views/mes/wm/productsales/data.ts | 6 +- .../src/views/mes/wm/productsales/index.vue | 2 +- .../mes/wm/productsales/modules/form.vue | 2 +- .../src/views/mes/wm/returnissue/data.ts | 6 +- .../src/views/mes/wm/returnissue/index.vue | 2 +- .../views/mes/wm/returnissue/modules/form.vue | 2 +- .../mes/wm/returnissue/modules/line-list.vue | 2 +- .../src/views/mes/wm/returnsales/data.ts | 3 +- .../src/views/mes/wm/returnsales/index.vue | 2 +- .../views/mes/wm/returnsales/modules/form.vue | 2 +- .../src/views/mes/wm/returnvendor/data.ts | 3 +- .../src/views/mes/wm/returnvendor/index.vue | 2 +- .../mes/wm/returnvendor/modules/form.vue | 2 +- .../src/views/mes/wm/salesnotice/data.ts | 3 +- .../src/views/mes/wm/salesnotice/index.vue | 2 +- .../views/mes/wm/salesnotice/modules/form.vue | 2 +- .../src/views/mes/wm/stocktaking/plan/data.ts | 8 +- .../stocktaking/plan/modules/param-form.vue | 3 +- .../src/views/mes/wm/stocktaking/task/data.ts | 6 +- .../views/mes/wm/stocktaking/task/index.vue | 2 +- .../mes/wm/stocktaking/task/modules/form.vue | 2 +- .../src/views/mes/wm/transfer/data.ts | 6 +- .../src/views/mes/wm/transfer/index.vue | 2 +- .../views/mes/wm/transfer/modules/form.vue | 2 +- .../src/views/mes/wm/warehouse/area/data.ts | 5 +- .../src/views/mes/wm/warehouse/area/index.vue | 2 +- .../mes/wm/warehouse/area/modules/form.vue | 2 +- .../src/views/mes/wm/warehouse/data.ts | 3 +- .../src/views/mes/wm/warehouse/index.vue | 2 +- .../views/mes/wm/warehouse/location/data.ts | 3 +- .../views/mes/wm/warehouse/location/index.vue | 2 +- .../wm/warehouse/location/modules/form.vue | 2 +- .../views/mes/wm/warehouse/modules/form.vue | 2 +- .../modules/wms-home-order-summary-cards.vue | 3 +- .../wms-home-order-trend-chart-options.ts | 4 +- .../src/views/wms/md/item/brand/data.ts | 3 +- .../src/views/wms/md/item/category/data.ts | 5 +- apps/web-antd/src/views/wms/md/item/data.ts | 3 +- .../views/wms/md/item/modules/sku-form.vue | 3 +- .../merchant/components/merchant-select.vue | 9 +- .../src/views/wms/md/merchant/data.ts | 3 +- .../src/views/wms/md/warehouse/data.ts | 3 +- .../src/views/wms/order/check/index.vue | 10 +- .../views/wms/order/check/modules/form.vue | 8 +- .../src/views/wms/order/movement/index.vue | 10 +- .../views/wms/order/movement/modules/form.vue | 8 +- .../src/views/wms/order/receipt/index.vue | 10 +- .../views/wms/order/receipt/modules/form.vue | 8 +- .../src/views/wms/order/shipment/index.vue | 10 +- .../views/wms/order/shipment/modules/form.vue | 8 +- .../detail/modules/modbus-config-form.vue | 8 +- .../device/detail/modules/modbus-config.vue | 3 +- .../detail/modules/modbus-point-form.vue | 10 +- .../device/detail/modules/simulator.vue | 6 +- .../detail/modules/thing-model-event.vue | 6 +- .../modules/thing-model-property-history.vue | 2 +- .../detail/modules/thing-model-service.vue | 6 +- .../iot/home/modules/device-map-card.vue | 3 +- .../views/iot/ota/modules/detail/index.vue | 2 +- .../iot/ota/modules/firmware-detail/index.vue | 2 +- .../iot/ota/modules/task/ota-task-detail.vue | 2 +- .../iot/ota/modules/task/ota-task-form.vue | 2 +- .../iot/ota/modules/task/ota-task-list.vue | 2 +- .../rule/components/source-config-form.vue | 3 +- .../scene/form/configs/condition-config.vue | 8 +- .../configs/current-time-condition-config.vue | 3 +- .../form/configs/device-control-config.vue | 10 +- .../configs/main-condition-inner-config.vue | 8 +- .../configs/sub-condition-group-config.vue | 9 +- .../scene/form/inputs/json-params-input.vue | 13 +- .../rule/scene/form/inputs/value-input.vue | 8 +- .../iot/rule/scene/form/rule-scene-form.vue | 7 +- .../scene/form/sections/action-section.vue | 11 +- .../scene/form/sections/trigger-section.vue | 10 +- .../scene/form/selectors/device-selector.vue | 3 +- .../form/selectors/operator-selector.vue | 8 +- .../form/selectors/property-selector.vue | 14 +- .../src/views/iot/thingmodel/index.vue | 2 +- .../modules/components/data-definition.vue | 6 +- .../thing-model-array-data-specs.vue | 8 +- .../thing-model-struct-data-specs.vue | 3 +- .../thingmodel/modules/thing-model-event.vue | 9 +- .../thingmodel/modules/thing-model-form.vue | 7 +- .../thing-model-input-output-param.vue | 3 +- .../modules/thing-model-property.vue | 11 +- .../modules/thing-model-service.vue | 9 +- .../thingmodel/modules/thing-model-tsl.vue | 3 +- .../src/views/iot/utils/constants.ts | 656 ------------------ .../src/views/mall/promotion/kefu/index.vue | 2 +- .../kefu/modules/conversation-list.vue | 2 +- .../promotion/kefu/modules/message-list.vue | 3 +- .../promotion/kefu/modules/tools/constants.ts | 17 - .../src/views/mall/promotion/kefu/index.vue | 2 +- .../kefu/modules/conversation-list.vue | 2 +- .../promotion/kefu/modules/message-list.vue | 3 +- .../promotion/kefu/modules/tools/constants.ts | 17 - .../components/calendar-date-cell.vue | 4 +- .../cal/calendar/components/use-calendar.ts | 3 +- .../web-ele/src/views/mes/cal/holiday/data.ts | 3 +- .../src/views/mes/cal/holiday/index.vue | 2 +- .../views/mes/cal/holiday/modules/form.vue | 2 +- apps/web-ele/src/views/mes/cal/plan/data.ts | 8 +- apps/web-ele/src/views/mes/cal/plan/index.vue | 2 +- .../src/views/mes/cal/plan/modules/form.vue | 2 +- apps/web-ele/src/views/mes/cal/team/data.ts | 3 +- .../src/views/mes/dv/checkplan/data.ts | 7 +- .../src/views/mes/dv/checkplan/index.vue | 2 +- .../views/mes/dv/checkplan/modules/form.vue | 2 +- .../src/views/mes/dv/checkrecord/data.ts | 7 +- .../src/views/mes/dv/checkrecord/index.vue | 2 +- .../views/mes/dv/checkrecord/modules/form.vue | 2 +- .../mes/dv/checkrecord/modules/line-list.vue | 3 +- .../src/views/mes/dv/machinery/data.ts | 3 +- .../views/mes/dv/machinery/modules/form.vue | 2 +- .../src/views/mes/dv/machinery/type/data.ts | 5 +- .../src/views/mes/dv/maintenrecord/data.ts | 7 +- .../src/views/mes/dv/maintenrecord/index.vue | 2 +- .../mes/dv/maintenrecord/modules/form.vue | 2 +- .../dv/maintenrecord/modules/line-list.vue | 3 +- apps/web-ele/src/views/mes/dv/repair/data.ts | 3 +- .../web-ele/src/views/mes/dv/repair/index.vue | 2 +- .../src/views/mes/dv/repair/modules/form.vue | 2 +- apps/web-ele/src/views/mes/dv/subject/data.ts | 5 +- apps/web-ele/src/views/mes/home/data.ts | 2 +- .../web-ele/src/views/mes/md/autocode/data.ts | 3 +- .../mes/md/autocode/modules/part-form.vue | 2 +- apps/web-ele/src/views/mes/md/client/data.ts | 5 +- apps/web-ele/src/views/mes/md/item/data.ts | 5 +- .../src/views/mes/md/item/modules/form.vue | 2 +- .../item/modules/item-batch-config-form.vue | 3 +- .../src/views/mes/md/item/type/data.ts | 8 +- apps/web-ele/src/views/mes/md/vendor/data.ts | 5 +- .../src/views/mes/md/workstation/data.ts | 5 +- .../src/views/mes/md/workstation/index.vue | 2 +- .../views/mes/md/workstation/modules/form.vue | 2 +- .../views/mes/md/workstation/workshop/data.ts | 5 +- .../md/workstation/workshop/modules/form.vue | 2 +- .../src/views/mes/pro/andon/record/data.ts | 3 +- .../src/views/mes/pro/andon/record/index.vue | 2 +- .../mes/pro/andon/record/modules/form.vue | 2 +- apps/web-ele/src/views/mes/pro/card/data.ts | 6 +- apps/web-ele/src/views/mes/pro/card/index.vue | 2 +- .../src/views/mes/pro/card/modules/form.vue | 8 +- .../src/views/mes/pro/feedback/data.ts | 7 +- .../src/views/mes/pro/feedback/index.vue | 2 +- .../views/mes/pro/feedback/modules/form.vue | 8 +- .../web-ele/src/views/mes/pro/process/data.ts | 5 +- apps/web-ele/src/views/mes/pro/route/data.ts | 5 +- .../mes/pro/task/components/gantt-chart.vue | 4 +- apps/web-ele/src/views/mes/pro/task/index.vue | 8 +- .../src/views/mes/pro/workorder/data.ts | 7 +- .../src/views/mes/pro/workorder/index.vue | 10 +- .../mes/pro/workorder/modules/bom-list.vue | 8 +- .../views/mes/pro/workorder/modules/form.vue | 8 +- .../components/work-record-status-bar.vue | 2 +- apps/web-ele/src/views/mes/qc/defect/data.ts | 3 +- .../src/views/mes/qc/indicator/data.ts | 6 +- .../mes/qc/indicatorresult/components/data.ts | 3 +- .../components/qc-indicator-result-form.vue | 2 +- apps/web-ele/src/views/mes/qc/ipqc/data.ts | 7 +- apps/web-ele/src/views/mes/qc/ipqc/index.vue | 2 +- .../src/views/mes/qc/ipqc/modules/form.vue | 2 +- .../views/mes/qc/ipqc/modules/line-list.vue | 2 +- apps/web-ele/src/views/mes/qc/iqc/data.ts | 3 +- apps/web-ele/src/views/mes/qc/iqc/index.vue | 2 +- .../src/views/mes/qc/iqc/modules/form.vue | 2 +- .../views/mes/qc/iqc/modules/line-list.vue | 2 +- apps/web-ele/src/views/mes/qc/oqc/data.ts | 3 +- apps/web-ele/src/views/mes/qc/oqc/index.vue | 2 +- .../src/views/mes/qc/oqc/modules/form.vue | 2 +- .../views/mes/qc/oqc/modules/line-list.vue | 2 +- .../src/views/mes/qc/pendinginspect/index.vue | 2 +- apps/web-ele/src/views/mes/qc/rqc/data.ts | 6 +- apps/web-ele/src/views/mes/qc/rqc/index.vue | 2 +- .../src/views/mes/qc/rqc/modules/form.vue | 2 +- .../views/mes/qc/rqc/modules/line-list.vue | 2 +- .../web-ele/src/views/mes/qc/template/data.ts | 5 +- apps/web-ele/src/views/mes/tm/tool/data.ts | 7 +- .../src/views/mes/tm/tool/modules/form.vue | 2 +- .../src/views/mes/tm/tool/type/data.ts | 3 +- apps/web-ele/src/views/mes/utils/constants.ts | 504 -------------- .../src/views/mes/wm/arrivalnotice/data.ts | 3 +- .../src/views/mes/wm/arrivalnotice/index.vue | 2 +- .../mes/wm/arrivalnotice/modules/form.vue | 2 +- apps/web-ele/src/views/mes/wm/barcode/data.ts | 5 +- .../src/views/mes/wm/barcode/modules/form.vue | 3 +- .../src/views/mes/wm/itemreceipt/data.ts | 6 +- .../src/views/mes/wm/itemreceipt/index.vue | 2 +- .../views/mes/wm/itemreceipt/modules/form.vue | 2 +- .../src/views/mes/wm/miscissue/data.ts | 3 +- .../src/views/mes/wm/miscissue/index.vue | 2 +- .../views/mes/wm/miscissue/modules/form.vue | 2 +- .../src/views/mes/wm/miscreceipt/data.ts | 3 +- .../src/views/mes/wm/miscreceipt/index.vue | 2 +- .../views/mes/wm/miscreceipt/modules/form.vue | 2 +- .../src/views/mes/wm/outsourceissue/data.ts | 7 +- .../src/views/mes/wm/outsourceissue/index.vue | 2 +- .../mes/wm/outsourceissue/modules/form.vue | 2 +- .../src/views/mes/wm/outsourcereceipt/data.ts | 7 +- .../views/mes/wm/outsourcereceipt/index.vue | 2 +- .../mes/wm/outsourcereceipt/modules/form.vue | 2 +- .../components/wm-package-select-dialog.vue | 3 +- .../web-ele/src/views/mes/wm/packages/data.ts | 6 +- .../src/views/mes/wm/packages/index.vue | 2 +- .../views/mes/wm/packages/modules/form.vue | 2 +- .../src/views/mes/wm/productissue/data.ts | 6 +- .../src/views/mes/wm/productissue/index.vue | 2 +- .../mes/wm/productissue/modules/form.vue | 2 +- .../src/views/mes/wm/productreceipt/data.ts | 6 +- .../src/views/mes/wm/productreceipt/index.vue | 2 +- .../mes/wm/productreceipt/modules/form.vue | 2 +- .../wm/productreceipt/modules/line-list.vue | 2 +- .../src/views/mes/wm/productsales/data.ts | 6 +- .../src/views/mes/wm/productsales/index.vue | 2 +- .../mes/wm/productsales/modules/form.vue | 2 +- .../src/views/mes/wm/returnissue/data.ts | 6 +- .../src/views/mes/wm/returnissue/index.vue | 2 +- .../views/mes/wm/returnissue/modules/form.vue | 2 +- .../mes/wm/returnissue/modules/line-list.vue | 2 +- .../src/views/mes/wm/returnsales/data.ts | 3 +- .../src/views/mes/wm/returnsales/index.vue | 2 +- .../views/mes/wm/returnsales/modules/form.vue | 2 +- .../src/views/mes/wm/returnvendor/data.ts | 3 +- .../src/views/mes/wm/returnvendor/index.vue | 2 +- .../mes/wm/returnvendor/modules/form.vue | 2 +- .../src/views/mes/wm/salesnotice/data.ts | 3 +- .../src/views/mes/wm/salesnotice/index.vue | 2 +- .../views/mes/wm/salesnotice/modules/form.vue | 2 +- .../src/views/mes/wm/stocktaking/plan/data.ts | 8 +- .../stocktaking/plan/modules/param-form.vue | 3 +- .../src/views/mes/wm/stocktaking/task/data.ts | 6 +- .../views/mes/wm/stocktaking/task/index.vue | 2 +- .../mes/wm/stocktaking/task/modules/form.vue | 2 +- .../web-ele/src/views/mes/wm/transfer/data.ts | 6 +- .../src/views/mes/wm/transfer/index.vue | 2 +- .../views/mes/wm/transfer/modules/form.vue | 2 +- .../src/views/mes/wm/warehouse/area/data.ts | 5 +- .../src/views/mes/wm/warehouse/area/index.vue | 2 +- .../mes/wm/warehouse/area/modules/form.vue | 2 +- .../src/views/mes/wm/warehouse/data.ts | 3 +- .../src/views/mes/wm/warehouse/index.vue | 2 +- .../views/mes/wm/warehouse/location/data.ts | 3 +- .../views/mes/wm/warehouse/location/index.vue | 2 +- .../wm/warehouse/location/modules/form.vue | 2 +- .../views/mes/wm/warehouse/modules/form.vue | 2 +- .../modules/wms-home-order-summary-cards.vue | 3 +- .../wms-home-order-trend-chart-options.ts | 4 +- .../src/views/wms/md/item/brand/data.ts | 3 +- .../src/views/wms/md/item/category/data.ts | 5 +- apps/web-ele/src/views/wms/md/item/data.ts | 3 +- .../views/wms/md/item/modules/sku-form.vue | 3 +- .../merchant/components/merchant-select.vue | 9 +- .../web-ele/src/views/wms/md/merchant/data.ts | 3 +- .../src/views/wms/md/warehouse/data.ts | 3 +- .../src/views/wms/order/check/index.vue | 10 +- .../views/wms/order/check/modules/form.vue | 8 +- .../src/views/wms/order/movement/index.vue | 10 +- .../views/wms/order/movement/modules/form.vue | 8 +- .../src/views/wms/order/receipt/index.vue | 10 +- .../views/wms/order/receipt/modules/form.vue | 8 +- .../src/views/wms/order/shipment/index.vue | 10 +- .../views/wms/order/shipment/modules/form.vue | 8 +- apps/web-ele/src/views/wms/utils/constants.ts | 58 -- packages/constants/src/biz-iot-enum.ts | 21 + packages/constants/src/biz-mall-enum.ts | 18 + .../constants/src/biz-mes-enum.ts | 0 .../constants/src/biz-wms-enum.ts | 0 packages/constants/src/index.ts | 2 + 387 files changed, 626 insertions(+), 2165 deletions(-) delete mode 100644 apps/web-antd/src/views/mall/promotion/kefu/modules/tools/constants.ts delete mode 100644 apps/web-antdv-next/src/views/iot/utils/constants.ts delete mode 100644 apps/web-antdv-next/src/views/mall/promotion/kefu/modules/tools/constants.ts delete mode 100644 apps/web-ele/src/views/mall/promotion/kefu/modules/tools/constants.ts delete mode 100644 apps/web-ele/src/views/mes/utils/constants.ts delete mode 100644 apps/web-ele/src/views/wms/utils/constants.ts rename apps/web-antd/src/views/mes/utils/constants.ts => packages/constants/src/biz-mes-enum.ts (100%) rename apps/web-antd/src/views/wms/utils/constants.ts => packages/constants/src/biz-wms-enum.ts (100%) diff --git a/apps/web-antd/src/views/mall/promotion/kefu/index.vue b/apps/web-antd/src/views/mall/promotion/kefu/index.vue index 55e833784..6fb7d5d9f 100644 --- a/apps/web-antd/src/views/mall/promotion/kefu/index.vue +++ b/apps/web-antd/src/views/mall/promotion/kefu/index.vue @@ -4,6 +4,7 @@ import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversa import { onBeforeUnmount, onMounted, ref, watch } from 'vue'; import { Page } from '@vben/common-ui'; +import { WebSocketMessageTypeConstants } from '@vben/constants'; import { useAccessStore } from '@vben/stores'; import { useWebSocket } from '@vueuse/core'; @@ -14,7 +15,6 @@ import { useMallKefuStore } from '#/store/mall/kefu'; import ConversationList from './modules/conversation-list.vue'; import MemberInfo from './modules/member/member-info.vue'; import MessageList from './modules/message-list.vue'; -import { WebSocketMessageTypeConstants } from './modules/tools/constants'; const accessStore = useAccessStore(); const kefuStore = useMallKefuStore(); // 客服缓存 diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue index b8460957b..91921d15d 100644 --- a/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue +++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/conversation-list.vue @@ -4,6 +4,7 @@ import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversa import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'; import { confirm } from '@vben/common-ui'; +import { KeFuMessageContentTypeEnum } from '@vben/constants'; import { IconifyIcon } from '@vben/icons'; import { formatPast, jsonParse } from '@vben/utils'; @@ -15,7 +16,6 @@ import { } from '#/api/mall/promotion/kefu/conversation'; import { useMallKefuStore } from '#/store/mall/kefu'; -import { KeFuMessageContentTypeEnum } from './tools/constants'; import { useEmoji } from './tools/emoji'; /** 打开右侧的消息列表 */ diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue index dcb34aaca..b888ee66d 100644 --- a/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue +++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/message-list.vue @@ -4,7 +4,7 @@ import type { Emoji } from './tools/emoji'; import type { MallKefuConversationApi } from '#/api/mall/promotion/kefu/conversation'; import type { MallKefuMessageApi } from '#/api/mall/promotion/kefu/message'; -import { computed, reactive, ref, toRefs, unref, watch } from 'vue'; +import { computed, KeFuMessageContentTypeEnum, reactive, ref, toRefs, unref, watch } from 'vue'; import { UserTypeEnum } from '@vben/constants'; import { IconifyIcon } from '@vben/icons'; @@ -25,7 +25,6 @@ import { useMallKefuStore } from '#/store/mall/kefu'; import MessageItem from './message/message-item.vue'; import OrderItem from './message/order-item.vue'; import ProductItem from './message/product-item.vue'; -import { KeFuMessageContentTypeEnum } from './tools/constants'; import { useEmoji } from './tools/emoji'; import EmojiSelectPopover from './tools/emoji-select-popover.vue'; import PictureSelectUpload from './tools/picture-select-upload.vue'; diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/constants.ts b/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/constants.ts deleted file mode 100644 index 266a6cf02..000000000 --- a/apps/web-antd/src/views/mall/promotion/kefu/modules/tools/constants.ts +++ /dev/null @@ -1,17 +0,0 @@ -/** 客服消息类型枚举类 */ -export const KeFuMessageContentTypeEnum = { - TEXT: 1, // 文本消息 - IMAGE: 2, // 图片消息 - VOICE: 3, // 语音消息 - VIDEO: 4, // 视频消息 - SYSTEM: 5, // 系统消息 - // ========== 商城特殊消息 ========== - PRODUCT: 10, // 商品消息 - ORDER: 11, // 订单消息" -}; - -/** Promotion 的 WebSocket 消息类型枚举类 */ -export const WebSocketMessageTypeConstants = { - KEFU_MESSAGE_TYPE: 'kefu_message_type', // 客服消息类型 - KEFU_MESSAGE_ADMIN_READ: 'kefu_message_read_status_change', // 客服消息管理员已读 -}; diff --git a/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue b/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue index e8d162119..1ea132565 100644 --- a/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue +++ b/apps/web-antd/src/views/mes/cal/calendar/components/calendar-date-cell.vue @@ -3,12 +3,12 @@ import type { MesCalCalendarApi } from '#/api/mes/cal/calendar'; import { computed } from 'vue'; +import { MesCalShiftTypeEnum } from '@vben/constants'; + import { Tag } from 'ant-design-vue'; import dayjs from 'dayjs'; import { SolarDay } from 'tyme4ts'; -import { MesCalShiftTypeEnum } from '#/views/mes/utils/constants'; - const props = defineProps<{ calendarDayMap: Map; // 排班数据 day: string; // 日期，格式 yyyy-MM-dd diff --git a/apps/web-antd/src/views/mes/cal/calendar/components/use-calendar.ts b/apps/web-antd/src/views/mes/cal/calendar/components/use-calendar.ts index 381e7f5bd..860c48a1b 100644 --- a/apps/web-antd/src/views/mes/cal/calendar/components/use-calendar.ts +++ b/apps/web-antd/src/views/mes/cal/calendar/components/use-calendar.ts @@ -4,11 +4,12 @@ import type { MesCalCalendarApi } from '#/api/mes/cal/calendar'; import { ref, watch } from 'vue'; +import { HolidayType } from '@vben/constants'; + import dayjs from 'dayjs'; import { getCalendarList } from '#/api/mes/cal/calendar'; import { getHolidayList } from '#/api/mes/cal/holiday'; -import { HolidayType } from '#/views/mes/utils/constants'; /** * 排班日历通用 composable diff --git a/apps/web-antd/src/views/mes/cal/holiday/data.ts b/apps/web-antd/src/views/mes/cal/holiday/data.ts index 891aa335a..a63e9d8aa 100644 --- a/apps/web-antd/src/views/mes/cal/holiday/data.ts +++ b/apps/web-antd/src/views/mes/cal/holiday/data.ts @@ -1,10 +1,9 @@ import type { VbenFormSchema } from '#/adapter/form'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, HolidayType } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; -import { HolidayType } from '#/views/mes/utils/constants'; /** 假期设置表单 */ export function useHolidayFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mes/cal/holiday/index.vue b/apps/web-antd/src/views/mes/cal/holiday/index.vue index 73be66f52..a3d037394 100644 --- a/apps/web-antd/src/views/mes/cal/holiday/index.vue +++ b/apps/web-antd/src/views/mes/cal/holiday/index.vue @@ -5,13 +5,13 @@ import { onMounted, ref, watch } from 'vue'; import { useAccess } from '@vben/access'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { HolidayType } from '@vben/constants'; import { Button, Calendar, message, Tag } from 'ant-design-vue'; import dayjs from 'dayjs'; import { SolarDay } from 'tyme4ts'; import { getHolidayList } from '#/api/mes/cal/holiday'; -import { HolidayType } from '#/views/mes/utils/constants'; import HolidayForm from './modules/form.vue'; diff --git a/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue b/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue index aac5a48d6..2fa745b7f 100644 --- a/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue +++ b/apps/web-antd/src/views/mes/cal/holiday/modules/form.vue @@ -2,13 +2,13 @@ import type { MesCalHolidayApi } from '#/api/mes/cal/holiday'; import { useVbenModal } from '@vben/common-ui'; +import { HolidayType } from '@vben/constants'; import { message } from 'ant-design-vue'; import dayjs from 'dayjs'; import { useVbenForm } from '#/adapter/form'; import { getHolidayByDay, saveHoliday } from '#/api/mes/cal/holiday'; -import { HolidayType } from '#/views/mes/utils/constants'; import { useHolidayFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/mes/cal/plan/data.ts b/apps/web-antd/src/views/mes/cal/plan/data.ts index d325202f1..c0c957956 100644 --- a/apps/web-antd/src/views/mes/cal/plan/data.ts +++ b/apps/web-antd/src/views/mes/cal/plan/data.ts @@ -4,19 +4,13 @@ import type { MesCalPlanApi } from '#/api/mes/cal/plan'; import { h } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesAutoCodeRuleCode, MesCalPlanStatusEnum, MesCalShiftMethodEnum, MesCalShiftTypeEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { getRangePickerDefaultProps } from '#/utils'; -import { - MesAutoCodeRuleCode, - MesCalPlanStatusEnum, - MesCalShiftMethodEnum, - MesCalShiftTypeEnum, -} from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/cal/plan/index.vue b/apps/web-antd/src/views/mes/cal/plan/index.vue index 94ae51603..3e6dc48d0 100644 --- a/apps/web-antd/src/views/mes/cal/plan/index.vue +++ b/apps/web-antd/src/views/mes/cal/plan/index.vue @@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesCalPlanApi } from '#/api/mes/cal/plan'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { MesCalPlanStatusEnum } from '@vben/constants'; import { downloadFileFromBlobPart } from '@vben/utils'; import { Button, message } from 'ant-design-vue'; @@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { deletePlan, exportPlan, getPlanPage } from '#/api/mes/cal/plan'; import { $t } from '#/locales'; -import { MesCalPlanStatusEnum } from '#/views/mes/utils/constants'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; diff --git a/apps/web-antd/src/views/mes/cal/plan/modules/form.vue b/apps/web-antd/src/views/mes/cal/plan/modules/form.vue index c76ed81e6..c2402d002 100644 --- a/apps/web-antd/src/views/mes/cal/plan/modules/form.vue +++ b/apps/web-antd/src/views/mes/cal/plan/modules/form.vue @@ -6,13 +6,13 @@ import type { MesCalPlanApi } from '#/api/mes/cal/plan'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { MesCalPlanStatusEnum } from '@vben/constants'; import { Button, message, Popconfirm, Tabs } from 'ant-design-vue'; import { useVbenForm } from '#/adapter/form'; import { confirmPlan, createPlan, getPlan, updatePlan } from '#/api/mes/cal/plan'; import { $t } from '#/locales'; -import { MesCalPlanStatusEnum } from '#/views/mes/utils/constants'; import { useFormSchema } from '../data'; import ShiftList from './shift-list.vue'; diff --git a/apps/web-antd/src/views/mes/cal/team/data.ts b/apps/web-antd/src/views/mes/cal/team/data.ts index a44bba18d..fac2487aa 100644 --- a/apps/web-antd/src/views/mes/cal/team/data.ts +++ b/apps/web-antd/src/views/mes/cal/team/data.ts @@ -4,14 +4,13 @@ import type { MesCalTeamApi } from '#/api/mes/cal/team'; import { h } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/dv/checkplan/data.ts b/apps/web-antd/src/views/mes/dv/checkplan/data.ts index 4f6409181..6c42eb7b3 100644 --- a/apps/web-antd/src/views/mes/dv/checkplan/data.ts +++ b/apps/web-antd/src/views/mes/dv/checkplan/data.ts @@ -4,7 +4,7 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan'; import { h } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesAutoCodeRuleCode, MesDvCheckPlanStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; @@ -12,11 +12,6 @@ import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { getRangePickerDefaultProps } from '#/utils'; -import { - MesAutoCodeRuleCode, - MesDvCheckPlanStatusEnum, - MesDvSubjectTypeEnum, -} from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/dv/checkplan/index.vue b/apps/web-antd/src/views/mes/dv/checkplan/index.vue index f20a5d5ac..51a29a5aa 100644 --- a/apps/web-antd/src/views/mes/dv/checkplan/index.vue +++ b/apps/web-antd/src/views/mes/dv/checkplan/index.vue @@ -4,6 +4,7 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan'; import type { ActionItem } from '#/components/table-action/typing'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { MesDvCheckPlanStatusEnum } from '@vben/constants'; import { downloadFileFromBlobPart } from '@vben/utils'; import { Button, message } from 'ant-design-vue'; @@ -17,7 +18,6 @@ import { getCheckPlanPage, } from '#/api/mes/dv/checkplan'; import { $t } from '#/locales'; -import { MesDvCheckPlanStatusEnum } from '#/views/mes/utils/constants'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; diff --git a/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue b/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue index 650003ed6..94b3f064d 100644 --- a/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue +++ b/apps/web-antd/src/views/mes/dv/checkplan/modules/form.vue @@ -6,13 +6,13 @@ import type { MesDvCheckPlanApi } from '#/api/mes/dv/checkplan'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { MesDvCheckPlanStatusEnum } from '@vben/constants'; import { message, Tabs } from 'ant-design-vue'; import { useVbenForm } from '#/adapter/form'; import { createCheckPlan, getCheckPlan, updateCheckPlan } from '#/api/mes/dv/checkplan'; import { $t } from '#/locales'; -import { MesDvCheckPlanStatusEnum } from '#/views/mes/utils/constants'; import { useFormSchema } from '../data'; import MachineryList from './machinery-list.vue'; diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/data.ts b/apps/web-antd/src/views/mes/dv/checkrecord/data.ts index fce03470a..665e3c988 100644 --- a/apps/web-antd/src/views/mes/dv/checkrecord/data.ts +++ b/apps/web-antd/src/views/mes/dv/checkrecord/data.ts @@ -4,18 +4,13 @@ import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord'; import { markRaw } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesDvCheckPlanStatusEnum, MesDvCheckRecordStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { getSimpleUserList } from '#/api/system/user'; import { getRangePickerDefaultProps } from '#/utils'; import { DvCheckPlanSelect } from '#/views/mes/dv/checkplan/components'; import { DvMachinerySelect } from '#/views/mes/dv/machinery/components'; -import { - MesDvCheckPlanStatusEnum, - MesDvCheckRecordStatusEnum, - MesDvSubjectTypeEnum, -} from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/index.vue b/apps/web-antd/src/views/mes/dv/checkrecord/index.vue index 0e5346ac7..1bc821568 100644 --- a/apps/web-antd/src/views/mes/dv/checkrecord/index.vue +++ b/apps/web-antd/src/views/mes/dv/checkrecord/index.vue @@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { MesDvCheckRecordStatusEnum } from '@vben/constants'; import { downloadFileFromBlobPart } from '@vben/utils'; import { Button, message } from 'ant-design-vue'; @@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteCheckRecord, exportCheckRecord, getCheckRecordPage } from '#/api/mes/dv/checkrecord'; import { $t } from '#/locales'; -import { MesDvCheckRecordStatusEnum } from '#/views/mes/utils/constants'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue b/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue index 0f85d632f..1e60dead1 100644 --- a/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue +++ b/apps/web-antd/src/views/mes/dv/checkrecord/modules/form.vue @@ -6,6 +6,7 @@ import type { MesDvCheckRecordApi } from '#/api/mes/dv/checkrecord'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { MesDvCheckRecordStatusEnum } from '@vben/constants'; import { Button, message, Popconfirm } from 'ant-design-vue'; @@ -17,7 +18,6 @@ import { updateCheckRecord, } from '#/api/mes/dv/checkrecord'; import { $t } from '#/locales'; -import { MesDvCheckRecordStatusEnum } from '#/views/mes/utils/constants'; import { useFormSchema } from '../data'; import LineList from './line-list.vue'; diff --git a/apps/web-antd/src/views/mes/dv/checkrecord/modules/line-list.vue b/apps/web-antd/src/views/mes/dv/checkrecord/modules/line-list.vue index 467077d99..9debff5fd 100644 --- a/apps/web-antd/src/views/mes/dv/checkrecord/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/dv/checkrecord/modules/line-list.vue @@ -2,7 +2,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesDvCheckRecordLineApi } from '#/api/mes/dv/checkrecord/line'; -import { computed, ref, watch } from 'vue'; +import { computed, MesDvCheckResultEnum, MesDvSubjectTypeEnum, ref, watch } from 'vue'; import { DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; @@ -20,7 +20,6 @@ import { } from '#/api/mes/dv/checkrecord/line'; import { $t } from '#/locales'; import { DvSubjectSelect } from '#/views/mes/dv/subject/components'; -import { MesDvCheckResultEnum, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants'; const props = defineProps<{ disabled?: boolean; recordId: number }>(); const formOpen = ref(false); diff --git a/apps/web-antd/src/views/mes/dv/machinery/data.ts b/apps/web-antd/src/views/mes/dv/machinery/data.ts index 6a1f64063..b32f87ad9 100644 --- a/apps/web-antd/src/views/mes/dv/machinery/data.ts +++ b/apps/web-antd/src/views/mes/dv/machinery/data.ts @@ -4,7 +4,7 @@ import type { MesDvMachineryApi } from '#/api/mes/dv/machinery'; import { h, markRaw } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesAutoCodeRuleCode, MesDvMachineryStatusEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; @@ -12,7 +12,6 @@ import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { MdWorkshopSelect } from '#/views/mes/md/workstation/components'; -import { MesAutoCodeRuleCode, MesDvMachineryStatusEnum } from '#/views/mes/utils/constants'; import { DvMachineryTypeSelect } from './type/components'; diff --git a/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue b/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue index 9599dc74a..3e8d68f1f 100644 --- a/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue +++ b/apps/web-antd/src/views/mes/dv/machinery/modules/form.vue @@ -6,13 +6,13 @@ import type { MesDvMachineryApi } from '#/api/mes/dv/machinery'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { BarcodeBizTypeEnum } from '@vben/constants'; import { Button, message, Tabs } from 'ant-design-vue'; import { useVbenForm } from '#/adapter/form'; import { createMachinery, getMachinery, updateMachinery } from '#/api/mes/dv/machinery'; import { $t } from '#/locales'; -import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants'; import { BarcodeDetail } from '#/views/mes/wm/barcode/components'; import { useFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/mes/dv/machinery/type/data.ts b/apps/web-antd/src/views/mes/dv/machinery/type/data.ts index 2e3120f3a..e817fcea1 100644 --- a/apps/web-antd/src/views/mes/dv/machinery/type/data.ts +++ b/apps/web-antd/src/views/mes/dv/machinery/type/data.ts @@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesDvMachineryTypeApi } from '#/api/mes/dv/machinery/type'; -import { h } from 'vue'; +import { DICT_TYPE, h } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { handleTree } from '@vben/utils'; @@ -13,7 +13,6 @@ import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { getMachineryTypeList } from '#/api/mes/dv/machinery/type'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; /** 新增/修改设备类型的表单 */ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts b/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts index 4a7b0e2d4..badcf2162 100644 --- a/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts +++ b/apps/web-antd/src/views/mes/dv/maintenrecord/data.ts @@ -4,18 +4,13 @@ import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord'; import { markRaw } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesDvCheckPlanStatusEnum, MesDvMaintenRecordStatusEnum, MesDvSubjectTypeEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { getSimpleUserList } from '#/api/system/user'; import { getRangePickerDefaultProps } from '#/utils'; import { DvCheckPlanSelect } from '#/views/mes/dv/checkplan/components'; import { DvMachinerySelect } from '#/views/mes/dv/machinery/components'; -import { - MesDvCheckPlanStatusEnum, - MesDvMaintenRecordStatusEnum, - MesDvSubjectTypeEnum, -} from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue index c7940f347..b96762895 100644 --- a/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue +++ b/apps/web-antd/src/views/mes/dv/maintenrecord/index.vue @@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { MesDvMaintenRecordStatusEnum } from '@vben/constants'; import { downloadFileFromBlobPart } from '@vben/utils'; import { Button, message } from 'ant-design-vue'; @@ -14,7 +15,6 @@ import { getMaintenRecordPage, } from '#/api/mes/dv/maintenrecord'; import { $t } from '#/locales'; -import { MesDvMaintenRecordStatusEnum } from '#/views/mes/utils/constants'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue index 0827b1cef..172c8814f 100644 --- a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue +++ b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/form.vue @@ -6,6 +6,7 @@ import type { MesDvMaintenRecordApi } from '#/api/mes/dv/maintenrecord'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { MesDvMaintenRecordStatusEnum } from '@vben/constants'; import { useUserStore } from '@vben/stores'; import { Button, message, Popconfirm } from 'ant-design-vue'; @@ -18,7 +19,6 @@ import { updateMaintenRecord, } from '#/api/mes/dv/maintenrecord'; import { $t } from '#/locales'; -import { MesDvMaintenRecordStatusEnum } from '#/views/mes/utils/constants'; import { useFormSchema } from '../data'; import LineList from './line-list.vue'; diff --git a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/line-list.vue b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/line-list.vue index c8969bcb9..1b03fa032 100644 --- a/apps/web-antd/src/views/mes/dv/maintenrecord/modules/line-list.vue +++ b/apps/web-antd/src/views/mes/dv/maintenrecord/modules/line-list.vue @@ -2,7 +2,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesDvMaintenRecordLineApi } from '#/api/mes/dv/maintenrecord/line'; -import { computed, ref, watch } from 'vue'; +import { computed, MesDvMaintenStatusEnum, MesDvSubjectTypeEnum, ref, watch } from 'vue'; import { DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; @@ -20,7 +20,6 @@ import { } from '#/api/mes/dv/maintenrecord/line'; import { $t } from '#/locales'; import { DvSubjectSelect } from '#/views/mes/dv/subject/components'; -import { MesDvMaintenStatusEnum, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants'; const props = defineProps<{ disabled?: boolean; recordId: number }>(); const formOpen = ref(false); diff --git a/apps/web-antd/src/views/mes/dv/repair/data.ts b/apps/web-antd/src/views/mes/dv/repair/data.ts index 76674cf38..524f41e87 100644 --- a/apps/web-antd/src/views/mes/dv/repair/data.ts +++ b/apps/web-antd/src/views/mes/dv/repair/data.ts @@ -4,7 +4,7 @@ import type { MesDvRepairApi } from '#/api/mes/dv/repair'; import { h, markRaw } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; @@ -13,7 +13,6 @@ import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { getSimpleUserList } from '#/api/system/user'; import { getRangePickerDefaultProps } from '#/utils'; import { DvMachinerySelect } from '#/views/mes/dv/machinery/components'; -import { MesAutoCodeRuleCode, MesDvRepairStatusEnum } from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'confirm' | 'create' | 'detail' | 'finish' | 'update'; diff --git a/apps/web-antd/src/views/mes/dv/repair/index.vue b/apps/web-antd/src/views/mes/dv/repair/index.vue index c66bf2f73..7dbc37d28 100644 --- a/apps/web-antd/src/views/mes/dv/repair/index.vue +++ b/apps/web-antd/src/views/mes/dv/repair/index.vue @@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesDvRepairApi } from '#/api/mes/dv/repair'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { MesDvRepairStatusEnum } from '@vben/constants'; import { downloadFileFromBlobPart } from '@vben/utils'; import { Button, message } from 'ant-design-vue'; @@ -10,7 +11,6 @@ import { Button, message } from 'ant-design-vue'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteRepair, exportRepair, getRepairPage } from '#/api/mes/dv/repair'; import { $t } from '#/locales'; -import { MesDvRepairStatusEnum } from '#/views/mes/utils/constants'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; diff --git a/apps/web-antd/src/views/mes/dv/repair/modules/form.vue b/apps/web-antd/src/views/mes/dv/repair/modules/form.vue index d9863755b..1ae2e612b 100644 --- a/apps/web-antd/src/views/mes/dv/repair/modules/form.vue +++ b/apps/web-antd/src/views/mes/dv/repair/modules/form.vue @@ -6,6 +6,7 @@ import type { MesDvRepairApi } from '#/api/mes/dv/repair'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { MesDvRepairResultEnum, MesDvRepairStatusEnum } from '@vben/constants'; import { Button, message, Popconfirm } from 'ant-design-vue'; @@ -19,7 +20,6 @@ import { updateRepair, } from '#/api/mes/dv/repair'; import { $t } from '#/locales'; -import { MesDvRepairResultEnum, MesDvRepairStatusEnum } from '#/views/mes/utils/constants'; import { useFormSchema } from '../data'; import LineList from './line-list.vue'; diff --git a/apps/web-antd/src/views/mes/dv/subject/data.ts b/apps/web-antd/src/views/mes/dv/subject/data.ts index cbc88abd8..3748e9c42 100644 --- a/apps/web-antd/src/views/mes/dv/subject/data.ts +++ b/apps/web-antd/src/views/mes/dv/subject/data.ts @@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesDvSubjectApi } from '#/api/mes/dv/subject'; -import { h } from 'vue'; +import { DICT_TYPE, h } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode, MesDvSubjectTypeEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; -import { MesAutoCodeRuleCode, MesDvSubjectTypeEnum } from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/home/data.ts b/apps/web-antd/src/views/mes/home/data.ts index eaa1f27e7..3ad2de089 100644 --- a/apps/web-antd/src/views/mes/home/data.ts +++ b/apps/web-antd/src/views/mes/home/data.ts @@ -1,6 +1,6 @@ import type { MesHomeApi } from '#/api/mes/home'; -import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants'; +import { MesProWorkOrderStatusEnum } from '@vben/constants'; /** 首页汇总统计默认值 */ export const defaultSummary: MesHomeApi.Summary = { diff --git a/apps/web-antd/src/views/mes/md/autocode/data.ts b/apps/web-antd/src/views/mes/md/autocode/data.ts index 7dab76a6d..4613d02fd 100644 --- a/apps/web-antd/src/views/mes/md/autocode/data.ts +++ b/apps/web-antd/src/views/mes/md/autocode/data.ts @@ -3,11 +3,10 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesMdAutoCodePartApi } from '#/api/mes/md/autocode/part'; import type { MesMdAutoCodeRuleApi } from '#/api/mes/md/autocode/rule'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, DICT_TYPE, MesAutoCodePartTypeEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { z } from '#/adapter/form'; -import { MesAutoCodePartTypeEnum } from '#/views/mes/utils/constants'; /** 新增/修改编码规则的表单 */ export function useFormSchema(): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue b/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue index d1ba56e4e..1b5324e99 100644 --- a/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue +++ b/apps/web-antd/src/views/mes/md/autocode/modules/part-form.vue @@ -4,6 +4,7 @@ import type { MesMdAutoCodePartApi } from '#/api/mes/md/autocode/part'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { MesAutoCodePartTypeEnum } from '@vben/constants'; import { message } from 'ant-design-vue'; @@ -14,7 +15,6 @@ import { updateAutoCodePart, } from '#/api/mes/md/autocode/part'; import { $t } from '#/locales'; -import { MesAutoCodePartTypeEnum } from '#/views/mes/utils/constants'; import { usePartFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/mes/md/client/data.ts b/apps/web-antd/src/views/mes/md/client/data.ts index 301973cc5..8b03d6e84 100644 --- a/apps/web-antd/src/views/mes/md/client/data.ts +++ b/apps/web-antd/src/views/mes/md/client/data.ts @@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesMdClientApi } from '#/api/mes/md/client'; -import { h } from 'vue'; +import { DICT_TYPE, h } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/md/item/data.ts b/apps/web-antd/src/views/mes/md/item/data.ts index 2da12e5a1..21e55f602 100644 --- a/apps/web-antd/src/views/mes/md/item/data.ts +++ b/apps/web-antd/src/views/mes/md/item/data.ts @@ -3,9 +3,9 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesMdItemApi } from '#/api/mes/md/item'; import type { MesMdProductBomApi } from '#/api/mes/md/item/productBom'; -import { h, markRaw } from 'vue'; +import { DICT_TYPE, h, markRaw } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; @@ -14,7 +14,6 @@ import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { MdItemTypeSelect } from '#/views/mes/md/item/type/components'; import { MdUnitMeasureSelect } from '#/views/mes/md/unitmeasure/components'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/md/item/modules/form.vue b/apps/web-antd/src/views/mes/md/item/modules/form.vue index 9008507c5..fb5bdd0f4 100644 --- a/apps/web-antd/src/views/mes/md/item/modules/form.vue +++ b/apps/web-antd/src/views/mes/md/item/modules/form.vue @@ -6,13 +6,13 @@ import type { MesMdItemApi } from '#/api/mes/md/item'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { BarcodeBizTypeEnum } from '@vben/constants'; import { Button, Empty, message, Tabs } from 'ant-design-vue'; import { useVbenForm } from '#/adapter/form'; import { createItem, getItem, updateItem } from '#/api/mes/md/item'; import { $t } from '#/locales'; -import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants'; import { BarcodeDetail } from '#/views/mes/wm/barcode/components'; import { useFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue b/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue index 31975250d..99d1e54e7 100644 --- a/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue +++ b/apps/web-antd/src/views/mes/md/item/modules/item-batch-config-form.vue @@ -5,13 +5,14 @@ import type { MesMdItemBatchConfigApi } from '#/api/mes/md/item/batchConfig'; import { computed, ref, watch } from 'vue'; +import { MesItemOrProductEnum } from '@vben/constants'; + import { Button, Checkbox, message, Spin } from 'ant-design-vue'; import { getBatchConfigByItemId, saveBatchConfig, } from '#/api/mes/md/item/batchConfig'; -import { MesItemOrProductEnum } from '#/views/mes/utils/constants'; const props = withDefaults( defineProps<{ diff --git a/apps/web-antd/src/views/mes/md/item/type/data.ts b/apps/web-antd/src/views/mes/md/item/type/data.ts index 7f61f4f03..a5a8c7549 100644 --- a/apps/web-antd/src/views/mes/md/item/type/data.ts +++ b/apps/web-antd/src/views/mes/md/item/type/data.ts @@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesMdItemTypeApi } from '#/api/mes/md/item/type'; -import { h } from 'vue'; +import { DICT_TYPE, h } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode, MesItemOrProductEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { handleTree } from '@vben/utils'; @@ -13,10 +13,6 @@ import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { getItemTypeList } from '#/api/mes/md/item/type'; -import { - MesAutoCodeRuleCode, - MesItemOrProductEnum, -} from '#/views/mes/utils/constants'; /** 新增/修改物料分类的表单 */ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] { diff --git a/apps/web-antd/src/views/mes/md/vendor/data.ts b/apps/web-antd/src/views/mes/md/vendor/data.ts index 24f692030..1395328b8 100644 --- a/apps/web-antd/src/views/mes/md/vendor/data.ts +++ b/apps/web-antd/src/views/mes/md/vendor/data.ts @@ -2,16 +2,15 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesMdVendorApi } from '#/api/mes/md/vendor'; -import { h } from 'vue'; +import { DICT_TYPE, h } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/md/workstation/data.ts b/apps/web-antd/src/views/mes/md/workstation/data.ts index 7ddf1d272..3807d5db7 100644 --- a/apps/web-antd/src/views/mes/md/workstation/data.ts +++ b/apps/web-antd/src/views/mes/md/workstation/data.ts @@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesMdWorkstationApi } from '#/api/mes/md/workstation'; -import { h, markRaw } from 'vue'; +import { DICT_TYPE, h, markRaw } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; @@ -15,7 +15,6 @@ import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse'; import { getWarehouseAreaSimpleList } from '#/api/mes/wm/warehouse/area'; import { getWarehouseLocationSimpleList } from '#/api/mes/wm/warehouse/location'; import { ProProcessSelect } from '#/views/mes/pro/process/components'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; import { MdWorkshopSelect } from './components'; diff --git a/apps/web-antd/src/views/mes/md/workstation/index.vue b/apps/web-antd/src/views/mes/md/workstation/index.vue index 657342ca7..704778694 100644 --- a/apps/web-antd/src/views/mes/md/workstation/index.vue +++ b/apps/web-antd/src/views/mes/md/workstation/index.vue @@ -5,6 +5,7 @@ import type { MesMdWorkstationApi } from '#/api/mes/md/workstation'; import { ref } from 'vue'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { BarcodeBizTypeEnum } from '@vben/constants'; import { downloadFileFromBlobPart } from '@vben/utils'; import { Button, message } from 'ant-design-vue'; @@ -16,7 +17,6 @@ import { getWorkstationPage, } from '#/api/mes/md/workstation'; import { $t } from '#/locales'; -import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants'; import { BarcodeDetail } from '#/views/mes/wm/barcode/components'; import { useGridColumns, useGridFormSchema } from './data'; diff --git a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue index 204cb5214..8489fc30e 100644 --- a/apps/web-antd/src/views/mes/md/workstation/modules/form.vue +++ b/apps/web-antd/src/views/mes/md/workstation/modules/form.vue @@ -6,6 +6,7 @@ import type { MesMdWorkstationApi } from '#/api/mes/md/workstation'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { BarcodeBizTypeEnum } from '@vben/constants'; import { Button, message, Tabs } from 'ant-design-vue'; @@ -16,7 +17,6 @@ import { updateWorkstation, } from '#/api/mes/md/workstation'; import { $t } from '#/locales'; -import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants'; import { BarcodeDetail } from '#/views/mes/wm/barcode/components'; import { useFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts b/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts index 82bd678d3..1db3673b4 100644 --- a/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts +++ b/apps/web-antd/src/views/mes/md/workstation/workshop/data.ts @@ -2,9 +2,9 @@ import type { VbenFormApi, VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop'; -import { h } from 'vue'; +import { DICT_TYPE, h } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; @@ -12,7 +12,6 @@ import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { getSimpleUserList } from '#/api/system/user'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue b/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue index 372006587..4cf478c03 100644 --- a/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue +++ b/apps/web-antd/src/views/mes/md/workstation/workshop/modules/form.vue @@ -6,6 +6,7 @@ import type { MesMdWorkshopApi } from '#/api/mes/md/workstation/workshop'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { BarcodeBizTypeEnum } from '@vben/constants'; import { Button, message } from 'ant-design-vue'; @@ -16,7 +17,6 @@ import { updateWorkshop, } from '#/api/mes/md/workstation/workshop'; import { $t } from '#/locales'; -import { BarcodeBizTypeEnum } from '#/views/mes/utils/constants'; import { BarcodeDetail } from '#/views/mes/wm/barcode/components'; import { useFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/mes/pro/andon/record/data.ts b/apps/web-antd/src/views/mes/pro/andon/record/data.ts index baafa5d1a..f88aad631 100644 --- a/apps/web-antd/src/views/mes/pro/andon/record/data.ts +++ b/apps/web-antd/src/views/mes/pro/andon/record/data.ts @@ -5,7 +5,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record'; import { markRaw } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesProWorkOrderStatusEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { getSimpleUserList } from '#/api/system/user'; @@ -13,7 +13,6 @@ import { getRangePickerDefaultProps } from '#/utils'; import { MdWorkstationSelect } from '#/views/mes/md/workstation/components'; import { ProProcessSelect } from '#/views/mes/pro/process/components'; import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components'; -import { MesProWorkOrderStatusEnum } from '#/views/mes/utils/constants'; import { AndonConfigSelect } from '../config/components'; diff --git a/apps/web-antd/src/views/mes/pro/andon/record/index.vue b/apps/web-antd/src/views/mes/pro/andon/record/index.vue index d6b256fbc..95774ac98 100644 --- a/apps/web-antd/src/views/mes/pro/andon/record/index.vue +++ b/apps/web-antd/src/views/mes/pro/andon/record/index.vue @@ -5,6 +5,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record'; import { ref } from 'vue'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { MesProAndonStatusEnum } from '@vben/constants'; import { downloadFileFromBlobPart } from '@vben/utils'; import { message } from 'ant-design-vue'; @@ -16,7 +17,6 @@ import { getAndonRecordPage, } from '#/api/mes/pro/andon/record'; import { $t } from '#/locales'; -import { MesProAndonStatusEnum } from '#/views/mes/utils/constants'; import ConfigList from '../config/modules/list.vue'; import { useGridColumns, useGridFormSchema } from './data'; diff --git a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue index e233b77f1..4f96c2386 100644 --- a/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue +++ b/apps/web-antd/src/views/mes/pro/andon/record/modules/form.vue @@ -6,6 +6,7 @@ import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { MesProAndonStatusEnum } from '@vben/constants'; import { useUserStore } from '@vben/stores'; import { Button, message, Popconfirm } from 'ant-design-vue'; @@ -17,7 +18,6 @@ import { updateAndonRecord, } from '#/api/mes/pro/andon/record'; import { $t } from '#/locales'; -import { MesProAndonStatusEnum } from '#/views/mes/utils/constants'; import { useFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/mes/pro/card/data.ts b/apps/web-antd/src/views/mes/pro/card/data.ts index b9da83a07..6b2cef847 100644 --- a/apps/web-antd/src/views/mes/pro/card/data.ts +++ b/apps/web-antd/src/views/mes/pro/card/data.ts @@ -5,7 +5,7 @@ import type { MesProCardProcessApi } from '#/api/mes/pro/card/process'; import { h, markRaw } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesAutoCodeRuleCode, MesProWorkOrderStatusEnum } from '@vben/constants'; import { Button } from 'ant-design-vue'; @@ -14,10 +14,6 @@ import { MdItemSelect } from '#/views/mes/md/item/components'; import { MdWorkstationSelect } from '#/views/mes/md/workstation/components'; import { ProProcessSelect } from '#/views/mes/pro/process/components'; import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components'; -import { - MesAutoCodeRuleCode, - MesProWorkOrderStatusEnum, -} from '#/views/mes/utils/constants'; import { UserSelect } from '#/views/system/user/components'; /** 表单类型 */ diff --git a/apps/web-antd/src/views/mes/pro/card/index.vue b/apps/web-antd/src/views/mes/pro/card/index.vue index 643efe25f..2f9119076 100644 --- a/apps/web-antd/src/views/mes/pro/card/index.vue +++ b/apps/web-antd/src/views/mes/pro/card/index.vue @@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesProCardApi } from '#/api/mes/pro/card'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { MesProCardStatusEnum } from '@vben/constants'; import { downloadFileFromBlobPart } from '@vben/utils'; import { Button, message } from 'ant-design-vue'; @@ -15,7 +16,6 @@ import { getCardPage, } from '#/api/mes/pro/card'; import { $t } from '#/locales'; -import { MesProCardStatusEnum } from '#/views/mes/utils/constants'; import { PrinterLabel } from '#/views/mes/wm/barcode/components'; import { useGridColumns, useGridFormSchema } from './data'; diff --git a/apps/web-antd/src/views/mes/pro/card/modules/form.vue b/apps/web-antd/src/views/mes/pro/card/modules/form.vue index 32af7cc57..f4222f2e8 100644 --- a/apps/web-antd/src/views/mes/pro/card/modules/form.vue +++ b/apps/web-antd/src/views/mes/pro/card/modules/form.vue @@ -6,6 +6,10 @@ import type { MesProCardApi } from '#/api/mes/pro/card'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { + BarcodeBizTypeEnum, + MesProCardStatusEnum, +} from '@vben/constants'; import { Button, Divider, message, Popconfirm } from 'ant-design-vue'; @@ -18,10 +22,6 @@ import { updateCard, } from '#/api/mes/pro/card'; import { $t } from '#/locales'; -import { - BarcodeBizTypeEnum, - MesProCardStatusEnum, -} from '#/views/mes/utils/constants'; import { BarcodeDetail } from '#/views/mes/wm/barcode/components'; import { useFormSchema } from '../data'; diff --git a/apps/web-antd/src/views/mes/pro/feedback/data.ts b/apps/web-antd/src/views/mes/pro/feedback/data.ts index cfd5a5015..f14625e96 100644 --- a/apps/web-antd/src/views/mes/pro/feedback/data.ts +++ b/apps/web-antd/src/views/mes/pro/feedback/data.ts @@ -5,7 +5,7 @@ import type { MesProTaskApi } from '#/api/mes/pro/task'; import { h, markRaw } from 'vue'; -import { DICT_TYPE } from '@vben/constants'; +import { DICT_TYPE, MesAutoCodeRuleCode, MesProTaskStatusEnum, MesProWorkOrderStatusEnum } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; @@ -18,11 +18,6 @@ import { MdItemSelect } from '#/views/mes/md/item/components'; import { MdWorkstationSelect } from '#/views/mes/md/workstation/components'; import { ProTaskSelect } from '#/views/mes/pro/task/components'; import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components'; -import { - MesAutoCodeRuleCode, - MesProTaskStatusEnum, - MesProWorkOrderStatusEnum, -} from '#/views/mes/utils/constants'; /** 生产报工表单类型 */ export type FormType = 'approve' | 'create' | 'detail' | 'submit' | 'update'; diff --git a/apps/web-antd/src/views/mes/pro/feedback/index.vue b/apps/web-antd/src/views/mes/pro/feedback/index.vue index b3ad35785..08a274d31 100644 --- a/apps/web-antd/src/views/mes/pro/feedback/index.vue +++ b/apps/web-antd/src/views/mes/pro/feedback/index.vue @@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesProFeedbackApi } from '#/api/mes/pro/feedback'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; +import { MesProFeedbackStatusEnum } from '@vben/constants'; import { useUserStore } from '@vben/stores'; import { downloadFileFromBlobPart } from '@vben/utils'; @@ -15,7 +16,6 @@ import { getFeedbackPage, } from '#/api/mes/pro/feedback'; import { $t } from '#/locales'; -import { MesProFeedbackStatusEnum } from '#/views/mes/utils/constants'; import { useGridColumns, useGridFormSchema } from './data'; import Form from './modules/form.vue'; diff --git a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue index 40e22c3e8..8d23430b8 100644 --- a/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue +++ b/apps/web-antd/src/views/mes/pro/feedback/modules/form.vue @@ -6,6 +6,10 @@ import type { MesProFeedbackApi } from '#/api/mes/pro/feedback'; import { computed, ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; +import { + MesAutoCodeRuleCode, + MesProFeedbackStatusEnum, +} from '@vben/constants'; import { useUserStore } from '@vben/stores'; import { Button, message, Popconfirm, Tabs } from 'ant-design-vue'; @@ -22,10 +26,6 @@ import { } from '#/api/mes/pro/feedback'; import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process'; import { $t } from '#/locales'; -import { - MesAutoCodeRuleCode, - MesProFeedbackStatusEnum, -} from '#/views/mes/utils/constants'; import { useFormSchema } from '../data'; import ItemConsumeList from './item-consume-list.vue'; diff --git a/apps/web-antd/src/views/mes/pro/process/data.ts b/apps/web-antd/src/views/mes/pro/process/data.ts index 59c56bb98..a5d37c260 100644 --- a/apps/web-antd/src/views/mes/pro/process/data.ts +++ b/apps/web-antd/src/views/mes/pro/process/data.ts @@ -3,16 +3,15 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { MesProProcessApi } from '#/api/mes/pro/process'; import type { MesProProcessContentApi } from '#/api/mes/pro/process/content'; -import { h } from 'vue'; +import { DICT_TYPE, h } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; /** 表单类型 */ export type FormType = 'create' | 'detail' | 'update'; diff --git a/apps/web-antd/src/views/mes/pro/route/data.ts b/apps/web-antd/src/views/mes/pro/route/data.ts index 7ba9f1083..24ce8c65d 100644 --- a/apps/web-antd/src/views/mes/pro/route/data.ts +++ b/apps/web-antd/src/views/mes/pro/route/data.ts @@ -5,9 +5,9 @@ import type { MesProRouteProcessApi } from '#/api/mes/pro/route/process'; import type { MesProRouteProductApi } from '#/api/mes/pro/route/product'; import type { MesProRouteProductBomApi } from '#/api/mes/pro/route/productbom'; -import { h } from 'vue'; +import { DICT_TYPE, h } from 'vue'; -import { CommonStatusEnum, DICT_TYPE } from '@vben/constants'; +import { CommonStatusEnum, MesAutoCodeRuleCode } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; import { Button } from 'ant-design-vue'; @@ -18,7 +18,6 @@ import { MdItemSelect, MdProductBomSelect, } from '#/views/mes/md/item/components'; -import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; import { RouteColorPicker } from './components'; diff --git a/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue b/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue index 573f68d51..dca1347c9 100644 --- a/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue +++ b/apps/web-antd/src/views/mes/pro/task/components/gantt-chart.vue @@ -1,9 +1,9 @@