From 680ac84c2e0021ac6c365bd12996f4a03010c4c7 Mon Sep 17 00:00:00 2001 From: dev <182542500@qq.com> Date: Mon, 24 Mar 2025 18:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 21 + .eslintrc-auto-import.json | 312 +++++++++++++ .gitignore | 29 ++ .prettierignore | 9 + .prettierrc | 20 + bin/build.bat | 12 + bin/package.bat | 12 + bin/run-web.bat | 12 + eslint.config.js | 86 ++++ html/ie.html | 242 ++++++++++ package.json | 1 + public/favicon.ico | Bin 0 -> 8131 bytes src/api/amz/inquiryRequest/index.ts | 19 +- src/api/amz/inquiryRequest/types.ts | 14 +- src/api/amz/logisticsOrder/index.ts | 75 +++ src/api/amz/logisticsOrder/types.ts | 179 ++++++++ src/api/amz/logisticsOrderDetail/index.ts | 63 +++ src/api/amz/logisticsOrderDetail/types.ts | 335 ++++++++++++++ src/api/amz/logisticsQuote/index.ts | 17 +- src/api/amz/logisticsQuote/types.ts | 126 ++++- src/api/amz/shipmentPlan/types.ts | 6 +- src/layout/components/Navbar.vue | 28 +- src/views/amz/inquiryRequest/index.vue | 107 +++-- src/views/amz/logisticsChannel/index.vue | 38 +- src/views/amz/logisticsOrder/index.vue | 336 ++++++++++++++ src/views/amz/logisticsOrderDetail/index.vue | 456 +++++++++++++++++++ src/views/amz/logisticsQuote/index.vue | 109 ++++- src/views/amz/shipmentPlan/index.vue | 367 +++++++++++---- tsconfig.json | 31 ++ uno.config.ts | 33 ++ vite/plugins/auto-import.ts | 24 + vite/plugins/components.ts | 17 + vite/plugins/icons.ts | 8 + vite/plugins/index.ts | 22 + vite/plugins/setup-extend.ts | 5 + vite/plugins/svg-icon.ts | 10 + vite/plugins/unocss.ts | 7 + 37 files changed, 3025 insertions(+), 163 deletions(-) create mode 100644 .editorconfig create mode 100644 .eslintrc-auto-import.json create mode 100644 .gitignore create mode 100644 .prettierignore create mode 100644 .prettierrc create mode 100644 bin/build.bat create mode 100644 bin/package.bat create mode 100644 bin/run-web.bat create mode 100644 eslint.config.js create mode 100644 html/ie.html create mode 100644 public/favicon.ico create mode 100644 src/api/amz/logisticsOrder/index.ts create mode 100644 src/api/amz/logisticsOrder/types.ts create mode 100644 src/api/amz/logisticsOrderDetail/index.ts create mode 100644 src/api/amz/logisticsOrderDetail/types.ts create mode 100644 src/views/amz/logisticsOrder/index.vue create mode 100644 src/views/amz/logisticsOrderDetail/index.vue create mode 100644 tsconfig.json create mode 100644 uno.config.ts create mode 100644 vite/plugins/auto-import.ts create mode 100644 vite/plugins/components.ts create mode 100644 vite/plugins/icons.ts create mode 100644 vite/plugins/index.ts create mode 100644 vite/plugins/setup-extend.ts create mode 100644 vite/plugins/svg-icon.ts create mode 100644 vite/plugins/unocss.ts diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5b1a804 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,21 @@ +# 告诉EditorConfig插件，这是根文件，不用继续往上查找 +root = true + +# 匹配全部文件 +[*] +# 缩进风格，可选space、tab +indent_style = space +# 缩进的空格数 +indent_size = 2 +# 设置字符集 +charset = utf-8 +# 结尾换行符，可选lf、cr、crlf +end_of_line = lf +# 在文件结尾插入新行 +trim_trailing_whitespace = true +# 删除一行中的前后空格 +insert_final_newline = true + +[*.md] +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json new file mode 100644 index 0000000..a6661b6 --- /dev/null +++ b/.eslintrc-auto-import.json @@ -0,0 +1,312 @@ +{ + "globals": { + "ComponentInternalInstance": true, + "TransferKey": true, + "ElFormRules": true, + "CheckboxValueType": true, + "PropType": true, + "DateModelType": true, + "UploadFile": true, + "ElFormInstance": true, + "ElTableInstance": true, + "ElTreeInstance": true, + "ElTreeSelectInstance": true, + "ElSelectInstance": true, + "ElUploadInstance": true, + "ElCardInstance": true, + "ElDialogInstance": true, + "ElInputInstance": true, + "ElInputNumberInstance": true, + "ElRadioInstance": true, + "ElRadioGroupInstance": true, + "ElRadioButtonInstance": true, + "ElCheckboxInstance": true, + "ElCheckboxGroupInstance": true, + "ElSwitchInstance": true, + "ElDatePickerInstance": true, + "ElTimePickerInstance": true, + "ElTimeSelectInstance": true, + "ElScrollbarInstance": true, + "ElCascaderInstance": true, + "ElColorPickerInstance": true, + "ElRateInstance": true, + "ElSliderInstance": true, + "useRouter": true, + "useRoute": true, + "EffectScope": true, + "ElTable": true, + "ElSelect": true, + "ElUpload": true, + "ElForm": true, + "ElTree": true, + "ElMessage": true, + "ElMessageBox": true, + "asyncComputed": true, + "autoResetRef": true, + "computed": true, + "computedAsync": true, + "computedEager": true, + "computedInject": true, + "computedWithControl": true, + "controlledComputed": true, + "controlledRef": true, + "createApp": true, + "createEventHook": true, + "createGlobalState": true, + "createInjectionState": true, + "createReactiveFn": true, + "createSharedComposable": true, + "createUnrefFn": true, + "customRef": true, + "debouncedRef": true, + "debouncedWatch": true, + "defineAsyncComponent": true, + "defineComponent": true, + "eagerComputed": true, + "effectScope": true, + "extendRef": true, + "getCurrentInstance": true, + "getCurrentScope": true, + "h": true, + "ignorableWatch": true, + "inject": true, + "isDefined": true, + "isProxy": true, + "isReactive": true, + "isReadonly": true, + "isRef": true, + "makeDestructurable": true, + "markRaw": true, + "nextTick": true, + "onActivated": true, + "onBeforeMount": true, + "onBeforeUnmount": true, + "onBeforeUpdate": true, + "onClickOutside": true, + "onDeactivated": true, + "onErrorCaptured": true, + "onKeyStroke": true, + "onLongPress": true, + "onMounted": true, + "onRenderTracked": true, + "onRenderTriggered": true, + "onScopeDispose": true, + "onServerPrefetch": true, + "onStartTyping": true, + "onUnmounted": true, + "onUpdated": true, + "pausableWatch": true, + "provide": true, + "reactify": true, + "reactifyObject": true, + "reactive": true, + "reactiveComputed": true, + "reactiveOmit": true, + "reactivePick": true, + "readonly": true, + "ref": true, + "refAutoReset": true, + "refDebounced": true, + "refDefault": true, + "refThrottled": true, + "refWithControl": true, + "resolveComponent": true, + "resolveDirective": true, + "resolveRef": true, + "resolveUnref": true, + "shallowReactive": true, + "shallowReadonly": true, + "shallowRef": true, + "syncRef": true, + "syncRefs": true, + "templateRef": true, + "throttledRef": true, + "throttledWatch": true, + "toRaw": true, + "toReactive": true, + "toRef": true, + "toRefs": true, + "triggerRef": true, + "tryOnBeforeMount": true, + "tryOnBeforeUnmount": true, + "tryOnMounted": true, + "tryOnScopeDispose": true, + "tryOnUnmounted": true, + "unref": true, + "unrefElement": true, + "until": true, + "useActiveElement": true, + "useArrayEvery": true, + "useArrayFilter": true, + "useArrayFind": true, + "useArrayFindIndex": true, + "useArrayFindLast": true, + "useArrayJoin": true, + "useArrayMap": true, + "useArrayReduce": true, + "useArraySome": true, + "useArrayUnique": true, + "useAsyncQueue": true, + "useAsyncState": true, + "useAttrs": true, + "useBase64": true, + "useBattery": true, + "useBluetooth": true, + "useBreakpoints": true, + "useBroadcastChannel": true, + "useBrowserLocation": true, + "useCached": true, + "useClipboard": true, + "useCloned": true, + "useColorMode": true, + "useConfirmDialog": true, + "useCounter": true, + "useCssModule": true, + "useCssVar": true, + "useCssVars": true, + "useCurrentElement": true, + "useCycleList": true, + "useDark": true, + "useDateFormat": true, + "useDebounce": true, + "useDebounceFn": true, + "useDebouncedRefHistory": true, + "useDeviceMotion": true, + "useDeviceOrientation": true, + "useDevicePixelRatio": true, + "useDevicesList": true, + "useDisplayMedia": true, + "useDocumentVisibility": true, + "useDraggable": true, + "useDropZone": true, + "useElementBounding": true, + "useElementByPoint": true, + "useElementHover": true, + "useElementSize": true, + "useElementVisibility": true, + "useEventBus": true, + "useEventListener": true, + "useEventSource": true, + "useEyeDropper": true, + "useFavicon": true, + "useFetch": true, + "useFileDialog": true, + "useFileSystemAccess": true, + "useFocus": true, + "useFocusWithin": true, + "useFps": true, + "useFullscreen": true, + "useGamepad": true, + "useGeolocation": true, + "useIdle": true, + "useImage": true, + "useInfiniteScroll": true, + "useIntersectionObserver": true, + "useInterval": true, + "useIntervalFn": true, + "useKeyModifier": true, + "useLastChanged": true, + "useLocalStorage": true, + "useMagicKeys": true, + "useManualRefHistory": true, + "useMediaControls": true, + "useMediaQuery": true, + "useMemoize": true, + "useMemory": true, + "useMounted": true, + "useMouse": true, + "useMouseInElement": true, + "useMousePressed": true, + "useMutationObserver": true, + "useNavigatorLanguage": true, + "useNetwork": true, + "useNow": true, + "useObjectUrl": true, + "useOffsetPagination": true, + "useOnline": true, + "usePageLeave": true, + "useParallax": true, + "usePermission": true, + "usePointer": true, + "usePointerLock": true, + "usePointerSwipe": true, + "usePreferredColorScheme": true, + "usePreferredContrast": true, + "usePreferredDark": true, + "usePreferredLanguages": true, + "usePreferredReducedMotion": true, + "usePrevious": true, + "useRafFn": true, + "useRefHistory": true, + "useResizeObserver": true, + "useScreenOrientation": true, + "useScreenSafeArea": true, + "useScriptTag": true, + "useScroll": true, + "useScrollLock": true, + "useSessionStorage": true, + "useShare": true, + "useSlots": true, + "useSorted": true, + "useSpeechRecognition": true, + "useSpeechSynthesis": true, + "useStepper": true, + "useStorage": true, + "useStorageAsync": true, + "useStyleTag": true, + "useSupported": true, + "useSwipe": true, + "useTemplateRefsList": true, + "useTextDirection": true, + "useTextSelection": true, + "useTextareaAutosize": true, + "useThrottle": true, + "useThrottleFn": true, + "useThrottledRefHistory": true, + "useTimeAgo": true, + "useTimeout": true, + "useTimeoutFn": true, + "useTimeoutPoll": true, + "useTimestamp": true, + "useTitle": true, + "useToNumber": true, + "useToString": true, + "useToggle": true, + "useTransition": true, + "useUrlSearchParams": true, + "useUserMedia": true, + "useVModel": true, + "useVModels": true, + "useVibrate": true, + "useVirtualList": true, + "useWakeLock": true, + "useWebNotification": true, + "useWebSocket": true, + "useWebWorker": true, + "useWebWorkerFn": true, + "useWindowFocus": true, + "useWindowScroll": true, + "useWindowSize": true, + "watch": true, + "watchArray": true, + "watchAtMost": true, + "watchDebounced": true, + "watchEffect": true, + "watchIgnorable": true, + "watchOnce": true, + "watchPausable": true, + "watchPostEffect": true, + "watchSyncEffect": true, + "watchThrottled": true, + "watchTriggerable": true, + "watchWithFilter": true, + "whenever": true, + "ImportOption": true, + "TreeType": true, + "FieldOption": true, + "PageData": true, + "storeToRefs": true, + "DictDataOption": true, + "UploadOption": true + } +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1fd56f0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +.DS_Store +.history +node_modules/ +dist/ +npm-debug.log* +yarn-debug.log* +yarn-error.log* +**/*.log + +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.local + +package-lock.json +yarn.lock +pnpm-lock.yaml + +# 编译生成的文件 +auto-imports.d.ts +components.d.ts diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..d251d2e --- /dev/null +++ b/.prettierignore @@ -0,0 +1,9 @@ +/dist/* +.local +.output.js +/node_modules/** + +**/*.svg +**/*.sh + +/public/* \ No newline at end of file diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..6ca3ce5 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,20 @@ +{ + "printWidth": 150, + "tabWidth": 2, + "useTabs": false, + "semi": true, + "singleQuote": true, + "quoteProps": "preserve", + "jsxSingleQuote": false, + "bracketSameLine": false, + "trailingComma": "none", + "bracketSpacing": true, + "embeddedLanguageFormatting": "auto", + "arrowParens": "always", + "requirePragma": false, + "insertPragma": false, + "proseWrap": "preserve", + "htmlWhitespaceSensitivity": "css", + "vueIndentScriptAndStyle": false, + "endOfLine": "auto" +} diff --git a/bin/build.bat b/bin/build.bat new file mode 100644 index 0000000..ecbb454 --- /dev/null +++ b/bin/build.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] Weḅdistļ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn build:prod + +pause \ No newline at end of file diff --git a/bin/package.bat b/bin/package.bat new file mode 100644 index 0000000..f5b24e0 --- /dev/null +++ b/bin/package.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] װWeḅnode_modulesļ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn --registry=https://registry.npmmirror.com + +pause \ No newline at end of file diff --git a/bin/run-web.bat b/bin/run-web.bat new file mode 100644 index 0000000..d2fe397 --- /dev/null +++ b/bin/run-web.bat @@ -0,0 +1,12 @@ +@echo off +echo. +echo [Ϣ] ʹ Vite Web ̡ +echo. + +%~d0 +cd %~dp0 + +cd .. +yarn dev + +pause \ No newline at end of file diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 0000000..8b67e9e --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,86 @@ +import globals from 'globals'; +import pluginJs from '@eslint/js'; +import tseslint from 'typescript-eslint'; +import pluginVue from 'eslint-plugin-vue'; +import { readFile } from 'node:fs/promises'; +import prettier from 'eslint-plugin-prettier'; + +/** + * https://blog.csdn.net/sayUonly/article/details/123482912 + * 自动导入的配置 + */ +const autoImportFile = new URL('./.eslintrc-auto-import.json', import.meta.url); +const autoImportGlobals = JSON.parse(await readFile(autoImportFile, 'utf8')); + +/** @type {import('eslint').Linter.Config[]} */ +export default [ + { + /** + * 不需要.eslintignore文件 而是在这里配置 + */ + ignores: [ + '*.sh', + 'node_modules', + '*.md', + '*.woff', + '*.ttf', + '.vscode', + '.idea', + 'dist', + '/public', + '/docs', + '.husky', + '.local', + '/bin', + '.eslintrc.cjs', + 'prettier.config.js', + 'src/assets', + 'tailwind.config.js' + ] + }, + { files: ['**/*.{js,mjs,cjs,ts,vue}'] }, + { + languageOptions: { + globals: globals.browser + } + }, + pluginJs.configs.recommended, + ...tseslint.configs.recommended, + ...pluginVue.configs['flat/essential'], + { + files: ['**/*.vue'], + languageOptions: { + parserOptions: { + parser: tseslint.parser + } + } + }, + { + languageOptions: { + globals: { + // 自动导入的配置 undef + ...autoImportGlobals.globals, + DialogOption: 'readonly', + LayoutSetting: 'readonly' + } + }, + plugins: { prettier }, + rules: { + '@typescript-eslint/no-empty-function': 'off', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-unused-vars': 'off', + '@typescript-eslint/no-this-alias': 'off', + + // vue + 'vue/multi-word-component-names': 'off', + 'vue/valid-define-props': 'off', + 'vue/no-v-model-argument': 'off', + 'prefer-rest-params': 'off', + // prettier + 'prettier/prettier': 'error', + // 允许使用空Object类型 {} + '@typescript-eslint/no-empty-object-type': 'off', + '@typescript-eslint/no-unused-expressions': 'off' + } + } +]; diff --git a/html/ie.html b/html/ie.html new file mode 100644 index 0000000..4d2773d --- /dev/null +++ b/html/ie.html @@ -0,0 +1,242 @@ + + + + + 请升级您的浏览器 + + + + + + +

请升级您的浏览器，以便我们更好的为您提供服务！

+

您正在使用 Internet Explorer 的早期版本（IE11以下版本或使用该内核的浏览器）。这意味着在升级浏览器前，您将无法访问此网站。

+
+

请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束

+

+ 自 2016 年 1 月 12 日起，Microsoft 不再为 IE 11 + 以下版本提供相应支持和更新。没有关键的浏览器安全更新，您的电脑可能易受有害病毒、间谍软件和其他恶意软件的攻击，它们可以窃取或损害您的业务数据和信息。请参阅 + 微软对 Internet Explorer 早期版本的支持将于 2016 年 1 月 12 日结束的说明 + 。 +

+
+

您可以选择更先进的浏览器

+

推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问即可。

+ +
+ + diff --git a/package.json b/package.json index d820647..0ffb576 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@highlightjs/vue-plugin": "2.1.0", "@vueup/vue-quill": "1.2.0", "@vueuse/core": "11.3.0", + "ag-grid-vue3": "^33.1.1", "animate.css": "4.1.1", "await-to-js": "3.0.0", "axios": "1.7.8", diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..3f919d85a5d1e093fd8d80ebcbe9987a3bdbb54f GIT binary patch literal 8131 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 d+2AD?_zza => { +export const createWithDesAndChannel = (destination: string, channelId: string, date: string): AxiosPromise => { return request({ - url: '/amz/inquiryRequest/create/' + destination + '/' + channelId, + url: '/amz/inquiryRequest/create/' + destination + '/' + channelId + '/' + date, + method: 'get' + }); +}; + +/** + * 根据目的地仓库和渠道查询物流询价列表 + * @returns {*} + * @param destination + * @param channelId + * @param date + */ + +export const queryWithDesAndChannel = (destination: string, channelId: string, date: string): AxiosPromise => { + return request({ + url: '/amz/inquiryRequest/query/' + destination + '/' + channelId + '/' + date, method: 'get' }); }; diff --git a/src/api/amz/inquiryRequest/types.ts b/src/api/amz/inquiryRequest/types.ts index 891bccf..4cce91c 100644 --- a/src/api/amz/inquiryRequest/types.ts +++ b/src/api/amz/inquiryRequest/types.ts @@ -58,7 +58,6 @@ export interface InquiryRequestVO { * 报价有效的结束日期 */ effectiveEndTime: string; - } export interface InquiryRequestForm extends BaseEntity { @@ -121,11 +120,9 @@ export interface InquiryRequestForm extends BaseEntity { * 报价有效的结束日期 */ effectiveEndTime?: string; - } export interface InquiryRequestQuery extends PageQuery { - /** * 询价单号（规则：INQ+年月+6位序列） */ @@ -181,11 +178,8 @@ export interface InquiryRequestQuery extends PageQuery { */ effectiveEndTime?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/api/amz/logisticsOrder/index.ts b/src/api/amz/logisticsOrder/index.ts new file mode 100644 index 0000000..ad7a7a6 --- /dev/null +++ b/src/api/amz/logisticsOrder/index.ts @@ -0,0 +1,75 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { LogisticsOrderVO, LogisticsOrderForm, LogisticsOrderQuery, createOrderForm } from '@/api/amz/logisticsOrder/types'; + +/** + * 查询物流订单列表 + * @param query + * @returns {*} + */ + +export const listLogisticsOrder = (query?: LogisticsOrderQuery): AxiosPromise => { + return request({ + url: '/amz/logisticsOrder/list', + method: 'get', + params: query + }); +}; + +/** + * 查询物流订单详细 + * @param id + */ +export const getLogisticsOrder = (id: string | number): AxiosPromise => { + return request({ + url: '/amz/logisticsOrder/' + id, + method: 'get' + }); +}; + +/** + * 新增物流订单 + * @param data + */ +export const addLogisticsOrder = (data: LogisticsOrderForm) => { + return request({ + url: '/amz/logisticsOrder', + method: 'post', + data: data + }); +}; + +/** + * 创建物流订单 + * @param data + */ +export const createLogisticsOrder = (data: createOrderForm) => { + return request({ + url: '/amz/logisticsOrder/createOrder', + method: 'post', + data: data + }); +}; + +/** + * 修改物流订单 + * @param data + */ +export const updateLogisticsOrder = (data: LogisticsOrderForm) => { + return request({ + url: '/amz/logisticsOrder', + method: 'put', + data: data + }); +}; + +/** + * 删除物流订单 + * @param id + */ +export const delLogisticsOrder = (id: string | number | Array) => { + return request({ + url: '/amz/logisticsOrder/' + id, + method: 'delete' + }); +}; diff --git a/src/api/amz/logisticsOrder/types.ts b/src/api/amz/logisticsOrder/types.ts new file mode 100644 index 0000000..2dda125 --- /dev/null +++ b/src/api/amz/logisticsOrder/types.ts @@ -0,0 +1,179 @@ +export interface LogisticsOrderVO { + /** + * 主键（应用层生成的全局唯一ID，如雪花算法） + */ + id: string | number; + + /** + * FBA货件编号（亚马逊系统生成的唯一标识） + */ + fbaShipmentId: string | number; + + /** + * 订单编号（应用层生成的唯一业务流水号） + */ + orderId: string; + + /** + * 物流商ID（关联物流商信息表） + */ + logisticsProviderId: string | number; + + /** + * 物流商名称（冗余存储，避免高频联表查询） + */ + logisticsProviderName: string | number; + + /** + * 物流渠道（如空运/海运/快递等） + */ + logisticsChannel: string; + + /** + * 目的地仓库名称或编码 + */ + destination: string; + + /** + * 总箱子数量（此订单包含的箱子总数） + */ + boxQuantity: number; + + /** + * 总货件数量（商品件数总和） + */ + shipmentQuantity: number; + + /** + * 亚马逊仓库实际上架日期 + */ + amazonShelfDate: string; + + /** + * 上架时效（单位：天，从发货到上架的总天数） + */ + shelfTimeliness: number; +} + +export interface LogisticsOrderForm extends BaseEntity { + /** + * 主键（应用层生成的全局唯一ID，如雪花算法） + */ + id?: string | number; + + /** + * FBA货件编号（亚马逊系统生成的唯一标识） + */ + fbaShipmentId?: string | number; + + /** + * 订单编号（应用层生成的唯一业务流水号） + */ + orderId?: string; + + /** + * 物流商ID（关联物流商信息表） + */ + logisticsProviderId?: string | number; + + /** + * 物流商名称（冗余存储，避免高频联表查询） + */ + logisticsProviderName?: string | number; + + /** + * 物流渠道（如空运/海运/快递等） + */ + logisticsChannel?: string; + + /** + * 目的地仓库名称或编码 + */ + destination?: string; + + /** + * 总箱子数量（此订单包含的箱子总数） + */ + boxQuantity?: number; + + /** + * 总货件数量（商品件数总和） + */ + shipmentQuantity?: number; + + /** + * 亚马逊仓库实际上架日期 + */ + amazonShelfDate?: string; + + /** + * 上架时效（单位：天，从发货到上架的总天数） + */ + shelfTimeliness?: number; +} + +export interface createOrderForm { + /** + * FBA货件编号（亚马逊系统生成的唯一标识） + */ + fbaShipmentId?: string | number; + + logicQuoteId?: string | number; +} + +export interface LogisticsOrderQuery extends PageQuery { + /** + * FBA货件编号（亚马逊系统生成的唯一标识） + */ + fbaShipmentId?: string | number; + + /** + * 订单编号（应用层生成的唯一业务流水号） + */ + orderId?: string; + + /** + * 物流商ID（关联物流商信息表） + */ + logisticsProviderId?: string | number; + + /** + * 物流商名称（冗余存储，避免高频联表查询） + */ + logisticsProviderName?: string | number; + + /** + * 物流渠道（如空运/海运/快递等） + */ + logisticsChannel?: string; + + /** + * 目的地仓库名称或编码 + */ + destination?: string; + + /** + * 总箱子数量（此订单包含的箱子总数） + */ + boxQuantity?: number; + + /** + * 总货件数量（商品件数总和） + */ + shipmentQuantity?: number; + + /** + * 亚马逊仓库实际上架日期 + */ + amazonShelfDate?: string; + + /** + * 上架时效（单位：天，从发货到上架的总天数） + */ + shelfTimeliness?: number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/amz/logisticsOrderDetail/index.ts b/src/api/amz/logisticsOrderDetail/index.ts new file mode 100644 index 0000000..7908ea1 --- /dev/null +++ b/src/api/amz/logisticsOrderDetail/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { LogisticsOrderDetailVO, LogisticsOrderDetailForm, LogisticsOrderDetailQuery } from '@/api/amz/logisticsOrderDetail/types'; + +/** + * 查询物流订单明细（按箱子维度存储）列表 + * @param query + * @returns {*} + */ + +export const listLogisticsOrderDetail = (query?: LogisticsOrderDetailQuery): AxiosPromise => { + return request({ + url: '/amz/logisticsOrderDetail/list', + method: 'get', + params: query + }); +}; + +/** + * 查询物流订单明细（按箱子维度存储）详细 + * @param id + */ +export const getLogisticsOrderDetail = (id: string | number): AxiosPromise => { + return request({ + url: '/amz/logisticsOrderDetail/' + id, + method: 'get' + }); +}; + +/** + * 新增物流订单明细（按箱子维度存储） + * @param data + */ +export const addLogisticsOrderDetail = (data: LogisticsOrderDetailForm) => { + return request({ + url: '/amz/logisticsOrderDetail', + method: 'post', + data: data + }); +}; + +/** + * 修改物流订单明细（按箱子维度存储） + * @param data + */ +export const updateLogisticsOrderDetail = (data: LogisticsOrderDetailForm) => { + return request({ + url: '/amz/logisticsOrderDetail', + method: 'put', + data: data + }); +}; + +/** + * 删除物流订单明细（按箱子维度存储） + * @param id + */ +export const delLogisticsOrderDetail = (id: string | number | Array) => { + return request({ + url: '/amz/logisticsOrderDetail/' + id, + method: 'delete' + }); +}; diff --git a/src/api/amz/logisticsOrderDetail/types.ts b/src/api/amz/logisticsOrderDetail/types.ts new file mode 100644 index 0000000..ab4d29d --- /dev/null +++ b/src/api/amz/logisticsOrderDetail/types.ts @@ -0,0 +1,335 @@ +export interface LogisticsOrderDetailVO { + /** + * 主键（应用层生成的全局唯一ID） + */ + id: string | number; + + /** + * 关联主表ID（biz_logistics_order.id） + */ + orderId: string | number; + + /** + * FBA货件编号（冗余存储，避免联表查询） + */ + fbaShipmentId: string | number; + + /** + * FBA箱号（亚马逊系统中箱子的唯一标识） + */ + fbaBoxNumber: string; + + /** + * 物流商ID（冗余存储） + */ + logisticsProviderId: string | number; + + /** + * 物流商名称（冗余存储） + */ + logisticsProviderName: string | number; + + /** + * 物流渠道（与主表一致） + */ + logisticsChannel: string; + + /** + * 目的地仓库（冗余存储） + */ + destination: string; + + /** + * 计划数量（该箱子预计装载的商品数量） + */ + plannedQuantity: number; + + /** + * 实际货件数量（该箱子实际装载的商品数量） + */ + shipmentQuantity: number; + + /** + * 物流追踪号（物流商提供的唯一包裹标识） + */ + trackingNumber: string; + + /** + * 供应商称重（单位：KG，由供应商提供） + */ + supplierWeight: number; + + /** + * 物流商计重（单位：KG，物流商实际测量值） + */ + logisticsWeight: number; + + /** + * 称重差异（应用层计算：物流商计重 - 供应商称重） + */ + weightDiff: number; + + /** + * 物流单价（单位：元/KG，由合同或报价确定） + */ + pricePerKg: number; + + /** + * 物流计价重量（应用层根据业务规则计算） + */ + logisticsCalculationPrice: number; + + /** + * 其他物流费用（如报关费、保险费等） + */ + otherFee: number; + + /** + * 费用合计（应用层计算：物流计价 + 其他费用） + */ + totalFee: number; + + /** + * 物流状态（pending:待发运/in_transit:运输中/delivered:已签收） + */ + logisticsStatus: string; + + /** + * 预计签收日期（物流商提供的预估日期） + */ + estimatedDeliveryDate: string; + + /** + * 实际签收日期（物流商回传的实际日期） + */ + actualDeliveryDate: string; + + /** + * 运输时效（单位：天，实际签收日期 - 发货日期） + */ + timeliness: number; +} + +export interface LogisticsOrderDetailForm extends BaseEntity { + /** + * 主键（应用层生成的全局唯一ID） + */ + id?: string | number; + + /** + * 关联主表ID（biz_logistics_order.id） + */ + orderId?: string | number; + + /** + * FBA货件编号（冗余存储，避免联表查询） + */ + fbaShipmentId?: string | number; + + /** + * FBA箱号（亚马逊系统中箱子的唯一标识） + */ + fbaBoxNumber?: string; + + /** + * 物流商ID（冗余存储） + */ + logisticsProviderId?: string | number; + + /** + * 物流商名称（冗余存储） + */ + logisticsProviderName?: string | number; + + /** + * 物流渠道（与主表一致） + */ + logisticsChannel?: string; + + /** + * 目的地仓库（冗余存储） + */ + destination?: string; + + /** + * 计划数量（该箱子预计装载的商品数量） + */ + plannedQuantity?: number; + + /** + * 实际货件数量（该箱子实际装载的商品数量） + */ + shipmentQuantity?: number; + + /** + * 物流追踪号（物流商提供的唯一包裹标识） + */ + trackingNumber?: string; + + /** + * 供应商称重（单位：KG，由供应商提供） + */ + supplierWeight?: number; + + /** + * 物流商计重（单位：KG，物流商实际测量值） + */ + logisticsWeight?: number; + + /** + * 称重差异（应用层计算：物流商计重 - 供应商称重） + */ + weightDiff?: number; + + /** + * 物流单价（单位：元/KG，由合同或报价确定） + */ + pricePerKg?: number; + + /** + * 物流计价重量（应用层根据业务规则计算） + */ + logisticsCalculationPrice?: number; + + /** + * 其他物流费用（如报关费、保险费等） + */ + otherFee?: number; + + /** + * 费用合计（应用层计算：物流计价 + 其他费用） + */ + totalFee?: number; + + /** + * 物流状态（pending:待发运/in_transit:运输中/delivered:已签收） + */ + logisticsStatus?: string; + + /** + * 预计签收日期（物流商提供的预估日期） + */ + estimatedDeliveryDate?: string; + + /** + * 实际签收日期（物流商回传的实际日期） + */ + actualDeliveryDate?: string; + + /** + * 运输时效（单位：天，实际签收日期 - 发货日期） + */ + timeliness?: number; +} + +export interface LogisticsOrderDetailQuery extends PageQuery { + /** + * 关联主表ID（biz_logistics_order.id） + */ + orderId?: string | number; + + /** + * FBA货件编号（冗余存储，避免联表查询） + */ + fbaShipmentId?: string | number; + + /** + * FBA箱号（亚马逊系统中箱子的唯一标识） + */ + fbaBoxNumber?: string; + + /** + * 物流商ID（冗余存储） + */ + logisticsProviderId?: string | number; + + /** + * 物流商名称（冗余存储） + */ + logisticsProviderName?: string | number; + + /** + * 物流渠道（与主表一致） + */ + logisticsChannel?: string; + + /** + * 目的地仓库（冗余存储） + */ + destination?: string; + + /** + * 计划数量（该箱子预计装载的商品数量） + */ + plannedQuantity?: number; + + /** + * 实际货件数量（该箱子实际装载的商品数量） + */ + shipmentQuantity?: number; + + /** + * 物流追踪号（物流商提供的唯一包裹标识） + */ + trackingNumber?: string; + + /** + * 供应商称重（单位：KG，由供应商提供） + */ + supplierWeight?: number; + + /** + * 物流商计重（单位：KG，物流商实际测量值） + */ + logisticsWeight?: number; + + /** + * 称重差异（应用层计算：物流商计重 - 供应商称重） + */ + weightDiff?: number; + + /** + * 物流单价（单位：元/KG，由合同或报价确定） + */ + pricePerKg?: number; + + /** + * 物流计价重量（应用层根据业务规则计算） + */ + logisticsCalculationPrice?: number; + + /** + * 其他物流费用（如报关费、保险费等） + */ + otherFee?: number; + + /** + * 费用合计（应用层计算：物流计价 + 其他费用） + */ + totalFee?: number; + + /** + * 物流状态（pending:待发运/in_transit:运输中/delivered:已签收） + */ + logisticsStatus?: string; + + /** + * 预计签收日期（物流商提供的预估日期） + */ + estimatedDeliveryDate?: string; + + /** + * 实际签收日期（物流商回传的实际日期） + */ + actualDeliveryDate?: string; + + /** + * 运输时效（单位：天，实际签收日期 - 发货日期） + */ + timeliness?: number; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/amz/logisticsQuote/index.ts b/src/api/amz/logisticsQuote/index.ts index 90046d4..a60529b 100644 --- a/src/api/amz/logisticsQuote/index.ts +++ b/src/api/amz/logisticsQuote/index.ts @@ -21,11 +21,12 @@ export const listLogisticsQuote = (query?: LogisticsQuoteQuery): AxiosPromise => { +export const queryLogisticsQuote = (destination: string, channelId: string, date: string): AxiosPromise => { return request({ - url: '/amz/logisticsQuote/query/' + destination + '/' + channelId, + url: '/amz/logisticsQuote/query/' + destination + '/' + channelId + '/' + date, method: 'get' }); }; @@ -53,6 +54,18 @@ export const addLogisticsQuote = (data: LogisticsQuoteForm) => { }); }; +/** + * 新增物流报价 + * @param data + */ +export const addMostLogisticsQuote = (data: LogisticsQuoteForm) => { + return request({ + url: '/amz/logisticsQuote/most', + method: 'post', + data: data + }); +}; + /** * 修改物流报价 * @param data diff --git a/src/api/amz/logisticsQuote/types.ts b/src/api/amz/logisticsQuote/types.ts index 549a7fd..f1fb8eb 100644 --- a/src/api/amz/logisticsQuote/types.ts +++ b/src/api/amz/logisticsQuote/types.ts @@ -17,7 +17,7 @@ export interface LogisticsQuoteVO { /** * 渠道名称（冗余存储，保证查询效率） */ - transportChannel: string; + channelName: string; /** * 基础价格 @@ -59,6 +59,15 @@ export interface LogisticsQuoteVO { */ channelId: string | number; + /** + * 是否双清包税（N不是 Y是） + */ + isDdp: string; + + /** + * 单位 + */ + unit: string; } export interface LogisticsQuoteForm extends BaseEntity { @@ -122,9 +131,22 @@ export interface LogisticsQuoteForm extends BaseEntity { */ channelId?: string | number; + /** + * 是否双清包税（N不是 Y是） + */ + isDdp?: string; + + /** + * 单位 + */ + unit?: string; } -export interface LogisticsQuoteQuery extends PageQuery { +export interface LogisticsMostQuoteForm extends BaseEntity { + /** + * 主键ID + */ + id?: string | number; /** * 物流商用户ID（关联sys_user表） @@ -139,7 +161,84 @@ export interface LogisticsQuoteQuery extends PageQuery { /** * 渠道名称（冗余存储，保证查询效率） */ - transportChannel?: string; + channelName?: string; + + /** + * 基础价格 + */ + price?: number; + + /** + * 时效（单位：天） + */ + leadTime?: number; + + /** + * 附加费 + */ + surcharge?: number; + + /** + * 报价生效日期 + */ + quoteDate?: string; + + /** + * 报价生效开始日期 + */ + quoteStartDate?: string; + + /** + * 报价生效结束日期 + */ + quoteEndDate?: string; + + /** + * 提交状态（Y已提交 N未提交） + */ + isSubmitted?: string; + + /** + * 报价备注 + */ + remark?: string; + + /** + * 渠道类型（system=系统/custom=自定义） + */ + channelType?: string; + + /** + * 渠道ID（system=dict_code，custom=自定义渠道ID） + */ + channelId?: string | number; + + /** + * 是否双清包税（N不是 Y是） + */ + isDdp?: string; + + /** + * 单位 + */ + unit?: string; +} + +export interface LogisticsQuoteQuery extends PageQuery { + /** + * 物流商用户ID（关联sys_user表） + */ + userId?: string | number; + + /** + * 目的地（建议使用ISO国家代码如CN/US/GB） + */ + destination?: string; + + /** + * 渠道名称（冗余存储，保证查询效率） + */ + channelName?: string; /** * 基础价格 @@ -176,11 +275,18 @@ export interface LogisticsQuoteQuery extends PageQuery { */ channelId?: string | number; - /** - * 日期范围参数 - */ - params?: any; + /** + * 是否双清包税（N不是 Y是） + */ + isDdp?: string; + + /** + * 单位 + */ + unit?: string; + + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/api/amz/shipmentPlan/types.ts b/src/api/amz/shipmentPlan/types.ts index 49efb12..cbb3ba7 100644 --- a/src/api/amz/shipmentPlan/types.ts +++ b/src/api/amz/shipmentPlan/types.ts @@ -32,7 +32,7 @@ export interface ShipmentPlanVO { /** * 物流中心编码 */ - destinationFulfillmentCenterId: string | number; + destination: string | number; /** * 运输模式 @@ -136,7 +136,7 @@ export interface ShipmentPlanForm extends BaseEntity { /** * 物流中心编码 */ - destinationFulfillmentCenterId?: string | number; + destination?: string | number; /** * 运输模式 @@ -235,7 +235,7 @@ export interface ShipmentPlanQuery extends PageQuery { /** * 物流中心编码 */ - destinationFulfillmentCenterId?: string | number; + destination?: string | number; /** * 运输模式 diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index a896261..4a19ad3 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -17,11 +17,16 @@ @change="dynamicTenantEvent" @clear="dynamicClearEvent" > - - + + +
+ {{ roleNmae }} +
@@ -60,7 +65,9 @@
- + + +