diff --git a/src/utils/enum/permission.ts b/src/utils/enum/permission.ts index fa2f9b46..c389d95f 100644 --- a/src/utils/enum/permission.ts +++ b/src/utils/enum/permission.ts @@ -19,11 +19,11 @@ export const permissionGroups = [ ], }, { - name: '需求管理', + name: '待办管理', permissions: [ - { btn: '需求管理-创建需求', code: 'demand_add_demand' }, - { btn: '需求管理-编辑需求', code: 'demand_edit_demand' }, - { btn: '需求管理-删除需求', code: 'demand_delete_demand' }, + { btn: '待办管理-创建待办', code: 'demand_add_demand' }, + { btn: '待办管理-编辑待办', code: 'demand_edit_demand' }, + { btn: '待办管理-删除待办', code: 'demand_delete_demand' }, ], }, { diff --git a/src/views/task/projectDetail/components/projectFile.vue b/src/views/task/projectDetail/components/projectFile.vue index 35c7e0fa..edadb04f 100644 --- a/src/views/task/projectDetail/components/projectFile.vue +++ b/src/views/task/projectDetail/components/projectFile.vue @@ -271,6 +271,7 @@ const confirmUploadFun = async () => { form.append('fileTypeDictValue', fromData.fileTypeDictValue || ''); form.append('disciplineTypeDictClass', 'DISCIPLINE_TYPE'); form.append('disciplineDictValue', fromData.disciplineDictValue || ''); + // 文件都走的batchAddFileInfoApi上传,这个只是插入数据库记录 await upload(`${PREFIX}node/uploadProjectFiles`, form); } } @@ -357,6 +358,7 @@ const confirmUploadFun = async () => { form.append('fileTypeDictValue', fromData.fileTypeDictValue || ''); form.append('disciplineTypeDictClass', 'DISCIPLINE_TYPE'); form.append('disciplineDictValue', fromData.disciplineDictValue || ''); + // 文件都走的batchAddFileInfoApi上传,这个只是更新数据库记录 await upload(`${PREFIX}node/uploadProjectFiles`, form); } } diff --git a/src/views/task/projectDetail/components/taskDetail.vue b/src/views/task/projectDetail/components/taskDetail.vue index 890e2aae..a74e57d1 100644 --- a/src/views/task/projectDetail/components/taskDetail.vue +++ b/src/views/task/projectDetail/components/taskDetail.vue @@ -25,7 +25,7 @@ - +
diff --git a/src/views/task/simulationTask/components/demandDetailDialog.vue b/src/views/task/simulationTask/components/demandDetailDialog.vue index bd0df758..9f2f519a 100644 --- a/src/views/task/simulationTask/components/demandDetailDialog.vue +++ b/src/views/task/simulationTask/components/demandDetailDialog.vue @@ -2,7 +2,7 @@
([ { - title: '需求名称', + title: '待办名称', key: 'demandName', isShow: true, inputMode: 'input', @@ -288,19 +288,19 @@ const confirmFun = async () => { for (let index = 0; index < tableRef.value.tableData.length; index++) { const item = tableRef.value.tableData[index]; if (!item.insertIndex) { - return ElMessage.warning('需求名为 ' + item.demandName + ' 的上层节点不能为空!'); + return ElMessage.warning('待办名为 ' + item.demandName + ' 的上层节点不能为空!'); } if (item.insertMode === 'lib' && item.chooseTaskList?.length === 0) { - return ElMessage.warning('需求名为 ' + item.demandName + ' 的选择工况不能为空!'); + return ElMessage.warning('待办名为 ' + item.demandName + ' 的选择工况不能为空!'); } if (item.insertMode === 'custom' && item.taskName?.trim()?.length === 0) { - return ElMessage.warning('需求名为 ' + item.demandName + ' 的任务名称不能为空!'); + return ElMessage.warning('待办名为 ' + item.demandName + ' 的任务名称不能为空!'); } if (item.eMemberList.length === 0) { - return ElMessage.warning('需求名为 ' + item.demandName + ' 的仿真执行人不能为空!'); + return ElMessage.warning('待办名为 ' + item.demandName + ' 的仿真执行人不能为空!'); } if (item.planTime.length === 2 && (!item.planTime[0] || !item.planTime[1])) { - return ElMessage.warning('需求名为 ' + item.demandName + ' 的仿计划时间不能为空!'); + return ElMessage.warning('待办名为 ' + item.demandName + ' 的仿计划时间不能为空!'); } } loadingInterface.value = true; diff --git a/src/views/task/simulationTask/confirmTask/index.vue b/src/views/task/simulationTask/confirmTask/index.vue index 41005e7e..b67becfe 100644 --- a/src/views/task/simulationTask/confirmTask/index.vue +++ b/src/views/task/simulationTask/confirmTask/index.vue @@ -9,7 +9,7 @@ tableName="SIMULATION_TASK_DEMAND_CONFIRM" :params="taskParams" :api="demandListApi" - exportFileName="我确认的需求" + exportFileName="我确认的待办" :actionList="actionList" :name-click="false" > @@ -458,7 +458,7 @@ const checkedList = ref(); const batchSendFun = () => { checkedList.value = tableRef.value.tableRef.tableRef.getCheckboxRecords(); if (checkedList.value.length === 0) { - return ElMessage.warning('请勾选需要分发的需求!'); + return ElMessage.warning('请勾选需要分发的待办!'); } bachSendVisible.value = true; }; diff --git a/src/views/task/simulationTask/newDemand/index.vue b/src/views/task/simulationTask/newDemand/index.vue index f1b2ca6f..07d765ff 100644 --- a/src/views/task/simulationTask/newDemand/index.vue +++ b/src/views/task/simulationTask/newDemand/index.vue @@ -12,7 +12,7 @@ auth: false, }, }" - exportFileName="新增待办需求" + exportFileName="新增待办" :actionList="actionList" @show="showTaskDetailFun" :name-click="false" @@ -30,14 +30,14 @@ type="primary" v-permission="'demand_add_demand'" @click="visibleDialog(true)" - >创建需求创建待办 { deleteDemandFun(row.uuid); },