Front_Team/SPDM
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复创建报工的乱码

Browse Source
This commit is contained in:
魏保林
2026-03-30 09:30:48 +08:00
parent e076c819c8
commit 223fe247cb
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tenants/lyric/views/task/exeTask.vue
View File

@@ -12,7 +12,7 @@ import ExeTaskVue from '@/views/task/simulationTask/executeTask/index.vue';
import CreateWorkTime from './components/createWorkTime.vue';
import { CommonStore } from '@/stores/common';
import { NODE_TYPE } from '@/utils/enum/node';
import { disposeTagName } from '@/views/task/simulationTask/taskPage';
// import { disposeTagName } from '@/views/task/simulationTask/taskPage';
const taskInfo = reactive({
uuid: '',
@@ -36,7 +36,7 @@ const actionList = ref([
taskInfo.uuid = row.uuid;
taskInfo.taskName = row.taskName;
taskInfo.description = row.description;
taskInfo.workName = disposeTagName(row, NODE_TYPE.PROJECT) + '-' + row.taskName;
taskInfo.workName = row.tag1Code + '-' + row.tag5Code + '-' + row.taskName;
tagTypeMapList.forEach((item: any) => {
if (item.value === NODE_TYPE.WORKSPACE) {
taskInfo.workspace = row[item.label];

4
src/tenants/lyric/views/task/mySend.vue
View File

@@ -12,7 +12,7 @@ import MySendVue from '@/views/task/simulationTask/mySend/index.vue';
import CreateWorkTime from './components/createWorkTime.vue';
import { CommonStore } from '@/stores/common';
import { NODE_TYPE } from '@/utils/enum/node';
import { disposeTagName } from '@/views/task/simulationTask/taskPage';
// import { disposeTagName } from '@/views/task/simulationTask/taskPage';
const taskInfo = reactive({
uuid: '',
@@ -35,7 +35,7 @@ const actionList = ref([
taskInfo.uuid = row.uuid;
taskInfo.taskName = row.taskName;
taskInfo.description = row.description;
taskInfo.workName = disposeTagName(row, NODE_TYPE.PROJECT) + '-' + row.taskName;
taskInfo.workName = row.tag1Code + '-' + row.tag5Code + '-' + row.taskName;
tagTypeMapList.forEach((item: any) => {
if (item.value === NODE_TYPE.WORKSPACE) {
taskInfo.workspace = row[item.label];

8
src/views/task/simulationTask/components/taskTable.vue
View File

@@ -118,12 +118,12 @@
<template #simType="{row}">
{{ disposeSimType(row.demandType,row.simType) }}
</template> -->
<template #project="{ row }">
<!-- <template #project="{ row }">
{{ disposeTagName(row, NODE_TYPE.PROJECT) }}
</template>
<template #phase="{ row }">
{{ disposeTagName(row, NODE_TYPE.PHASE) }}
</template>
</template> -->
<template #pMemberList="{ row }">
{{ disposeMemberList(row, 'pMemberList') }}
</template>
@@ -152,7 +152,7 @@
import { computed, onMounted, onBeforeUnmount, reactive, ref, type PropType } from 'vue';
import BaseTable from '@/components/common/table/baseTable.vue';
// import { getChildrenNodeList } from '../../projectDetail/components/projectApi';
import { NODE_TYPE } from '@/utils/enum/node';
// import { NODE_TYPE } from '@/utils/enum/node';
// import { CommonStore } from '@/stores/common';
import attachments from '@/views/task/simulationTask/components/attachments.vue';
import { disposeMemberList } from '../../projectDetail/components/project';
@@ -164,7 +164,7 @@ import {
TASK_PROCESS_STATUS,
TASK_APPROVE_STATUS_ENUM,
} from '@/utils/enum/task';
import { disposeTagName, formatQueryTaskListApi, setTaskSearchOptions } from '../taskPage';
import { formatQueryTaskListApi, setTaskSearchOptions } from '../taskPage';
import { getIdMap } from '../../projectDetail/components/project';
import { exportTaskApi, getTaskCountApi } from '@/api/project/task';
import { getTagMapList } from '@/utils/task';

8
src/views/task/simulationTask/taskPage.ts
View File

@@ -43,10 +43,10 @@ export const setDemandSearchOptions = (tableRef: any) => {
tableRef.setOptionsFun('achieveStatus', TASK_CALCULATE_STATUS_OPTIONS);
};
export const disposeTagName = (row: any, nodeType: string) => {
const tagMap = getTagKeyMap();
return row[tagMap.get(nodeType)] || '--';
};
// export const disposeTagName = (row: any, nodeType: string) => {
// const tagMap = getTagKeyMap();
// return row[tagMap.get(nodeType)] || '--';
// };
export const formatQueryTaskListApi = (params: any) => {
emitter.emit('TASK_SEARCH', params.tagReq.tag1 || '');