From 8e3b638a35f6b7649c7ba8a322fd0a15f845efcf Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 00:08:09 +0800
Subject: [PATCH] 界面优化
---
src/views/flowmgr/exceptiontask.vue | 4 ++++
src/views/flowmgr/backImport1.vue | 10 +++-------
src/views/flow/donelist.vue | 1 +
src/views/flow/components/TodolistLeft.vue | 2 +-
src/views/flow/todolist.vue | 3 +++
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index 8f60b2b..55a2d3b 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/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="宸ヨ壓缂栧埗" />
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index 0d5d503..5031e67 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -320,6 +320,7 @@
label: '鏂囦欢',
width: 200,
prop: 'file',
+ showOverflowTooltip:true,
},
],
},
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index f149360..dde89b0 100644
--- a/src/views/flow/todolist.vue
+++ b/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: '鍒涘缓鏃堕棿',
diff --git a/src/views/flowmgr/backImport1.vue b/src/views/flowmgr/backImport1.vue
index c64edd9..52509e6 100644
--- a/src/views/flowmgr/backImport1.vue
+++ b/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',
},
],
},
diff --git a/src/views/flowmgr/exceptiontask.vue b/src/views/flowmgr/exceptiontask.vue
index 11cce35..070edfd 100644
--- a/src/views/flowmgr/exceptiontask.vue
+++ b/src/views/flowmgr/exceptiontask.vue
@@ -92,6 +92,10 @@
prop: 'drawingNoEdition'
},
{
+ label: '璁惧缂栧彿',
+ prop: 'equipmentCode',
+ },
+ {
label: '鏈哄簥缂栫爜',
prop: 'machineCode',
},
--
Gitblit v1.9.3