From cafa9ae77da5ae18db0336a353a79a639b7cc299 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 10:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/tasks/machinereturnfiles.vue | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/views/tasks/machinereturnfiles.vue b/src/views/tasks/machinereturnfiles.vue
index 73431d1..91f5f48 100644
--- a/src/views/tasks/machinereturnfiles.vue
+++ b/src/views/tasks/machinereturnfiles.vue
@@ -65,18 +65,15 @@
prop: 'programName',
hide: true
},
- {
- label: '鏂囦欢缂栧彿',
- prop: ''
+ {
+ label: '鏂囦欢鍚嶇О',
+ prop: 'name',
},
{
label: '鏈哄簥鍙�',
prop: 'machineCode',
},
- {
- label: '鏂囦欢鍚嶇О',
- prop: 'name',
- },
+
{
label: '鏂囦欢鍥哄寲鐘舵��',
prop: 'isCured',
@@ -84,11 +81,11 @@
{
label: '鏂囦欢鍒拌揪鏃堕棿',
prop: 'arrivedTime',
- },
+ },/*
{
label: '鏂囦欢鏁版嵁搴撶紪鍙�',
prop: '',
- },
+ },*/
{
label: '鍏抽敭淇℃伅',
prop: 'keyword',
--
Gitblit v1.9.3