From 202cee04088a8f98f9b070935d57c473cbf02b54 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期一, 07 七月 2025 17:53:48 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/tasks/machinereturnfileop.vue | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/views/tasks/machinereturnfileop.vue b/src/views/tasks/machinereturnfileop.vue
index f69e562..5daf5d9 100644
--- a/src/views/tasks/machinereturnfileop.vue
+++ b/src/views/tasks/machinereturnfileop.vue
@@ -76,7 +76,7 @@
{
label: '绋嬪簭缂栧彿',
- prop: 'programName',
+ prop: 'code',
},
{
label: '鍥炰紶鏈哄簥',
@@ -85,14 +85,14 @@
{
label: '鏂囦欢鍚嶇О',
- prop: '',
- formatter: (val, value, label) => {
- return `${val?.variables?.machineCode}`;
- },
+ prop: 'name'
},
{
label: '鏂囦欢鍥哄寲鐘舵��',
- prop: 'machineCode',
+ prop: 'isCured',
+ formatter: (val, value, label) => {
+ return `${val==0?'鏈浐鍖�':"宸插浐鍖�"}`;
+ },
},
{
label: '鏂囦欢鍒拌揪鏃堕棿',
@@ -100,11 +100,7 @@
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
- },
- {
- label: '鏂囦欢鏁版嵁搴撶紪鍙�',
- prop: '',
- },
+ }
],
}
}
--
Gitblit v1.9.3