小优化，修改TASK_EXE_STATUS为TASK_ACHIEVE_STATUS

2026-02-04 16:54:14 +08:00
parent b1df980ff4
commit b551acd0de
8 changed files with 52 additions and 37 deletions
--- a/src/components/common/treeCaseTable/treeTable.vue
+++ b/src/components/common/treeCaseTable/treeTable.vue
@@ -46,7 +46,7 @@
        <StatusDot
          v-if="row.nodeType === NODE_TYPE.TASK"
          :status="getTaskExeStyleClass(row.exeStatus)"
-          :title="TASK_EXE_STATUS.O[row.exeStatus]"
+          :title="TASK_ACHIEVE_STATUS.O[row.exeStatus]"
        />
      </template>
      <!-- 达成状态 -->
@@ -580,10 +580,10 @@ const props = withDefaults(defineProps<Props>(), {
  editMode: false,
 });

-const { TASK_EXE_STATUS, RESULT_ACHIEVE_STATUS, TASK_APPROVE_STATUS, TASK_PROGRESS_STATUS } =
+const { TASK_ACHIEVE_STATUS, RESULT_ACHIEVE_STATUS, TASK_APPROVE_STATUS, TASK_PROGRESS_STATUS } =
  useDict(
    'RESULT_ACHIEVE_STATUS',
-    'TASK_EXE_STATUS',
+    'TASK_ACHIEVE_STATUS',
    'TASK_APPROVE_STATUS',
    'TASK_PROGRESS_STATUS'
  );
--- a/src/tenants/lyric/views/task/components/planningInformation.vue
+++ b/src/tenants/lyric/views/task/components/planningInformation.vue
@@ -70,8 +70,15 @@ const demandTypeInfo = ref<any>({
  },
  有限元: {
    name: '有限元仿真',
-    reminder: '',
-    content: [],
+    reminder: '有限元仿真登记提醒',
+    content: [
+      {
+        index: 1,
+        header: '(1)、',
+        inner: ['若不清楚本待办需求如何填写，请看', '《填写指导书》', ';'],
+        type: 1,
+      },
+    ],
  },
  动画: {
    name: '动画',
@@ -251,6 +258,8 @@ const downLoadFileFun = (name: any) => {
 <style lang="scss" scoped>
 .info-page {
  width: 100%;
+  border-bottom: 1px solid rgb(220, 223, 230);
+  margin-bottom: var(--padding-medium);

  .page-title {
    width: 100%;
--- a/src/tenants/lyric/views/task/lyricTask.ts
+++ b/src/tenants/lyric/views/task/lyricTask.ts
@@ -14,6 +14,7 @@ export const getDemandHideKeys = (key: string) => {
    'referenceData',
    'deviceMessage',
    'materialAndCraftsmanship',
+    'robotNum',
  ];
  let keys: string[] = [];
  if (key.indexOf('有限元') !== -1 || key.indexOf('DISCIPLINE_TYPE') !== -1) {
--- a/src/utils/enum/permission.ts
+++ b/src/utils/enum/permission.ts
@@ -29,23 +29,22 @@ export const permissionGroups = [
  {
    name: '任务管理',
    permissions: [
-      { btn: '未分发的-批量分发', code: 'task_confirm_batch_send' },
-      { btn: '未分发的-分发', code: 'task_confirm_send' },
-      { btn: '我分发的-编辑', code: 'task_send_edit' },
-      // { btn: '我分发的-创建报工', code: 'demand_delete' },
-      { btn: '我分发的-删除', code: 'task_send_delete' },
-      { btn: '我执行的-启动', code: 'task_execute_start' },
-      { btn: '我执行的-暂停', code: 'task_execute_pause' },
-      { btn: '我执行的-编辑', code: 'task_execute_edit' },
-      { btn: '我执行的-完成', code: 'task_execute_complete' },
-      { btn: '我执行的-详情', code: 'task_execute_detail' },
-      { btn: '我执行的-驳回', code: 'task_execute_reject' },
-      { btn: '我执行的-跳转', code: 'task_execute_skip' },
-      { btn: '我关注的-详情', code: 'task_attention_detail' },
-      { btn: '我关注的-取消关注', code: 'task_attention_cancel_attention' },
-      { btn: '所有任务-详情', code: 'task_all_detail' },
-      { btn: '所有任务-关注', code: 'task_all_attention' },
-      { btn: '所有任务-取消关注', code: 'task_all_cancel_attention' },
+      // { btn: '未分发的-批量分发', code: 'task_confirm_batch_send' },
+      // { btn: '未分发的-分发', code: 'task_confirm_send' },
+      // { btn: '我分发的-编辑', code: 'task_send_edit' },
+      // { btn: '我分发的-删除', code: 'task_send_delete' },
+      // { btn: '我执行的-启动', code: 'task_execute_start' },
+      // { btn: '我执行的-暂停', code: 'task_execute_pause' },
+      // { btn: '我执行的-编辑', code: 'task_execute_edit' },
+      // { btn: '我执行的-完成', code: 'task_execute_complete' },
+      // { btn: '我执行的-详情', code: 'task_execute_detail' },
+      // { btn: '我执行的-驳回', code: 'task_execute_reject' },
+      // { btn: '我执行的-跳转', code: 'task_execute_skip' },
+      // { btn: '我关注的-详情', code: 'task_attention_detail' },
+      // { btn: '我关注的-取消关注', code: 'task_attention_cancel_attention' },
+      // { btn: '所有任务-详情', code: 'task_all_detail' },
+      // { btn: '所有任务-关注', code: 'task_all_attention' },
+      // { btn: '所有任务-取消关注', code: 'task_all_cancel_attention' },
      { btn: '所有任务-编辑', code: 'task_all_edit' },
    ],
  },
--- a/src/views/task/projectDetail/components/statisticAnalysis.vue
+++ b/src/views/task/projectDetail/components/statisticAnalysis.vue
@@ -100,14 +100,14 @@ import { useDict } from '@/utils/useDict';
 import { TASK_CALCULATE_STATUS_OPTIONS } from '@/utils/enum/task';
 import { getThemeColor } from '@/utils/theme';

-const { TASK_EXE_STATUS, DIFFICULTY_COEFFICIENT } = useDict(
-  'TASK_EXE_STATUS',
+const { TASK_ACHIEVE_STATUS, DIFFICULTY_COEFFICIENT } = useDict(
+  'TASK_ACHIEVE_STATUS',
  'DIFFICULTY_COEFFICIENT'
 );
 const taskCalculateStatusLegendData = TASK_CALCULATE_STATUS_OPTIONS.map((item) => ({
  name: item.label,
 }));
-const taskExeStatusLegendData = TASK_EXE_STATUS.value.A.map((item: any) => {
+const taskExeStatusLegendData = TASK_ACHIEVE_STATUS.value.A.map((item: any) => {
  return {
    name: item.label,
  };
@@ -173,8 +173,8 @@ const getUserTaskCompleteStatistics = async () => {
    res.data.result.forEach((item: any) => {
      xData.push(item.userName);
    });
-    for (let i = 0; i < TASK_EXE_STATUS.value.A.length; i++) {
-      const item = TASK_EXE_STATUS.value.A[i];
+    for (let i = 0; i < TASK_ACHIEVE_STATUS.value.A.length; i++) {
+      const item = TASK_ACHIEVE_STATUS.value.A[i];
      const obj: any = {
        name: item.label,
        stack: 'total',
@@ -291,8 +291,8 @@ const queryTaskCompletionByWorkspace = async () => {
    xData = res.data.result.map((item: any) => {
      return item.name;
    });
-    for (let i = 0; i < TASK_EXE_STATUS.value.A.length; i++) {
-      const item = TASK_EXE_STATUS.value.A[i];
+    for (let i = 0; i < TASK_ACHIEVE_STATUS.value.A.length; i++) {
+      const item = TASK_ACHIEVE_STATUS.value.A[i];
      const obj: any = {
        name: item.label,
        type: 'bar',
@@ -341,8 +341,8 @@ const queryTaskCompletionByDiscipline = async () => {
    xData = res.data.result.map((item: any) => {
      return item.name;
    });
-    for (let i = 0; i < TASK_EXE_STATUS.value.A.length; i++) {
-      const item = TASK_EXE_STATUS.value.A[i];
+    for (let i = 0; i < TASK_ACHIEVE_STATUS.value.A.length; i++) {
+      const item = TASK_ACHIEVE_STATUS.value.A[i];
      const obj: any = {
        name: item.label,
        type: 'bar',
--- a/src/views/task/projectOverview/index.vue
+++ b/src/views/task/projectOverview/index.vue
@@ -99,7 +99,7 @@
        <StatusDot
          v-if="row.nodeType === NODE_TYPE.TASK"
          :status="getTaskExeStyleClass(row.exeStatus)"
-          :title="TASK_EXE_STATUS.O[row.exeStatus]"
+          :title="TASK_ACHIEVE_STATUS.O[row.exeStatus]"
        />
      </template>
      <!-- 达成状态 -->
@@ -503,10 +503,10 @@ const filterParamFormData = reactive<any>({
  phaseNodeId: '',
  expandType: 'all',
 });
-const { TASK_EXE_STATUS, RESULT_ACHIEVE_STATUS, TASK_APPROVE_STATUS, TASK_PROGRESS_STATUS } =
+const { TASK_ACHIEVE_STATUS, RESULT_ACHIEVE_STATUS, TASK_APPROVE_STATUS, TASK_PROGRESS_STATUS } =
  useDict(
    'RESULT_ACHIEVE_STATUS',
-    'TASK_EXE_STATUS',
+    'TASK_ACHIEVE_STATUS',
    'TASK_APPROVE_STATUS',
    'TASK_PROGRESS_STATUS'
  );
--- a/src/views/task/simulationTask/mySend/index.vue
+++ b/src/views/task/simulationTask/mySend/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="gl-page-content-full">
    <div class="tabs">
-      <el-tabs v-model="isSend" type="card" @tab-change="exeTableRef.initTaskCount()">
+      <el-tabs v-model="isSend" type="card" @tab-change="tabChangeFun">
        <el-tab-pane label="未分发任务" :name="false" />
        <el-tab-pane label="已分发任务" :name="true" />
      </el-tabs>
@@ -115,6 +115,12 @@ const formAttrs = ref({

 const isSend = ref(false);

+const tabChangeFun = () => {
+  nextTick(() => {
+    exeTableRef.value.initTaskCount();
+  });
+};
+
 const taskParams = computed(() => {
  if (isSend.value) {
    // 已分发的任务
--- a/src/views/task/simulationTask/newDemand/index.vue
+++ b/src/views/task/simulationTask/newDemand/index.vue
@@ -39,7 +39,7 @@
      :loading="loadingInterface"
      :diaTitle="isCreateDialog ? '创建需求' : '编辑需求'"
      :width="800"
-      :height="650"
+      :height="700"
      @close="closeFun"
      show-footer
    >
@@ -53,7 +53,7 @@
          />
        </el-tabs>
      </div>
-      <PlanningInformation :data="{ name: simulationType }"></PlanningInformation>
+      <PlanningInformation :data="simulationType"></PlanningInformation>
      <!-- <div class="message-info">
        <div v-if="simulationType === SIMULATION_TYPE.FINITE_ELEMENT" class="message-item">
          1、有限元仿真登记提醒： 若不清楚本待办需求如何填写，请看<span class="down-file"