From 51ea9d3bfad849b8b14671ff7f8119ae85bba375 Mon Sep 17 00:00:00 2001 From: dev <182542500@qq.com> Date: Mon, 16 Jun 2025 11:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .deployrc.js | 11 +- .env.development | 13 +- .env.production | 16 +- deploy.js | 6 - index.html | 2 +- package.json | 3 +- src/App.vue | 2 - src/api/amz/inquiryRequest/types.ts | 2 + src/api/amz/logisticsQuote/types.ts | 11 +- src/api/amz/purchaseOrder/index.ts | 12 + src/api/amz/purchaseOrder/types.ts | 27 +- src/api/amz/purchaseOrderItem/index.ts | 71 ++ src/api/amz/purchaseOrderItem/types.ts | 435 +++++++ src/api/amz/sendOrder/types.ts | 16 +- src/api/amz/shipForward/index.ts | 12 + src/api/amz/shipForward/types.ts | 6 + src/api/amz/shipmentPlan/index.ts | 12 +- src/api/amz/shipmentPlan/types.ts | 31 +- src/api/amz/statusHistory/index.ts | 63 + src/api/amz/statusHistory/types.ts | 115 ++ src/api/system/user/types.ts | 1 + src/assets/icons/png/wechat.png | Bin 0 -> 4259 bytes src/components/Countup/index.vue | 40 + src/layout/components/AppMain.vue | 38 +- src/layout/components/Navbar.vue | 6 +- src/layout/components/Sidebar/Logo.vue | 10 +- src/layout/index.vue | 42 +- src/main.ts | 4 +- src/store/modules/permission.ts | 10 + src/types/global.d.ts | 1 + src/{permission.ts => userGetInfoBz.ts} | 31 +- src/utils/asinkj.ts | 7 + src/utils/permission.ts | 2 +- src/views/amz/amazonStore/index.vue | 60 +- src/views/amz/inquiryRequest/index.vue | 76 +- src/views/amz/logisticsOrder/index.vue | 52 +- src/views/amz/logisticsOrderDetail/index.vue | 8 +- .../amz/logisticsOrderQuotation/index.vue | 9 +- src/views/amz/logisticsQuote/index.vue | 12 +- src/views/amz/logisticsQuoteReport/index.vue | 6 +- src/views/amz/purchaseOrder/index.vue | 271 ++--- src/views/amz/purchaseOrderConfirm/index.vue | 1019 +++++++++++------ src/views/amz/purchaseOrderItem/index.vue | 551 +++++++++ src/views/amz/purchaseOrderQuery/index.vue | 941 +++++++++++++++ src/views/amz/sendOrder/index.vue | 338 ++++-- src/views/amz/sendOrderConfirm/index.vue | 155 +-- src/views/amz/sendOrderLast/index.vue | 355 ++++++ src/views/amz/sendOrderReport/index.vue | 644 +++++++++++ src/views/amz/shipForward/index.vue | 131 ++- src/views/amz/shipForwardIn/index.vue | 118 +- src/views/amz/shipForwardOut/index.vue | 134 ++- src/views/amz/shipmentPlan/index.vue | 6 +- src/views/amz/shipmentPlanAsk/index.vue | 341 +++++- src/views/amz/shipmentPlanQuery/index.vue | 82 +- src/views/amz/shipmentPlanSend/index.vue | 160 +-- src/views/index.vue | 131 ++- src/views/login.vue | 4 +- src/views/register.vue | 2 +- src/views/system/user/index.vue | 9 +- src/views/system/user/profile/index.vue | 9 +- src/views/system/user/profile/userInfo.vue | 3 + 61 files changed, 5466 insertions(+), 1219 deletions(-) create mode 100644 src/api/amz/purchaseOrderItem/index.ts create mode 100644 src/api/amz/purchaseOrderItem/types.ts create mode 100644 src/api/amz/statusHistory/index.ts create mode 100644 src/api/amz/statusHistory/types.ts create mode 100644 src/assets/icons/png/wechat.png create mode 100644 src/components/Countup/index.vue rename src/{permission.ts => userGetInfoBz.ts} (64%) create mode 100644 src/views/amz/purchaseOrderItem/index.vue create mode 100644 src/views/amz/purchaseOrderQuery/index.vue create mode 100644 src/views/amz/sendOrderLast/index.vue create mode 100644 src/views/amz/sendOrderReport/index.vue diff --git a/.deployrc.js b/.deployrc.js index 43da59e..f9b99dd 100644 --- a/.deployrc.js +++ b/.deployrc.js @@ -4,20 +4,13 @@ import { resolve } from 'node:path'; export default { host: '112.74.106.216', - port: 22, // 默认 SSH 端口 + port: 22, username: 'root', - // 密码和私钥二选一 password: 'Smt1618?', - privateKey: null, // 示例: readFileSync(resolve(process.env.HOME, '.ssh/id_rsa')), + privateKey: null, - // 部署路径 remotePath: '/opt/1panel/apps/openresty/openresty/www/sites/www.amzups.com/index', - // 是否清空目标目录 cleanRemote: true - - // 高级选项 (可选) - // uploadIgnore: ['*.map', 'tmp/*'], - // execAfterDeploy: 'sudo systemctl restart nginx' }; diff --git a/.env.development b/.env.development index 35cdc83..e137571 100644 --- a/.env.development +++ b/.env.development @@ -1,39 +1,28 @@ # 页面标题 -VITE_APP_TITLE = 瑷胜科技管理系统 +VITE_APP_TITLE = 香港SMT订单物流管理系统 -# 开发环境配置 VITE_APP_ENV = 'development' -# 开发环境 VITE_APP_BASE_API = '/dev-api' VITE_BACKEND_URL = 'http://localhost:8080' #VITE_BACKEND_URL = 'http://112.74.106.216:8080' -# 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' -# 监控地址 VITE_APP_MONITOR_ADMIN = 'http://localhost:9090/admin/applications' -# SnailJob 控制台地址 VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job' VITE_APP_PORT = 80 -# 接口加密功能开关(如需关闭 后端也必须对应关闭) VITE_APP_ENCRYPT = true -# 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换 VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==' -# 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换 VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=' -# 客户端id VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' -# websocket 开关 默认使用sse推送 VITE_APP_WEBSOCKET = false -# sse 开关 VITE_APP_SSE = true diff --git a/.env.production b/.env.production index 6f68aab..9500f5d 100644 --- a/.env.production +++ b/.env.production @@ -1,40 +1,28 @@ -# 页面标题 -VITE_APP_TITLE = 瑷胜科技管理系统 +VITE_APP_TITLE = 香港SMT订单物流管理系统 -# 生产环境配置 VITE_APP_ENV = 'production' -# 应用访问路径 例如使用前缀 /admin/ VITE_APP_CONTEXT_PATH = '/' -# 监控地址 VITE_APP_MONITOR_ADMIN = '/admin/applications' -# SnailJob 控制台地址 VITE_APP_SNAILJOB_ADMIN = '/snail-job' -# 生产环境 VITE_APP_BASE_API = '/prod-api' VITE_BACKEND_URL = 'http://112.74.106.216:8080' -# 是否在打包时开启压缩,支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip VITE_APP_PORT = 80 -# 接口加密功能开关(如需关闭 后端也必须对应关闭) + VITE_APP_ENCRYPT = true -# 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换 VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==' -# 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换 VITE_APP_RSA_PRIVATE_KEY = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=' -# 客户端id VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e' -# websocket 开关 默认使用sse推送 VITE_APP_WEBSOCKET = false -# sse 开关 VITE_APP_SSE = true diff --git a/deploy.js b/deploy.js index 5bb98cd..54509fc 100644 --- a/deploy.js +++ b/deploy.js @@ -3,7 +3,6 @@ import path from 'node:path'; import fs from 'node:fs'; import process from 'node:process'; -// 动态导入配置文件(支持文件不存在的情况) const loadConfig = async () => { try { const { default: config } = await import('./.deployrc.js'); @@ -27,11 +26,9 @@ const ssh = new NodeSSH(); async function deploy() { try { - // 加载配置 const config = await loadConfig(); validateConfig(config); - // 连接服务器 console.log('🔄 Connecting to server...'); await ssh.connect({ host: config.host, @@ -41,17 +38,14 @@ async function deploy() { privateKey: config.privateKey }); - // 确保目录存在 console.log('📂 Ensuring remote directory exists...'); await ssh.execCommand(`mkdir -p ${config.remotePath}`); - // 清理目录 if (config.cleanRemote) { console.log('🧹 Cleaning remote directory...'); await ssh.execCommand(`rm -rf ${config.remotePath}/*`); } - // 上传文件 console.log('🚀 Uploading files...'); const uploadResult = await ssh.putDirectory('./dist', config.remotePath, { recursive: true, diff --git a/index.html b/index.html index ec54548..9e75bc3 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - 瑷胜科技管理系统 + 香港SMT订单物流管理系统 + + + + + + + + + + + @@ -29,24 +29,14 @@ const tagsViewStore = useTagsViewStore(); const userStore = useUserStore(); const font = reactive({ + fontSize: 22, color: 'rgba(0, 0, 0, .06)' }); const currentUser = userStore.currentUser; const userNick = computed(() => { - // if (roles.includes('superadmin')) { - // return '超级管理员'; - // } else if (roles.includes('wuliu')) { - // return '物流商'; - // } else if (roles.includes('yunying')) { - // return '运营'; - // } else if (roles.includes('manager')) { - // return '管理员'; - // } else { - // return '普通用户'; - // } - return currentUser.userName; + return currentUser.nickName; }); // 随机动画集合 const animante = ref(''); diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 8586328..16db894 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -77,9 +77,9 @@ {{ proxy.$t('navbar.personalCenter') }} - - {{ proxy.$t('navbar.layoutSetting') }} - + + + {{ proxy.$t('navbar.logout') }} diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 31dfb6d..9ef113f 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -7,15 +7,15 @@ -

+

+
-

+

+
@@ -34,7 +34,7 @@ defineProps({ } }); -const title = ref('瑷胜科技管理系统'); +const title = ref('SMT订单物流管理系统'); const settingsStore = useSettingsStore(); const sideTheme = computed(() => settingsStore.sideTheme); diff --git a/src/layout/index.vue b/src/layout/index.vue index 207a470..5223784 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,24 +1,26 @@ diff --git a/src/views/amz/purchaseOrderQuery/index.vue b/src/views/amz/purchaseOrderQuery/index.vue new file mode 100644 index 0000000..949a6b6 --- /dev/null +++ b/src/views/amz/purchaseOrderQuery/index.vue @@ -0,0 +1,941 @@ + + + + diff --git a/src/views/amz/sendOrder/index.vue b/src/views/amz/sendOrder/index.vue index 8385a26..dc22bf2 100644 --- a/src/views/amz/sendOrder/index.vue +++ b/src/views/amz/sendOrder/index.vue @@ -16,21 +16,6 @@ - - - - - - - - - - - - - - - @@ -54,40 +39,68 @@ 新增 - - 修改 - - - - 删除 - - - - 导出 - + + + + + + + + + + + + + - - + + + + + + + + + - - + + + + - - + +