yangys
2025-09-20 8e3b638a35f6b7649c7ba8a322fd0a15f845efcf
界面优化
已修改5个文件
20 ■■■■■ 文件已修改
src/views/flow/components/TodolistLeft.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flow/donelist.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flow/todolist.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowmgr/backImport1.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowmgr/exceptiontask.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flow/components/TodolistLeft.vue
@@ -7,7 +7,7 @@
<template>
    <basic-container>
        <!--'cureProgramTask', 固化编制能添加文件0916-->
        <div class="tool" v-show="['programmingTask','cureProgramTask', 'replaceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)">
        <div class="tool" v-show="['programmingTask','replaceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)">
           
            <!--无固化的情况才显示该开关-->
            <el-switch v-if="row.variables.hasCuredProgram!=='Y'" v-model="programOnMachine" active-text="现场编制" inactive-text="工艺编制" />
src/views/flow/donelist.vue
@@ -320,6 +320,7 @@
                        label: '文件',
                        width: 200,
                        prop: 'file',
                         showOverflowTooltip:true,
                    },
                ],
            },
src/views/flow/todolist.vue
@@ -269,6 +269,9 @@
                        width: 70,
                        overHidden:true,
                        prop: 'startUserName',
                        formatter: (val, value, label) => {
                            return value=='' || value==null ?"MES":value;
                        },
                    },
                    {
                        label: '创建时间',
src/views/flowmgr/backImport1.vue
@@ -4,8 +4,8 @@
      @selection-change="selectionChange">
      <template #menu-left>
        <div style="display: flex;">
          <el-button type="primary" size="default" icon="el-icon-circle-plus" @click="importData">导入</el-button>
          <el-button type="primary" :disabled="this.selection.length==0" size="default" icon="el-icon-circle-plus" plain @click="handleWarehouse"
          <el-button type="primary" size="default" icon="el-icon-upload" @click="importData">导入</el-button>
          <el-button type="primary" :disabled="this.selection.length==0" size="default" icon="el-icon-checked" plain @click="handleWarehouse"
            style="margin-left: 12px;">入库</el-button>
        </div>
      </template>
@@ -15,7 +15,7 @@
    </avue-crud>
    <el-dialog title="工控网文件导入" append-to-body v-model="excelBox" width="555px">
      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter" :upload-error="uploadError">
        <!-- <template #excelTemplate>
        <!-- <template #excelTemplate> icon="el-icon-circle-plus"
          <el-button type="primary" @click="handleTemplate">
            点击下载<i class="el-icon-download el-icon--right"></i>
          </el-button>
@@ -67,10 +67,6 @@
          {
            label: '文件到达时间',
            prop: 'fileBackTime',
          },
          {
            label: '文件数据库编号',
            prop: 'id',
          },
        ],
      },
src/views/flowmgr/exceptiontask.vue
@@ -92,6 +92,10 @@
                        prop: 'drawingNoEdition'
                    },
                    {
                        label: '设备编号',
                        prop: 'equipmentCode',
                    },
                    {
                        label: '机床编码',
                        prop: 'machineCode',
                    },