From ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:50:14 +0800
Subject: [PATCH] 机床增加设备编号
---
src/views/tasks/machinereturnfiles.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/views/tasks/machinereturnfiles.vue b/src/views/tasks/machinereturnfiles.vue
index f92b572..4f26492 100644
--- a/src/views/tasks/machinereturnfiles.vue
+++ b/src/views/tasks/machinereturnfiles.vue
@@ -1,6 +1,6 @@
<template>
<div class="gongkongMain">
- <div>
+ <div >
<el-tree :data="treeData" :props="defaultProps" node-key="id" :default-expand-all="false" :default-expanded-keys="defaultKeys" @node-click="handleNodeClick" />
</div>
<div>
@@ -27,10 +27,12 @@
<el-button type="primary" v-if="this.search.dirType!='REC'" :disabled="this.selection.length==0" size="default" icon="el-icon-circle-plus" plain @click="receiveBtn">鎺ユ敹宸查��</el-button>
<el-button type="primary" v-if="this.search.dirType!='REC'" :disabled="this.selection.length==0" size="default" icon="el-icon-circle-plus" plain @click="rejectBtn">鎷掔粷</el-button>
</template>
+ <!--
<template #menu="scope">
<el-button type="primary" v-if="scope.row.dirType==='TEMP'" text size="default" icon="el-icon-document-delete" @click.stop="rejectBtn(scope.row, scope.index)">鎷掔粷</el-button>
<el-button type="primary" v-if="scope.row.dirType==='TEMP'" text size="default" icon="el-icon-document-add" @click.stop="acceptBtn(scope.row, scope.index)">鎺ユ敹</el-button>
</template>
+ -->
</avue-crud>
</basic-container>
</div>
@@ -68,8 +70,10 @@
total: 0,
},
option: {
+ size:'mini',
index: true,
selection: true,
+ selectionWidth:30,
addBtn: false,
editBtn: false,
delBtn: false,
@@ -77,19 +81,23 @@
emptyBtn: false,
searchLabelWidth: "120",
searchSpan: 8,
- menuWidth: 150,
+ menu:false,
+ width:'100%',
column: [
{
label: '鏂囦欢鍚嶇О',
prop: 'name',
+ showOverflowTooltip:true,
},
{
label: '鏈哄簥鍙�',
prop: 'machineCode',
+ showOverflowTooltip:true,
},
{
label: '绋嬪簭鐘舵��',
prop: 'programStatus',
+ showOverflowTooltip:true,
render: ({ row,value }) => {
var txt = '鏈煡';
switch(row.programStatus){
@@ -114,6 +122,7 @@
},
{
label: '鏂囦欢鍒拌揪鏃堕棿',
+ showOverflowTooltip:true,
prop: 'fileCreateTime',
},/*
{
@@ -121,7 +130,7 @@
prop: '',
},*/
{
- label: '鍏抽敭淇℃伅',
+ label: '鍏抽敭瀛�',
prop: 'keyword',
search: true,
hide: true,
@@ -288,6 +297,8 @@
params: obj,
}).then(
res => {
+ var screenHeight = window.innerHeight;
+ this.option.maxHeight = (screenHeight - 390) + 'px';
const data = res.data.data;
this.mypage.total = data.total;
this.data = data.records;
@@ -342,7 +353,7 @@
}
}
.gongkongMain > div:nth-child(1) {
- width:25%;
+ width:17%;
border-right: 1px solid #ccc;
}
.gongkongMain div:nth-child(2) {
@@ -353,4 +364,15 @@
display: flex;
justify-content: flex-end;
}
+/*
+.Avue-crud{
+ :deep(.el-table) {
+ .el-table__body-wrapper,
+ .el-table__fixed-body-wrapper {
+ max-height:calc(100vh - 630px)!important;
+ overflow-y: auto;
+ }
+ }
+}
+*/
</style>
\ No newline at end of file
--
Gitblit v1.9.3