From 1deae1d89a7039ef0b943be291f6c1b9aaa5ad2c Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 10:30:33 +0800
Subject: [PATCH] feat(mes): 生产报工新增「可报工数量」展示 - `src/api/mes/pro/task/index.ts`: `MesProTaskApi.Task` 接口新增 `reportableQuantity` (可报工数量) 字段定义 - `src/views/mes/pro/feedback/data.ts`: - 生产报工弹框表单中新增「可报工数量」字段展示，设置为不可编辑，且仅在新建/编辑模式下显示 - 在生产任务选择弹框 (`ProTaskSelect`) 的 `onChange` 事件中，自动从选中的任务对象中提取并带入 `reportableQuantity` - 完善了表单联动的重置逻辑，确保更换工单等操作时正确清空此字段
---
vite.config.ts | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/vite.config.ts b/vite.config.ts
index 825d4d4..1406863 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,27 +1,32 @@
import { resolve } from "node:path";
import { loadEnv } from "vite";
import { defineConfig } from "./internal/vite-config/src";
-
-/** 鍏徃閰嶇疆锛氭柊澧炲叕鍙稿彧闇�鍔犱竴琛岋紝logo 鍥剧墖鏀� public/logos/ 鐩綍 */
-const companyConfigs: Record<string, { favicon: string; logo: string; name: string }> = {
- TEST: { name: '娴嬭瘯鍏徃', logo: '/logos/TEST.png', favicon: '/logos/TEST.ico' },
-};
+import { companies } from "./company.config";
export default defineConfig(async ({ mode }) => {
const env = loadEnv(mode, process.cwd(), 'VITE_');
const companyKey = env.VITE_COMPANY || '';
- const company = companyConfigs[companyKey];
+ const company = companies[companyKey];
const appLogo = company?.logo ?? '';
const appFavicon = company?.favicon ?? '';
- console.log('[company]', companyKey, '-> logo:', appLogo, 'favicon:', appFavicon);
+ const appApiUrl = company?.apiUrl ?? '';
+ const isDev = mode === 'development';
+ console.log('[company]', companyKey, '-> name:', company?.name, 'logo:', appLogo, 'api:', appApiUrl || '(from env)');
+
+ const defineVars: Record<string, string> = {
+ __APP_LOGO__: JSON.stringify(appLogo),
+ __APP_FAVICON__: JSON.stringify(appFavicon),
+ __APP_NAME__: JSON.stringify(company?.name ?? ''),
+ };
+ if (!isDev && appApiUrl) {
+ defineVars['import.meta.env.VITE_GLOB_API_URL'] = JSON.stringify(appApiUrl);
+ defineVars['import.meta.env.VITE_BASE_URL'] = JSON.stringify(new URL(appApiUrl).origin);
+ }
return {
application: {},
vite: {
- define: {
- __APP_LOGO__: JSON.stringify(appLogo),
- __APP_FAVICON__: JSON.stringify(appFavicon),
- },
+ define: defineVars,
resolve: {
alias: {
'@vue-office/pdf': resolve(__dirname, 'node_modules/@vue-office/pdf/lib/v3/vue-office-pdf.mjs'),
@@ -71,8 +76,7 @@
proxy: {
"/admin-api": {
changeOrigin: true,
- rewrite: path => path.replace(/^\/admin-api/, ""),
- target: "http://192.168.0.10:48080/admin-api",
+ target: "http://36.213.180.217:9501",
ws: true,
},
},
--
Gitblit v1.9.3