From 81b663de6391f01956ab187d1bd34e612f30acf5 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sun, 30 Aug 2026 09:29:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8E=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=20Windows=20=E8=B7=A8=E5=B9=B3=E5=8F=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复 TS1261 import 大小写(33 处)、TS2561 report_code→report_id、TS2339 类型标注 - deploy/rollback 支持 Windows: npm.cmd EINVAL(改用 node 直跑 npm-cli.js)、sshKey 绝对路径 - map.ts 兼容后端菜单老路径,强制指向 basicManagement newview(含投递计划/报表定义) - report.deliveryPlan.copy 返回结构对齐后端 created/skipped,修正前端误报复制成功 --- scripts/deploy.mjs | 17 +++++- scripts/rollback.mjs | 2 +- src/api/report/report.ts | 8 +-- src/layout/component/Navbar.vue | 2 +- src/router/map.ts | 3 + .../shipperSigning/index.vue | 2 +- .../detail/AfterSaleDetailDialog.vue | 2 +- src/views/afterSale/detail/ClaimDialog.vue | 2 +- src/views/afterSale/detail/HandleDialog.vue | 2 +- src/views/afterSale/detail/TransferDialog.vue | 2 +- src/views/afterSale/detail/index.vue | 2 +- src/views/afterSale/list/index.vue | 2 +- src/views/express/returnReceived/index.vue | 2 +- .../components/CreateAfterSaleDialog.vue | 4 +- src/views/message/index.vue | 2 +- .../component/CreatePendingOrderDialog.vue | 4 +- .../component/OrderItemsDetailPanel.vue | 2 +- .../component/PendingOrderDetailPanel.vue | 2 +- .../order/orderManagement/deliveryOrder.vue | 4 +- .../order/orderManagement/exceptionOrder.vue | 2 +- .../order/orderManagement/outboundOrder.vue | 2 +- .../order/orderManagement/pendingOrder.vue | 2 +- .../order/orderManagement/reviewOrder.vue | 4 +- src/views/order/orderWeighing/index.vue | 2 +- .../waveOrder/GroupWaveBatchListPanel.vue | 2 +- .../waveOrder/SandanWaveBatchListPanel.vue | 2 +- .../component/PendingOrderListPanel.vue | 2 +- .../order/waveOrder/config/wave-config.ts | 2 +- .../generalreport/config/template-config.ts | 58 ++++++++++++++----- .../pages/DeliveryPlanFormDialog.vue | 58 +++++++++++++++---- src/views/store/shipperSigning/index.vue | 4 +- src/views/store/stores/index.vue | 2 +- .../newview/pages/DefinitionFormDialog.vue | 4 +- .../newview/pages/DeliveryPlanCopyDialog.vue | 14 ++++- src/views/warehouses/index.vue | 2 +- 35 files changed, 161 insertions(+), 67 deletions(-) diff --git a/scripts/deploy.mjs b/scripts/deploy.mjs index 3616b187..b35cce5c 100644 --- a/scripts/deploy.mjs +++ b/scripts/deploy.mjs @@ -30,7 +30,7 @@ const BASE_PATH = config.basePath; // 项目在服务器上的存放路径 const KEEP_RELEASES = config.keepReleases; // 服务器上保留的最近版本数 const SITE_HOST = config.siteHost; // 发版后健康检查域名 const LOCAL_DIST = path.resolve('dist'); -const SSH_KEY = path.join(os.homedir(), '.ssh', config.sshKey); +const SSH_KEY = path.isAbsolute(config.sshKey) ? config.sshKey : path.join(os.homedir(), '.ssh', config.sshKey); const SSH_OPTS = ['-i', SSH_KEY, '-o', 'StrictHostKeyChecking=no']; const HOST = `${USER}@${IP}`; const TARBALL = 'dist.tar.gz'; @@ -47,7 +47,20 @@ function timestamp() { } function run(cmd, args, opts = {}) { - const res = spawnSync(cmd, args, { stdio: 'inherit', ...opts }); + // Windows 下 .cmd/.bat(如 npm.cmd)不能直接用 spawnSync 执行(报 EINVAL): + // 优先用 node 直接运行 npm-cli.js(无 shell、无 DEP0190 警告),否则回退到 shell: true + const isWinCmd = process.platform === 'win32' && /\.(cmd|bat)$/i.test(cmd) + let res + if (isWinCmd) { + const npmCli = process.env.npm_execpath + if (npmCli && /npm-cli\.js$/i.test(npmCli)) { + res = spawnSync(process.execPath, [npmCli, ...args], { stdio: 'inherit', ...opts }) + } else { + res = spawnSync(cmd, args, { stdio: 'inherit', shell: true, ...opts }) + } + } else { + res = spawnSync(cmd, args, { stdio: 'inherit', ...opts }) + } if (res.error) { console.error(`❌ 无法执行命令 ${cmd}: ${res.error.message}`); if (res.error.code === 'ENOENT') { diff --git a/scripts/rollback.mjs b/scripts/rollback.mjs index 82e8d3bc..1b9e2236 100644 --- a/scripts/rollback.mjs +++ b/scripts/rollback.mjs @@ -27,7 +27,7 @@ const config = JSON.parse(readFileSync(CONFIG_PATH, 'utf8')); const USER = config.user; const IP = config.ip; // 服务器 IP const BASE_PATH = config.basePath; // 项目在服务器上的存放路径 -const SSH_KEY = path.join(os.homedir(), '.ssh', config.sshKey); +const SSH_KEY = path.isAbsolute(config.sshKey) ? config.sshKey : path.join(os.homedir(), '.ssh', config.sshKey); const SSH_OPTS = ['-i', SSH_KEY, '-o', 'StrictHostKeyChecking=no']; const HOST = `${USER}@${IP}`; diff --git a/src/api/report/report.ts b/src/api/report/report.ts index 4e0ba746..b040eb32 100644 --- a/src/api/report/report.ts +++ b/src/api/report/report.ts @@ -210,10 +210,10 @@ export interface DeliveryPlanCopyParams { } export interface DeliveryPlanCopyResult { - /** 成功复制的计划数 */ - copied: number - /** 复制后的计划ID列表 */ - plan_ids?: number[] + /** 成功复制的计划列表(实际后端返回结构;每项含目标货主 store_id 与可选新计划 plan_id) */ + created?: Array<{ store_id?: number; plan_id?: number }> + /** 跳过的货主列表(含原因,如「货主不存在或状态异常」) */ + skipped?: Array<{ store_id: number; reason?: string }> code?: number } diff --git a/src/layout/component/Navbar.vue b/src/layout/component/Navbar.vue index 0eda5594..394e5862 100644 --- a/src/layout/component/Navbar.vue +++ b/src/layout/component/Navbar.vue @@ -101,7 +101,7 @@ import LangSelect from '@/components/LangSelect/index.vue' import TopMenu from './TopMenu.vue' import dayjs from 'dayjs' import { useFullscreen } from '@vueuse/core' -import { afterSaleWorkCount, afterSaleWorkList } from '@/api/aftersale/index' +import { afterSaleWorkCount, afterSaleWorkList } from '@/api/afterSale/index' const { isFullscreen, toggle } = useFullscreen() diff --git a/src/router/map.ts b/src/router/map.ts index c72a4f16..999094b1 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -48,6 +48,9 @@ export const componentMap: Record = { 'order/weighing': () => import('@/views/order/orderWeighing/index.vue'), 'role/index': () => import('@/views/system/setting/role/index.vue'), 'basicManagement':() => import('@/views/system/setting/basicManagement/newview/index.vue'), + /** 与后端菜单 component 字段兼容:部分环境为老路径 system/setting/basicManagement/index → 强制指向 newview(含投递计划/报表定义) */ + 'system/setting/basicManagement/index': () => import('@/views/system/setting/basicManagement/newview/index.vue'), + 'system/setting/basicManagement': () => import('@/views/system/setting/basicManagement/newview/index.vue'), 'system/setting/role/index': () => import('@/views/system/setting/role/index.vue'), // 'role/index': () => import('@/views/system/setting/role/index.vue'), // 'system/setting/role/index': () => import('@/views/system/setting/role/index.vue'), diff --git a/src/views/Externalwarehouse/shipperSigning/index.vue b/src/views/Externalwarehouse/shipperSigning/index.vue index 44bcb558..20c96c9c 100644 --- a/src/views/Externalwarehouse/shipperSigning/index.vue +++ b/src/views/Externalwarehouse/shipperSigning/index.vue @@ -140,7 +140,7 @@ import { ref, reactive, onMounted } from 'vue' import { ElMessage } from 'element-plus' import { Search, Refresh } from '@element-plus/icons-vue' -import { storeWarehouseWarehouseList } from '@/api/storewarehouse.warehouse/storeWarehouse' +import { storeWarehouseWarehouseList } from '@/api/storeWarehouse.warehouse/storeWarehouse' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' diff --git a/src/views/afterSale/detail/AfterSaleDetailDialog.vue b/src/views/afterSale/detail/AfterSaleDetailDialog.vue index 0258c4d8..2fb26e68 100644 --- a/src/views/afterSale/detail/AfterSaleDetailDialog.vue +++ b/src/views/afterSale/detail/AfterSaleDetailDialog.vue @@ -254,7 +254,7 @@ import { type AfterSale, type AfterSaleStep, type AfterSaleRelated, -} from '@/api/aftersale/index' +} from '@/api/afterSale/index' import { orderQueryOrderLogList, type OrderLogListItem } from '@/api/order.index/orderindex' import { getCOSUploadConfig, uploadSuccessNotify } from '@/api/index/index' import { diff --git a/src/views/afterSale/detail/ClaimDialog.vue b/src/views/afterSale/detail/ClaimDialog.vue index 9283da74..3020eab2 100644 --- a/src/views/afterSale/detail/ClaimDialog.vue +++ b/src/views/afterSale/detail/ClaimDialog.vue @@ -35,7 +35,7 @@