From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
index 520a52c..fc2167c 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
@@ -22,7 +22,7 @@
:sm='6'
>
<a-form-item label='淇濆吇椤圭洰鍚嶇О'>
- <a-input
+ <j-input
placeholder='璇疯緭鍏ヤ繚鍏婚」鐩悕绉�'
v-model='queryParam.name'
/>
@@ -102,20 +102,25 @@
align: 'center',
dataIndex: 'standard'
},
+ // {
+ // title: '鏂规硶',
+ // align: 'center',
+ // dataIndex: 'maintenanceMethod_dictText'
+ // },
+ // {
+ // title: '宸ュ叿',
+ // align: 'center',
+ // dataIndex: 'maintenanceTool'
+ // },
+ // {
+ // title: '缁翠繚涓撲笟',
+ // align: 'center',
+ // dataIndex: 'maintenanceSpecialtyId_dictText'
+ // },
{
- title: '鏂规硶',
+ title: '淇濆吇閮ㄤ綅',
align: 'center',
- dataIndex: 'maintenanceMethod_dictText'
- },
- {
- title: '宸ュ叿',
- align: 'center',
- dataIndex: 'maintenanceTool'
- },
- {
- title: '缁翠繚涓撲笟',
- align: 'center',
- dataIndex: 'maintenanceSpecialtyId_dictText'
+ dataIndex: 'location'
},
{
title: '瀹夊叏瑕佹眰',
--
Gitblit v1.9.3