- {{ item.module }} {{ item.title }}
+ {{ item.moduleName }} {{ item.title }}
{
});
todoItems.value = data.rows.map((item) => {
- let module =
+ let moduleName =
getDictObj(DICT_TYPE.contract_todo_type, item.module)?.label || '';
- if (module) {
- module = `[${module}]`;
+ if (moduleName) {
+ moduleName = `[${moduleName}]`;
}
return {
- module,
+ ...item,
+ moduleName,
avatar: '',
date: item.createTime,
isRead: true,
diff --git a/apps/web-contract/vite.config.mts b/apps/web-contract/vite.config.mts
index f74951c5..413e1066 100644
--- a/apps/web-contract/vite.config.mts
+++ b/apps/web-contract/vite.config.mts
@@ -35,28 +35,32 @@ export default defineConfig(async () => {
},
'/api/flowCenter': {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api\/flowCenter/, '/flowCenter'),
+ rewrite: (path) =>
+ path.replace(/^\/api\/flowCenter/, '/flowCenter'),
// target: `http://10.71.220.24:8083/rl`,
target: `http://192.168.147.164:19007`,
ws: true,
},
'/api/czg/flowCenter': {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api\/flowCenter/, '/flowCenter'),
+ rewrite: (path) =>
+ path.replace(/^\/api\/czg\/flowCenter/, '/flowCenter'),
// target: `http://10.71.220.24:8083/rl`,
target: `http://192.168.147.164:19007`,
ws: true,
},
'/api/zp/flowCenter': {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api\/flowCenter/, '/flowCenter'),
+ rewrite: (path) =>
+ path.replace(/^\/api\/zp\/flowCenter/, '/flowCenter'),
// target: `http://10.71.220.24:8083/rl`,
target: `http://192.168.147.164:19007`,
ws: true,
},
'/api/zzz/flowCenter': {
changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api\/flowCenter/, '/flowCenter'),
+ rewrite: (path) =>
+ path.replace(/^\/api\/zzz\/flowCenter/, '/flowCenter'),
// target: `http://10.71.220.24:8083/rl`,
target: `http://192.168.147.164:19007`,
ws: true,
diff --git a/apps/web-office/src/layouts/basic.vue b/apps/web-office/src/layouts/basic.vue
index f2016600..8ee59043 100644
--- a/apps/web-office/src/layouts/basic.vue
+++ b/apps/web-office/src/layouts/basic.vue
@@ -150,13 +150,13 @@ function handleMenuClick(e) {
{{ value ? `代理${value}` : '代理切换' }}
-
+ /> -->
{
+ // 正则匹配类似 :param? 的可选参数
+ return path.replace(/\/:\w+\?/g, '');
+ };
+
const navigation = async (path: string) => {
+ // 如果是HTTP URL，则在新窗口打开
if (isHttpUrl(path)) {
openWindow(path, { target: '_blank' });
} else {
- await router.push(path);
+ // 去除未赋值的可选参数
+ const cleanedPath = cleanPath(path);
+
+ // 路由跳转
+ await router.push(cleanedPath);
}
};
diff --git a/packages/preferences/src/index.ts b/packages/preferences/src/index.ts
index 9034f6f2..927e49c5 100644
--- a/packages/preferences/src/index.ts
+++ b/packages/preferences/src/index.ts
@@ -31,7 +31,7 @@ function mergeDeep(target: any, source: any) {
*/
function defineOverridesPreferences(preferences: DeepPartial) {
- let defaultPreferences: DeepPartial = {
+ const defaultPreferences: DeepPartial = {
app: {
accessMode: 'frontend',
colorGrayMode: false,
@@ -41,7 +41,7 @@ function defineOverridesPreferences(preferences: DeepPartial) {
defaultAvatar: '',
dynamicTitle: true,
// 是否开启检查更新
- enableCheckUpdates: true,
+ enableCheckUpdates: false,
// 检查更新的时间间隔，单位为分钟
checkUpdatesInterval: 1,
// 开启布局设置按钮
diff --git a/resource/apiDefinitions.ts b/resource/apiDefinitions.ts
index 08d01233..36cd1853 100644
--- a/resource/apiDefinitions.ts
+++ b/resource/apiDefinitions.ts
@@ -1,5 +1,6 @@
+import type { BodyOptions, QueryOptions } from './global.d';
+
import { http } from './request/index';
-import type { QueryOptions, BodyOptions } from './global.d';
export default {
meeting: {
@@ -549,6 +550,15 @@ export default {
/** 合同系统/履行/履行提示/合同变更 获取合同变更信息 */
get_getContractChangeInfo: (data?: QueryOptions) =>
http.get('/app/lvxChange/getContractChangeInfo', data),
+ /** 合同系统/履行/履行提示/合同变更 查询流程未配置人员节点 */
+ get_getFlowNodeUserConfig: (data?: QueryOptions) =>
+ http.get('/app/lvxChange/getFlowNodeUserConfig', data),
+ /** 合同系统/履行/履行提示/合同变更 流程启动 */
+ post_startWorkFlow: (data?: BodyOptions) =>
+ http.post('/app/lvxChange/startWorkFlow', data),
+ /** 合同系统/履行/履行提示/合同变更 审核通过 */
+ post_submit: (data?: BodyOptions) =>
+ http.post('/app/lvxChange/submit', data),
},
contractRelieve: {
/** 合同系统/履行/履行提示/合同解除 获取合同解除信息 */
@@ -581,6 +591,11 @@ export default {
lvxResult: {
/** 合同系统/履行/履行结果 履行结果保存 */
post_save: (data?: BodyOptions) => http.post('/app/lvxResult/save', data),
+ /** 合同系统/履行/履行结果 分页履行结果查询 */
+ get_page: (data?: QueryOptions) => http.get('/app/lvxResult/page', data),
+ /** 合同系统/履行/履行结果 已办 */
+ get_pageDone: (data?: QueryOptions) =>
+ http.get('/app/lvxResult/pageDone', data),
},
contractFiling: {
/** 合同系统/履行/履行提示/临时归档 保存临时归档信息 */
@@ -643,7 +658,7 @@ export default {
/** 合同系统/签订 获取合同签订信息 */
get_getContractSignInfo: (data?: QueryOptions) =>
http.get('/app/qdSign/getContractSignInfo', data),
- /** 合同系统/签订 打印签订审批表 */
+ /** 合同系统/打印 选商打印 */
get_printApprove: (data?: QueryOptions) =>
http.get('/app/qdSign/printApprove', data),
/** 合同系统/签订 打印文本 */
@@ -812,6 +827,15 @@ export default {
/** 合同系统/选商/选商结果 待审核 */
get_toDoPage: (data?: QueryOptions) =>
http.get('/app/biddingResult/toDoPage', data),
+ /** 合同系统/选商/选商结果 查询合同信息 */
+ get_getContractInfo: (data?: QueryOptions) =>
+ http.get('/app/biddingResult/getContractInfo', data),
+ /** 合同系统/选商/选商结果 查询供应商列表 */
+ get_getProviderInfo: (data?: QueryOptions) =>
+ http.get('/app/biddingResult/getProviderInfo', data),
+ /** 合同系统/选商/选商结果 选商专家列表 */
+ get_queryBiddingExpert: (data?: QueryOptions) =>
+ http.get('/app/biddingResult/queryBiddingExpert', data),
},
home: {
/** 合同系统/首页待办/已办 首页待办 */
@@ -865,8 +889,8 @@ export default {
/** 设备管理/设备静态库管理/设备调拨 调拨信息保存 */
post_save: (data?: BodyOptions) => http.post('/app/equAllot/save', data),
/** 设备管理/设备静态库管理/设备调拨 调拨信息删除 */
- post_delete: (data?: BodyOptions) =>
- http.post('/app/equAllot/delete', data),
+ post_deletes: (data?: BodyOptions) =>
+ http.post('/app/equAllot/deletes', data),
},
bidding: {
/** 合同系统/标段信息 标段查询 */
@@ -876,6 +900,9 @@ export default {
/** 合同系统/标段信息 标段信息删除 */
post_deletes: (data?: BodyOptions) =>
http.post('/app/bidding/deletes', data),
+ /** 合同系统/选商/选商结果 查询标段列表 */
+ get_getBuddingPtInfoList: (data?: QueryOptions) =>
+ http.get('/app/bidding/getBuddingPtInfoList', data),
},
equAccident: {
/** 设备管理/设备使用管理/事故处理 事故处理(查询/获取) */
@@ -921,8 +948,8 @@ export default {
post_save: (data?: BodyOptions) =>
http.post('/app/equDayRepair/save', data),
/** 设备管理/设备使用管理/日常维修 删除 */
- get_deletes: (data?: QueryOptions) =>
- http.get('/app/equDayRepair/deletes', data),
+ post_deletes: (data?: BodyOptions) =>
+ http.post('/app/equDayRepair/deletes', data),
/** 设备管理/查询管理/日常维修查询 查询 */
get_query: (data?: QueryOptions) =>
http.get('/app/equDayRepair/query', data),