From bb0a24ce08ce6bba47423210d40148872327cabd Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 09 九月 2025 11:41:34 +0800
Subject: [PATCH] 补充确认表，审批表模板字段；界面优化
---
src/views/statreport/taskdispatchreport.vue | 44 ++++++++++++++++------
src/views/statreport/approveTablePrint.vue | 2 +
src/views/tasks/machinereturnfiles.vue | 28 ++++++++++++--
src/views/statreport/curedprogram.vue | 2
4 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/src/views/statreport/approveTablePrint.vue b/src/views/statreport/approveTablePrint.vue
index 285c542..1ecc8c2 100644
--- a/src/views/statreport/approveTablePrint.vue
+++ b/src/views/statreport/approveTablePrint.vue
@@ -63,6 +63,8 @@
menuWidth: 140,
menu: true,
dialogClickModal: false,
+ height:'auto',
+ calcHeight:170,
column: [
{
diff --git a/src/views/statreport/curedprogram.vue b/src/views/statreport/curedprogram.vue
index 4ccc90d..e2a4d2b 100644
--- a/src/views/statreport/curedprogram.vue
+++ b/src/views/statreport/curedprogram.vue
@@ -117,7 +117,7 @@
prop: 'actSeniorName',
},
{
- label: '瀹℃牳鏃堕棿',
+ label: '瀹℃牳缁撴潫鏃堕棿',
prop: 'endTime',
},
],
diff --git a/src/views/statreport/taskdispatchreport.vue b/src/views/statreport/taskdispatchreport.vue
index b1f18f9..3fa8f21 100644
--- a/src/views/statreport/taskdispatchreport.vue
+++ b/src/views/statreport/taskdispatchreport.vue
@@ -9,7 +9,7 @@
<basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" v-model="form" ref="crud"
@search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
- @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" @selection-change="selectionChange">
+ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
</avue-crud>
</basic-container>
@@ -68,6 +68,16 @@
label: '宸ュ簭鐗堟',
prop: 'processEdition'
},
+ {
+ label: '鍒涘缓鏃堕棿',
+ prop: 'createTime',
+ type: 'datetime',
+ showOverflowTooltip:true,
+ width: 155,
+ search: false,
+ searchSpan: 8,
+ hide: false,
+ },
{
label: '鍒涘缓鏃堕棿',
prop: 'createTime',
@@ -79,32 +89,42 @@
search: true,
searchRange: true,
searchSpan: 8,
- hide: false,
+ hide: true,
},
{
- label: '鏄惁鍥哄寲',
- prop: 'cureTime',
+ label: '绋嬪簭鐘舵��',
+ prop: 'status',
width: 85,
render: ({ row }) => {
- return row.cureTime?'宸插浐鍖�':'鏈浐鍖�';
+ let txt = '';
+ switch(row.status){
+ case 1:
+ txt = '璇曞垏涓�'
+ break;
+ case 2:
+ txt = '鍥哄寲涓�';
+ break;
+ default:
+ txt = '宸插浐鍖�';
+
+ }
+ return txt;
},
},
{
label: '鍥哄寲鏃堕棿',
prop: 'cureTime'
+ },
+ {
+ label: '鏈哄簥',
+ prop: 'machineCode'
}
],
- selection: [],
},
-
- selection: [],
}
},
methods: {
- selectionChange (list) {
- this.selection = list;
- },
-
+
handleExport(row,index) {
//瀹℃壒琛ㄤ笅杞�
this.$confirm('鏄惁瀵煎嚭瀹℃壒琛�?', '鎻愮ず', {
diff --git a/src/views/tasks/machinereturnfiles.vue b/src/views/tasks/machinereturnfiles.vue
index f92b572..c0f6786 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:20,
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,
@@ -342,7 +351,7 @@
}
}
.gongkongMain > div:nth-child(1) {
- width:25%;
+ width:17%;
border-right: 1px solid #ccc;
}
.gongkongMain div:nth-child(2) {
@@ -353,4 +362,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